From 1fc638686a20f9a9c77d0ca3c9a42b6ca1871e56 Mon Sep 17 00:00:00 2001
From: nynex <nynex>
Date: Wed, 22 Apr 2015 02:40:12 +0000
Subject: [PATCH] Removed package/feeds

---
 trunk/package/feeds/packages/acl/Makefile     |    88 -
 .../patches/100-no-gettext_configure.patch    |    21 -
 .../acl/patches/101-no-gettext_autogen.patch  |     9 -
 .../acl/patches/102-no-gettext_Makefile.patch |    13 -
 trunk/package/feeds/packages/aiccu/Makefile   |    56 -
 .../feeds/packages/aiccu/files/aiccu.hotplug  |     3 -
 .../feeds/packages/aiccu/files/aiccu.sh       |   121 -
 .../aiccu/patches/100-cross_compile.patch     |   101 -
 .../aiccu/patches/200-add_dn_skipname.patch   |    70 -
 .../aiccu/patches/300-resolver-uclibc.patch   |    29 -
 .../feeds/packages/aircrack-ng/Makefile       |    52 -
 trunk/package/feeds/packages/alpine/Makefile  |   123 -
 .../100-no-openssl-check-cross-compile.patch  |    29 -
 .../package/feeds/packages/alsa-lib/Makefile  |    94 -
 .../alsa-lib/patches/001-link_fix.patch       |    22 -
 .../002-remove_cross_compile_guess.patch      |    23 -
 .../feeds/packages/alsa-utils/Makefile        |    93 -
 .../patches/100-uClibc-compat.patch           |    23 -
 .../package/feeds/packages/announce/Makefile  |    57 -
 trunk/package/feeds/packages/apache/Makefile  |   166 -
 .../apache/patches/001-Makefile_in.patch      |    14 -
 .../apache/patches/002-test_char_h.patch      |    26 -
 .../apache/patches/003-logdir_fix.patch       |    33 -
 .../apache/patches/004-pidfile_fix.patch      |    11 -
 .../apache/patches/005-httpd_conf.patch       |    60 -
 trunk/package/feeds/packages/apcupsd/Makefile |   106 -
 .../feeds/packages/apcupsd/files/apccontrol   |   146 -
 .../feeds/packages/apcupsd/files/apcupsd.conf |   322 -
 .../feeds/packages/apcupsd/files/apcupsd.css  |    64 -
 .../feeds/packages/apcupsd/files/apcupsd.init |    12 -
 .../packages/apcupsd/files/apcupsd_mail.conf  |     7 -
 .../feeds/packages/apcupsd/files/changeme     |    17 -
 .../feeds/packages/apcupsd/files/commfailure  |    17 -
 .../feeds/packages/apcupsd/files/commok       |    17 -
 .../feeds/packages/apcupsd/files/hosts.conf   |    19 -
 .../packages/apcupsd/files/multimon.conf      |    63 -
 .../feeds/packages/apcupsd/files/offbattery   |    17 -
 .../feeds/packages/apcupsd/files/onbattery    |    17 -
 .../apcupsd/patches/010-fix-usb.patch         |     8 -
 trunk/package/feeds/packages/apinger/Makefile |    67 -
 .../feeds/packages/apinger/files/apinger.init |    18 -
 .../apinger/patches/001-autoreconf.patch      |    13 -
 .../apinger/patches/002-run_as_user.patch     |    11 -
 .../apinger/patches/003-no_docs.patch         |    11 -
 .../package/feeds/packages/apr-util/Makefile  |    77 -
 .../patches/001-automake-compat.patch         |    21 -
 trunk/package/feeds/packages/apr/Makefile     |    79 -
 .../apr/patches/001-autoconf-compat.patch     |    22 -
 .../apr/patches/101-fix_apr_time_now.patch    |    13 -
 .../patches/201-upgrade-and-fix-1.5.1.patch   |    54 -
 .../feeds/packages/argp-standalone/Makefile   |    48 -
 .../patches/001-throw-in-funcdef.patch        |    79 -
 trunk/package/feeds/packages/aria2/Config.in  |    28 -
 trunk/package/feeds/packages/aria2/Makefile   |    70 -
 trunk/package/feeds/packages/attr/Makefile    |    93 -
 .../patches/100-no-gettext_configure.patch    |    21 -
 .../attr/patches/101-no-gettext_autogen.patch |     9 -
 .../patches/102-no-gettext_Makefile.patch     |    13 -
 trunk/package/feeds/packages/avahi/Makefile   |   404 -
 .../packages/avahi/files/avahi-daemon.conf    |    28 -
 .../packages/avahi/files/avahi-daemon.init    |    23 -
 .../feeds/packages/avahi/files/service-http   |    10 -
 .../feeds/packages/avahi/files/service-ssh    |     9 -
 .../010-step_back_autotools-no-gettext.patch  |    80 -
 trunk/package/feeds/packages/bash/Makefile    |    73 -
 .../bash/patches/001-compile-fix.patch        |    15 -
 .../patches/002-force-internal-readline.patch |    24 -
 .../patches/101-upstream-bash43-001.patch     |    49 -
 .../patches/102-upstream-bash43-002.patch     |    49 -
 .../patches/103-upstream-bash43-003.patch     |    39 -
 .../patches/104-upstream-bash43-004.patch     |    38 -
 .../patches/105-upstream-bash43-005.patch     |    50 -
 .../patches/106-upstream-bash43-006.patch     |    39 -
 .../patches/107-upstream-bash43-007.patch     |    45 -
 .../patches/108-upstream-bash43-008.patch     |   148 -
 .../patches/109-upstream-bash43-009.patch     |    51 -
 .../patches/110-upstream-bash43-010.patch     |   145 -
 .../patches/111-upstream-bash43-011.patch     |    40 -
 .../patches/112-upstream-bash43-012.patch     |    38 -
 .../patches/113-upstream-bash43-013.patch     |    52 -
 .../patches/114-upstream-bash43-014.patch     |    95 -
 .../patches/115-upstream-bash43-015.patch     |    48 -
 .../patches/116-upstream-bash43-016.patch     |   121 -
 .../patches/117-upstream-bash43-017.patch     |    41 -
 .../patches/118-upstream-bash43-018.patch     |    38 -
 .../patches/119-upstream-bash43-019.patch     |    75 -
 .../patches/120-upstream-bash43-020.patch     |    93 -
 .../patches/121-upstream-bash43-021.patch     |    46 -
 .../patches/122-upstream-bash43-022.patch     |    47 -
 .../patches/123-upstream-bash43-023.patch     |    78 -
 .../patches/124-upstream-bash43-024.patch     |    45 -
 .../patches/125-upstream-bash43-025.patch     |   110 -
 .../patches/126-upstream-bash43-026.patch     |    54 -
 .../patches/127-upstream-bash43-027.patch     |   176 -
 .../patches/128-upstream-bash43-028.patch     |  1526 ---
 .../patches/129-upstream-bash43-029.patch     |    50 -
 .../patches/130-upstream-bash43-030.patch     |  1396 ---
 .../patches/131-upstream-bash43-031.patch     |    96 -
 .../patches/132-upstream-bash43-032.patch     |    42 -
 .../patches/133-upstream-bash43-033.patch     |   201 -
 .../packages/bash/patches/900-no_doc.patch    |    13 -
 trunk/package/feeds/packages/bcp38/Makefile   |    62 -
 .../feeds/packages/bcp38/files/bcp38.config   |    22 -
 .../feeds/packages/bcp38/files/bcp38.defaults |    13 -
 .../package/feeds/packages/bcp38/files/run.sh |   104 -
 trunk/package/feeds/packages/bind/Makefile    |   204 -
 .../feeds/packages/bind/files/bind/db.0       |    12 -
 .../feeds/packages/bind/files/bind/db.127     |    13 -
 .../feeds/packages/bind/files/bind/db.255     |    12 -
 .../feeds/packages/bind/files/bind/db.local   |    13 -
 .../feeds/packages/bind/files/bind/db.root    |    45 -
 .../bind/files/bind/named.conf.example        |    45 -
 .../feeds/packages/bind/files/named.init      |    36 -
 .../packages/bind/patches/001-no-tests.patch  |    26 -
 .../bind/patches/002-autoconf-ar-fix.patch    |    29 -
 trunk/package/feeds/packages/bluelog/Makefile |    92 -
 .../feeds/packages/bluelog/files/bluelog.init |    13 -
 trunk/package/feeds/packages/bluez/Makefile   |   129 -
 .../packages/bluez/files/bluetooth.config     |    15 -
 .../feeds/packages/bluez/files/bluetooth.dbus |    37 -
 .../packages/bluez/files/bluetoothd.init      |    13 -
 .../feeds/packages/bluez/files/givepin        |    14 -
 .../bluez/patches/200-uart-speed.patch        |    40 -
 .../packages/bluez/patches/201-readline.patch |    52 -
 trunk/package/feeds/packages/bmon/Makefile    |    48 -
 .../feeds/packages/bogofilter/Makefile        |    58 -
 .../bogofilter/files/postfix-bogofilter       |    34 -
 trunk/package/feeds/packages/boost/Makefile   |   277 -
 .../boost/patches/100-do-not-use-librt.patch  |    28 -
 .../feeds/packages/btrfs-progs/Makefile       |    65 -
 .../btrfs-progs/files/btrfs-scan.init         |     9 -
 .../001-fix-xattr-h-include-location.patch    |    79 -
 trunk/package/feeds/packages/bwm-ng/Config.in |    35 -
 trunk/package/feeds/packages/bwm-ng/Makefile  |    61 -
 trunk/package/feeds/packages/bzip2/Makefile   |    80 -
 trunk/package/feeds/packages/c-ares/Makefile  |    51 -
 trunk/package/feeds/packages/ccid/Makefile    |    52 -
 trunk/package/feeds/packages/ccrypt/Makefile  |    39 -
 .../packages/ccrypt/patches/001-no-intl.patch |    89 -
 trunk/package/feeds/packages/check/Makefile   |    58 -
 trunk/package/feeds/packages/cmdpad/Makefile  |    61 -
 .../feeds/packages/cmdpad/files/cmdpad.init   |    14 -
 .../cmdpad/patches/100-Makefile.patch         |    35 -
 .../cmdpad/patches/120-kernel26-compat.patch  |    15 -
 .../cmdpad/patches/130-no_zombie.patch        |    18 -
 .../cmdpad/patches/140-compile_fix.patch      |    11 -
 .../package/feeds/packages/collectd/Makefile  |   330 -
 .../packages/collectd/files/collectd.conf     |    90 -
 .../packages/collectd/files/collectd.init     |    15 -
 .../001-undefined-AM_PATH_LIBGCRYPT.patch     |     4 -
 .../collectd/patches/003-remove-werror.patch  |    22 -
 .../100-rrdtool-add-rrasingle-option.patch    |    57 -
 .../patches/110-net-device-stats.patch        |    46 -
 .../collectd/patches/140-fix-fqdnlookup.patch |    11 -
 .../patches/150-fix-interface-af-link         |    21 -
 .../patches/200-fix-git-describe-error.patch  |    11 -
 .../patches/400-fix-olsrd-get-all.patch       |    11 -
 .../patches/900-add-iwinfo-plugin.patch       |   279 -
 .../patches/920-fix-ping-droprate.patch       |    11 -
 trunk/package/feeds/packages/confuse/Makefile |    79 -
 .../feeds/packages/coova-chilli/Config.in     |    52 -
 .../feeds/packages/coova-chilli/Makefile      |   105 -
 .../coova-chilli/files/chilli.hotplug         |     7 -
 .../100-fix-sysinfo-redeclaration.patch       |    24 -
 .../package/feeds/packages/coreutils/Makefile |   116 -
 .../patches/001-no_docs_man_tests.patch       |    89 -
 .../patches/002-fix_compile_with_uclibc.patch |    12 -
 .../feeds/packages/crtmpserver/Makefile       |    95 -
 .../crtmpserver/files/crtmpserver.init        |    30 -
 .../patches/010-link-crypt-for-lua.patch      |    11 -
 .../crtmpserver/patches/020-add-rpath.patch   |    13 -
 .../patches/030-default-config.patch          |    60 -
 .../crtmpserver/patches/040-use-select.patch  |    13 -
 .../050-add-missing-make-defines.patch        |    57 -
 .../patches/060-add-missing-includes.patch    |    26 -
 .../patches/070-missing-include-gcc-47.patch  |    10 -
 .../feeds/packages/cryptodev-linux/Makefile   |    75 -
 .../cryptodev-linux/files/cryptodev.modules   |     1 -
 .../feeds/packages/cryptsetup/Makefile        |    78 -
 trunk/package/feeds/packages/cshark/Makefile  |    75 -
 .../feeds/packages/ctorrent-svn/Makefile      |    98 -
 .../patches/100-compile-fix.patch             |    88 -
 .../ctorrent-svn/patches/300-negative.patch   |    14 -
 .../package/feeds/packages/ctorrent/Makefile  |    84 -
 .../ctorrent/patches/100-CVE-2009-1759.patch  |   364 -
 .../ctorrent/patches/100-negative-ints.patch  |    13 -
 .../feeds/packages/cyrus-sasl/Makefile        |   112 -
 .../feeds/packages/dansguardian/Makefile      |    78 -
 .../dansguardian/files/dansguardian.config    |    71 -
 .../dansguardian/files/dansguardian.init      |   190 -
 .../dansguardian/files/dansguardianf1.conf    |   348 -
 .../dansguardian/patches/001-compile.patch    |    29 -
 trunk/package/feeds/packages/davfs2/Makefile  |    69 -
 .../feeds/packages/davfs2/files/davfs2.conf   |     9 -
 .../davfs2/patches/010-main_code_fix.patch    |    35 -
 trunk/package/feeds/packages/db47/Makefile    |   100 -
 .../db47/patches/010-patch.4.7.25.1.patch     |    55 -
 .../db47/patches/020-patch.4.7.25.2.patch     |    42 -
 .../db47/patches/030-patch.4.7.25.3.patch     |   211 -
 .../db47/patches/040-patch.4.7.25.4.patch     |   118 -
 trunk/package/feeds/packages/dbus/Makefile    |   213 -
 .../feeds/packages/dbus/files/dbus-launch     |    12 -
 .../feeds/packages/dbus/files/dbus.init       |    17 -
 .../dbus/patches/100-fix-poll-select.patch    |    13 -
 .../feeds/packages/ddns-scripts/Makefile      |   216 -
 .../packages/ddns-scripts/files/ddns.config   |    31 -
 .../packages/ddns-scripts/files/ddns.hotplug  |    14 -
 .../packages/ddns-scripts/files/ddns.init     |    28 -
 .../files/dynamic_dns_functions.sh            |  1124 --
 .../files/dynamic_dns_lucihelper.sh           |   102 -
 .../ddns-scripts/files/dynamic_dns_updater.sh |   334 -
 .../packages/ddns-scripts/files/services      |    93 -
 .../packages/ddns-scripts/files/services_ipv6 |    43 -
 .../packages/ddns-scripts/files/tld_names.dat | 10460 ----------------
 .../ddns-scripts/files/update_CloudFlare.sh   |   142 -
 .../ddns-scripts/files/update_No-IP.com.sh    |    52 -
 .../ddns-scripts/files/update_nsupdate.sh     |    46 -
 .../ddns-scripts/samples/ddns.config_sample   |   299 -
 .../ddns-scripts/samples/getlocalip_sample.sh |    35 -
 .../ddns-scripts/samples/update_sample.sh     |    39 -
 .../feeds/packages/debootstrap/Makefile       |    57 -
 .../packages/debootstrap/files/pkgdetails.c   |   347 -
 .../debootstrap/patches/100-busybox_fix.patch |    11 -
 trunk/package/feeds/packages/dhcpcd/Makefile  |    63 -
 .../feeds/packages/dhcpcd/files/dhcpcd.init   |    24 -
 .../package/feeds/packages/diffutils/Makefile |    62 -
 trunk/package/feeds/packages/dkjson/Makefile  |    46 -
 trunk/package/feeds/packages/dmapd/Makefile   |    66 -
 .../feeds/packages/dmapd/files/dmapd.init     |    28 -
 .../dmapd/patches/001-dmapd_conf.patch        |    11 -
 .../002-make_unit_test_optionnal.patch        |    17 -
 .../package/feeds/packages/dmidecode/Makefile |    48 -
 .../feeds/packages/dmx_usb_module/Makefile    |    56 -
 .../patches/001-dmx_usb_Makefile.patch        |    13 -
 .../feeds/packages/dnscrypt-proxy/Makefile    |   119 -
 .../files/dnscrypt-proxy.config               |     5 -
 .../dnscrypt-proxy/files/dnscrypt-proxy.init  |    27 -
 .../feeds/packages/dosfstools/Makefile        |   109 -
 .../packages/dosfstools/files/dosfsck.sh      |    30 -
 trunk/package/feeds/packages/dovecot/Makefile |    98 -
 .../feeds/packages/dovecot/files/dovecot.init |    16 -
 .../dovecot/patches/001-configure_in.patch    |    31 -
 trunk/package/feeds/packages/dtndht/Makefile  |    46 -
 .../package/feeds/packages/dump1090/Config.in |    20 -
 .../package/feeds/packages/dump1090/Makefile  |    70 -
 .../packages/dump1090/files/dump1090.config   |    39 -
 .../packages/dump1090/files/dump1090.init     |    92 -
 .../dump1090/patches/100-html_dir.patch       |    11 -
 .../feeds/packages/e2guardian/Makefile        |    78 -
 .../e2guardian/files/e2guardian.config        |    70 -
 .../packages/e2guardian/files/e2guardian.init |   192 -
 .../e2guardian/files/e2guardianf1.conf        |   426 -
 .../package/feeds/packages/elfutils/Makefile  |    97 -
 .../patches/001-elfutils-portability.patch    |  1871 ---
 .../patches/002-argp_standalone.patch         |    14 -
 .../elfutils/patches/003-libint-stub.patch    |    49 -
 .../patches/004-maybe-uninitialized.patch     |    11 -
 .../elfutils/patches/004-memcpy_def.patch     |    14 -
 .../patches/005-build_only_libs.patch         |    24 -
 .../elfutils/patches/006-libdw_LIBS.patch     |    11 -
 .../elfutils/patches/100-musl-compat.patch    |   788 --
 .../elfutils/patches/101-no-fts.patch         |   109 -
 .../feeds/packages/emailrelay/Makefile        |   116 -
 .../packages/emailrelay/files/emailrelay.auth |    16 -
 .../packages/emailrelay/files/emailrelay.init |    15 -
 .../feeds/packages/engine_pkcs11/Makefile     |    48 -
 trunk/package/feeds/packages/erlang/Makefile  |   335 -
 .../patches/101-emulator_includes.patch       |    11 -
 .../erlang/patches/103-disable_emacs.patch    |    11 -
 trunk/package/feeds/packages/espeak/Makefile  |    57 -
 .../espeak/patches/101-portaudio.patch        |  2093 ----
 .../package/feeds/packages/etherwake/Makefile |    55 -
 .../packages/etherwake/files/etherwake.config |    28 -
 .../packages/etherwake/files/etherwake.init   |   132 -
 .../patches/100-no_ether_hostton.patch        |    37 -
 .../patches/110-format_security_fix.patch     |    19 -
 trunk/package/feeds/packages/ethtool/Makefile |    45 -
 trunk/package/feeds/packages/expat/Makefile   |    69 -
 .../feeds/packages/f2fs-tools/Config.in       |    25 -
 .../feeds/packages/f2fs-tools/Makefile        |    89 -
 .../f2fs-tools/patches/001-compile.patch      |    19 -
 trunk/package/feeds/packages/faad2/Config.in  |    12 -
 trunk/package/feeds/packages/faad2/Makefile   |   114 -
 .../feeds/packages/fakeidentd/Makefile        |    48 -
 .../packages/fakeidentd/files/fakeidentd.init |    12 -
 trunk/package/feeds/packages/fastd/Config.in  |   108 -
 trunk/package/feeds/packages/fastd/Makefile   |   199 -
 .../feeds/packages/fastd/files/fastd.upgrade  |     1 -
 trunk/package/feeds/packages/fcgi/Makefile    |    82 -
 .../fcgi/patches/100-fcgio-int-type-fix.patch |    38 -
 .../fcgi/patches/110-no_examples.patch        |    24 -
 .../packages/fcgi/patches/120-stdio.patch     |    12 -
 trunk/package/feeds/packages/fdm/Config.in    |    10 -
 trunk/package/feeds/packages/fdm/Makefile     |    86 -
 .../feeds/packages/fdm/files/etc/fdm.conf     |    36 -
 .../packages/fdm/patches/001-base64-fix.patch |    14 -
 .../packages/fdm/patches/002-base64-fix.patch |    20 -
 .../feeds/packages/fdm/src/compat/b64_ntop.c  |   183 -
 .../feeds/packages/fdm/src/compat/b64_pton.c  |   393 -
 trunk/package/feeds/packages/fftw3/Makefile   |   119 -
 .../packages/fftw3/patches/001-makefile.patch |    20 -
 trunk/package/feeds/packages/file/Makefile    |    94 -
 trunk/package/feeds/packages/flac/Makefile    |    75 -
 .../patches/001-no-docs-and-examples.patch    |    25 -
 .../flac/patches/002-no-utility.patch         |    13 -
 .../flac/patches/010-automake-compat.patch    |    11 -
 .../package/feeds/packages/flashrom/Config.in |   279 -
 .../package/feeds/packages/flashrom/Makefile  |    57 -
 .../feeds/packages/flashrom/flashrom.mk       |    54 -
 .../patches/0001-fix_internal_bitbang.patch   |    11 -
 .../feeds/packages/freeradius2/Config.in      |    14 -
 .../feeds/packages/freeradius2/Makefile       |   633 -
 .../packages/freeradius2/files/radiusd.init   |    22 -
 .../patches/001-fix-makefile.patch            |    10 -
 .../freeradius2/patches/002-config.patch      |   588 -
 .../patches/004-ldap_configure.patch          |  4253 -------
 .../patches/008-honor_ccpflags.patch          |    15 -
 .../patches/010-disbale-openssl-check.patch   |    38 -
 .../package/feeds/packages/freetype/Makefile  |    84 -
 .../package/feeds/packages/fswebcam/Makefile  |    50 -
 trunk/package/feeds/packages/fwknop/Makefile  |   119 -
 .../fwknop/patches/001-fix_config.patch       |    18 -
 .../fwknop/patches/002-fix_init.patch         |    17 -
 trunk/package/feeds/packages/gammu/Makefile   |    64 -
 .../package/feeds/packages/gammu/files/gammu  |     5 -
 .../feeds/packages/gammu/files/gammu.init     |   116 -
 .../patches/001-iconv-disabling-option.patch  |    51 -
 .../patches/002-no-fstack-protector.patch     |    11 -
 .../patches/003-cmake-cross-toolchain.patch   |    43 -
 .../patches/004-cmake_libdbi_optional.patch   |    34 -
 .../gammu/patches/010-utils-shell-fix.patch   |    16 -
 trunk/package/feeds/packages/gcc/Makefile     |   116 -
 trunk/package/feeds/packages/gcc/README       |    10 -
 ...t-choke-when-building-32bit-on-64bit.patch |    15 -
 .../gcc/patches/003-mpfr-longlong-mips.patch  |    38 -
 .../gcc/patches/010-documentation.patch       |    23 -
 .../020-disable-check-for-sys-sdt-h.patch     |    45 -
 .../gcc/patches/100-uclibc-conf.patch         |    33 -
 .../feeds/packages/gcc/patches/200-musl.patch |   321 -
 .../patches/800-arm_v5te_no_ldrd_strd.patch   |    11 -
 .../patches/810-arm-softfloat-libgcc.patch    |    25 -
 .../packages/gcc/patches/820-libgcc_pic.patch |    36 -
 .../gcc/patches/830-arm_unbreak_armv4t.patch  |    13 -
 .../840-armv4_pass_fix-v4bx_to_ld.patch       |    19 -
 .../gcc/patches/850-use_shared_libgcc.patch   |    47 -
 .../gcc/patches/860-uclibc_use_eh_frame.patch |    29 -
 .../gcc/patches/870-ppc_no_crtsavres.patch    |    11 -
 .../gcc/patches/880-no_java_section.patch     |    11 -
 .../gcc/patches/900-bad-mips16-crt.patch      |     9 -
 .../packages/gcc/patches/910-mbsd_multi.patch |   253 -
 .../patches/920-specs_nonfatal_getenv.patch   |    14 -
 trunk/package/feeds/packages/gdbm/Makefile    |    67 -
 trunk/package/feeds/packages/git/Makefile     |   114 -
 .../git/patches/100-convert_builtin.patch     |   219 -
 .../git/patches/200-disable_fasthash.patch    |    12 -
 .../patches/300-configure_for_crosscompiling  |    32 -
 .../patches/400-imapsend_without_curl.patch   |    11 -
 trunk/package/feeds/packages/glib2/Makefile   |   104 -
 .../glib2/patches/001-automake-compat.patch   |    11 -
 .../glib2/patches/100-fix-gio-linking.patch   |    10 -
 trunk/package/feeds/packages/gnupg/Makefile   |    69 -
 trunk/package/feeds/packages/gnutls/Config.in |    52 -
 trunk/package/feeds/packages/gnutls/Makefile  |   250 -
 .../gnutls/patches/001-ai-idn-remove.patch    |    15 -
 trunk/package/feeds/packages/gperf/Makefile   |    47 -
 trunk/package/feeds/packages/grep/Makefile    |    60 -
 ...rep-F-fix-a-heap-buffer-read-overrun.patch |    15 -
 .../feeds/packages/gst1-libav/Config.in       |   279 -
 .../feeds/packages/gst1-libav/Makefile        |   205 -
 .../feeds/packages/gst1-plugins-base/Makefile |   289 -
 .../patches/001-no_docs.patch                 |    34 -
 .../patches/002-no_tests.patch                |    36 -
 .../patches/003-no_translations.patch         |    46 -
 .../feeds/packages/gst1-plugins-good/Makefile |   236 -
 .../patches/001-no_docs.patch                 |    20 -
 .../patches/002-no_tests.patch                |    20 -
 .../patches/003-no_translations.patch         |    30 -
 .../feeds/packages/gstreamer1/Makefile        |   231 -
 .../gstreamer1/patches/001-no_docs.patch      |    35 -
 .../gstreamer1/patches/002-no_tests.patch     |    37 -
 .../patches/003-no_translations.patch         |    45 -
 ...10-gstplugin_use_lazy_symbol_binding.patch |    20 -
 trunk/package/feeds/packages/hamlib/Makefile  |   529 -
 .../100-override-autoconf-detection.patch     |    30 -
 trunk/package/feeds/packages/haproxy/Makefile |   139 -
 .../feeds/packages/haproxy/files/haproxy.cfg  |   100 -
 .../packages/haproxy/files/haproxy.hotplug    |     8 -
 .../feeds/packages/haproxy/files/haproxy.init |    25 -
 ...-MINOR-pattern-error-message-missing.patch |    30 -
 ...rn-some-entries-are-not-deleted-with.patch |    38 -
 trunk/package/feeds/packages/haserl/Config.in |    35 -
 trunk/package/feeds/packages/haserl/Makefile  |    57 -
 .../patches/100-replace-lua2c-with-sed.patch  |    82 -
 .../patches/101-adjust-script-size.patch      |    11 -
 trunk/package/feeds/packages/haveged/Makefile |    68 -
 .../feeds/packages/haveged/files/haveged.init |    16 -
 trunk/package/feeds/packages/hd-idle/Makefile |    55 -
 .../packages/hd-idle/files/hd-idle.config     |     5 -
 .../feeds/packages/hd-idle/files/hd-idle.init |    79 -
 trunk/package/feeds/packages/hdparm/Makefile  |    42 -
 .../hdparm/patches/001-fix-includes.patch     |    20 -
 .../package/feeds/packages/hfsprogs/Makefile  |    81 -
 .../feeds/packages/hfsprogs/files/hfsfsck.sh  |    30 -
 ...01-Create-short-Makefiles-for-Debian.patch |    93 -
 ...002-Add-exclude-Darwin-specific-code.patch |  1407 ---
 ...de-files-absent-from-the-upstream-pa.patch |  1024 --
 ...004-Fix-compilation-on-64-bit-arches.patch |   131 -
 ...Remove-Apple-specific-p-from-strings.patch |   291 -
 .../0006-Adjust-types-for-printing.patch      |    37 -
 .../0007-Fix-path-for-HFS-wrapper-block.patch |    23 -
 .../0008-Provide-command-line-option-a.patch  |    40 -
 .../0009-Rename-dprintf-to-dbg_printf.patch   |   187 -
 ...10-Rename-custom-macro-nil-with-NULL.patch |  1319 --
 .../hfsprogs/patches/0011-Fix-types.patch     |    71 -
 ...t-creating-UUIDs-for-new-filesystems.patch |    50 -
 .../hfsprogs/patches/0013-Fix-manpages.patch  |   157 -
 .../patches/0014-uClibc_no_loadavg.patch      |    15 -
 trunk/package/feeds/packages/hidapi/Makefile  |    77 -
 .../patches/010-add-iconv-linkage.patch       |    22 -
 trunk/package/feeds/packages/horst/Makefile   |    51 -
 trunk/package/feeds/packages/htop/Makefile    |    57 -
 .../package/feeds/packages/hub-ctrl/Makefile  |    53 -
 .../package/feeds/packages/ibrcommon/Makefile |    49 -
 .../feeds/packages/ibrdtn-tools/Makefile      |    51 -
 trunk/package/feeds/packages/ibrdtn/Makefile  |    50 -
 trunk/package/feeds/packages/ibrdtnd/Makefile |    62 -
 .../packages/ibrdtnd/files/build-config.sh    |   173 -
 .../feeds/packages/ibrdtnd/files/ibrdtn.init  |    71 -
 .../feeds/packages/ibrdtnd/files/ibrdtn.uci   |   176 -
 .../packages/ibrdtnd/files/mkcontainer.sh     |    43 -
 .../packages/ibrdtnd/files/mountcontainer.sh  |   122 -
 .../packages/ibrdtnd/files/safety-wrapper.sh  |   172 -
 .../packages/ibrdtnd/files/systemcheck.sh     |   101 -
 trunk/package/feeds/packages/icecast/Makefile |    95 -
 .../feeds/packages/icecast/files/icecast.init |    14 -
 .../feeds/packages/icecast/libvorbisidec.mk   |    41 -
 .../patches/001-icecast-2.4.0-tremor.patch    |   155 -
 .../patches/010-fix_libcurl_test_crap.patch   |    11 -
 trunk/package/feeds/packages/ices/Makefile    |    51 -
 .../package/feeds/packages/intltool/Makefile  |    47 -
 trunk/package/feeds/packages/iodine/Makefile  |    73 -
 .../packages/iodine/files/iodined.config      |     5 -
 .../feeds/packages/iodine/files/iodined.init  |    27 -
 .../iodine/patches/010-cross-compile.patch    |    24 -
 .../feeds/packages/ipsec-tools/Makefile       |   100 -
 .../packages/ipsec-tools/files/racoon.conf    |    36 -
 .../packages/ipsec-tools/files/racoon.init    |    17 -
 .../patches/001-ipsec-tools-def-psk.patch     |    24 -
 .../ipsec-tools/patches/001-no_libfl.patch    |    22 -
 .../ipsec-tools/patches/002-patch8-utmp.patch |    72 -
 .../patches/003-microsoft-fqdn-in-main.patch  |    13 -
 .../ipsec-tools/patches/005-isakmp-fix.patch  |    11 -
 .../patches/006-linux-3.7-compat.patch        |    50 -
 .../ipsec-tools/patches/force_HAVE_POLICY_FWD |    14 -
 trunk/package/feeds/packages/irssi/Makefile   |    98 -
 trunk/package/feeds/packages/jamvm/Makefile   |    67 -
 trunk/package/feeds/packages/jansson/Makefile |    52 -
 trunk/package/feeds/packages/joe/Makefile     |    63 -
 trunk/package/feeds/packages/joe/files/joerc  |   621 -
 .../packages/joe/patches/001-mathaway.patch   |    58 -
 .../package/feeds/packages/json4lua/Makefile  |    48 -
 .../feeds/packages/keepalived/Makefile        |    68 -
 .../packages/keepalived/files/keepalived.init |    14 -
 trunk/package/feeds/packages/kismet/Makefile  |   142 -
 .../feeds/packages/kismet/files/kismet.conf   |   304 -
 .../packages/kismet/files/kismet_drone.conf   |    69 -
 .../packages/kismet/files/kismet_drone.config |     2 -
 .../packages/kismet/files/kismet_drone.init   |    26 -
 .../kismet/files/kismet_server.config         |     2 -
 .../packages/kismet/files/kismet_server.init  |    26 -
 .../010-dont-add-host-include-paths.patch     |    14 -
 trunk/package/feeds/packages/kmod/Makefile    |    93 -
 .../kmod/patches/001-fix_pkgconfig_file.patch |    22 -
 trunk/package/feeds/packages/knot/Makefile    |   194 -
 .../feeds/packages/knot/files/knotd.init      |    45 -
 .../feeds/packages/knot/files/runtests.sh     |     9 -
 .../knot/patches/01_strptime_susv3.patch      |    21 -
 .../packages/knot/patches/02_knot.conf.patch  |    28 -
 .../knot/patches/03_zscanner_tests.patch      |    41 -
 trunk/package/feeds/packages/knxd/Makefile    |   152 -
 .../feeds/packages/knxd/files/knxd.config     |    12 -
 .../feeds/packages/knxd/files/knxd.init       |    19 -
 .../packages/knxd/patches/0099-openwrt.patch  |     8 -
 trunk/package/feeds/packages/krb5/Makefile    |   137 -
 .../package/feeds/packages/krb5/files/krb5kdc |    19 -
 .../packages/krb5/patches/001-fix-build.patch |    45 -
 .../feeds/packages/l7-protocols/Makefile      |    87 -
 .../patches/100-testing_crosscompile.patch    |    27 -
 .../patches/101-testing-timeit.patch          |   102 -
 .../patches/102-testing-doallspeeds.patch     |    16 -
 trunk/package/feeds/packages/lame/Makefile    |    85 -
 .../lame/patches/001-automake-compat.patch    |    33 -
 trunk/package/feeds/packages/less/Makefile    |    93 -
 trunk/package/feeds/packages/lftp/Makefile    |    73 -
 trunk/package/feeds/packages/libaio/Makefile  |    63 -
 .../packages/libaio/patches/001_arches.patch  |   566 -
 .../libaio/patches/002_arches_sh.patch        |   139 -
 .../libaio/patches/003_arches_sparc64.patch   |   117 -
 .../libaio/patches/004_arches_x32.patch       |    65 -
 .../libaio/patches/005_arches_mips.patch      |    63 -
 .../patches/006_arches_mips_fix_padding.patch |    37 -
 .../feeds/packages/libantlr3c/Makefile        |    55 -
 trunk/package/feeds/packages/libao/Makefile   |    67 -
 .../feeds/packages/libarchive/Makefile        |    58 -
 .../package/feeds/packages/libartnet/Makefile |    60 -
 .../libartnet/patches/001-bswap_16.patch      |    12 -
 .../feeds/packages/libaudiofile/Makefile      |    72 -
 trunk/package/feeds/packages/libavl/Makefile  |    55 -
 .../patches/010-update_GNUmakefile.patch      |    45 -
 trunk/package/feeds/packages/libcap/Makefile  |    56 -
 .../package/feeds/packages/libdaemon/Makefile |    72 -
 .../patches/001-daemon_set_verbosity.patch    |    30 -
 trunk/package/feeds/packages/libdaq/Makefile  |    73 -
 .../packages/libdaq/patches/001-compile.patch |    18 -
 .../feeds/packages/libdbi-drivers/Makefile    |   105 -
 .../patches/001_libsqlite3_fix.patch          |    11 -
 trunk/package/feeds/packages/libdbi/Makefile  |    57 -
 .../feeds/packages/libdmapsharing/Makefile    |    72 -
 .../patches/001-disable_pixbuf.patch          |    22 -
 .../patches/002-disable_tests.patch           |     8 -
 .../patches/003-make_unit_test_optional.patch |    17 -
 trunk/package/feeds/packages/libdnet/Makefile |    87 -
 .../libdnet/patches/001-compile.patch         |    20 -
 .../packages/libdnet/patches/002-config.patch |    23 -
 .../package/feeds/packages/libesmtp/Makefile  |    56 -
 .../package/feeds/packages/libevent/Makefile  |    67 -
 .../package/feeds/packages/libevhtp/Makefile  |    59 -
 .../010-enable-shared-object-building.patch   |    12 -
 trunk/package/feeds/packages/libexif/Makefile |    63 -
 .../packages/libexif/patches/100-no_doc.patch |    12 -
 trunk/package/feeds/packages/libffi/Makefile  |    81 -
 trunk/package/feeds/packages/libftdi/Makefile |    64 -
 .../patches/100-fix-x86_64-build.patch        |    11 -
 .../101-fix-cmake-version-packagekit.patch    |    29 -
 .../package/feeds/packages/libftdi1/Makefile  |    91 -
 .../patches/100-fix-x86_64-build.patch        |    11 -
 .../package/feeds/packages/libgcrypt/Makefile |    68 -
 .../libgcrypt/patches/001-no_docs_tests.patch |    28 -
 trunk/package/feeds/packages/libgd/Makefile   |    81 -
 .../libgd/patches/101-gdlib-config.patch      |    20 -
 .../libgd/patches/200-uclibc-ceill.patch      |    24 -
 .../feeds/packages/libgpg-error/Makefile      |    79 -
 .../feeds/packages/libhttp-parser/Makefile    |    60 -
 trunk/package/feeds/packages/libical/Makefile |    62 -
 .../package/feeds/packages/libid3tag/Makefile |    65 -
 trunk/package/feeds/packages/libidn/Makefile  |    95 -
 .../002-disable-po-docs-examples.patch        |    22 -
 .../patches/010-fix-idn-error-usage.patch     |   119 -
 .../feeds/packages/libimobiledevice/Makefile  |    96 -
 trunk/package/feeds/packages/libjpeg/Makefile |    90 -
 trunk/package/feeds/packages/liblo/Makefile   |    71 -
 trunk/package/feeds/packages/libmad/Makefile  |    79 -
 .../001-mips_removal_h_constraint.patch       |    70 -
 .../package/feeds/packages/libmcrypt/Makefile |    65 -
 .../feeds/packages/libmicrohttpd/Makefile     |    54 -
 trunk/package/feeds/packages/libmms/Makefile  |    63 -
 .../package/feeds/packages/libmodbus/Makefile |    56 -
 .../feeds/packages/libmpdclient/Makefile      |    69 -
 .../patches/001-WIP_musl_compatibility.patch  |    22 -
 .../package/feeds/packages/libmpeg2/Makefile  |    60 -
 .../libmpeg2/patches/101-ppc_no_altivec.patch |    66 -
 .../patches/102-arm_data_preload_check.patch  |    19 -
 .../package/feeds/packages/libnatpmp/Makefile |    87 -
 .../patches/001-install_declspec.patch        |    11 -
 .../feeds/packages/libnetfilter-acct/Makefile |    70 -
 trunk/package/feeds/packages/libnfc/Makefile  |    98 -
 trunk/package/feeds/packages/libogg/Makefile  |    59 -
 trunk/package/feeds/packages/liboil/Makefile  |    70 -
 .../package/feeds/packages/liboping/Makefile  |    84 -
 .../liboping/patches/01-no-werror.patch       |    11 -
 .../package/feeds/packages/libowfat/Makefile  |    61 -
 .../libowfat/patches/001-fixbuild.patch       |    11 -
 trunk/package/feeds/packages/libp11/Makefile  |    58 -
 trunk/package/feeds/packages/libpam/Makefile  |    71 -
 .../feeds/packages/libpam/files/pam.conf      |    15 -
 .../libpam/files/pam.d/common-account         |    20 -
 .../packages/libpam/files/pam.d/common-auth   |    21 -
 .../libpam/files/pam.d/common-password        |    28 -
 .../libpam/files/pam.d/common-session         |    25 -
 .../files/pam.d/common-session-noninteractive |    25 -
 .../feeds/packages/libpam/files/pam.d/other   |    16 -
 .../libpam/patches/000-OE-libpam-xtests.patch |    35 -
 .../patches/000-OE-pam-no-innetgr.patch       |    85 -
 .../packages/libpam/patches/001-no_nis.patch  |    68 -
 .../libpam/patches/002-no_yywrap.patch        |    26 -
 .../packages/libpam/patches/003-no_doc.patch  |    22 -
 .../libpam/patches/004-fix_lib64.patch        |    16 -
 .../libpam/patches/005-fix_ruserok.patch      |   364 -
 .../packages/libpam/patches/006-fix_xdr.patch |   271 -
 .../libpam/patches/007-cve-2014-2583.patch    |    52 -
 .../package/feeds/packages/libplist/Makefile  |   105 -
 trunk/package/feeds/packages/libpng/Makefile  |    68 -
 .../libpng/patches/100-config_fix.patch       |    10 -
 .../feeds/packages/libsamplerate/Makefile     |    55 -
 .../package/feeds/packages/libsearpc/Makefile |    77 -
 .../feeds/packages/libseccomp/Makefile        |    74 -
 .../package/feeds/packages/libshout/Makefile  |    68 -
 .../libshout/patches/120-vorbis-c.patch       |    11 -
 .../patches/140-no_example_doc_win32.patch    |    17 -
 .../package/feeds/packages/libsigc++/Makefile |    63 -
 .../patches/001-no_doc_tests_examples.patch   |    22 -
 .../feeds/packages/libsndfile/Makefile        |    65 -
 .../patches/001-automake-compat.patch         |    10 -
 .../package/feeds/packages/libsodium/Makefile |    72 -
 trunk/package/feeds/packages/libsoup/Makefile |    75 -
 trunk/package/feeds/packages/libsoxr/Makefile |    62 -
 trunk/package/feeds/packages/libssh2/Makefile |    58 -
 .../package/feeds/packages/libtasn1/Makefile  |    57 -
 .../package/feeds/packages/libtheora/Makefile |    68 -
 .../libtheora/patches/001-no_docs_tests.patch |    33 -
 .../libtheora/patches/002-no_sdl_check.patch  |    14 -
 .../feeds/packages/libtorrent/Makefile        |    68 -
 .../patches/100-fix_cross_compile.patch       |    41 -
 .../120-fix-ipv6_socket_datagram.patch        |    26 -
 trunk/package/feeds/packages/libuecc/Makefile |    47 -
 .../package/feeds/packages/libugpio/Makefile  |    72 -
 .../feeds/packages/libunistring/Makefile      |    59 -
 trunk/package/feeds/packages/libupnp/Makefile |    76 -
 .../package/feeds/packages/libupnpp/Makefile  |    52 -
 trunk/package/feeds/packages/liburcu/Makefile |    51 -
 .../feeds/packages/libusbmuxd/Makefile        |    90 -
 trunk/package/feeds/packages/libuv/Makefile   |    73 -
 trunk/package/feeds/packages/libuvc/Makefile  |    53 -
 trunk/package/feeds/packages/libv4l/Makefile  |   115 -
 .../libv4l/patches/001-no-shm_open-fix.patch  |    57 -
 .../patches/020-add-missing-includes.patch    |    10 -
 .../package/feeds/packages/libvorbis/Makefile |    65 -
 .../feeds/packages/libvorbisidec/Makefile     |    62 -
 trunk/package/feeds/packages/libvpx/Makefile  |    80 -
 .../feeds/packages/libwebsockets/Makefile     |    83 -
 ...yassl-correct-include-path-for-3.1.x.patch |    25 -
 .../feeds/packages/libxerces-c/Makefile       |    93 -
 trunk/package/feeds/packages/libxml2/Makefile |   134 -
 ...ard-declarations-only-for-glibc-fixe.patch |    42 -
 trunk/package/feeds/packages/libxslt/Makefile |   152 -
 trunk/package/feeds/packages/libzdb/Makefile  |    89 -
 .../patches/010-cross-compile-fixes.patch     |   186 -
 .../020-filterh-use-host-built-version.patch  |    20 -
 .../package/feeds/packages/lighttpd/Makefile  |   187 -
 .../packages/lighttpd/files/lighttpd.conf     |    32 -
 .../packages/lighttpd/files/lighttpd.init     |    20 -
 trunk/package/feeds/packages/linknx/Makefile  |    59 -
 .../feeds/packages/linknx/files/linknx.config |     8 -
 .../feeds/packages/linknx/files/linknx.init   |    23 -
 .../packages/linknx/files/linknx.xml.dist     |    16 -
 trunk/package/feeds/packages/lispmob/Makefile |    56 -
 .../feeds/packages/lm-sensors/Makefile        |   116 -
 .../packages/lm-sensors/files/sensors.conf    |   117 -
 trunk/package/feeds/packages/lsof/Makefile    |    57 -
 .../lsof/patches/001-lsof_makefile.patch      |    13 -
 .../lsof/patches/002-lsof_noportmap.patch     |    18 -
 .../lsof/patches/003-lsof_selinux.patch       |    11 -
 .../packages/lsof/patches/004-lsof_ccv.patch  |    12 -
 .../feeds/packages/lttng-modules/Makefile     |    45 -
 .../patches/001-mm_page_alloc_extfrag.patch   |    98 -
 .../feeds/packages/lttng-tools/Makefile       |    60 -
 .../package/feeds/packages/lttng-ust/Makefile |    51 -
 .../lttng-ust/patches/001-no_docs_tests.patch |    11 -
 .../lttng-ust/patches/002-examples.patch      |    18 -
 .../feeds/packages/lua-bencode/Makefile       |    50 -
 .../feeds/packages/lua-mosquitto/Makefile     |    41 -
 .../feeds/packages/lua-penlight/Makefile      |    46 -
 .../package/feeds/packages/lua-sha2/Makefile  |    52 -
 .../lua-sha2/patches/001-makefile.patch       |    14 -
 .../package/feeds/packages/luabitop/Makefile  |    53 -
 .../package/feeds/packages/luaexpat/Makefile  |    56 -
 .../luaexpat/files/compat-5.1r5/compat-5.1.c  |    97 -
 .../luaexpat/files/compat-5.1r5/compat-5.1.h  |    13 -
 .../files/compat-5.1r5/compat-5.1.lua         |   267 -
 .../feeds/packages/luafilesystem/Makefile     |    66 -
 trunk/package/feeds/packages/luai2c/Makefile  |    46 -
 .../package/feeds/packages/lualanes/Makefile  |    57 -
 .../package/feeds/packages/luaposix/Makefile  |    58 -
 .../luaposix/patches/100-eglibc-compat.patch  |    30 -
 .../luaposix/patches/101-disable-curses.patch |    32 -
 .../102-disable-compat-deprecated.diff        |    20 -
 .../package/feeds/packages/luarocks/Makefile  |    54 -
 .../patches/01_dont_modify_bin_shebang.diff   |    13 -
 trunk/package/feeds/packages/luasec/Makefile  |    61 -
 .../patches/100-luasocket-Makefile.patch      |    20 -
 trunk/package/feeds/packages/luasoap/Makefile |    56 -
 .../package/feeds/packages/luasocket/Makefile |    63 -
 .../patches/0001-Add-interface-support.patch  |   237 -
 trunk/package/feeds/packages/luasql/Makefile  |   116 -
 .../feeds/packages/luci-app-bcp38/Makefile    |    57 -
 .../luci-app-bcp38/files/bcp38-cbi.lua        |    58 -
 .../luci-app-bcp38/files/bcp38-controller.lua |     7 -
 .../luci-app-bcp38/files/uci-defaults-bcp38   |    11 -
 .../feeds/packages/luci-app-lxc/Makefile      |    68 -
 .../luci-app-lxc/files/controller/lxc.lua     |   125 -
 .../packages/luci-app-lxc/files/lxc.config    |     6 -
 .../luci-app-lxc/files/model/cbi/lxc.lua      |    31 -
 .../packages/luci-app-lxc/files/view/lxc.htm  |   441 -
 .../www/luci-static/resources/cbi/green.gif   |   Bin 310 -> 0 bytes
 .../www/luci-static/resources/cbi/purple.gif  |   Bin 317 -> 0 bytes
 .../www/luci-static/resources/cbi/red.gif     |   Bin 320 -> 0 bytes
 .../feeds/packages/luci-app-sqm/Makefile      |    67 -
 .../packages/luci-app-sqm/files/sqm-cbi.lua   |   217 -
 .../luci-app-sqm/files/sqm-controller.lua     |    26 -
 .../luci-app-sqm/files/uci-defaults-sqm       |    12 -
 trunk/package/feeds/packages/lvm2/Makefile    |    91 -
 .../feeds/packages/lvm2/files/lvm2.init       |    14 -
 .../packages/lvm2/patches/000-compile.patch   |    11 -
 .../lvm2/patches/001-include_fix.patch        |    11 -
 trunk/package/feeds/packages/lxc/Config.in    |    30 -
 trunk/package/feeds/packages/lxc/Makefile     |   249 -
 .../package/feeds/packages/lxc/files/lxc.conf |     1 -
 .../packages/lxc/patches/010-compile.patch    |    33 -
 .../packages/lxc/patches/015-getline.patch    |    15 -
 .../lxc/patches/020-lxc-checkconfig.patch     |    20 -
 .../025-remove-unsupported-option.patch       |    19 -
 .../lxc/patches/030-lxc-download.patch        |    43 -
 .../lxc/patches/300-lxc-destroy.patch         |   113 -
 .../feeds/packages/mac-telnet/Makefile        |    71 -
 .../mac-telnet/files/mactelnet.config         |     9 -
 .../packages/mac-telnet/files/mactelnet.init  |    80 -
 .../feeds/packages/macchanger/Makefile        |    45 -
 trunk/package/feeds/packages/madplay/Makefile |    63 -
 trunk/package/feeds/packages/mailman/Makefile |   126 -
 .../feeds/packages/mailman/files/mailman.init |    22 -
 .../mailman/patches/100-postfix.patch         |    12 -
 .../mailman/patches/200-nohostdnspython.patch |    68 -
 .../mailman/patches/300-targetpython.patch    |    12 -
 .../mailman/patches/400-modules.patch         |    35 -
 .../package/feeds/packages/mailsend/Makefile  |    73 -
 trunk/package/feeds/packages/mc/Config.in     |    60 -
 trunk/package/feeds/packages/mc/Makefile      |   122 -
 .../feeds/packages/mdnsresponder/Makefile     |   163 -
 .../mdnsresponder/files/mDNSResponder.conf    |     4 -
 .../mdnsresponder/files/mDNSResponder.init    |    14 -
 .../packages/mdnsresponder/files/mdnsd.init   |    14 -
 .../patches/001-cross_compile.patch           |   115 -
 .../patches/100-linux_fixes.patch             |   377 -
 .../package/feeds/packages/memcached/Makefile |    68 -
 .../packages/memcached/files/memcached.config |     6 -
 .../packages/memcached/files/memcached.init   |    27 -
 .../memcached/patches/100-fix_iov_max.patch   |    23 -
 .../feeds/packages/micropython-lib/Makefile   |    55 -
 .../feeds/packages/micropython/Makefile       |    52 -
 trunk/package/feeds/packages/minicom/Makefile |    45 -
 .../patches/100-fix_iconv_include.patch       |    12 -
 .../package/feeds/packages/miniupnpc/Makefile |    73 -
 .../patches/100-no_minixml_test.patch         |    13 -
 .../patches/200-miniupnpc_desc.patch          |    11 -
 .../feeds/packages/mjpg-streamer/Config.in    |    36 -
 .../feeds/packages/mjpg-streamer/Makefile     |   109 -
 .../mjpg-streamer/files/mjpg-streamer.config  |    13 -
 .../mjpg-streamer/files/mjpg-streamer.hotplug |    10 -
 .../mjpg-streamer/files/mjpg-streamer.init    |    90 -
 .../010-enable_additional_plugins.patch       |    17 -
 .../020-remove_gcc_debug_options.patch        |    33 -
 .../030-allow_16_char_device_names.patch      |    11 -
 ...used-variable-from-struct-v4l2_buffe.patch |    87 -
 ...-leaking-data-via-struct-v4l2_buffer.patch |   242 -
 .../patches/050-fix-yuv-capture.patch         |    58 -
 trunk/package/feeds/packages/mksh/Makefile    |    89 -
 .../packages/mksh/patches/100-dot_mkshrc      |    50 -
 .../package/feeds/packages/mktorrent/Makefile |    41 -
 .../package/feeds/packages/mmc-utils/Makefile |    56 -
 ...perly-set-fortify-source-in-makefile.patch |    11 -
 trunk/package/feeds/packages/mocp/Makefile    |    64 -
 trunk/package/feeds/packages/monit/Makefile   |    95 -
 .../feeds/packages/monit/files/monit.init     |    15 -
 .../patches/001-fix-default-piddir.patch      |    18 -
 .../feeds/packages/mosquitto/Config.in        |     6 -
 .../package/feeds/packages/mosquitto/Makefile |   198 -
 .../packages/mosquitto/files/mosquitto.init   |    28 -
 .../mosquitto/files/mosquitto.uci.convert     |   134 -
 .../mosquitto/patches/101-qos2-inflight.patch |    12 -
 trunk/package/feeds/packages/motion/Makefile  |    58 -
 trunk/package/feeds/packages/mpack/Makefile   |    45 -
 trunk/package/feeds/packages/mpc/Makefile     |    58 -
 .../feeds/packages/mpc/files/pls-handler.sh   |     5 -
 trunk/package/feeds/packages/msmtp/Makefile   |   141 -
 trunk/package/feeds/packages/mtr/Makefile     |    68 -
 .../feeds/packages/mtr/patches/501-dns.patch  |   510 -
 .../mtr/patches/502-fix-res_ninit.patch       |    31 -
 .../package/feeds/packages/muninlite/Makefile |    54 -
 .../muninlite/files/etc/xinetd.d/munin        |    10 -
 .../muninlite/patches/001-no_disks.patch      |    12 -
 .../muninlite/patches/002-hostname.patch      |    11 -
 .../patches/100-fix-no-ethtool.patch          |    21 -
 .../patches/110-fix-uptime-days.patch         |    12 -
 .../muninlite/patches/200-add-tap-dev.patch   |    20 -
 .../patches/210-add-bridge-devs.patch         |    24 -
 .../feeds/packages/mwan3-luci/Makefile        |    41 -
 .../etc/hotplug.d/iface/16-mwancustombak      |    38 -
 .../files/etc/uci-defaults/mwan-luci          |    14 -
 .../usr/lib/lua/luci/controller/mwan3.lua     |   318 -
 .../model/cbi/mwan/advanced_hotplugscript.lua |    55 -
 .../model/cbi/mwan/advanced_mwanconfig.lua    |    32 -
 .../model/cbi/mwan/advanced_networkconfig.lua |    32 -
 .../lib/lua/luci/model/cbi/mwan/interface.lua |   266 -
 .../luci/model/cbi/mwan/interfaceconfig.lua   |   190 -
 .../lib/lua/luci/model/cbi/mwan/member.lua    |    46 -
 .../lua/luci/model/cbi/mwan/memberconfig.lua  |    47 -
 .../lib/lua/luci/model/cbi/mwan/policy.lua    |    95 -
 .../lua/luci/model/cbi/mwan/policyconfig.lua  |    65 -
 .../usr/lib/lua/luci/model/cbi/mwan/rule.lua  |   141 -
 .../lua/luci/model/cbi/mwan/ruleconfig.lua    |   113 -
 .../lua/luci/view/admin_status/index/mwan.htm |     1 -
 .../luci/view/mwan/advanced_diagnostics.htm   |   128 -
 .../luci/view/mwan/advanced_hotplugscript.htm |    23 -
 .../luci/view/mwan/advanced_mwanconfig.htm    |    23 -
 .../luci/view/mwan/advanced_networkconfig.htm |    23 -
 .../view/mwan/advanced_troubleshooting.htm    |    71 -
 .../usr/lib/lua/luci/view/mwan/config_css.htm |    34 -
 .../view/mwan/openwrt_overview_status.htm     |    83 -
 .../lua/luci/view/mwan/overview_detailed.htm  |    51 -
 .../lua/luci/view/mwan/overview_interface.htm |   122 -
 trunk/package/feeds/packages/mwan3/Makefile   |    45 -
 .../packages/mwan3/files/etc/config/mwan3     |    80 -
 .../mwan3/files/etc/hotplug.d/iface/15-mwan3  |   427 -
 .../feeds/packages/mwan3/files/usr/sbin/mwan3 |   220 -
 .../packages/mwan3/files/usr/sbin/mwan3track  |    65 -
 trunk/package/feeds/packages/mxml/Makefile    |    56 -
 .../packages/mxml/patches/001-targets.patch   |    11 -
 trunk/package/feeds/packages/mysql/Makefile   |   189 -
 .../package/feeds/packages/mysql/conf/my.cnf  |    54 -
 .../feeds/packages/mysql/files/mysqld.init    |    30 -
 .../mysql/patches/100-fix_hostname.patch      |    11 -
 .../mysql/patches/110-cross_compile.patch     |   179 -
 .../mysql/patches/120-bison-compat.patch      |  3290 -----
 trunk/package/feeds/packages/nacl/Makefile    |    49 -
 trunk/package/feeds/packages/nacl/do-openwrt  |   206 -
 trunk/package/feeds/packages/nail/Makefile    |    59 -
 .../100-handle-openssl-without-sslv2.patch    |    16 -
 trunk/package/feeds/packages/nano/Makefile    |    56 -
 trunk/package/feeds/packages/ncdu/Makefile    |    46 -
 trunk/package/feeds/packages/neon/Makefile    |    78 -
 .../package/feeds/packages/net-snmp/Makefile  |   256 -
 .../feeds/packages/net-snmp/files/snmpd.conf  |    82 -
 .../feeds/packages/net-snmp/files/snmpd.init  |   171 -
 .../patches/100-debian-statistics.patch       |    22 -
 .../patches/110-debian-makefiles.patch        |    40 -
 .../patches/120-debian-searchdirs.patch       |    14 -
 .../patches/130-debian-extramibs.patch        |  6261 ---------
 .../net-snmp/patches/160-no_ldconfig.patch    |    11 -
 .../net-snmp/patches/170-ldflags.patch        |    11 -
 .../net-snmp/patches/750-ieee802dot11.patch   |  6156 ---------
 .../patches/800-format-security.patch         |    29 -
 .../package/feeds/packages/netatalk/Makefile  |    86 -
 .../netatalk/files/AppleVolumes.default       |     2 -
 .../feeds/packages/netatalk/files/afpd.conf   |     1 -
 .../feeds/packages/netatalk/files/afpd.init   |    23 -
 .../patches/001-automake-compat.patch         |     9 -
 .../patches/002-ld_library_path.patch         |    26 -
 trunk/package/feeds/packages/netcat/Makefile  |    65 -
 .../patches/001-netcat_flag_count.patch       |    22 -
 .../feeds/packages/nfs-kernel-server/Makefile |   157 -
 .../nfs-kernel-server/files/nfsd.exports      |     1 -
 .../nfs-kernel-server/files/nfsd.init         |    38 -
 .../patches/100-no_malloc_h.patch             |    10 -
 trunk/package/feeds/packages/nginx/Config.in  |   192 -
 trunk/package/feeds/packages/nginx/Makefile   |   334 -
 .../feeds/packages/nginx/files/nginx.init     |    24 -
 .../nginx/files/nginx.proxyprotocol.example   |    40 -
 .../packages/nginx/files/nginx.syslog.example |    59 -
 .../nginx/patches-lua-nginx/300-ldl.patch     |    21 -
 .../check_1.2.6+.patch                        |   209 -
 .../nginx/patches/101-feature_test_fix.patch  |   107 -
 .../nginx/patches/102-sizeof_test_fix.patch   |    26 -
 .../packages/nginx/patches/103-sys_nerr.patch |    12 -
 .../packages/nginx/patches/200-config.patch   |    18 -
 .../patches/300-crosscompile_ccflags.patch    |    33 -
 ...-nginx-1.4.x_proxy_protocol_patch_v2.patch |  1183 --
 .../patches/401-nginx-1.4.0-syslog.patch      |   698 --
 trunk/package/feeds/packages/nmap/Makefile    |   143 -
 trunk/package/feeds/packages/nsd/Makefile     |   135 -
 .../package/feeds/packages/nsd/files/nsd.init |    16 -
 trunk/package/feeds/packages/ntfs-3g/Makefile |   217 -
 ...001-fuseint-fix-path-mounted-on-musl.patch |    30 -
 .../package/feeds/packages/ntpclient/Makefile |    57 -
 .../packages/ntpclient/files/ntpclient.config |    23 -
 .../ntpclient/files/ntpclient.hotplug         |    78 -
 .../ntpclient/patches/100-daemon.patch        |    22 -
 trunk/package/feeds/packages/ntpd/Makefile    |   157 -
 .../feeds/packages/ntpd/files/ntp.conf        |    26 -
 .../feeds/packages/ntpd/files/ntpd.hotplug    |    10 -
 .../feeds/packages/ntpd/files/ntpd.init       |    18 -
 .../feeds/packages/ntpd/files/ntpdate.init    |    13 -
 .../feeds/packages/ntripcaster/Makefile       |    52 -
 .../feeds/packages/ntripclient/Makefile       |    49 -
 .../feeds/packages/ntripserver/Makefile       |    49 -
 trunk/package/feeds/packages/nut/Config.in    |   107 -
 trunk/package/feeds/packages/nut/Makefile     |   292 -
 .../feeds/packages/nut/files/nut-monitor.init |    21 -
 .../feeds/packages/nut/files/nut-server.init  |    23 -
 .../001-fix-missing-libmath-flags.patch       |    22 -
 .../patches/010-ignore_automake_k_bug.patch   |    28 -
 trunk/package/feeds/packages/ola/Makefile     |   128 -
 .../feeds/packages/ola/files/olad.init        |    15 -
 .../feeds/packages/open-plc-utils/Makefile    |   103 -
 .../feeds/packages/openconnect/Config.in      |    21 -
 .../feeds/packages/openconnect/Makefile       |    75 -
 .../package/feeds/packages/openconnect/README |    32 -
 .../openconnect/files/openconnect-wrapper     |    41 -
 .../packages/openconnect/files/openconnect.sh |    96 -
 .../openconnect/files/openconnect.upgrade     |     9 -
 trunk/package/feeds/packages/opencv/Makefile  |    71 -
 trunk/package/feeds/packages/opencv/README.md |    23 -
 .../package/feeds/packages/openldap/Makefile  |   149 -
 .../feeds/packages/openldap/files/ldap.init   |    19 -
 .../patches/001-automake-compat.patch         |   323 -
 .../openldap/patches/020-autofs-schema.patch  |    26 -
 .../openldap/patches/750-no-strip.patch       |    22 -
 .../package/feeds/packages/opennhrp/Makefile  |    60 -
 .../packages/opennhrp/files/opennhrp.init     |    15 -
 .../package/feeds/packages/openobex/Makefile  |    89 -
 .../packages/openobex/patches/001-cxx.patch   |    10 -
 trunk/package/feeds/packages/openocd/Makefile |    77 -
 trunk/package/feeds/packages/opensc/Makefile  |   227 -
 ...penPGP-Detect-and-support-Gnuk-Token.patch |   258 -
 ...P-Add-Gnuk-in-pkcs15-emulation-layer.patch |    50 -
 ...private-DO-to-filesystem-at-driver-i.patch |    30 -
 ...-PKCS15-OpenPGP-Declare-DATA-objects.patch |    82 -
 ...5-OpenPGP-Support-erasing-reset-card.patch |   172 -
 ...gp-tool-Support-deleting-key-in-Gnuk.patch |   208 -
 ...building-Extended-Header-List-when-i.patch |    27 -
 ...penPGP-Read-some-empty-DOs-from-Gnuk.patch |    58 -
 ...o-not-show-empty-DO-in-pkcs15-emu_in.patch |    53 -
 ...llow-to-store-data-to-pkcs15-data-ob.patch |    91 -
 ...enough-buffer-to-read-pubkey-from-Gn.patch |    87 -
 ...P-Support-write-certificate-for-Gnuk.patch |   220 -
 ...hange-to-sc_put_data-instead-of-sc_u.patch |    31 -
 ...-the-restriction-of-even-data-length.patch |    53 -
 ...-OpenPGP-Delete-key-as-file-for-Gnuk.patch |    92 -
 ...6-OpenPGP-Correct-parameter-checking.patch |    47 -
 .../0017-OpenPGP-Make-code-neater.patch       |    39 -
 ...018-Move-declaration-to-top-of-block.patch |    34 -
 ...ake-indentation-consistent-space-tab.patch |   182 -
 ...PGP-Don-t-use-sc_log-in-openpgp-tool.patch |    84 -
 ...implement-gnuk_delete_key-in-openpgp.patch |   112 -
 ...ctly-binary-array-of-APDUs-for-ERASE.patch |    87 -
 ...rivate-blob-type-to-avoid-confusing-.patch |   339 -
 ...rash-after-accessing-inexistent-file.patch |    41 -
 .../patches/0025-Replace-hardcode.patch       |   148 -
 .../0026-hardcode-defines-for-DO-s.patch      |    53 -
 trunk/package/feeds/packages/openssh/Makefile |   291 -
 .../packages/openssh/files/sftp-ssh.service   |     9 -
 .../feeds/packages/openssh/files/sshd.init    |    42 -
 .../feeds/packages/openssh/files/sshd.pam     |    41 -
 .../packages/openssh/files/sshd.pam-access    |     4 -
 .../openssh/patches/100-no_cast_fix.patch     |    13 -
 .../130-implicit_memset_decl_fix.patch        |    12 -
 .../patches/140-pam_uclibc_pthreads_fix.patch |    84 -
 .../openssh/patches/200-dscp-qos.patch        |    21 -
 .../feeds/packages/opentracker/Makefile       |    98 -
 .../opentracker/files/opentracker.init        |    16 -
 .../opentracker/files/opentracker6.init       |    16 -
 .../opentracker/patches/100-makefile.patch    |    30 -
 .../feeds/packages/openvswitch/Makefile       |   199 -
 .../files/etc/init.d/openvswitch.init         |    41 -
 ...-interface-flag-survive-internal-por.patch |    41 -
 ...linux-Use-unsigned-int-for-ifi_flags.patch |    28 -
 ...le-ovs_assert-when-build-with-NDEBUG.patch |    36 -
 ...lags-y-instead-of-deprecated-EXTRA_C.patch |    41 -
 .../feeds/packages/opus-tools/Makefile        |    47 -
 trunk/package/feeds/packages/opus/Makefile    |    53 -
 trunk/package/feeds/packages/owfs/Makefile    |   248 -
 trunk/package/feeds/packages/p11-kit/Makefile |    59 -
 .../packages/p11-kit/files/opensc.module      |     1 -
 trunk/package/feeds/packages/p910nd/Makefile  |    59 -
 .../feeds/packages/p910nd/files/p910nd.config |     5 -
 .../feeds/packages/p910nd/files/p910nd.init   |    51 -
 trunk/package/feeds/packages/patch/Makefile   |    48 -
 .../package/feeds/packages/pciutils/Makefile  |    72 -
 .../patches/100-remove-no-timestamping.patch  |    11 -
 .../pciutils/patches/101-no-strip.patch       |    11 -
 .../pciutils/patches/102-compressed-ids.patch |    31 -
 .../patches/103-relative-path-ids.patch       |    11 -
 .../pciutils/patches/104-resolv.patch         |    11 -
 trunk/package/feeds/packages/pcre/Makefile    |   101 -
 .../package/feeds/packages/pcsc-lite/Makefile |   101 -
 .../feeds/packages/pcsc-lite/files/pcscd.init |    14 -
 trunk/package/feeds/packages/pen/Makefile     |    58 -
 .../packages/perl-compress-bzip2/Makefile     |    48 -
 .../package/feeds/packages/perl-dbi/Makefile  |    63 -
 .../feeds/packages/perl-html-parser/Makefile  |    48 -
 .../feeds/packages/perl-html-tagset/Makefile  |    48 -
 .../feeds/packages/perl-html-tree/Makefile    |    49 -
 .../packages/perl-lockfile-simple/Makefile    |    48 -
 .../feeds/packages/perl-net-telnet/Makefile   |    48 -
 .../feeds/packages/perl-test-harness/Makefile |    48 -
 .../package/feeds/packages/perl-uri/Makefile  |    48 -
 .../feeds/packages/perl-www-curl/Makefile     |    49 -
 ...rl-www-curl_disable_curl-config_hack.patch |    74 -
 .../patches/200-fix_default_lflags.patch      |    11 -
 .../packages/perl-www-mechanize/Makefile      |    48 -
 .../package/feeds/packages/perl-www/Makefile  |    48 -
 ...ttps-call-verify-hostname-when-avail.patch |    41 -
 ...wp-https-verify-hostnames-by-default.patch |   113 -
 trunk/package/feeds/packages/perl/Config.in   |    20 -
 trunk/package/feeds/packages/perl/Makefile    |   195 -
 .../packages/perl/files/config.sh-arm-mt.in   |  1163 --
 .../packages/perl/files/config.sh-arm.in      |  1162 --
 .../packages/perl/files/config.sh-armeb-mt.in |  1163 --
 .../packages/perl/files/config.sh-armeb.in    |  1162 --
 .../packages/perl/files/config.sh-avr32-mt.in |  1165 --
 .../packages/perl/files/config.sh-avr32.in    |  1164 --
 .../packages/perl/files/config.sh-i486-mt.in  |  1149 --
 .../packages/perl/files/config.sh-i486.in     |  1148 --
 .../packages/perl/files/config.sh-mips-mt.in  |  1163 --
 .../packages/perl/files/config.sh-mips.in     |  1162 --
 .../perl/files/config.sh-mips64-mt.in         |  1163 --
 .../packages/perl/files/config.sh-mips64.in   |  1162 --
 .../perl/files/config.sh-mipsel-mt.in         |  1149 --
 .../packages/perl/files/config.sh-mipsel.in   |  1148 --
 .../perl/files/config.sh-powerpc-mt.in        |  1163 --
 .../packages/perl/files/config.sh-powerpc.in  |  1162 --
 .../perl/files/config.sh-x86_64-mt.in         |  1149 --
 .../packages/perl/files/config.sh-x86_64.in   |  1148 --
 .../packages/perl/files/perl-run_tests.sh     |    24 -
 ...x-cross-compile-endianness-detection.patch |    22 -
 ...st-libc-dir-moved-debian+derivatives.patch |    27 -
 .../patches/300-always_use_miniperl.patch     |    27 -
 .../400-add_microperl_caretx_dependency.patch |    22 -
 .../perl/patches/500-add-relink-hack.patch    |     6 -
 trunk/package/feeds/packages/perl/perlbase.mk |  1539 ---
 trunk/package/feeds/packages/perl/perlmod.mk  |   160 -
 trunk/package/feeds/packages/php5/Makefile    |   563 -
 .../package/feeds/packages/php5/files/php.ini |   311 -
 .../packages/php5/files/php5-fastcgi.config   |     3 -
 .../packages/php5/files/php5-fastcgi.init     |    30 -
 .../packages/php5/files/php5-fpm-www.conf     |   392 -
 .../feeds/packages/php5/files/php5-fpm.conf   |   121 -
 .../feeds/packages/php5/files/php5-fpm.config |     2 -
 .../feeds/packages/php5/files/php5-fpm.init   |    29 -
 ...fix_membar_producer_link_error_gcc3x.patch |    11 -
 ...bian_patches_use_embedded_timezonedb.patch |   620 -
 ...bian_patches_use_embedded_timezonedb.patch |    19 -
 .../packages/php5/patches/800-gd-iconv.patch  |    14 -
 .../950-Fix-dl-cross-compiling-issue.patch    |    62 -
 trunk/package/feeds/packages/php5/pecl.mk     |    47 -
 trunk/package/feeds/packages/pianod/Makefile  |   110 -
 .../feeds/packages/pianod/files/pianod.init   |    42 -
 .../005-Fix_IPV6_socket_handling.patch        |    75 -
 .../010-Configure_add_SSL_options.patch       |    42 -
 ...Use_package_config_h_for_all_modules.patch |    59 -
 .../030-Waitress_add_polarssl_variant.patch   |   333 -
 trunk/package/feeds/packages/picocom/Makefile |    46 -
 trunk/package/feeds/packages/polipo/Makefile  |    59 -
 .../feeds/packages/polipo/files/polipo.config |    42 -
 .../feeds/packages/polipo/files/polipo.init   |   150 -
 .../package/feeds/packages/portaudio/Makefile |    70 -
 trunk/package/feeds/packages/portmap/Makefile |    53 -
 .../feeds/packages/portmap/files/portmap.init |    13 -
 .../packages/portmap/patches/101-no_pie.patch |    12 -
 trunk/package/feeds/packages/postfix/Makefile |   243 -
 .../packages/postfix/files/main.cf.default    |   840 --
 .../feeds/packages/postfix/files/postfix.init |    64 -
 .../packages/postfix/patches/100-fsstat.patch |    12 -
 .../postfix/patches/200-manpages.patch        |    80 -
 .../patches/300-bdb_hash_segfault.patch       |    14 -
 .../packages/postfix/patches/400-cdb.patch    |    14 -
 .../postfix/patches/500-crosscompile.patch    |    27 -
 .../postfix/patches/600-nopostconf.patch      |    44 -
 .../postfix/patches/700-defaultconfig.patch   |    93 -
 .../packages/postfix/patches/800-fmt.patch    |    12 -
 .../feeds/packages/postgresql/Makefile        |   254 -
 .../postgresql/files/postgresql.config        |     5 -
 .../packages/postgresql/files/postgresql.init |    93 -
 .../postgresql/patches/200-ranlib.patch       |    10 -
 .../patches/800-busybox-default-pager.patch   |    13 -
 .../package/feeds/packages/pps-tools/Makefile |    50 -
 trunk/package/feeds/packages/privoxy/Makefile |   109 -
 .../packages/privoxy/files/privoxy.config     |    44 -
 .../packages/privoxy/files/privoxy.hotplug    |    18 -
 .../feeds/packages/privoxy/files/privoxy.init |   150 -
 trunk/package/feeds/packages/procps/Makefile  |    86 -
 .../procps/patches/010-make_fix.patch         |    11 -
 .../packages/procps/patches/020_hz_fix.patch  |    41 -
 .../patches/030-fix-string-problems.patch     |    11 -
 trunk/package/feeds/packages/prosody/Makefile |   124 -
 .../packages/prosody/files/prosody.cfg.lua    |   170 -
 .../feeds/packages/prosody/files/prosody.init |    53 -
 .../prosody/patches/010-fix-randomseed.patch  |    12 -
 .../feeds/packages/protobuf-c/Makefile        |    62 -
 .../package/feeds/packages/protobuf/Makefile  |    83 -
 .../protobuf/patches/001-mipseb-compile.patch |    11 -
 trunk/package/feeds/packages/pthsem/Makefile  |    60 -
 .../pthsem/patches/001-linux3x-fix.patch      |    12 -
 .../feeds/packages/pulseaudio/Makefile        |   196 -
 .../packages/pulseaudio/files/pulseaudio.init |    29 -
 .../patches/001-no_default_64mb_alloc.patch   |    11 -
 trunk/package/feeds/packages/pv/Makefile      |    46 -
 .../feeds/packages/python-dns/Makefile        |    44 -
 .../feeds/packages/python-imglib/Makefile     |    62 -
 .../patches/010-cross-compile.patch           |    48 -
 .../patches/020-freetype-header-include.patch |    21 -
 .../feeds/packages/python-mysql/Makefile      |    50 -
 .../python-mysql/patches/010-threadsafe.patch |    11 -
 .../feeds/packages/python-pip/Makefile        |    76 -
 .../feeds/packages/python-setuptools/Makefile |    56 -
 .../patches/0001-remove-windows-support.patch |    20 -
 trunk/package/feeds/packages/python/Makefile  |   248 -
 .../feeds/packages/python/files/config.site   |    12 -
 .../python/files/python-package-codecs.mk     |    23 -
 .../python/files/python-package-compiler.mk   |    16 -
 .../python/files/python-package-ctypes.mk     |    18 -
 .../python/files/python-package-db.mk         |    18 -
 .../python/files/python-package-decimal.mk    |    16 -
 .../python/files/python-package-distutils.mk  |    16 -
 .../python/files/python-package-email.mk      |    16 -
 .../python/files/python-package-gdbm.mk       |    16 -
 .../python/files/python-package-logging.mk    |    16 -
 .../files/python-package-multiprocessing.mk   |    17 -
 .../python/files/python-package-ncurses.mk    |    18 -
 .../python/files/python-package-openssl.mk    |    17 -
 .../python/files/python-package-pydoc.mk      |    18 -
 .../python/files/python-package-sqlite3.mk    |    17 -
 .../python/files/python-package-unittest.mk   |    16 -
 .../python/files/python-package-xml.mk        |    20 -
 .../packages/python/files/python-package.mk   |   119 -
 .../python/patches/001-enable-zlib.patch      |    25 -
 ...dd-include-dirs-when-cross-compiling.patch |    14 -
 .../003-do-not-compile-tests-at-build.patch   |    20 -
 .../004-do-not-write-bytes-codes.patch        |    22 -
 .../005-fix-libffi-x86-64-configure.patch     |    31 -
 .../006-remove-debian-multiarch-support.patch |    12 -
 .../007-distutils-do-not-adjust-path.patch    |    10 -
 .../008-distutils-use-python-sysroot.patch    |    54 -
 ...t-use-dblib_dir-when-cross-compiling.patch |    34 -
 ...add-rt-lib-dirs-when-cross-compiling.patch |    15 -
 .../feeds/packages/python3-bottle/Makefile    |    51 -
 trunk/package/feeds/packages/python3/Makefile |   255 -
 .../feeds/packages/python3/files/config.site  |    12 -
 .../python3/files/python3-package-asyncio.mk  |    16 -
 .../python3/files/python3-package-codecs.mk   |    22 -
 .../python3/files/python3-package-ctypes.mk   |    18 -
 .../python3/files/python3-package-dbm.mk      |    17 -
 .../python3/files/python3-package-decimal.mk  |    17 -
 .../files/python3-package-distutils.mk        |    16 -
 .../python3/files/python3-package-email.mk    |    16 -
 .../python3/files/python3-package-gdbm.mk     |    16 -
 .../python3/files/python3-package-logging.mk  |    16 -
 .../files/python3-package-multiprocessing.mk  |    17 -
 .../python3/files/python3-package-ncurses.mk  |    18 -
 .../python3/files/python3-package-openssl.mk  |    17 -
 .../python3/files/python3-package-pydoc.mk    |    18 -
 .../python3/files/python3-package-sqlite3.mk  |    17 -
 .../python3/files/python3-package-unittest.mk |    16 -
 .../python3/files/python3-package-xml.mk      |    19 -
 .../packages/python3/files/python3-package.mk |   109 -
 .../python3/patches/001-enable-zlib.patch     |    25 -
 ...dd-include-dirs-when-cross-compiling.patch |    14 -
 .../003-do-not-run-distutils-tests.patch      |    37 -
 .../004-do-not-write-bytes-codes.patch        |    22 -
 .../005-fix-libffi-x86-64-configure.patch     |    31 -
 .../006-remove-debian-multiarch-support.patch |    12 -
 .../007-distutils-do-not-adjust-path.patch    |    10 -
 ...add-rt-lib-dirs-when-cross-compiling.patch |    15 -
 .../feeds/packages/radsecproxy/Makefile       |    57 -
 .../radsecproxy/files/radsecproxy.init        |    16 -
 .../patches/100-missing-return.patch          |    58 -
 .../patches/200-logdest-on-foreground.patch   |    31 -
 .../package/feeds/packages/redsocks/Makefile  |    56 -
 .../packages/redsocks/files/redsocks.conf     |   108 -
 .../packages/redsocks/files/redsocks.init     |    36 -
 ...esolution-results-were-ignored-since.patch |    53 -
 .../0002-inet_ntop-red_inet_ntop.patch        |   161 -
 ...for-UDP-TPROXY-redirection.-No-more-.patch |   449 -
 ...x-transposition-of-memset-parameters.patch |    25 -
 ...on-Ubuntu-10.04-LTS-and-hopefully-De.patch |   105 -
 .../0006-fix_default_config_location.patch    |    17 -
 .../package/feeds/packages/remserial/Makefile |    34 -
 .../package/feeds/packages/rng-tools/Makefile |    50 -
 .../feeds/packages/rng-tools/files/rngd.init  |    16 -
 .../feeds/packages/rpcd-mod-lxc/Makefile      |    37 -
 .../rpcd-mod-lxc/files/CMakeLists.txt         |    19 -
 .../feeds/packages/rpcd-mod-lxc/files/lxc.c   |   504 -
 .../package/feeds/packages/rrdtool1/Makefile  |   133 -
 .../patches/001-no_ordering_cd_joke.patch     |    21 -
 .../rrdtool1/patches/002-no_timezone.patch    |    24 -
 .../rrdtool1/patches/020-x86-float-cast.patch |    13 -
 .../rrdtool1/patches/030-pod2man-stderr.patch |    11 -
 trunk/package/feeds/packages/rsync/Config.in  |    25 -
 trunk/package/feeds/packages/rsync/Makefile   |   104 -
 .../feeds/packages/rsync/files/rsyncd.conf    |    16 -
 .../feeds/packages/rsync/files/rsyncd.init    |    14 -
 .../rsync/patches/000-CVE-2014-9512.patch     |   106 -
 trunk/package/feeds/packages/rtklib/Makefile  |    96 -
 trunk/package/feeds/packages/rtl-sdr/Makefile |    88 -
 .../package/feeds/packages/rtorrent/Makefile  |    91 -
 .../patches/100-fix-cross_compile.patch       |    30 -
 .../rtorrent/patches/120-fix-ncurses.patch    |    11 -
 trunk/package/feeds/packages/ruby/Makefile    |  1374 --
 trunk/package/feeds/packages/ruby/files/ruby  |     5 -
 .../patches/001-rdoc-remove_gems_dep.patch    |    36 -
 .../feeds/packages/ruby/ruby_find_pkgsdeps    |   270 -
 .../feeds/packages/ruby/ruby_missingfiles     |    20 -
 trunk/package/feeds/packages/sbc/Makefile     |    57 -
 trunk/package/feeds/packages/screen/Makefile  |    56 -
 .../feeds/packages/screen/files/etc/screenrc  |     1 -
 .../patches/100-cross_compile_fix.patch       |    64 -
 ...10-do_not_add_srcdir_to_include_path.patch |    11 -
 .../feeds/packages/seafile-ccnet/Makefile     |    74 -
 .../feeds/packages/seafile-seahub/Makefile    |   159 -
 .../patches/010-default-config.patch          |    30 -
 .../feeds/packages/seafile-server/Makefile    |   126 -
 .../seafile-server/files/seafile.init         |    47 -
 .../patches/020-script-patches.patch          |    40 -
 .../030-pidfiles-in-same-directory.patch      |    24 -
 .../patches/040-seafile-admin.patch           |    68 -
 trunk/package/feeds/packages/ser2net/Makefile |    50 -
 .../001-fix_TIOCSRS485_undeclared_error.patch |    59 -
 .../feeds/packages/serialconsole/Makefile     |    40 -
 trunk/package/feeds/packages/shadow/Makefile  |   146 -
 .../shadow/patches/001-busybox_ash.patch      |    11 -
 .../patches/002-disable-ruser-lookup.patch    |    10 -
 .../patches/003-fix-disabling-subids.patch    |    32 -
 .../packages/shadowsocks-client/Makefile      |    39 -
 .../shadowsocks-client/files/sslocal.config   |     7 -
 .../shadowsocks-client/files/sslocal.init     |    52 -
 .../package/feeds/packages/shairplay/Makefile |    50 -
 .../packages/shairplay/files/shairplay.config |    10 -
 .../packages/shairplay/files/shairplay.init   |    51 -
 .../shairplay/patches/001-key_file_dir.patch  |    11 -
 .../patches/002-libavahi-compat-dnssd.patch   |    11 -
 .../patches/003-fix_big-endian.patch          |    24 -
 .../feeds/packages/shairport-sync/Makefile    |    62 -
 .../files/shairport-sync.config               |    35 -
 .../shairport-sync/files/shairport-sync.init  |    77 -
 .../package/feeds/packages/shairport/Makefile |    60 -
 .../packages/shairport/files/shairport.config |    36 -
 .../packages/shairport/files/shairport.init   |   104 -
 .../patches/001-disable_pulseaudio.patch      |    12 -
 trunk/package/feeds/packages/shine/Makefile   |    64 -
 .../feeds/packages/simplejson/Makefile        |    48 -
 .../package/feeds/packages/sispmctl/Makefile  |    56 -
 .../sispmctl/patches/001-fix-includes.patch   |    25 -
 .../feeds/packages/smartmontools/Makefile     |    91 -
 .../packages/smartmontools/files/smartd.conf  |     1 -
 .../packages/smartmontools/files/smartd.init  |    16 -
 .../feeds/packages/smartsnmpd/Makefile        |    75 -
 .../packages/smartsnmpd/files/mibs/dummy.lua  |    24 -
 .../smartsnmpd/files/mibs/interfaces.lua      |   125 -
 .../packages/smartsnmpd/files/mibs/system.lua |   176 -
 .../packages/smartsnmpd/files/smartsnmpd.conf |    21 -
 .../packages/smartsnmpd/files/smartsnmpd.init |    47 -
 .../package/feeds/packages/smstools3/Makefile |    74 -
 .../packages/smstools3/files/smstools3.conf   |    20 -
 .../packages/smstools3/files/smstools3.init   |   152 -
 .../packages/smstools3/patches/001-smsd.patch |    13 -
 .../smstools3/patches/002-Makefile.patch      |    12 -
 trunk/package/feeds/packages/snort/Makefile   |   202 -
 .../feeds/packages/snort/files/snort.config   |     3 -
 .../feeds/packages/snort/files/snort.init     |    40 -
 .../packages/snort/patches/001-compile.patch  |   105 -
 trunk/package/feeds/packages/socat/Makefile   |    81 -
 .../feeds/packages/socat/files/socat.config   |     5 -
 .../feeds/packages/socat/files/socat.init     |    39 -
 .../package/feeds/packages/sockread/Makefile  |    35 -
 .../feeds/packages/sockread/src/Makefile      |    11 -
 .../feeds/packages/sockread/src/main.c        |    63 -
 .../package/feeds/packages/softflowd/Makefile |    54 -
 .../packages/softflowd/files/softflowd.config |    14 -
 .../packages/softflowd/files/softflowd.init   |    74 -
 .../feeds/packages/spawn-fcgi/Makefile        |    42 -
 trunk/package/feeds/packages/speex/Makefile   |   105 -
 trunk/package/feeds/packages/sqlite3/Makefile |   106 -
 .../feeds/packages/sqm-scripts/Makefile       |    59 -
 .../packages/sqm-scripts/files/etc/config/sqm |    16 -
 .../files/etc/hotplug.d/iface/11-sqm          |     3 -
 .../packages/sqm-scripts/files/etc/init.d/sqm |    23 -
 .../files/usr/lib/sqm/functions.sh            |   486 -
 .../sqm-scripts/files/usr/lib/sqm/run.sh      |   133 -
 .../sqm-scripts/files/usr/lib/sqm/simple.qos  |   218 -
 .../files/usr/lib/sqm/simple.qos.help         |     1 -
 .../files/usr/lib/sqm/simple_pppoe.qos        |   398 -
 .../files/usr/lib/sqm/simple_pppoe.qos.help   |     2 -
 .../files/usr/lib/sqm/simplest.qos            |    84 -
 .../files/usr/lib/sqm/simplest.qos.help       |     1 -
 .../sqm-scripts/files/usr/lib/sqm/stop.sh     |    42 -
 trunk/package/feeds/packages/squid/Makefile   |   133 -
 .../feeds/packages/squid/files/squid.conf     |    44 -
 .../feeds/packages/squid/files/squid.config   |     5 -
 .../feeds/packages/squid/files/squid.init     |    52 -
 .../squid/patches/001-cross_compile.patch     |    49 -
 .../packages/squid/patches/100-mime.patch     |    30 -
 trunk/package/feeds/packages/sshfs/Makefile   |    62 -
 .../package/feeds/packages/sshtunnel/Makefile |    48 -
 .../packages/sshtunnel/files/sshtunnel.init   |   203 -
 .../packages/sshtunnel/files/sshtunnel.sh     |    21 -
 .../packages/sshtunnel/files/uci_sshtunnel    |    63 -
 trunk/package/feeds/packages/sslh/Makefile    |    53 -
 .../feeds/packages/sslh/files/sslh.config     |    30 -
 .../feeds/packages/sslh/files/sslh.init       |    62 -
 .../sslh/patches/001-no_sslh_select.patch     |    29 -
 trunk/package/feeds/packages/ssmtp/Makefile   |    64 -
 .../ssmtp/patches/002-fix_pointer.patch       |   466 -
 .../feeds/packages/sstp-client/Makefile       |    51 -
 .../sstp-client/files/etc/ppp/chap-secrets    |     4 -
 .../etc/ppp/peers/peer-sstp-example-nopty.txt |    14 -
 .../files/etc/ppp/peers/peer-sstp-example.txt |    15 -
 .../feeds/packages/stm32flash/Makefile        |    40 -
 trunk/package/feeds/packages/stoken/Makefile  |    77 -
 .../feeds/packages/strongswan/Config.in       |    16 -
 .../feeds/packages/strongswan/Makefile        |   497 -
 .../packages/strongswan/files/ipsec.init      |    20 -
 .../packages/strongswan/files/ipsec.secrets   |     1 -
 .../packages/strongswan/files/ipsec.user      |     6 -
 .../strongswan/patches/201-kmodloader.patch   |    28 -
 .../packages/strongswan/patches/203-uci.patch |    20 -
 .../300-include-ipsec-user-script.patch       |    17 -
 trunk/package/feeds/packages/stunnel/Makefile |    77 -
 .../feeds/packages/stunnel/files/stunnel.conf |    45 -
 .../feeds/packages/stunnel/files/stunnel.init |    12 -
 .../stunnel/patches/010_fix_getnameinfo.patch |    25 -
 .../patches/011_disable_ssp_linking.patch     |   140 -
 trunk/package/feeds/packages/sudo/Makefile    |    97 -
 .../feeds/packages/sudo/files/sudo.init       |    11 -
 .../patches/010-cross-compile-fixes.patch     |    25 -
 .../sudo/patches/020-no-owner-change.patch    |    12 -
 trunk/package/feeds/packages/sumo/Makefile    |    61 -
 .../package/feeds/packages/sumo/files/sumo.sh |     6 -
 .../sumo/patches/100-configure_fix.patch      |    14 -
 trunk/package/feeds/packages/svox/Makefile    |    61 -
 ...nf-building-of-library-using-libtool.patch |   113 -
 .../0002-gitignore-for-autotools-files.patch  |    51 -
 ...t-text-to-.wav-using-svox-text-to-sp.patch |   399 -
 .../svox/patches/0004-add-header-files.patch  |    59 -
 .../patches/0005-Install-lang-files.patch     |    32 -
 .../svox/patches/0006-Set-picolangdir.patch   |    40 -
 .../packages/svox/patches/0008-64bits.patch   |    26 -
 .../svox/patches/0009-Fix-link-order.patch    |    21 -
 .../packages/svox/patches/0010-platform.patch |    30 -
 .../packages/svox/patches/0011-subdir.patch   |    12 -
 .../svox/patches/0012-no-headers.patch        |    46 -
 trunk/package/feeds/packages/tar/Makefile     |    64 -
 .../feeds/packages/taskwarrior/Makefile       |    48 -
 trunk/package/feeds/packages/tayga/Makefile   |    49 -
 .../feeds/packages/tayga/files/tayga-proto.sh |    96 -
 .../feeds/packages/tayga/files/tayga.hotplug  |    37 -
 .../feeds/packages/tayga/files/tayga.sh       |   152 -
 .../patches/001-configure_unset_CFLAGS.patch  |    11 -
 .../002-bigendian_wrong_checksum.patch        |    53 -
 .../feeds/packages/tcp_wrappers/Makefile      |    65 -
 .../patches/001-debian_subset.patch           |   936 --
 .../tcp_wrappers/patches/002-opt_cflags.patch |    12 -
 .../patches/003-scaffold_malloc.patch         |    17 -
 .../patches/004-ipv4_prefix.patch             |    72 -
 .../package/feeds/packages/tcpproxy/Makefile  |    84 -
 .../packages/tcpproxy/files/tcpproxy.config   |    26 -
 .../packages/tcpproxy/files/tcpproxy.init     |    96 -
 .../patches/001-ragel_generated.patch         |  1378 --
 trunk/package/feeds/packages/tcsh/Makefile    |    55 -
 trunk/package/feeds/packages/tdb/Makefile     |    56 -
 .../packages/tdb/patches/001-printf-fix.patch |    41 -
 trunk/package/feeds/packages/tgt/Makefile     |    62 -
 .../feeds/packages/tgt/files/etc/config/tgt   |    64 -
 .../feeds/packages/tgt/files/etc/init.d/tgt   |   237 -
 .../packages/tgt/patches/010-fallocate.patch  |    14 -
 .../tgt/patches/020-usr_Makefile.patch        |    56 -
 .../packages/tgt/patches/030-Makefile.patch   |    11 -
 trunk/package/feeds/packages/tiff/Makefile    |   108 -
 .../tiff/patches/001-autoconf-compat.patch    |    31 -
 .../tiff/patches/010-CVE-2012-4564.patch      |    31 -
 .../tiff/patches/011-CVE-2013-1960.patch      |   146 -
 .../tiff/patches/012-CVE-2013-1961.patch      |   768 --
 .../tiff/patches/013-CVE-2013-4231.patch      |    17 -
 .../tiff/patches/014-CVE-2013-4232.patch      |    18 -
 .../tiff/patches/015-CVE-2013-4244.patch      |    18 -
 .../tiff/patches/016-CVE-2013-4243.patch      |    37 -
 .../tiff/patches/017-CVE-2014-9330.patch      |    45 -
 trunk/package/feeds/packages/tinc/Makefile    |    60 -
 .../feeds/packages/tinc/files/tinc.config     |    56 -
 .../feeds/packages/tinc/files/tinc.init       |   239 -
 .../feeds/packages/tinc/files/tinc.upgrade    |     1 -
 trunk/package/feeds/packages/tinycdb/Makefile |    39 -
 .../tinycdb/patches/100-Makefile.patch        |    25 -
 .../package/feeds/packages/tinyproxy/Makefile |    51 -
 .../packages/tinyproxy/files/tinyproxy.config |   251 -
 .../packages/tinyproxy/files/tinyproxy.init   |   142 -
 .../patches/010-no-docs-and-tests.patch       |    86 -
 .../patches/020-config_and_pid-path.patch     |    13 -
 .../030-allow_bind_in_transparent_mode.patch  |    22 -
 .../tinyproxy/patches/120-fix_INET6.patch     |    38 -
 ...2-3505-tiniproxy-randomized-hashmaps.patch |   101 -
 ...VE-2012-3505-tinyproxy-limit-headers.patch |    44 -
 trunk/package/feeds/packages/tmux/Makefile    |    46 -
 .../100-b64_ntop-conflict_compath_h.patch     |    15 -
 ...-b64_ntop-conflict_compat_b64_ntop_c.patch |    13 -
 .../patches/102-b64_ntop-conflict_tty_c.patch |    13 -
 .../packages/tmux/patches/200-usr-local.patch |    14 -
 .../feeds/packages/tracertools/Makefile       |    42 -
 .../feeds/packages/transmission/Makefile      |   122 -
 .../transmission/files/transmission.config    |    71 -
 .../transmission/files/transmission.init      |   111 -
 ...0_libtransmission_fallocate64_eglibc.patch |    14 -
 .../patches/020-use-internal-miniupnp.patch   |    11 -
 .../patches/030-fix-musl-build.patch          |    34 -
 .../feeds/packages/triggerhappy/Makefile      |    58 -
 .../files/triggerhappy-example.conf           |    14 -
 .../triggerhappy/files/triggerhappy.hotplug   |    15 -
 .../triggerhappy/files/triggerhappy.init      |    10 -
 .../patches/100-fix-LINUX_INPUT_H.patch       |    11 -
 trunk/package/feeds/packages/uanytun/Makefile |   175 -
 .../uanytun/files/uanytun-nocrypt.config      |    88 -
 .../packages/uanytun/files/uanytun.config     |   116 -
 .../feeds/packages/uanytun/files/uanytun.init |   104 -
 trunk/package/feeds/packages/udpxy/Makefile   |    64 -
 .../feeds/packages/udpxy/files/udpxy.conf     |    15 -
 .../feeds/packages/udpxy/files/udpxy.init     |    67 -
 .../patches/0001-fix-build-on-Mac-OS-X.patch  |    30 -
 trunk/package/feeds/packages/ulogd/Makefile   |   200 -
 .../feeds/packages/ulogd/files/ulogd.init     |    12 -
 ...ix-JSON-output-on-big-endian-systems.patch |    47 -
 ...opy-of-linux-netfilter_ipv4-ipt_ULOG.patch |   108 -
 trunk/package/feeds/packages/umurmur/Makefile |   103 -
 trunk/package/feeds/packages/unbound/Makefile |   176 -
 .../feeds/packages/unbound/files/named.cache  |    90 -
 .../feeds/packages/unbound/files/root.key     |     1 -
 .../feeds/packages/unbound/files/unbound.init |    14 -
 .../packages/unbound/patches/001-conf.patch   |   154 -
 .../package/feeds/packages/unixodbc/Makefile  |   117 -
 .../packages/unixodbc/files/unixodbc_conf.h   |    22 -
 trunk/package/feeds/packages/unrar/Makefile   |    50 -
 .../unrar/patches/100-makefile_fixes.patch    |    18 -
 trunk/package/feeds/packages/unzip/Makefile   |    65 -
 .../001-CVE-2014-8139-crc-overflow.patch      |    49 -
 .../002-CVE-2014-8140-test-compr-eb.patch     |    23 -
 .../003-CVE-2014-8141-getzip64data.patch      |   133 -
 .../004-CVE-2014-9636-test-compr-eb.patch     |    25 -
 .../package/feeds/packages/upmpdcli/Makefile  |    52 -
 .../packages/upmpdcli/files/upmpdcli.config   |    15 -
 .../packages/upmpdcli/files/upmpdcli.init     |    51 -
 .../packages/upmpdcli/files/upmpdcli.png      |   Bin 1640 -> 0 bytes
 .../patches/010-Add_icon_config.patch         |     9 -
 trunk/package/feeds/packages/usbmuxd/Makefile |    52 -
 trunk/package/feeds/packages/uuid/Makefile    |    48 -
 .../feeds/packages/uvcdynctrl/Makefile        |    87 -
 trunk/package/feeds/packages/vala/Makefile    |    73 -
 trunk/package/feeds/packages/vim/Makefile     |   194 -
 trunk/package/feeds/packages/vim/files/vimrc  |    11 -
 .../feeds/packages/vim/files/vimrc.full       |    28 -
 .../packages/vim/patches/001-compile.patch    |    41 -
 trunk/package/feeds/packages/vips/Makefile    |    82 -
 .../packages/vips/patches/001-no_cpp.patch    |   154 -
 trunk/package/feeds/packages/vnstat/Makefile  |   109 -
 .../feeds/packages/vnstat/files/vnstat.config |     5 -
 .../packages/vnstat/files/vnstat.defaults     |    13 -
 .../feeds/packages/vnstat/files/vnstat.init   |    82 -
 .../packages/vnstat/patches/001-conf.patch    |    19 -
 .../vnstat/patches/002-no_install_strip.patch |    35 -
 .../vnstat/patches/003-no_install_uname.patch |    15 -
 .../feeds/packages/vpnc-scripts/Makefile      |    37 -
 .../packages/vpnc-scripts/files/vpnc-script   |   190 -
 trunk/package/feeds/packages/vpnc/Config.in   |    18 -
 trunk/package/feeds/packages/vpnc/Makefile    |    94 -
 trunk/package/feeds/packages/vpnc/README      |    39 -
 .../package/feeds/packages/vpnc/files/vpnc.sh |    98 -
 .../feeds/packages/vpnc/files/vpnc.upgrade    |     2 -
 .../packages/vpnc/patches/001-cross.patch     |    42 -
 trunk/package/feeds/packages/vsftpd/Makefile  |    86 -
 .../feeds/packages/vsftpd/files/vsftpd.conf   |    30 -
 .../feeds/packages/vsftpd/files/vsftpd.init   |    13 -
 .../packages/vsftpd/patches/001-destdir.patch |    47 -
 .../vsftpd/patches/002-find_libs.patch        |    13 -
 .../packages/vsftpd/patches/003-chroot.patch  |    11 -
 .../patches/004-disable-capabilities.patch    |    12 -
 .../vsftpd/patches/005-disable-pam.patch      |    11 -
 .../package/feeds/packages/watchcat/Makefile  |    45 -
 .../packages/watchcat/files/initd_watchcat    |   108 -
 .../watchcat/files/uci_defaults_watchcat      |    10 -
 .../feeds/packages/watchcat/files/watchcat.sh |    74 -
 trunk/package/feeds/packages/wavemon/Makefile |    55 -
 trunk/package/feeds/packages/wget/Makefile    |   134 -
 .../feeds/packages/wifitoggle/Makefile        |    45 -
 .../wifitoggle/files/wifitoggle.config        |    11 -
 .../wifitoggle/files/wifitoggle.hotplug       |   172 -
 trunk/package/feeds/packages/wshaper/Makefile |    58 -
 .../packages/wshaper/files/wshaper.config     |     4 -
 .../feeds/packages/wshaper/files/wshaper.htb  |   166 -
 .../packages/wshaper/files/wshaper.iface      |     3 -
 .../feeds/packages/wshaper/files/wshaper.init |    10 -
 trunk/package/feeds/packages/xinetd/Makefile  |    65 -
 .../feeds/packages/xinetd/files/xinetd.conf   |     6 -
 .../feeds/packages/xinetd/files/xinetd.init   |    15 -
 .../packages/xinetd/patches/001-ar.patch      |    66 -
 .../packages/xinetd/patches/002-destdir.patch |    27 -
 .../packages/xinetd/patches/003-rpc_fix.patch |    19 -
 .../xinetd/patches/004-ident-bind.patch       |    42 -
 trunk/package/feeds/packages/xl2tpd/Makefile  |    73 -
 trunk/package/feeds/packages/xl2tpd/README    |    23 -
 .../feeds/packages/xl2tpd/files/l2tp.sh       |   107 -
 .../packages/xl2tpd/files/options.xl2tpd      |    13 -
 .../feeds/packages/xl2tpd/files/xl2tp-secrets |     5 -
 .../feeds/packages/xl2tpd/files/xl2tpd.conf   |    23 -
 .../packages/xl2tpd/files/xl2tpd.conf.sample  |    73 -
 .../feeds/packages/xl2tpd/files/xl2tpd.init   |    18 -
 .../patches/100-makefile_opt_flags.patch      |    12 -
 .../patches/110-makefile_dont_build_pfc.patch |    43 -
 .../patches/120-no-bsd-signal-in-musl.patch   |    13 -
 .../package/feeds/packages/xmlrpc-c/Makefile  |   226 -
 .../xmlrpc-c/patches/001-config.mk.in.patch   |    11 -
 .../patches/002-automake-compat.patch         |    13 -
 trunk/package/feeds/packages/xupnpd/Makefile  |    71 -
 .../feeds/packages/xupnpd/files/xupnpd.init   |    15 -
 .../xupnpd/patches/100-default_config.patch   |    15 -
 .../xupnpd/patches/101-root_dir_param.patch   |    83 -
 trunk/package/feeds/packages/zabbix/Makefile  |   247 -
 .../feeds/packages/zabbix/files/mac80211      |    27 -
 .../feeds/packages/zabbix/files/network       |     9 -
 .../package/feeds/packages/zabbix/files/wifi  |    25 -
 .../packages/zabbix/files/zabbix_agentd.init  |    31 -
 .../zabbix/files/zabbix_helper_mac80211.c     |    77 -
 .../patches/002-fix-res_send-on-uclibc.patch  |    35 -
 .../zabbix/patches/002-uclibc_loadavg.patch   |    48 -
 .../patches/010-change-agentd-config.patch    |    62 -
 trunk/package/feeds/packages/zile/Makefile    |    49 -
 trunk/package/feeds/packages/zip/Makefile     |    62 -
 trunk/package/feeds/packages/znc/Makefile     |   289 -
 .../package/feeds/packages/znc/files/znc.conf |    29 -
 .../package/feeds/packages/znc/files/znc.init |   194 -
 .../001-move_rootcheck_after_config.patch     |    52 -
 .../znc/patches/003-Reduce_rebuild_time.patch |    38 -
 .../znc/patches/004-restore_droproot.patch    |   147 -
 .../package/feeds/packages/zoneinfo/Makefile  |   242 -
 trunk/package/feeds/packages/zsh/Makefile     |    82 -
 1520 files changed, 170291 deletions(-)
 delete mode 100644 trunk/package/feeds/packages/acl/Makefile
 delete mode 100644 trunk/package/feeds/packages/acl/patches/100-no-gettext_configure.patch
 delete mode 100644 trunk/package/feeds/packages/acl/patches/101-no-gettext_autogen.patch
 delete mode 100644 trunk/package/feeds/packages/acl/patches/102-no-gettext_Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/aiccu/Makefile
 delete mode 100644 trunk/package/feeds/packages/aiccu/files/aiccu.hotplug
 delete mode 100755 trunk/package/feeds/packages/aiccu/files/aiccu.sh
 delete mode 100644 trunk/package/feeds/packages/aiccu/patches/100-cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/aiccu/patches/200-add_dn_skipname.patch
 delete mode 100644 trunk/package/feeds/packages/aiccu/patches/300-resolver-uclibc.patch
 delete mode 100644 trunk/package/feeds/packages/aircrack-ng/Makefile
 delete mode 100644 trunk/package/feeds/packages/alpine/Makefile
 delete mode 100644 trunk/package/feeds/packages/alpine/patches/100-no-openssl-check-cross-compile.patch
 delete mode 100644 trunk/package/feeds/packages/alsa-lib/Makefile
 delete mode 100644 trunk/package/feeds/packages/alsa-lib/patches/001-link_fix.patch
 delete mode 100644 trunk/package/feeds/packages/alsa-lib/patches/002-remove_cross_compile_guess.patch
 delete mode 100644 trunk/package/feeds/packages/alsa-utils/Makefile
 delete mode 100644 trunk/package/feeds/packages/alsa-utils/patches/100-uClibc-compat.patch
 delete mode 100644 trunk/package/feeds/packages/announce/Makefile
 delete mode 100644 trunk/package/feeds/packages/apache/Makefile
 delete mode 100644 trunk/package/feeds/packages/apache/patches/001-Makefile_in.patch
 delete mode 100644 trunk/package/feeds/packages/apache/patches/002-test_char_h.patch
 delete mode 100644 trunk/package/feeds/packages/apache/patches/003-logdir_fix.patch
 delete mode 100644 trunk/package/feeds/packages/apache/patches/004-pidfile_fix.patch
 delete mode 100644 trunk/package/feeds/packages/apache/patches/005-httpd_conf.patch
 delete mode 100644 trunk/package/feeds/packages/apcupsd/Makefile
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/apccontrol
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/apcupsd.conf
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/apcupsd.css
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/apcupsd.init
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/apcupsd_mail.conf
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/changeme
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/commfailure
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/commok
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/hosts.conf
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/multimon.conf
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/offbattery
 delete mode 100644 trunk/package/feeds/packages/apcupsd/files/onbattery
 delete mode 100644 trunk/package/feeds/packages/apcupsd/patches/010-fix-usb.patch
 delete mode 100644 trunk/package/feeds/packages/apinger/Makefile
 delete mode 100644 trunk/package/feeds/packages/apinger/files/apinger.init
 delete mode 100644 trunk/package/feeds/packages/apinger/patches/001-autoreconf.patch
 delete mode 100644 trunk/package/feeds/packages/apinger/patches/002-run_as_user.patch
 delete mode 100644 trunk/package/feeds/packages/apinger/patches/003-no_docs.patch
 delete mode 100644 trunk/package/feeds/packages/apr-util/Makefile
 delete mode 100644 trunk/package/feeds/packages/apr-util/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/apr/Makefile
 delete mode 100644 trunk/package/feeds/packages/apr/patches/001-autoconf-compat.patch
 delete mode 100644 trunk/package/feeds/packages/apr/patches/101-fix_apr_time_now.patch
 delete mode 100644 trunk/package/feeds/packages/apr/patches/201-upgrade-and-fix-1.5.1.patch
 delete mode 100644 trunk/package/feeds/packages/argp-standalone/Makefile
 delete mode 100644 trunk/package/feeds/packages/argp-standalone/patches/001-throw-in-funcdef.patch
 delete mode 100644 trunk/package/feeds/packages/aria2/Config.in
 delete mode 100644 trunk/package/feeds/packages/aria2/Makefile
 delete mode 100644 trunk/package/feeds/packages/attr/Makefile
 delete mode 100644 trunk/package/feeds/packages/attr/patches/100-no-gettext_configure.patch
 delete mode 100644 trunk/package/feeds/packages/attr/patches/101-no-gettext_autogen.patch
 delete mode 100644 trunk/package/feeds/packages/attr/patches/102-no-gettext_Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/avahi/Makefile
 delete mode 100644 trunk/package/feeds/packages/avahi/files/avahi-daemon.conf
 delete mode 100644 trunk/package/feeds/packages/avahi/files/avahi-daemon.init
 delete mode 100644 trunk/package/feeds/packages/avahi/files/service-http
 delete mode 100644 trunk/package/feeds/packages/avahi/files/service-ssh
 delete mode 100644 trunk/package/feeds/packages/avahi/patches/010-step_back_autotools-no-gettext.patch
 delete mode 100644 trunk/package/feeds/packages/bash/Makefile
 delete mode 100644 trunk/package/feeds/packages/bash/patches/001-compile-fix.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/002-force-internal-readline.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/101-upstream-bash43-001.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/102-upstream-bash43-002.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/103-upstream-bash43-003.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/104-upstream-bash43-004.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/105-upstream-bash43-005.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/106-upstream-bash43-006.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/107-upstream-bash43-007.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/108-upstream-bash43-008.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/109-upstream-bash43-009.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/110-upstream-bash43-010.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/111-upstream-bash43-011.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/112-upstream-bash43-012.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/113-upstream-bash43-013.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/114-upstream-bash43-014.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/115-upstream-bash43-015.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/116-upstream-bash43-016.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/117-upstream-bash43-017.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/118-upstream-bash43-018.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/119-upstream-bash43-019.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/120-upstream-bash43-020.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/121-upstream-bash43-021.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/122-upstream-bash43-022.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/123-upstream-bash43-023.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/124-upstream-bash43-024.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/125-upstream-bash43-025.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/126-upstream-bash43-026.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/127-upstream-bash43-027.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/128-upstream-bash43-028.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/129-upstream-bash43-029.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/130-upstream-bash43-030.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/131-upstream-bash43-031.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/132-upstream-bash43-032.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/133-upstream-bash43-033.patch
 delete mode 100644 trunk/package/feeds/packages/bash/patches/900-no_doc.patch
 delete mode 100644 trunk/package/feeds/packages/bcp38/Makefile
 delete mode 100644 trunk/package/feeds/packages/bcp38/files/bcp38.config
 delete mode 100644 trunk/package/feeds/packages/bcp38/files/bcp38.defaults
 delete mode 100755 trunk/package/feeds/packages/bcp38/files/run.sh
 delete mode 100644 trunk/package/feeds/packages/bind/Makefile
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/db.0
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/db.127
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/db.255
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/db.local
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/db.root
 delete mode 100644 trunk/package/feeds/packages/bind/files/bind/named.conf.example
 delete mode 100644 trunk/package/feeds/packages/bind/files/named.init
 delete mode 100644 trunk/package/feeds/packages/bind/patches/001-no-tests.patch
 delete mode 100644 trunk/package/feeds/packages/bind/patches/002-autoconf-ar-fix.patch
 delete mode 100644 trunk/package/feeds/packages/bluelog/Makefile
 delete mode 100644 trunk/package/feeds/packages/bluelog/files/bluelog.init
 delete mode 100644 trunk/package/feeds/packages/bluez/Makefile
 delete mode 100644 trunk/package/feeds/packages/bluez/files/bluetooth.config
 delete mode 100644 trunk/package/feeds/packages/bluez/files/bluetooth.dbus
 delete mode 100644 trunk/package/feeds/packages/bluez/files/bluetoothd.init
 delete mode 100644 trunk/package/feeds/packages/bluez/files/givepin
 delete mode 100644 trunk/package/feeds/packages/bluez/patches/200-uart-speed.patch
 delete mode 100644 trunk/package/feeds/packages/bluez/patches/201-readline.patch
 delete mode 100644 trunk/package/feeds/packages/bmon/Makefile
 delete mode 100644 trunk/package/feeds/packages/bogofilter/Makefile
 delete mode 100755 trunk/package/feeds/packages/bogofilter/files/postfix-bogofilter
 delete mode 100644 trunk/package/feeds/packages/boost/Makefile
 delete mode 100644 trunk/package/feeds/packages/boost/patches/100-do-not-use-librt.patch
 delete mode 100644 trunk/package/feeds/packages/btrfs-progs/Makefile
 delete mode 100644 trunk/package/feeds/packages/btrfs-progs/files/btrfs-scan.init
 delete mode 100644 trunk/package/feeds/packages/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
 delete mode 100644 trunk/package/feeds/packages/bwm-ng/Config.in
 delete mode 100644 trunk/package/feeds/packages/bwm-ng/Makefile
 delete mode 100644 trunk/package/feeds/packages/bzip2/Makefile
 delete mode 100644 trunk/package/feeds/packages/c-ares/Makefile
 delete mode 100644 trunk/package/feeds/packages/ccid/Makefile
 delete mode 100644 trunk/package/feeds/packages/ccrypt/Makefile
 delete mode 100644 trunk/package/feeds/packages/ccrypt/patches/001-no-intl.patch
 delete mode 100644 trunk/package/feeds/packages/check/Makefile
 delete mode 100644 trunk/package/feeds/packages/cmdpad/Makefile
 delete mode 100644 trunk/package/feeds/packages/cmdpad/files/cmdpad.init
 delete mode 100644 trunk/package/feeds/packages/cmdpad/patches/100-Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/cmdpad/patches/120-kernel26-compat.patch
 delete mode 100644 trunk/package/feeds/packages/cmdpad/patches/130-no_zombie.patch
 delete mode 100644 trunk/package/feeds/packages/cmdpad/patches/140-compile_fix.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/Makefile
 delete mode 100644 trunk/package/feeds/packages/collectd/files/collectd.conf
 delete mode 100644 trunk/package/feeds/packages/collectd/files/collectd.init
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/003-remove-werror.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/100-rrdtool-add-rrasingle-option.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/110-net-device-stats.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/140-fix-fqdnlookup.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/150-fix-interface-af-link
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/200-fix-git-describe-error.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/400-fix-olsrd-get-all.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/900-add-iwinfo-plugin.patch
 delete mode 100644 trunk/package/feeds/packages/collectd/patches/920-fix-ping-droprate.patch
 delete mode 100644 trunk/package/feeds/packages/confuse/Makefile
 delete mode 100644 trunk/package/feeds/packages/coova-chilli/Config.in
 delete mode 100644 trunk/package/feeds/packages/coova-chilli/Makefile
 delete mode 100644 trunk/package/feeds/packages/coova-chilli/files/chilli.hotplug
 delete mode 100644 trunk/package/feeds/packages/coova-chilli/patches/100-fix-sysinfo-redeclaration.patch
 delete mode 100644 trunk/package/feeds/packages/coreutils/Makefile
 delete mode 100644 trunk/package/feeds/packages/coreutils/patches/001-no_docs_man_tests.patch
 delete mode 100644 trunk/package/feeds/packages/coreutils/patches/002-fix_compile_with_uclibc.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/Makefile
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/files/crtmpserver.init
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/010-link-crypt-for-lua.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/020-add-rpath.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/030-default-config.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/040-use-select.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/050-add-missing-make-defines.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/060-add-missing-includes.patch
 delete mode 100644 trunk/package/feeds/packages/crtmpserver/patches/070-missing-include-gcc-47.patch
 delete mode 100644 trunk/package/feeds/packages/cryptodev-linux/Makefile
 delete mode 100644 trunk/package/feeds/packages/cryptodev-linux/files/cryptodev.modules
 delete mode 100644 trunk/package/feeds/packages/cryptsetup/Makefile
 delete mode 100644 trunk/package/feeds/packages/cshark/Makefile
 delete mode 100644 trunk/package/feeds/packages/ctorrent-svn/Makefile
 delete mode 100644 trunk/package/feeds/packages/ctorrent-svn/patches/100-compile-fix.patch
 delete mode 100644 trunk/package/feeds/packages/ctorrent-svn/patches/300-negative.patch
 delete mode 100644 trunk/package/feeds/packages/ctorrent/Makefile
 delete mode 100644 trunk/package/feeds/packages/ctorrent/patches/100-CVE-2009-1759.patch
 delete mode 100644 trunk/package/feeds/packages/ctorrent/patches/100-negative-ints.patch
 delete mode 100644 trunk/package/feeds/packages/cyrus-sasl/Makefile
 delete mode 100644 trunk/package/feeds/packages/dansguardian/Makefile
 delete mode 100644 trunk/package/feeds/packages/dansguardian/files/dansguardian.config
 delete mode 100644 trunk/package/feeds/packages/dansguardian/files/dansguardian.init
 delete mode 100644 trunk/package/feeds/packages/dansguardian/files/dansguardianf1.conf
 delete mode 100644 trunk/package/feeds/packages/dansguardian/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/davfs2/Makefile
 delete mode 100644 trunk/package/feeds/packages/davfs2/files/davfs2.conf
 delete mode 100644 trunk/package/feeds/packages/davfs2/patches/010-main_code_fix.patch
 delete mode 100644 trunk/package/feeds/packages/db47/Makefile
 delete mode 100644 trunk/package/feeds/packages/db47/patches/010-patch.4.7.25.1.patch
 delete mode 100644 trunk/package/feeds/packages/db47/patches/020-patch.4.7.25.2.patch
 delete mode 100644 trunk/package/feeds/packages/db47/patches/030-patch.4.7.25.3.patch
 delete mode 100644 trunk/package/feeds/packages/db47/patches/040-patch.4.7.25.4.patch
 delete mode 100644 trunk/package/feeds/packages/dbus/Makefile
 delete mode 100644 trunk/package/feeds/packages/dbus/files/dbus-launch
 delete mode 100644 trunk/package/feeds/packages/dbus/files/dbus.init
 delete mode 100644 trunk/package/feeds/packages/dbus/patches/100-fix-poll-select.patch
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/Makefile
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/ddns.config
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/ddns.hotplug
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/ddns.init
 delete mode 100755 trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_functions.sh
 delete mode 100755 trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_lucihelper.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_updater.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/services
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/services_ipv6
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/tld_names.dat
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/update_CloudFlare.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/update_No-IP.com.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/files/update_nsupdate.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/samples/ddns.config_sample
 delete mode 100755 trunk/package/feeds/packages/ddns-scripts/samples/getlocalip_sample.sh
 delete mode 100644 trunk/package/feeds/packages/ddns-scripts/samples/update_sample.sh
 delete mode 100644 trunk/package/feeds/packages/debootstrap/Makefile
 delete mode 100644 trunk/package/feeds/packages/debootstrap/files/pkgdetails.c
 delete mode 100644 trunk/package/feeds/packages/debootstrap/patches/100-busybox_fix.patch
 delete mode 100644 trunk/package/feeds/packages/dhcpcd/Makefile
 delete mode 100755 trunk/package/feeds/packages/dhcpcd/files/dhcpcd.init
 delete mode 100644 trunk/package/feeds/packages/diffutils/Makefile
 delete mode 100644 trunk/package/feeds/packages/dkjson/Makefile
 delete mode 100644 trunk/package/feeds/packages/dmapd/Makefile
 delete mode 100644 trunk/package/feeds/packages/dmapd/files/dmapd.init
 delete mode 100644 trunk/package/feeds/packages/dmapd/patches/001-dmapd_conf.patch
 delete mode 100644 trunk/package/feeds/packages/dmapd/patches/002-make_unit_test_optionnal.patch
 delete mode 100644 trunk/package/feeds/packages/dmidecode/Makefile
 delete mode 100644 trunk/package/feeds/packages/dmx_usb_module/Makefile
 delete mode 100644 trunk/package/feeds/packages/dmx_usb_module/patches/001-dmx_usb_Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/dnscrypt-proxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.config
 delete mode 100644 trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.init
 delete mode 100644 trunk/package/feeds/packages/dosfstools/Makefile
 delete mode 100644 trunk/package/feeds/packages/dosfstools/files/dosfsck.sh
 delete mode 100644 trunk/package/feeds/packages/dovecot/Makefile
 delete mode 100644 trunk/package/feeds/packages/dovecot/files/dovecot.init
 delete mode 100644 trunk/package/feeds/packages/dovecot/patches/001-configure_in.patch
 delete mode 100644 trunk/package/feeds/packages/dtndht/Makefile
 delete mode 100644 trunk/package/feeds/packages/dump1090/Config.in
 delete mode 100644 trunk/package/feeds/packages/dump1090/Makefile
 delete mode 100644 trunk/package/feeds/packages/dump1090/files/dump1090.config
 delete mode 100644 trunk/package/feeds/packages/dump1090/files/dump1090.init
 delete mode 100644 trunk/package/feeds/packages/dump1090/patches/100-html_dir.patch
 delete mode 100644 trunk/package/feeds/packages/e2guardian/Makefile
 delete mode 100644 trunk/package/feeds/packages/e2guardian/files/e2guardian.config
 delete mode 100644 trunk/package/feeds/packages/e2guardian/files/e2guardian.init
 delete mode 100644 trunk/package/feeds/packages/e2guardian/files/e2guardianf1.conf
 delete mode 100644 trunk/package/feeds/packages/elfutils/Makefile
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/001-elfutils-portability.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/002-argp_standalone.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/003-libint-stub.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/004-maybe-uninitialized.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/004-memcpy_def.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/005-build_only_libs.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/006-libdw_LIBS.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/100-musl-compat.patch
 delete mode 100644 trunk/package/feeds/packages/elfutils/patches/101-no-fts.patch
 delete mode 100644 trunk/package/feeds/packages/emailrelay/Makefile
 delete mode 100644 trunk/package/feeds/packages/emailrelay/files/emailrelay.auth
 delete mode 100644 trunk/package/feeds/packages/emailrelay/files/emailrelay.init
 delete mode 100644 trunk/package/feeds/packages/engine_pkcs11/Makefile
 delete mode 100644 trunk/package/feeds/packages/erlang/Makefile
 delete mode 100644 trunk/package/feeds/packages/erlang/patches/101-emulator_includes.patch
 delete mode 100644 trunk/package/feeds/packages/erlang/patches/103-disable_emacs.patch
 delete mode 100644 trunk/package/feeds/packages/espeak/Makefile
 delete mode 100644 trunk/package/feeds/packages/espeak/patches/101-portaudio.patch
 delete mode 100644 trunk/package/feeds/packages/etherwake/Makefile
 delete mode 100644 trunk/package/feeds/packages/etherwake/files/etherwake.config
 delete mode 100644 trunk/package/feeds/packages/etherwake/files/etherwake.init
 delete mode 100644 trunk/package/feeds/packages/etherwake/patches/100-no_ether_hostton.patch
 delete mode 100644 trunk/package/feeds/packages/etherwake/patches/110-format_security_fix.patch
 delete mode 100644 trunk/package/feeds/packages/ethtool/Makefile
 delete mode 100644 trunk/package/feeds/packages/expat/Makefile
 delete mode 100644 trunk/package/feeds/packages/f2fs-tools/Config.in
 delete mode 100644 trunk/package/feeds/packages/f2fs-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/f2fs-tools/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/faad2/Config.in
 delete mode 100644 trunk/package/feeds/packages/faad2/Makefile
 delete mode 100644 trunk/package/feeds/packages/fakeidentd/Makefile
 delete mode 100644 trunk/package/feeds/packages/fakeidentd/files/fakeidentd.init
 delete mode 100644 trunk/package/feeds/packages/fastd/Config.in
 delete mode 100644 trunk/package/feeds/packages/fastd/Makefile
 delete mode 100644 trunk/package/feeds/packages/fastd/files/fastd.upgrade
 delete mode 100644 trunk/package/feeds/packages/fcgi/Makefile
 delete mode 100644 trunk/package/feeds/packages/fcgi/patches/100-fcgio-int-type-fix.patch
 delete mode 100644 trunk/package/feeds/packages/fcgi/patches/110-no_examples.patch
 delete mode 100644 trunk/package/feeds/packages/fcgi/patches/120-stdio.patch
 delete mode 100644 trunk/package/feeds/packages/fdm/Config.in
 delete mode 100644 trunk/package/feeds/packages/fdm/Makefile
 delete mode 100644 trunk/package/feeds/packages/fdm/files/etc/fdm.conf
 delete mode 100644 trunk/package/feeds/packages/fdm/patches/001-base64-fix.patch
 delete mode 100644 trunk/package/feeds/packages/fdm/patches/002-base64-fix.patch
 delete mode 100644 trunk/package/feeds/packages/fdm/src/compat/b64_ntop.c
 delete mode 100644 trunk/package/feeds/packages/fdm/src/compat/b64_pton.c
 delete mode 100644 trunk/package/feeds/packages/fftw3/Makefile
 delete mode 100644 trunk/package/feeds/packages/fftw3/patches/001-makefile.patch
 delete mode 100644 trunk/package/feeds/packages/file/Makefile
 delete mode 100644 trunk/package/feeds/packages/flac/Makefile
 delete mode 100644 trunk/package/feeds/packages/flac/patches/001-no-docs-and-examples.patch
 delete mode 100644 trunk/package/feeds/packages/flac/patches/002-no-utility.patch
 delete mode 100644 trunk/package/feeds/packages/flac/patches/010-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/flashrom/Config.in
 delete mode 100644 trunk/package/feeds/packages/flashrom/Makefile
 delete mode 100644 trunk/package/feeds/packages/flashrom/flashrom.mk
 delete mode 100644 trunk/package/feeds/packages/flashrom/patches/0001-fix_internal_bitbang.patch
 delete mode 100644 trunk/package/feeds/packages/freeradius2/Config.in
 delete mode 100644 trunk/package/feeds/packages/freeradius2/Makefile
 delete mode 100644 trunk/package/feeds/packages/freeradius2/files/radiusd.init
 delete mode 100644 trunk/package/feeds/packages/freeradius2/patches/001-fix-makefile.patch
 delete mode 100644 trunk/package/feeds/packages/freeradius2/patches/002-config.patch
 delete mode 100644 trunk/package/feeds/packages/freeradius2/patches/004-ldap_configure.patch
 delete mode 100644 trunk/package/feeds/packages/freeradius2/patches/008-honor_ccpflags.patch
 delete mode 100644 trunk/package/feeds/packages/freeradius2/patches/010-disbale-openssl-check.patch
 delete mode 100644 trunk/package/feeds/packages/freetype/Makefile
 delete mode 100644 trunk/package/feeds/packages/fswebcam/Makefile
 delete mode 100644 trunk/package/feeds/packages/fwknop/Makefile
 delete mode 100644 trunk/package/feeds/packages/fwknop/patches/001-fix_config.patch
 delete mode 100644 trunk/package/feeds/packages/fwknop/patches/002-fix_init.patch
 delete mode 100644 trunk/package/feeds/packages/gammu/Makefile
 delete mode 100644 trunk/package/feeds/packages/gammu/files/gammu
 delete mode 100755 trunk/package/feeds/packages/gammu/files/gammu.init
 delete mode 100644 trunk/package/feeds/packages/gammu/patches/001-iconv-disabling-option.patch
 delete mode 100644 trunk/package/feeds/packages/gammu/patches/002-no-fstack-protector.patch
 delete mode 100644 trunk/package/feeds/packages/gammu/patches/003-cmake-cross-toolchain.patch
 delete mode 100644 trunk/package/feeds/packages/gammu/patches/004-cmake_libdbi_optional.patch
 delete mode 100644 trunk/package/feeds/packages/gammu/patches/010-utils-shell-fix.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/Makefile
 delete mode 100644 trunk/package/feeds/packages/gcc/README
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/003-mpfr-longlong-mips.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/010-documentation.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/020-disable-check-for-sys-sdt-h.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/100-uclibc-conf.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/200-musl.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/810-arm-softfloat-libgcc.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/820-libgcc_pic.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/830-arm_unbreak_armv4t.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/850-use_shared_libgcc.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/860-uclibc_use_eh_frame.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/870-ppc_no_crtsavres.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/880-no_java_section.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/900-bad-mips16-crt.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/910-mbsd_multi.patch
 delete mode 100644 trunk/package/feeds/packages/gcc/patches/920-specs_nonfatal_getenv.patch
 delete mode 100644 trunk/package/feeds/packages/gdbm/Makefile
 delete mode 100644 trunk/package/feeds/packages/git/Makefile
 delete mode 100644 trunk/package/feeds/packages/git/patches/100-convert_builtin.patch
 delete mode 100644 trunk/package/feeds/packages/git/patches/200-disable_fasthash.patch
 delete mode 100644 trunk/package/feeds/packages/git/patches/300-configure_for_crosscompiling
 delete mode 100644 trunk/package/feeds/packages/git/patches/400-imapsend_without_curl.patch
 delete mode 100644 trunk/package/feeds/packages/glib2/Makefile
 delete mode 100644 trunk/package/feeds/packages/glib2/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/glib2/patches/100-fix-gio-linking.patch
 delete mode 100644 trunk/package/feeds/packages/gnupg/Makefile
 delete mode 100644 trunk/package/feeds/packages/gnutls/Config.in
 delete mode 100644 trunk/package/feeds/packages/gnutls/Makefile
 delete mode 100644 trunk/package/feeds/packages/gnutls/patches/001-ai-idn-remove.patch
 delete mode 100644 trunk/package/feeds/packages/gperf/Makefile
 delete mode 100644 trunk/package/feeds/packages/grep/Makefile
 delete mode 100644 trunk/package/feeds/packages/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-libav/Config.in
 delete mode 100644 trunk/package/feeds/packages/gst1-libav/Makefile
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-base/Makefile
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-base/patches/001-no_docs.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-base/patches/002-no_tests.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-base/patches/003-no_translations.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-good/Makefile
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-good/patches/001-no_docs.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-good/patches/002-no_tests.patch
 delete mode 100644 trunk/package/feeds/packages/gst1-plugins-good/patches/003-no_translations.patch
 delete mode 100644 trunk/package/feeds/packages/gstreamer1/Makefile
 delete mode 100644 trunk/package/feeds/packages/gstreamer1/patches/001-no_docs.patch
 delete mode 100644 trunk/package/feeds/packages/gstreamer1/patches/002-no_tests.patch
 delete mode 100644 trunk/package/feeds/packages/gstreamer1/patches/003-no_translations.patch
 delete mode 100644 trunk/package/feeds/packages/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch
 delete mode 100644 trunk/package/feeds/packages/hamlib/Makefile
 delete mode 100644 trunk/package/feeds/packages/hamlib/patches/100-override-autoconf-detection.patch
 delete mode 100644 trunk/package/feeds/packages/haproxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/haproxy/files/haproxy.cfg
 delete mode 100644 trunk/package/feeds/packages/haproxy/files/haproxy.hotplug
 delete mode 100644 trunk/package/feeds/packages/haproxy/files/haproxy.init
 delete mode 100644 trunk/package/feeds/packages/haproxy/patches/0001-BUG-MINOR-pattern-error-message-missing.patch
 delete mode 100644 trunk/package/feeds/packages/haproxy/patches/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch
 delete mode 100644 trunk/package/feeds/packages/haserl/Config.in
 delete mode 100644 trunk/package/feeds/packages/haserl/Makefile
 delete mode 100644 trunk/package/feeds/packages/haserl/patches/100-replace-lua2c-with-sed.patch
 delete mode 100644 trunk/package/feeds/packages/haserl/patches/101-adjust-script-size.patch
 delete mode 100644 trunk/package/feeds/packages/haveged/Makefile
 delete mode 100644 trunk/package/feeds/packages/haveged/files/haveged.init
 delete mode 100644 trunk/package/feeds/packages/hd-idle/Makefile
 delete mode 100644 trunk/package/feeds/packages/hd-idle/files/hd-idle.config
 delete mode 100644 trunk/package/feeds/packages/hd-idle/files/hd-idle.init
 delete mode 100644 trunk/package/feeds/packages/hdparm/Makefile
 delete mode 100644 trunk/package/feeds/packages/hdparm/patches/001-fix-includes.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/Makefile
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/files/hfsfsck.sh
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0001-Create-short-Makefiles-for-Debian.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0002-Add-exclude-Darwin-specific-code.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0003-Add-helper-include-files-absent-from-the-upstream-pa.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0004-Fix-compilation-on-64-bit-arches.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0005-Remove-Apple-specific-p-from-strings.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0006-Adjust-types-for-printing.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0007-Fix-path-for-HFS-wrapper-block.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0008-Provide-command-line-option-a.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0009-Rename-dprintf-to-dbg_printf.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0010-Rename-custom-macro-nil-with-NULL.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0011-Fix-types.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0012-Fix-mkfs-not-creating-UUIDs-for-new-filesystems.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0013-Fix-manpages.patch
 delete mode 100644 trunk/package/feeds/packages/hfsprogs/patches/0014-uClibc_no_loadavg.patch
 delete mode 100644 trunk/package/feeds/packages/hidapi/Makefile
 delete mode 100644 trunk/package/feeds/packages/hidapi/patches/010-add-iconv-linkage.patch
 delete mode 100644 trunk/package/feeds/packages/horst/Makefile
 delete mode 100644 trunk/package/feeds/packages/htop/Makefile
 delete mode 100644 trunk/package/feeds/packages/hub-ctrl/Makefile
 delete mode 100644 trunk/package/feeds/packages/ibrcommon/Makefile
 delete mode 100644 trunk/package/feeds/packages/ibrdtn-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/ibrdtn/Makefile
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/Makefile
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/build-config.sh
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.init
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.uci
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/mkcontainer.sh
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/mountcontainer.sh
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/safety-wrapper.sh
 delete mode 100644 trunk/package/feeds/packages/ibrdtnd/files/systemcheck.sh
 delete mode 100644 trunk/package/feeds/packages/icecast/Makefile
 delete mode 100755 trunk/package/feeds/packages/icecast/files/icecast.init
 delete mode 100644 trunk/package/feeds/packages/icecast/libvorbisidec.mk
 delete mode 100644 trunk/package/feeds/packages/icecast/patches/001-icecast-2.4.0-tremor.patch
 delete mode 100644 trunk/package/feeds/packages/icecast/patches/010-fix_libcurl_test_crap.patch
 delete mode 100644 trunk/package/feeds/packages/ices/Makefile
 delete mode 100644 trunk/package/feeds/packages/intltool/Makefile
 delete mode 100644 trunk/package/feeds/packages/iodine/Makefile
 delete mode 100644 trunk/package/feeds/packages/iodine/files/iodined.config
 delete mode 100644 trunk/package/feeds/packages/iodine/files/iodined.init
 delete mode 100644 trunk/package/feeds/packages/iodine/patches/010-cross-compile.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/files/racoon.conf
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/files/racoon.init
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/001-no_libfl.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/002-patch8-utmp.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/005-isakmp-fix.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/006-linux-3.7-compat.patch
 delete mode 100644 trunk/package/feeds/packages/ipsec-tools/patches/force_HAVE_POLICY_FWD
 delete mode 100644 trunk/package/feeds/packages/irssi/Makefile
 delete mode 100644 trunk/package/feeds/packages/jamvm/Makefile
 delete mode 100644 trunk/package/feeds/packages/jansson/Makefile
 delete mode 100644 trunk/package/feeds/packages/joe/Makefile
 delete mode 100644 trunk/package/feeds/packages/joe/files/joerc
 delete mode 100644 trunk/package/feeds/packages/joe/patches/001-mathaway.patch
 delete mode 100644 trunk/package/feeds/packages/json4lua/Makefile
 delete mode 100644 trunk/package/feeds/packages/keepalived/Makefile
 delete mode 100644 trunk/package/feeds/packages/keepalived/files/keepalived.init
 delete mode 100644 trunk/package/feeds/packages/kismet/Makefile
 delete mode 100644 trunk/package/feeds/packages/kismet/files/kismet.conf
 delete mode 100644 trunk/package/feeds/packages/kismet/files/kismet_drone.conf
 delete mode 100644 trunk/package/feeds/packages/kismet/files/kismet_drone.config
 delete mode 100755 trunk/package/feeds/packages/kismet/files/kismet_drone.init
 delete mode 100644 trunk/package/feeds/packages/kismet/files/kismet_server.config
 delete mode 100755 trunk/package/feeds/packages/kismet/files/kismet_server.init
 delete mode 100644 trunk/package/feeds/packages/kismet/patches/010-dont-add-host-include-paths.patch
 delete mode 100644 trunk/package/feeds/packages/kmod/Makefile
 delete mode 100644 trunk/package/feeds/packages/kmod/patches/001-fix_pkgconfig_file.patch
 delete mode 100644 trunk/package/feeds/packages/knot/Makefile
 delete mode 100644 trunk/package/feeds/packages/knot/files/knotd.init
 delete mode 100644 trunk/package/feeds/packages/knot/files/runtests.sh
 delete mode 100644 trunk/package/feeds/packages/knot/patches/01_strptime_susv3.patch
 delete mode 100644 trunk/package/feeds/packages/knot/patches/02_knot.conf.patch
 delete mode 100644 trunk/package/feeds/packages/knot/patches/03_zscanner_tests.patch
 delete mode 100644 trunk/package/feeds/packages/knxd/Makefile
 delete mode 100644 trunk/package/feeds/packages/knxd/files/knxd.config
 delete mode 100644 trunk/package/feeds/packages/knxd/files/knxd.init
 delete mode 100644 trunk/package/feeds/packages/knxd/patches/0099-openwrt.patch
 delete mode 100644 trunk/package/feeds/packages/krb5/Makefile
 delete mode 100644 trunk/package/feeds/packages/krb5/files/krb5kdc
 delete mode 100644 trunk/package/feeds/packages/krb5/patches/001-fix-build.patch
 delete mode 100644 trunk/package/feeds/packages/l7-protocols/Makefile
 delete mode 100644 trunk/package/feeds/packages/l7-protocols/patches/100-testing_crosscompile.patch
 delete mode 100644 trunk/package/feeds/packages/l7-protocols/patches/101-testing-timeit.patch
 delete mode 100644 trunk/package/feeds/packages/l7-protocols/patches/102-testing-doallspeeds.patch
 delete mode 100644 trunk/package/feeds/packages/lame/Makefile
 delete mode 100644 trunk/package/feeds/packages/lame/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/less/Makefile
 delete mode 100644 trunk/package/feeds/packages/lftp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libaio/Makefile
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/001_arches.patch
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/002_arches_sh.patch
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/003_arches_sparc64.patch
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/004_arches_x32.patch
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/005_arches_mips.patch
 delete mode 100644 trunk/package/feeds/packages/libaio/patches/006_arches_mips_fix_padding.patch
 delete mode 100644 trunk/package/feeds/packages/libantlr3c/Makefile
 delete mode 100644 trunk/package/feeds/packages/libao/Makefile
 delete mode 100644 trunk/package/feeds/packages/libarchive/Makefile
 delete mode 100644 trunk/package/feeds/packages/libartnet/Makefile
 delete mode 100644 trunk/package/feeds/packages/libartnet/patches/001-bswap_16.patch
 delete mode 100644 trunk/package/feeds/packages/libaudiofile/Makefile
 delete mode 100644 trunk/package/feeds/packages/libavl/Makefile
 delete mode 100644 trunk/package/feeds/packages/libavl/patches/010-update_GNUmakefile.patch
 delete mode 100644 trunk/package/feeds/packages/libcap/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdaemon/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdaemon/patches/001-daemon_set_verbosity.patch
 delete mode 100644 trunk/package/feeds/packages/libdaq/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdaq/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/libdbi-drivers/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdbi-drivers/patches/001_libsqlite3_fix.patch
 delete mode 100644 trunk/package/feeds/packages/libdbi/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdmapsharing/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdmapsharing/patches/001-disable_pixbuf.patch
 delete mode 100644 trunk/package/feeds/packages/libdmapsharing/patches/002-disable_tests.patch
 delete mode 100644 trunk/package/feeds/packages/libdmapsharing/patches/003-make_unit_test_optional.patch
 delete mode 100644 trunk/package/feeds/packages/libdnet/Makefile
 delete mode 100644 trunk/package/feeds/packages/libdnet/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/libdnet/patches/002-config.patch
 delete mode 100644 trunk/package/feeds/packages/libesmtp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libevent/Makefile
 delete mode 100644 trunk/package/feeds/packages/libevhtp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libevhtp/patches/010-enable-shared-object-building.patch
 delete mode 100644 trunk/package/feeds/packages/libexif/Makefile
 delete mode 100644 trunk/package/feeds/packages/libexif/patches/100-no_doc.patch
 delete mode 100644 trunk/package/feeds/packages/libffi/Makefile
 delete mode 100644 trunk/package/feeds/packages/libftdi/Makefile
 delete mode 100644 trunk/package/feeds/packages/libftdi/patches/100-fix-x86_64-build.patch
 delete mode 100644 trunk/package/feeds/packages/libftdi/patches/101-fix-cmake-version-packagekit.patch
 delete mode 100644 trunk/package/feeds/packages/libftdi1/Makefile
 delete mode 100644 trunk/package/feeds/packages/libftdi1/patches/100-fix-x86_64-build.patch
 delete mode 100644 trunk/package/feeds/packages/libgcrypt/Makefile
 delete mode 100644 trunk/package/feeds/packages/libgcrypt/patches/001-no_docs_tests.patch
 delete mode 100644 trunk/package/feeds/packages/libgd/Makefile
 delete mode 100644 trunk/package/feeds/packages/libgd/patches/101-gdlib-config.patch
 delete mode 100644 trunk/package/feeds/packages/libgd/patches/200-uclibc-ceill.patch
 delete mode 100644 trunk/package/feeds/packages/libgpg-error/Makefile
 delete mode 100644 trunk/package/feeds/packages/libhttp-parser/Makefile
 delete mode 100644 trunk/package/feeds/packages/libical/Makefile
 delete mode 100644 trunk/package/feeds/packages/libid3tag/Makefile
 delete mode 100644 trunk/package/feeds/packages/libidn/Makefile
 delete mode 100644 trunk/package/feeds/packages/libidn/patches/002-disable-po-docs-examples.patch
 delete mode 100644 trunk/package/feeds/packages/libidn/patches/010-fix-idn-error-usage.patch
 delete mode 100644 trunk/package/feeds/packages/libimobiledevice/Makefile
 delete mode 100644 trunk/package/feeds/packages/libjpeg/Makefile
 delete mode 100644 trunk/package/feeds/packages/liblo/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmad/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmad/patches/001-mips_removal_h_constraint.patch
 delete mode 100644 trunk/package/feeds/packages/libmcrypt/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmicrohttpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmms/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmodbus/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmpdclient/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmpdclient/patches/001-WIP_musl_compatibility.patch
 delete mode 100644 trunk/package/feeds/packages/libmpeg2/Makefile
 delete mode 100644 trunk/package/feeds/packages/libmpeg2/patches/101-ppc_no_altivec.patch
 delete mode 100644 trunk/package/feeds/packages/libmpeg2/patches/102-arm_data_preload_check.patch
 delete mode 100644 trunk/package/feeds/packages/libnatpmp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libnatpmp/patches/001-install_declspec.patch
 delete mode 100644 trunk/package/feeds/packages/libnetfilter-acct/Makefile
 delete mode 100644 trunk/package/feeds/packages/libnfc/Makefile
 delete mode 100644 trunk/package/feeds/packages/libogg/Makefile
 delete mode 100644 trunk/package/feeds/packages/liboil/Makefile
 delete mode 100644 trunk/package/feeds/packages/liboping/Makefile
 delete mode 100644 trunk/package/feeds/packages/liboping/patches/01-no-werror.patch
 delete mode 100644 trunk/package/feeds/packages/libowfat/Makefile
 delete mode 100644 trunk/package/feeds/packages/libowfat/patches/001-fixbuild.patch
 delete mode 100644 trunk/package/feeds/packages/libp11/Makefile
 delete mode 100644 trunk/package/feeds/packages/libpam/Makefile
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.conf
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/common-account
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/common-auth
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/common-password
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/common-session
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/common-session-noninteractive
 delete mode 100644 trunk/package/feeds/packages/libpam/files/pam.d/other
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/000-OE-libpam-xtests.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/000-OE-pam-no-innetgr.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/001-no_nis.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/002-no_yywrap.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/003-no_doc.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/004-fix_lib64.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/005-fix_ruserok.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/006-fix_xdr.patch
 delete mode 100644 trunk/package/feeds/packages/libpam/patches/007-cve-2014-2583.patch
 delete mode 100644 trunk/package/feeds/packages/libplist/Makefile
 delete mode 100644 trunk/package/feeds/packages/libpng/Makefile
 delete mode 100644 trunk/package/feeds/packages/libpng/patches/100-config_fix.patch
 delete mode 100644 trunk/package/feeds/packages/libsamplerate/Makefile
 delete mode 100644 trunk/package/feeds/packages/libsearpc/Makefile
 delete mode 100644 trunk/package/feeds/packages/libseccomp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libshout/Makefile
 delete mode 100644 trunk/package/feeds/packages/libshout/patches/120-vorbis-c.patch
 delete mode 100644 trunk/package/feeds/packages/libshout/patches/140-no_example_doc_win32.patch
 delete mode 100644 trunk/package/feeds/packages/libsigc++/Makefile
 delete mode 100644 trunk/package/feeds/packages/libsigc++/patches/001-no_doc_tests_examples.patch
 delete mode 100644 trunk/package/feeds/packages/libsndfile/Makefile
 delete mode 100644 trunk/package/feeds/packages/libsndfile/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/libsodium/Makefile
 delete mode 100644 trunk/package/feeds/packages/libsoup/Makefile
 delete mode 100644 trunk/package/feeds/packages/libsoxr/Makefile
 delete mode 100644 trunk/package/feeds/packages/libssh2/Makefile
 delete mode 100644 trunk/package/feeds/packages/libtasn1/Makefile
 delete mode 100644 trunk/package/feeds/packages/libtheora/Makefile
 delete mode 100644 trunk/package/feeds/packages/libtheora/patches/001-no_docs_tests.patch
 delete mode 100644 trunk/package/feeds/packages/libtheora/patches/002-no_sdl_check.patch
 delete mode 100644 trunk/package/feeds/packages/libtorrent/Makefile
 delete mode 100644 trunk/package/feeds/packages/libtorrent/patches/100-fix_cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/libtorrent/patches/120-fix-ipv6_socket_datagram.patch
 delete mode 100644 trunk/package/feeds/packages/libuecc/Makefile
 delete mode 100644 trunk/package/feeds/packages/libugpio/Makefile
 delete mode 100644 trunk/package/feeds/packages/libunistring/Makefile
 delete mode 100644 trunk/package/feeds/packages/libupnp/Makefile
 delete mode 100644 trunk/package/feeds/packages/libupnpp/Makefile
 delete mode 100644 trunk/package/feeds/packages/liburcu/Makefile
 delete mode 100644 trunk/package/feeds/packages/libusbmuxd/Makefile
 delete mode 100644 trunk/package/feeds/packages/libuv/Makefile
 delete mode 100644 trunk/package/feeds/packages/libuvc/Makefile
 delete mode 100644 trunk/package/feeds/packages/libv4l/Makefile
 delete mode 100644 trunk/package/feeds/packages/libv4l/patches/001-no-shm_open-fix.patch
 delete mode 100644 trunk/package/feeds/packages/libv4l/patches/020-add-missing-includes.patch
 delete mode 100644 trunk/package/feeds/packages/libvorbis/Makefile
 delete mode 100644 trunk/package/feeds/packages/libvorbisidec/Makefile
 delete mode 100644 trunk/package/feeds/packages/libvpx/Makefile
 delete mode 100644 trunk/package/feeds/packages/libwebsockets/Makefile
 delete mode 100644 trunk/package/feeds/packages/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch
 delete mode 100644 trunk/package/feeds/packages/libxerces-c/Makefile
 delete mode 100644 trunk/package/feeds/packages/libxml2/Makefile
 delete mode 100644 trunk/package/feeds/packages/libxml2/patches/0001-threads-use-forward-declarations-only-for-glibc-fixe.patch
 delete mode 100644 trunk/package/feeds/packages/libxslt/Makefile
 delete mode 100644 trunk/package/feeds/packages/libzdb/Makefile
 delete mode 100644 trunk/package/feeds/packages/libzdb/patches/010-cross-compile-fixes.patch
 delete mode 100644 trunk/package/feeds/packages/libzdb/patches/020-filterh-use-host-built-version.patch
 delete mode 100644 trunk/package/feeds/packages/lighttpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/lighttpd/files/lighttpd.conf
 delete mode 100644 trunk/package/feeds/packages/lighttpd/files/lighttpd.init
 delete mode 100644 trunk/package/feeds/packages/linknx/Makefile
 delete mode 100644 trunk/package/feeds/packages/linknx/files/linknx.config
 delete mode 100644 trunk/package/feeds/packages/linknx/files/linknx.init
 delete mode 100644 trunk/package/feeds/packages/linknx/files/linknx.xml.dist
 delete mode 100644 trunk/package/feeds/packages/lispmob/Makefile
 delete mode 100644 trunk/package/feeds/packages/lm-sensors/Makefile
 delete mode 100644 trunk/package/feeds/packages/lm-sensors/files/sensors.conf
 delete mode 100644 trunk/package/feeds/packages/lsof/Makefile
 delete mode 100644 trunk/package/feeds/packages/lsof/patches/001-lsof_makefile.patch
 delete mode 100644 trunk/package/feeds/packages/lsof/patches/002-lsof_noportmap.patch
 delete mode 100644 trunk/package/feeds/packages/lsof/patches/003-lsof_selinux.patch
 delete mode 100644 trunk/package/feeds/packages/lsof/patches/004-lsof_ccv.patch
 delete mode 100644 trunk/package/feeds/packages/lttng-modules/Makefile
 delete mode 100644 trunk/package/feeds/packages/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
 delete mode 100644 trunk/package/feeds/packages/lttng-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/lttng-ust/Makefile
 delete mode 100644 trunk/package/feeds/packages/lttng-ust/patches/001-no_docs_tests.patch
 delete mode 100644 trunk/package/feeds/packages/lttng-ust/patches/002-examples.patch
 delete mode 100644 trunk/package/feeds/packages/lua-bencode/Makefile
 delete mode 100644 trunk/package/feeds/packages/lua-mosquitto/Makefile
 delete mode 100644 trunk/package/feeds/packages/lua-penlight/Makefile
 delete mode 100644 trunk/package/feeds/packages/lua-sha2/Makefile
 delete mode 100644 trunk/package/feeds/packages/lua-sha2/patches/001-makefile.patch
 delete mode 100644 trunk/package/feeds/packages/luabitop/Makefile
 delete mode 100644 trunk/package/feeds/packages/luaexpat/Makefile
 delete mode 100644 trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.c
 delete mode 100644 trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.h
 delete mode 100644 trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.lua
 delete mode 100644 trunk/package/feeds/packages/luafilesystem/Makefile
 delete mode 100755 trunk/package/feeds/packages/luai2c/Makefile
 delete mode 100644 trunk/package/feeds/packages/lualanes/Makefile
 delete mode 100644 trunk/package/feeds/packages/luaposix/Makefile
 delete mode 100644 trunk/package/feeds/packages/luaposix/patches/100-eglibc-compat.patch
 delete mode 100644 trunk/package/feeds/packages/luaposix/patches/101-disable-curses.patch
 delete mode 100644 trunk/package/feeds/packages/luaposix/patches/102-disable-compat-deprecated.diff
 delete mode 100644 trunk/package/feeds/packages/luarocks/Makefile
 delete mode 100644 trunk/package/feeds/packages/luarocks/patches/01_dont_modify_bin_shebang.diff
 delete mode 100644 trunk/package/feeds/packages/luasec/Makefile
 delete mode 100644 trunk/package/feeds/packages/luasec/patches/100-luasocket-Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/luasoap/Makefile
 delete mode 100644 trunk/package/feeds/packages/luasocket/Makefile
 delete mode 100644 trunk/package/feeds/packages/luasocket/patches/0001-Add-interface-support.patch
 delete mode 100644 trunk/package/feeds/packages/luasql/Makefile
 delete mode 100644 trunk/package/feeds/packages/luci-app-bcp38/Makefile
 delete mode 100644 trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-cbi.lua
 delete mode 100644 trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-controller.lua
 delete mode 100755 trunk/package/feeds/packages/luci-app-bcp38/files/uci-defaults-bcp38
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/Makefile
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/controller/lxc.lua
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/lxc.config
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/model/cbi/lxc.lua
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/view/lxc.htm
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/green.gif
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/purple.gif
 delete mode 100644 trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/red.gif
 delete mode 100644 trunk/package/feeds/packages/luci-app-sqm/Makefile
 delete mode 100644 trunk/package/feeds/packages/luci-app-sqm/files/sqm-cbi.lua
 delete mode 100644 trunk/package/feeds/packages/luci-app-sqm/files/sqm-controller.lua
 delete mode 100644 trunk/package/feeds/packages/luci-app-sqm/files/uci-defaults-sqm
 delete mode 100644 trunk/package/feeds/packages/lvm2/Makefile
 delete mode 100644 trunk/package/feeds/packages/lvm2/files/lvm2.init
 delete mode 100644 trunk/package/feeds/packages/lvm2/patches/000-compile.patch
 delete mode 100644 trunk/package/feeds/packages/lvm2/patches/001-include_fix.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/Config.in
 delete mode 100644 trunk/package/feeds/packages/lxc/Makefile
 delete mode 100644 trunk/package/feeds/packages/lxc/files/lxc.conf
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/010-compile.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/015-getline.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/020-lxc-checkconfig.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/025-remove-unsupported-option.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/030-lxc-download.patch
 delete mode 100644 trunk/package/feeds/packages/lxc/patches/300-lxc-destroy.patch
 delete mode 100644 trunk/package/feeds/packages/mac-telnet/Makefile
 delete mode 100644 trunk/package/feeds/packages/mac-telnet/files/mactelnet.config
 delete mode 100755 trunk/package/feeds/packages/mac-telnet/files/mactelnet.init
 delete mode 100644 trunk/package/feeds/packages/macchanger/Makefile
 delete mode 100644 trunk/package/feeds/packages/madplay/Makefile
 delete mode 100644 trunk/package/feeds/packages/mailman/Makefile
 delete mode 100644 trunk/package/feeds/packages/mailman/files/mailman.init
 delete mode 100644 trunk/package/feeds/packages/mailman/patches/100-postfix.patch
 delete mode 100644 trunk/package/feeds/packages/mailman/patches/200-nohostdnspython.patch
 delete mode 100644 trunk/package/feeds/packages/mailman/patches/300-targetpython.patch
 delete mode 100644 trunk/package/feeds/packages/mailman/patches/400-modules.patch
 delete mode 100644 trunk/package/feeds/packages/mailsend/Makefile
 delete mode 100644 trunk/package/feeds/packages/mc/Config.in
 delete mode 100644 trunk/package/feeds/packages/mc/Makefile
 delete mode 100644 trunk/package/feeds/packages/mdnsresponder/Makefile
 delete mode 100644 trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.conf
 delete mode 100644 trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.init
 delete mode 100755 trunk/package/feeds/packages/mdnsresponder/files/mdnsd.init
 delete mode 100644 trunk/package/feeds/packages/mdnsresponder/patches/001-cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/mdnsresponder/patches/100-linux_fixes.patch
 delete mode 100644 trunk/package/feeds/packages/memcached/Makefile
 delete mode 100644 trunk/package/feeds/packages/memcached/files/memcached.config
 delete mode 100644 trunk/package/feeds/packages/memcached/files/memcached.init
 delete mode 100644 trunk/package/feeds/packages/memcached/patches/100-fix_iov_max.patch
 delete mode 100644 trunk/package/feeds/packages/micropython-lib/Makefile
 delete mode 100644 trunk/package/feeds/packages/micropython/Makefile
 delete mode 100644 trunk/package/feeds/packages/minicom/Makefile
 delete mode 100644 trunk/package/feeds/packages/minicom/patches/100-fix_iconv_include.patch
 delete mode 100644 trunk/package/feeds/packages/miniupnpc/Makefile
 delete mode 100644 trunk/package/feeds/packages/miniupnpc/patches/100-no_minixml_test.patch
 delete mode 100644 trunk/package/feeds/packages/miniupnpc/patches/200-miniupnpc_desc.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/Config.in
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/Makefile
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.config
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.hotplug
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.init
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/010-enable_additional_plugins.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/020-remove_gcc_debug_options.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/030-allow_16_char_device_names.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/040-Buffer-the-bytesused-variable-from-struct-v4l2_buffe.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/041-Stop-leaking-data-via-struct-v4l2_buffer.patch
 delete mode 100644 trunk/package/feeds/packages/mjpg-streamer/patches/050-fix-yuv-capture.patch
 delete mode 100644 trunk/package/feeds/packages/mksh/Makefile
 delete mode 100644 trunk/package/feeds/packages/mksh/patches/100-dot_mkshrc
 delete mode 100644 trunk/package/feeds/packages/mktorrent/Makefile
 delete mode 100644 trunk/package/feeds/packages/mmc-utils/Makefile
 delete mode 100644 trunk/package/feeds/packages/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch
 delete mode 100644 trunk/package/feeds/packages/mocp/Makefile
 delete mode 100644 trunk/package/feeds/packages/monit/Makefile
 delete mode 100644 trunk/package/feeds/packages/monit/files/monit.init
 delete mode 100644 trunk/package/feeds/packages/monit/patches/001-fix-default-piddir.patch
 delete mode 100644 trunk/package/feeds/packages/mosquitto/Config.in
 delete mode 100644 trunk/package/feeds/packages/mosquitto/Makefile
 delete mode 100755 trunk/package/feeds/packages/mosquitto/files/mosquitto.init
 delete mode 100644 trunk/package/feeds/packages/mosquitto/files/mosquitto.uci.convert
 delete mode 100644 trunk/package/feeds/packages/mosquitto/patches/101-qos2-inflight.patch
 delete mode 100644 trunk/package/feeds/packages/motion/Makefile
 delete mode 100644 trunk/package/feeds/packages/mpack/Makefile
 delete mode 100644 trunk/package/feeds/packages/mpc/Makefile
 delete mode 100644 trunk/package/feeds/packages/mpc/files/pls-handler.sh
 delete mode 100644 trunk/package/feeds/packages/msmtp/Makefile
 delete mode 100644 trunk/package/feeds/packages/mtr/Makefile
 delete mode 100644 trunk/package/feeds/packages/mtr/patches/501-dns.patch
 delete mode 100644 trunk/package/feeds/packages/mtr/patches/502-fix-res_ninit.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/Makefile
 delete mode 100644 trunk/package/feeds/packages/muninlite/files/etc/xinetd.d/munin
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/001-no_disks.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/002-hostname.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/100-fix-no-ethtool.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/110-fix-uptime-days.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/200-add-tap-dev.patch
 delete mode 100644 trunk/package/feeds/packages/muninlite/patches/210-add-bridge-devs.patch
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/Makefile
 delete mode 100755 trunk/package/feeds/packages/mwan3-luci/files/etc/hotplug.d/iface/16-mwancustombak
 delete mode 100755 trunk/package/feeds/packages/mwan3-luci/files/etc/uci-defaults/mwan-luci
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_hotplugscript.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_mwanconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_networkconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interface.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interfaceconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/member.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/memberconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policy.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policyconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/rule.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/ruleconfig.lua
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_diagnostics.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_hotplugscript.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_mwanconfig.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_networkconfig.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_troubleshooting.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/config_css.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_detailed.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
 delete mode 100644 trunk/package/feeds/packages/mwan3/Makefile
 delete mode 100644 trunk/package/feeds/packages/mwan3/files/etc/config/mwan3
 delete mode 100644 trunk/package/feeds/packages/mwan3/files/etc/hotplug.d/iface/15-mwan3
 delete mode 100755 trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3
 delete mode 100755 trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3track
 delete mode 100644 trunk/package/feeds/packages/mxml/Makefile
 delete mode 100644 trunk/package/feeds/packages/mxml/patches/001-targets.patch
 delete mode 100644 trunk/package/feeds/packages/mysql/Makefile
 delete mode 100644 trunk/package/feeds/packages/mysql/conf/my.cnf
 delete mode 100644 trunk/package/feeds/packages/mysql/files/mysqld.init
 delete mode 100644 trunk/package/feeds/packages/mysql/patches/100-fix_hostname.patch
 delete mode 100644 trunk/package/feeds/packages/mysql/patches/110-cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/mysql/patches/120-bison-compat.patch
 delete mode 100644 trunk/package/feeds/packages/nacl/Makefile
 delete mode 100755 trunk/package/feeds/packages/nacl/do-openwrt
 delete mode 100644 trunk/package/feeds/packages/nail/Makefile
 delete mode 100644 trunk/package/feeds/packages/nail/patches/100-handle-openssl-without-sslv2.patch
 delete mode 100644 trunk/package/feeds/packages/nano/Makefile
 delete mode 100644 trunk/package/feeds/packages/ncdu/Makefile
 delete mode 100644 trunk/package/feeds/packages/neon/Makefile
 delete mode 100644 trunk/package/feeds/packages/net-snmp/Makefile
 delete mode 100644 trunk/package/feeds/packages/net-snmp/files/snmpd.conf
 delete mode 100644 trunk/package/feeds/packages/net-snmp/files/snmpd.init
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/100-debian-statistics.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/110-debian-makefiles.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/120-debian-searchdirs.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/130-debian-extramibs.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/160-no_ldconfig.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/170-ldflags.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/750-ieee802dot11.patch
 delete mode 100644 trunk/package/feeds/packages/net-snmp/patches/800-format-security.patch
 delete mode 100644 trunk/package/feeds/packages/netatalk/Makefile
 delete mode 100644 trunk/package/feeds/packages/netatalk/files/AppleVolumes.default
 delete mode 100644 trunk/package/feeds/packages/netatalk/files/afpd.conf
 delete mode 100644 trunk/package/feeds/packages/netatalk/files/afpd.init
 delete mode 100644 trunk/package/feeds/packages/netatalk/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/netatalk/patches/002-ld_library_path.patch
 delete mode 100644 trunk/package/feeds/packages/netcat/Makefile
 delete mode 100644 trunk/package/feeds/packages/netcat/patches/001-netcat_flag_count.patch
 delete mode 100644 trunk/package/feeds/packages/nfs-kernel-server/Makefile
 delete mode 100644 trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.exports
 delete mode 100644 trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.init
 delete mode 100644 trunk/package/feeds/packages/nfs-kernel-server/patches/100-no_malloc_h.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/Config.in
 delete mode 100644 trunk/package/feeds/packages/nginx/Makefile
 delete mode 100644 trunk/package/feeds/packages/nginx/files/nginx.init
 delete mode 100644 trunk/package/feeds/packages/nginx/files/nginx.proxyprotocol.example
 delete mode 100644 trunk/package/feeds/packages/nginx/files/nginx.syslog.example
 delete mode 100644 trunk/package/feeds/packages/nginx/patches-lua-nginx/300-ldl.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/101-feature_test_fix.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/102-sizeof_test_fix.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/103-sys_nerr.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/200-config.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/300-crosscompile_ccflags.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
 delete mode 100644 trunk/package/feeds/packages/nginx/patches/401-nginx-1.4.0-syslog.patch
 delete mode 100644 trunk/package/feeds/packages/nmap/Makefile
 delete mode 100644 trunk/package/feeds/packages/nsd/Makefile
 delete mode 100644 trunk/package/feeds/packages/nsd/files/nsd.init
 delete mode 100644 trunk/package/feeds/packages/ntfs-3g/Makefile
 delete mode 100644 trunk/package/feeds/packages/ntfs-3g/patches/001-fuseint-fix-path-mounted-on-musl.patch
 delete mode 100644 trunk/package/feeds/packages/ntpclient/Makefile
 delete mode 100644 trunk/package/feeds/packages/ntpclient/files/ntpclient.config
 delete mode 100644 trunk/package/feeds/packages/ntpclient/files/ntpclient.hotplug
 delete mode 100644 trunk/package/feeds/packages/ntpclient/patches/100-daemon.patch
 delete mode 100644 trunk/package/feeds/packages/ntpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/ntpd/files/ntp.conf
 delete mode 100644 trunk/package/feeds/packages/ntpd/files/ntpd.hotplug
 delete mode 100644 trunk/package/feeds/packages/ntpd/files/ntpd.init
 delete mode 100644 trunk/package/feeds/packages/ntpd/files/ntpdate.init
 delete mode 100644 trunk/package/feeds/packages/ntripcaster/Makefile
 delete mode 100644 trunk/package/feeds/packages/ntripclient/Makefile
 delete mode 100644 trunk/package/feeds/packages/ntripserver/Makefile
 delete mode 100644 trunk/package/feeds/packages/nut/Config.in
 delete mode 100644 trunk/package/feeds/packages/nut/Makefile
 delete mode 100755 trunk/package/feeds/packages/nut/files/nut-monitor.init
 delete mode 100755 trunk/package/feeds/packages/nut/files/nut-server.init
 delete mode 100644 trunk/package/feeds/packages/nut/patches/001-fix-missing-libmath-flags.patch
 delete mode 100644 trunk/package/feeds/packages/nut/patches/010-ignore_automake_k_bug.patch
 delete mode 100644 trunk/package/feeds/packages/ola/Makefile
 delete mode 100644 trunk/package/feeds/packages/ola/files/olad.init
 delete mode 100644 trunk/package/feeds/packages/open-plc-utils/Makefile
 delete mode 100644 trunk/package/feeds/packages/openconnect/Config.in
 delete mode 100644 trunk/package/feeds/packages/openconnect/Makefile
 delete mode 100644 trunk/package/feeds/packages/openconnect/README
 delete mode 100755 trunk/package/feeds/packages/openconnect/files/openconnect-wrapper
 delete mode 100755 trunk/package/feeds/packages/openconnect/files/openconnect.sh
 delete mode 100644 trunk/package/feeds/packages/openconnect/files/openconnect.upgrade
 delete mode 100644 trunk/package/feeds/packages/opencv/Makefile
 delete mode 100644 trunk/package/feeds/packages/opencv/README.md
 delete mode 100644 trunk/package/feeds/packages/openldap/Makefile
 delete mode 100644 trunk/package/feeds/packages/openldap/files/ldap.init
 delete mode 100644 trunk/package/feeds/packages/openldap/patches/001-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/openldap/patches/020-autofs-schema.patch
 delete mode 100644 trunk/package/feeds/packages/openldap/patches/750-no-strip.patch
 delete mode 100644 trunk/package/feeds/packages/opennhrp/Makefile
 delete mode 100644 trunk/package/feeds/packages/opennhrp/files/opennhrp.init
 delete mode 100644 trunk/package/feeds/packages/openobex/Makefile
 delete mode 100644 trunk/package/feeds/packages/openobex/patches/001-cxx.patch
 delete mode 100644 trunk/package/feeds/packages/openocd/Makefile
 delete mode 100644 trunk/package/feeds/packages/opensc/Makefile
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0001-OpenPGP-Detect-and-support-Gnuk-Token.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0002-OpenPGP-Add-Gnuk-in-pkcs15-emulation-layer.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0003-OpenPGP-Include-private-DO-to-filesystem-at-driver-i.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0004-PKCS15-OpenPGP-Declare-DATA-objects.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0005-OpenPGP-Support-erasing-reset-card.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0006-openpgp-tool-Support-deleting-key-in-Gnuk.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0007-OpenPGP-Correct-building-Extended-Header-List-when-i.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0008-OpenPGP-Read-some-empty-DOs-from-Gnuk.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0009-PKCS15-OpenPGP-Do-not-show-empty-DO-in-pkcs15-emu_in.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0010-PKCS15-OpenPGP-Allow-to-store-data-to-pkcs15-data-ob.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0011-OpenPGP-Provide-enough-buffer-to-read-pubkey-from-Gn.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0012-OpenPGP-Support-write-certificate-for-Gnuk.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0013-pkcs15-openpgp-Change-to-sc_put_data-instead-of-sc_u.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0014-OpenPGP-Overcome-the-restriction-of-even-data-length.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0015-OpenPGP-Delete-key-as-file-for-Gnuk.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0016-OpenPGP-Correct-parameter-checking.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0017-OpenPGP-Make-code-neater.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0018-Move-declaration-to-top-of-block.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0019-OpenPGP-Make-indentation-consistent-space-tab.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0020-OpenPGP-Don-t-use-sc_log-in-openpgp-tool.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0021-OpenPGP-Don-t-reimplement-gnuk_delete_key-in-openpgp.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0022-OpenPGP-Use-directly-binary-array-of-APDUs-for-ERASE.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0023-OpenPGP-Rename-private-blob-type-to-avoid-confusing-.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0024-OpenPGP-Fix-crash-after-accessing-inexistent-file.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0025-Replace-hardcode.patch
 delete mode 100644 trunk/package/feeds/packages/opensc/patches/0026-hardcode-defines-for-DO-s.patch
 delete mode 100644 trunk/package/feeds/packages/openssh/Makefile
 delete mode 100644 trunk/package/feeds/packages/openssh/files/sftp-ssh.service
 delete mode 100644 trunk/package/feeds/packages/openssh/files/sshd.init
 delete mode 100644 trunk/package/feeds/packages/openssh/files/sshd.pam
 delete mode 100644 trunk/package/feeds/packages/openssh/files/sshd.pam-access
 delete mode 100644 trunk/package/feeds/packages/openssh/patches/100-no_cast_fix.patch
 delete mode 100644 trunk/package/feeds/packages/openssh/patches/130-implicit_memset_decl_fix.patch
 delete mode 100644 trunk/package/feeds/packages/openssh/patches/140-pam_uclibc_pthreads_fix.patch
 delete mode 100644 trunk/package/feeds/packages/openssh/patches/200-dscp-qos.patch
 delete mode 100644 trunk/package/feeds/packages/opentracker/Makefile
 delete mode 100755 trunk/package/feeds/packages/opentracker/files/opentracker.init
 delete mode 100755 trunk/package/feeds/packages/opentracker/files/opentracker6.init
 delete mode 100644 trunk/package/feeds/packages/opentracker/patches/100-makefile.patch
 delete mode 100644 trunk/package/feeds/packages/openvswitch/Makefile
 delete mode 100644 trunk/package/feeds/packages/openvswitch/files/etc/init.d/openvswitch.init
 delete mode 100644 trunk/package/feeds/packages/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
 delete mode 100644 trunk/package/feeds/packages/openvswitch/patches/0002-netdev-linux-Use-unsigned-int-for-ifi_flags.patch
 delete mode 100644 trunk/package/feeds/packages/openvswitch/patches/0003-lib-util.h-Disable-ovs_assert-when-build-with-NDEBUG.patch
 delete mode 100644 trunk/package/feeds/packages/openvswitch/patches/0004-datapath-Use-ccflags-y-instead-of-deprecated-EXTRA_C.patch
 delete mode 100644 trunk/package/feeds/packages/opus-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/opus/Makefile
 delete mode 100644 trunk/package/feeds/packages/owfs/Makefile
 delete mode 100644 trunk/package/feeds/packages/p11-kit/Makefile
 delete mode 100644 trunk/package/feeds/packages/p11-kit/files/opensc.module
 delete mode 100644 trunk/package/feeds/packages/p910nd/Makefile
 delete mode 100644 trunk/package/feeds/packages/p910nd/files/p910nd.config
 delete mode 100644 trunk/package/feeds/packages/p910nd/files/p910nd.init
 delete mode 100644 trunk/package/feeds/packages/patch/Makefile
 delete mode 100644 trunk/package/feeds/packages/pciutils/Makefile
 delete mode 100644 trunk/package/feeds/packages/pciutils/patches/100-remove-no-timestamping.patch
 delete mode 100644 trunk/package/feeds/packages/pciutils/patches/101-no-strip.patch
 delete mode 100644 trunk/package/feeds/packages/pciutils/patches/102-compressed-ids.patch
 delete mode 100644 trunk/package/feeds/packages/pciutils/patches/103-relative-path-ids.patch
 delete mode 100644 trunk/package/feeds/packages/pciutils/patches/104-resolv.patch
 delete mode 100644 trunk/package/feeds/packages/pcre/Makefile
 delete mode 100644 trunk/package/feeds/packages/pcsc-lite/Makefile
 delete mode 100644 trunk/package/feeds/packages/pcsc-lite/files/pcscd.init
 delete mode 100644 trunk/package/feeds/packages/pen/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-compress-bzip2/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-dbi/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-html-parser/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-html-tagset/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-html-tree/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-lockfile-simple/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-net-telnet/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-test-harness/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-uri/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-www-curl/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
 delete mode 100644 trunk/package/feeds/packages/perl-www-curl/patches/200-fix_default_lflags.patch
 delete mode 100644 trunk/package/feeds/packages/perl-www-mechanize/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-www/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
 delete mode 100644 trunk/package/feeds/packages/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
 delete mode 100644 trunk/package/feeds/packages/perl/Config.in
 delete mode 100644 trunk/package/feeds/packages/perl/Makefile
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-arm-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-arm.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-armeb-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-armeb.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-avr32-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-avr32.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-i486-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-i486.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mips-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mips.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mips64-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mips64.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mipsel-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-mipsel.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-powerpc-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-powerpc.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-x86_64-mt.in
 delete mode 100644 trunk/package/feeds/packages/perl/files/config.sh-x86_64.in
 delete mode 100755 trunk/package/feeds/packages/perl/files/perl-run_tests.sh
 delete mode 100644 trunk/package/feeds/packages/perl/patches/101-fix-cross-compile-endianness-detection.patch
 delete mode 100644 trunk/package/feeds/packages/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
 delete mode 100644 trunk/package/feeds/packages/perl/patches/300-always_use_miniperl.patch
 delete mode 100644 trunk/package/feeds/packages/perl/patches/400-add_microperl_caretx_dependency.patch
 delete mode 100644 trunk/package/feeds/packages/perl/patches/500-add-relink-hack.patch
 delete mode 100644 trunk/package/feeds/packages/perl/perlbase.mk
 delete mode 100644 trunk/package/feeds/packages/perl/perlmod.mk
 delete mode 100644 trunk/package/feeds/packages/php5/Makefile
 delete mode 100644 trunk/package/feeds/packages/php5/files/php.ini
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fastcgi.config
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fastcgi.init
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fpm-www.conf
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fpm.conf
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fpm.config
 delete mode 100644 trunk/package/feeds/packages/php5/files/php5-fpm.init
 delete mode 100644 trunk/package/feeds/packages/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
 delete mode 100644 trunk/package/feeds/packages/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
 delete mode 100644 trunk/package/feeds/packages/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
 delete mode 100644 trunk/package/feeds/packages/php5/patches/800-gd-iconv.patch
 delete mode 100644 trunk/package/feeds/packages/php5/patches/950-Fix-dl-cross-compiling-issue.patch
 delete mode 100644 trunk/package/feeds/packages/php5/pecl.mk
 delete mode 100644 trunk/package/feeds/packages/pianod/Makefile
 delete mode 100644 trunk/package/feeds/packages/pianod/files/pianod.init
 delete mode 100644 trunk/package/feeds/packages/pianod/patches/005-Fix_IPV6_socket_handling.patch
 delete mode 100644 trunk/package/feeds/packages/pianod/patches/010-Configure_add_SSL_options.patch
 delete mode 100644 trunk/package/feeds/packages/pianod/patches/020-Use_package_config_h_for_all_modules.patch
 delete mode 100644 trunk/package/feeds/packages/pianod/patches/030-Waitress_add_polarssl_variant.patch
 delete mode 100644 trunk/package/feeds/packages/picocom/Makefile
 delete mode 100644 trunk/package/feeds/packages/polipo/Makefile
 delete mode 100644 trunk/package/feeds/packages/polipo/files/polipo.config
 delete mode 100644 trunk/package/feeds/packages/polipo/files/polipo.init
 delete mode 100644 trunk/package/feeds/packages/portaudio/Makefile
 delete mode 100644 trunk/package/feeds/packages/portmap/Makefile
 delete mode 100644 trunk/package/feeds/packages/portmap/files/portmap.init
 delete mode 100644 trunk/package/feeds/packages/portmap/patches/101-no_pie.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/Makefile
 delete mode 100644 trunk/package/feeds/packages/postfix/files/main.cf.default
 delete mode 100644 trunk/package/feeds/packages/postfix/files/postfix.init
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/100-fsstat.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/200-manpages.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/300-bdb_hash_segfault.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/400-cdb.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/500-crosscompile.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/600-nopostconf.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/700-defaultconfig.patch
 delete mode 100644 trunk/package/feeds/packages/postfix/patches/800-fmt.patch
 delete mode 100644 trunk/package/feeds/packages/postgresql/Makefile
 delete mode 100644 trunk/package/feeds/packages/postgresql/files/postgresql.config
 delete mode 100644 trunk/package/feeds/packages/postgresql/files/postgresql.init
 delete mode 100644 trunk/package/feeds/packages/postgresql/patches/200-ranlib.patch
 delete mode 100644 trunk/package/feeds/packages/postgresql/patches/800-busybox-default-pager.patch
 delete mode 100644 trunk/package/feeds/packages/pps-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/privoxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/privoxy/files/privoxy.config
 delete mode 100644 trunk/package/feeds/packages/privoxy/files/privoxy.hotplug
 delete mode 100644 trunk/package/feeds/packages/privoxy/files/privoxy.init
 delete mode 100644 trunk/package/feeds/packages/procps/Makefile
 delete mode 100644 trunk/package/feeds/packages/procps/patches/010-make_fix.patch
 delete mode 100644 trunk/package/feeds/packages/procps/patches/020_hz_fix.patch
 delete mode 100644 trunk/package/feeds/packages/procps/patches/030-fix-string-problems.patch
 delete mode 100644 trunk/package/feeds/packages/prosody/Makefile
 delete mode 100644 trunk/package/feeds/packages/prosody/files/prosody.cfg.lua
 delete mode 100644 trunk/package/feeds/packages/prosody/files/prosody.init
 delete mode 100644 trunk/package/feeds/packages/prosody/patches/010-fix-randomseed.patch
 delete mode 100644 trunk/package/feeds/packages/protobuf-c/Makefile
 delete mode 100644 trunk/package/feeds/packages/protobuf/Makefile
 delete mode 100644 trunk/package/feeds/packages/protobuf/patches/001-mipseb-compile.patch
 delete mode 100644 trunk/package/feeds/packages/pthsem/Makefile
 delete mode 100644 trunk/package/feeds/packages/pthsem/patches/001-linux3x-fix.patch
 delete mode 100644 trunk/package/feeds/packages/pulseaudio/Makefile
 delete mode 100644 trunk/package/feeds/packages/pulseaudio/files/pulseaudio.init
 delete mode 100644 trunk/package/feeds/packages/pulseaudio/patches/001-no_default_64mb_alloc.patch
 delete mode 100644 trunk/package/feeds/packages/pv/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-dns/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-imglib/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-imglib/patches/010-cross-compile.patch
 delete mode 100644 trunk/package/feeds/packages/python-imglib/patches/020-freetype-header-include.patch
 delete mode 100644 trunk/package/feeds/packages/python-mysql/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-mysql/patches/010-threadsafe.patch
 delete mode 100644 trunk/package/feeds/packages/python-pip/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-setuptools/Makefile
 delete mode 100644 trunk/package/feeds/packages/python-setuptools/patches/0001-remove-windows-support.patch
 delete mode 100644 trunk/package/feeds/packages/python/Makefile
 delete mode 100644 trunk/package/feeds/packages/python/files/config.site
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-codecs.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-compiler.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-ctypes.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-db.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-decimal.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-distutils.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-email.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-gdbm.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-logging.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-multiprocessing.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-ncurses.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-openssl.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-pydoc.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-sqlite3.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-unittest.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package-xml.mk
 delete mode 100644 trunk/package/feeds/packages/python/files/python-package.mk
 delete mode 100644 trunk/package/feeds/packages/python/patches/001-enable-zlib.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/003-do-not-compile-tests-at-build.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/004-do-not-write-bytes-codes.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/005-fix-libffi-x86-64-configure.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/006-remove-debian-multiarch-support.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/007-distutils-do-not-adjust-path.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/008-distutils-use-python-sysroot.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
 delete mode 100644 trunk/package/feeds/packages/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
 delete mode 100644 trunk/package/feeds/packages/python3-bottle/Makefile
 delete mode 100644 trunk/package/feeds/packages/python3/Makefile
 delete mode 100644 trunk/package/feeds/packages/python3/files/config.site
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-asyncio.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-codecs.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-ctypes.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-dbm.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-decimal.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-distutils.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-email.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-gdbm.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-logging.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-multiprocessing.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-ncurses.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-openssl.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-pydoc.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-sqlite3.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-unittest.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package-xml.mk
 delete mode 100644 trunk/package/feeds/packages/python3/files/python3-package.mk
 delete mode 100644 trunk/package/feeds/packages/python3/patches/001-enable-zlib.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/003-do-not-run-distutils-tests.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/004-do-not-write-bytes-codes.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/005-fix-libffi-x86-64-configure.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/006-remove-debian-multiarch-support.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/007-distutils-do-not-adjust-path.patch
 delete mode 100644 trunk/package/feeds/packages/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
 delete mode 100644 trunk/package/feeds/packages/radsecproxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/radsecproxy/files/radsecproxy.init
 delete mode 100644 trunk/package/feeds/packages/radsecproxy/patches/100-missing-return.patch
 delete mode 100644 trunk/package/feeds/packages/radsecproxy/patches/200-logdest-on-foreground.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/Makefile
 delete mode 100644 trunk/package/feeds/packages/redsocks/files/redsocks.conf
 delete mode 100644 trunk/package/feeds/packages/redsocks/files/redsocks.init
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0001-Fix-bug-in-DNS-resolution-results-were-ignored-since.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0002-inet_ntop-red_inet_ntop.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0003-Initial-support-for-UDP-TPROXY-redirection.-No-more-.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0004-Fix-transposition-of-memset-parameters.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0005-Fix-compilation-on-Ubuntu-10.04-LTS-and-hopefully-De.patch
 delete mode 100644 trunk/package/feeds/packages/redsocks/patches/0006-fix_default_config_location.patch
 delete mode 100644 trunk/package/feeds/packages/remserial/Makefile
 delete mode 100644 trunk/package/feeds/packages/rng-tools/Makefile
 delete mode 100644 trunk/package/feeds/packages/rng-tools/files/rngd.init
 delete mode 100644 trunk/package/feeds/packages/rpcd-mod-lxc/Makefile
 delete mode 100644 trunk/package/feeds/packages/rpcd-mod-lxc/files/CMakeLists.txt
 delete mode 100644 trunk/package/feeds/packages/rpcd-mod-lxc/files/lxc.c
 delete mode 100644 trunk/package/feeds/packages/rrdtool1/Makefile
 delete mode 100644 trunk/package/feeds/packages/rrdtool1/patches/001-no_ordering_cd_joke.patch
 delete mode 100644 trunk/package/feeds/packages/rrdtool1/patches/002-no_timezone.patch
 delete mode 100644 trunk/package/feeds/packages/rrdtool1/patches/020-x86-float-cast.patch
 delete mode 100644 trunk/package/feeds/packages/rrdtool1/patches/030-pod2man-stderr.patch
 delete mode 100644 trunk/package/feeds/packages/rsync/Config.in
 delete mode 100644 trunk/package/feeds/packages/rsync/Makefile
 delete mode 100644 trunk/package/feeds/packages/rsync/files/rsyncd.conf
 delete mode 100644 trunk/package/feeds/packages/rsync/files/rsyncd.init
 delete mode 100644 trunk/package/feeds/packages/rsync/patches/000-CVE-2014-9512.patch
 delete mode 100644 trunk/package/feeds/packages/rtklib/Makefile
 delete mode 100644 trunk/package/feeds/packages/rtl-sdr/Makefile
 delete mode 100644 trunk/package/feeds/packages/rtorrent/Makefile
 delete mode 100644 trunk/package/feeds/packages/rtorrent/patches/100-fix-cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/rtorrent/patches/120-fix-ncurses.patch
 delete mode 100644 trunk/package/feeds/packages/ruby/Makefile
 delete mode 100644 trunk/package/feeds/packages/ruby/files/ruby
 delete mode 100644 trunk/package/feeds/packages/ruby/patches/001-rdoc-remove_gems_dep.patch
 delete mode 100644 trunk/package/feeds/packages/ruby/ruby_find_pkgsdeps
 delete mode 100644 trunk/package/feeds/packages/ruby/ruby_missingfiles
 delete mode 100644 trunk/package/feeds/packages/sbc/Makefile
 delete mode 100644 trunk/package/feeds/packages/screen/Makefile
 delete mode 100644 trunk/package/feeds/packages/screen/files/etc/screenrc
 delete mode 100644 trunk/package/feeds/packages/screen/patches/100-cross_compile_fix.patch
 delete mode 100644 trunk/package/feeds/packages/screen/patches/110-do_not_add_srcdir_to_include_path.patch
 delete mode 100644 trunk/package/feeds/packages/seafile-ccnet/Makefile
 delete mode 100644 trunk/package/feeds/packages/seafile-seahub/Makefile
 delete mode 100644 trunk/package/feeds/packages/seafile-seahub/patches/010-default-config.patch
 delete mode 100644 trunk/package/feeds/packages/seafile-server/Makefile
 delete mode 100755 trunk/package/feeds/packages/seafile-server/files/seafile.init
 delete mode 100644 trunk/package/feeds/packages/seafile-server/patches/020-script-patches.patch
 delete mode 100644 trunk/package/feeds/packages/seafile-server/patches/030-pidfiles-in-same-directory.patch
 delete mode 100644 trunk/package/feeds/packages/seafile-server/patches/040-seafile-admin.patch
 delete mode 100644 trunk/package/feeds/packages/ser2net/Makefile
 delete mode 100644 trunk/package/feeds/packages/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch
 delete mode 100644 trunk/package/feeds/packages/serialconsole/Makefile
 delete mode 100644 trunk/package/feeds/packages/shadow/Makefile
 delete mode 100644 trunk/package/feeds/packages/shadow/patches/001-busybox_ash.patch
 delete mode 100644 trunk/package/feeds/packages/shadow/patches/002-disable-ruser-lookup.patch
 delete mode 100644 trunk/package/feeds/packages/shadow/patches/003-fix-disabling-subids.patch
 delete mode 100644 trunk/package/feeds/packages/shadowsocks-client/Makefile
 delete mode 100644 trunk/package/feeds/packages/shadowsocks-client/files/sslocal.config
 delete mode 100755 trunk/package/feeds/packages/shadowsocks-client/files/sslocal.init
 delete mode 100644 trunk/package/feeds/packages/shairplay/Makefile
 delete mode 100644 trunk/package/feeds/packages/shairplay/files/shairplay.config
 delete mode 100644 trunk/package/feeds/packages/shairplay/files/shairplay.init
 delete mode 100644 trunk/package/feeds/packages/shairplay/patches/001-key_file_dir.patch
 delete mode 100644 trunk/package/feeds/packages/shairplay/patches/002-libavahi-compat-dnssd.patch
 delete mode 100644 trunk/package/feeds/packages/shairplay/patches/003-fix_big-endian.patch
 delete mode 100644 trunk/package/feeds/packages/shairport-sync/Makefile
 delete mode 100644 trunk/package/feeds/packages/shairport-sync/files/shairport-sync.config
 delete mode 100755 trunk/package/feeds/packages/shairport-sync/files/shairport-sync.init
 delete mode 100644 trunk/package/feeds/packages/shairport/Makefile
 delete mode 100644 trunk/package/feeds/packages/shairport/files/shairport.config
 delete mode 100644 trunk/package/feeds/packages/shairport/files/shairport.init
 delete mode 100644 trunk/package/feeds/packages/shairport/patches/001-disable_pulseaudio.patch
 delete mode 100644 trunk/package/feeds/packages/shine/Makefile
 delete mode 100644 trunk/package/feeds/packages/simplejson/Makefile
 delete mode 100644 trunk/package/feeds/packages/sispmctl/Makefile
 delete mode 100644 trunk/package/feeds/packages/sispmctl/patches/001-fix-includes.patch
 delete mode 100644 trunk/package/feeds/packages/smartmontools/Makefile
 delete mode 100644 trunk/package/feeds/packages/smartmontools/files/smartd.conf
 delete mode 100644 trunk/package/feeds/packages/smartmontools/files/smartd.init
 delete mode 100644 trunk/package/feeds/packages/smartsnmpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/smartsnmpd/files/mibs/dummy.lua
 delete mode 100644 trunk/package/feeds/packages/smartsnmpd/files/mibs/interfaces.lua
 delete mode 100644 trunk/package/feeds/packages/smartsnmpd/files/mibs/system.lua
 delete mode 100644 trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.conf
 delete mode 100755 trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.init
 delete mode 100644 trunk/package/feeds/packages/smstools3/Makefile
 delete mode 100644 trunk/package/feeds/packages/smstools3/files/smstools3.conf
 delete mode 100644 trunk/package/feeds/packages/smstools3/files/smstools3.init
 delete mode 100644 trunk/package/feeds/packages/smstools3/patches/001-smsd.patch
 delete mode 100644 trunk/package/feeds/packages/smstools3/patches/002-Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/snort/Makefile
 delete mode 100644 trunk/package/feeds/packages/snort/files/snort.config
 delete mode 100644 trunk/package/feeds/packages/snort/files/snort.init
 delete mode 100644 trunk/package/feeds/packages/snort/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/socat/Makefile
 delete mode 100644 trunk/package/feeds/packages/socat/files/socat.config
 delete mode 100644 trunk/package/feeds/packages/socat/files/socat.init
 delete mode 100644 trunk/package/feeds/packages/sockread/Makefile
 delete mode 100644 trunk/package/feeds/packages/sockread/src/Makefile
 delete mode 100644 trunk/package/feeds/packages/sockread/src/main.c
 delete mode 100644 trunk/package/feeds/packages/softflowd/Makefile
 delete mode 100644 trunk/package/feeds/packages/softflowd/files/softflowd.config
 delete mode 100755 trunk/package/feeds/packages/softflowd/files/softflowd.init
 delete mode 100644 trunk/package/feeds/packages/spawn-fcgi/Makefile
 delete mode 100644 trunk/package/feeds/packages/speex/Makefile
 delete mode 100644 trunk/package/feeds/packages/sqlite3/Makefile
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/Makefile
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/files/etc/config/sqm
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/etc/hotplug.d/iface/11-sqm
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/etc/init.d/sqm
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/functions.sh
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/run.sh
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos.help
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos.help
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos
 delete mode 100644 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos.help
 delete mode 100755 trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/stop.sh
 delete mode 100644 trunk/package/feeds/packages/squid/Makefile
 delete mode 100644 trunk/package/feeds/packages/squid/files/squid.conf
 delete mode 100644 trunk/package/feeds/packages/squid/files/squid.config
 delete mode 100644 trunk/package/feeds/packages/squid/files/squid.init
 delete mode 100644 trunk/package/feeds/packages/squid/patches/001-cross_compile.patch
 delete mode 100644 trunk/package/feeds/packages/squid/patches/100-mime.patch
 delete mode 100644 trunk/package/feeds/packages/sshfs/Makefile
 delete mode 100644 trunk/package/feeds/packages/sshtunnel/Makefile
 delete mode 100644 trunk/package/feeds/packages/sshtunnel/files/sshtunnel.init
 delete mode 100644 trunk/package/feeds/packages/sshtunnel/files/sshtunnel.sh
 delete mode 100644 trunk/package/feeds/packages/sshtunnel/files/uci_sshtunnel
 delete mode 100644 trunk/package/feeds/packages/sslh/Makefile
 delete mode 100644 trunk/package/feeds/packages/sslh/files/sslh.config
 delete mode 100644 trunk/package/feeds/packages/sslh/files/sslh.init
 delete mode 100644 trunk/package/feeds/packages/sslh/patches/001-no_sslh_select.patch
 delete mode 100644 trunk/package/feeds/packages/ssmtp/Makefile
 delete mode 100644 trunk/package/feeds/packages/ssmtp/patches/002-fix_pointer.patch
 delete mode 100644 trunk/package/feeds/packages/sstp-client/Makefile
 delete mode 100644 trunk/package/feeds/packages/sstp-client/files/etc/ppp/chap-secrets
 delete mode 100644 trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example-nopty.txt
 delete mode 100644 trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example.txt
 delete mode 100644 trunk/package/feeds/packages/stm32flash/Makefile
 delete mode 100644 trunk/package/feeds/packages/stoken/Makefile
 delete mode 100644 trunk/package/feeds/packages/strongswan/Config.in
 delete mode 100644 trunk/package/feeds/packages/strongswan/Makefile
 delete mode 100644 trunk/package/feeds/packages/strongswan/files/ipsec.init
 delete mode 100644 trunk/package/feeds/packages/strongswan/files/ipsec.secrets
 delete mode 100644 trunk/package/feeds/packages/strongswan/files/ipsec.user
 delete mode 100644 trunk/package/feeds/packages/strongswan/patches/201-kmodloader.patch
 delete mode 100644 trunk/package/feeds/packages/strongswan/patches/203-uci.patch
 delete mode 100644 trunk/package/feeds/packages/strongswan/patches/300-include-ipsec-user-script.patch
 delete mode 100644 trunk/package/feeds/packages/stunnel/Makefile
 delete mode 100644 trunk/package/feeds/packages/stunnel/files/stunnel.conf
 delete mode 100644 trunk/package/feeds/packages/stunnel/files/stunnel.init
 delete mode 100644 trunk/package/feeds/packages/stunnel/patches/010_fix_getnameinfo.patch
 delete mode 100644 trunk/package/feeds/packages/stunnel/patches/011_disable_ssp_linking.patch
 delete mode 100644 trunk/package/feeds/packages/sudo/Makefile
 delete mode 100755 trunk/package/feeds/packages/sudo/files/sudo.init
 delete mode 100644 trunk/package/feeds/packages/sudo/patches/010-cross-compile-fixes.patch
 delete mode 100644 trunk/package/feeds/packages/sudo/patches/020-no-owner-change.patch
 delete mode 100644 trunk/package/feeds/packages/sumo/Makefile
 delete mode 100644 trunk/package/feeds/packages/sumo/files/sumo.sh
 delete mode 100644 trunk/package/feeds/packages/sumo/patches/100-configure_fix.patch
 delete mode 100644 trunk/package/feeds/packages/svox/Makefile
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0001-autoconf-building-of-library-using-libtool.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0002-gitignore-for-autotools-files.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0004-add-header-files.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0005-Install-lang-files.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0006-Set-picolangdir.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0008-64bits.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0009-Fix-link-order.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0010-platform.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0011-subdir.patch
 delete mode 100644 trunk/package/feeds/packages/svox/patches/0012-no-headers.patch
 delete mode 100644 trunk/package/feeds/packages/tar/Makefile
 delete mode 100644 trunk/package/feeds/packages/taskwarrior/Makefile
 delete mode 100644 trunk/package/feeds/packages/tayga/Makefile
 delete mode 100755 trunk/package/feeds/packages/tayga/files/tayga-proto.sh
 delete mode 100644 trunk/package/feeds/packages/tayga/files/tayga.hotplug
 delete mode 100644 trunk/package/feeds/packages/tayga/files/tayga.sh
 delete mode 100644 trunk/package/feeds/packages/tayga/patches/001-configure_unset_CFLAGS.patch
 delete mode 100644 trunk/package/feeds/packages/tayga/patches/002-bigendian_wrong_checksum.patch
 delete mode 100644 trunk/package/feeds/packages/tcp_wrappers/Makefile
 delete mode 100644 trunk/package/feeds/packages/tcp_wrappers/patches/001-debian_subset.patch
 delete mode 100644 trunk/package/feeds/packages/tcp_wrappers/patches/002-opt_cflags.patch
 delete mode 100644 trunk/package/feeds/packages/tcp_wrappers/patches/003-scaffold_malloc.patch
 delete mode 100644 trunk/package/feeds/packages/tcp_wrappers/patches/004-ipv4_prefix.patch
 delete mode 100644 trunk/package/feeds/packages/tcpproxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/tcpproxy/files/tcpproxy.config
 delete mode 100644 trunk/package/feeds/packages/tcpproxy/files/tcpproxy.init
 delete mode 100644 trunk/package/feeds/packages/tcpproxy/patches/001-ragel_generated.patch
 delete mode 100644 trunk/package/feeds/packages/tcsh/Makefile
 delete mode 100644 trunk/package/feeds/packages/tdb/Makefile
 delete mode 100644 trunk/package/feeds/packages/tdb/patches/001-printf-fix.patch
 delete mode 100644 trunk/package/feeds/packages/tgt/Makefile
 delete mode 100644 trunk/package/feeds/packages/tgt/files/etc/config/tgt
 delete mode 100755 trunk/package/feeds/packages/tgt/files/etc/init.d/tgt
 delete mode 100644 trunk/package/feeds/packages/tgt/patches/010-fallocate.patch
 delete mode 100644 trunk/package/feeds/packages/tgt/patches/020-usr_Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/tgt/patches/030-Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/Makefile
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/001-autoconf-compat.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/010-CVE-2012-4564.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/011-CVE-2013-1960.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/012-CVE-2013-1961.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/013-CVE-2013-4231.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/014-CVE-2013-4232.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/015-CVE-2013-4244.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/016-CVE-2013-4243.patch
 delete mode 100644 trunk/package/feeds/packages/tiff/patches/017-CVE-2014-9330.patch
 delete mode 100644 trunk/package/feeds/packages/tinc/Makefile
 delete mode 100644 trunk/package/feeds/packages/tinc/files/tinc.config
 delete mode 100644 trunk/package/feeds/packages/tinc/files/tinc.init
 delete mode 100644 trunk/package/feeds/packages/tinc/files/tinc.upgrade
 delete mode 100644 trunk/package/feeds/packages/tinycdb/Makefile
 delete mode 100644 trunk/package/feeds/packages/tinycdb/patches/100-Makefile.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/files/tinyproxy.config
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/files/tinyproxy.init
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/010-no-docs-and-tests.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/020-config_and_pid-path.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/120-fix_INET6.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tiniproxy-randomized-hashmaps.patch
 delete mode 100644 trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tinyproxy-limit-headers.patch
 delete mode 100644 trunk/package/feeds/packages/tmux/Makefile
 delete mode 100644 trunk/package/feeds/packages/tmux/patches/100-b64_ntop-conflict_compath_h.patch
 delete mode 100644 trunk/package/feeds/packages/tmux/patches/101-b64_ntop-conflict_compat_b64_ntop_c.patch
 delete mode 100644 trunk/package/feeds/packages/tmux/patches/102-b64_ntop-conflict_tty_c.patch
 delete mode 100644 trunk/package/feeds/packages/tmux/patches/200-usr-local.patch
 delete mode 100644 trunk/package/feeds/packages/tracertools/Makefile
 delete mode 100644 trunk/package/feeds/packages/transmission/Makefile
 delete mode 100644 trunk/package/feeds/packages/transmission/files/transmission.config
 delete mode 100644 trunk/package/feeds/packages/transmission/files/transmission.init
 delete mode 100644 trunk/package/feeds/packages/transmission/patches/010_libtransmission_fallocate64_eglibc.patch
 delete mode 100644 trunk/package/feeds/packages/transmission/patches/020-use-internal-miniupnp.patch
 delete mode 100644 trunk/package/feeds/packages/transmission/patches/030-fix-musl-build.patch
 delete mode 100644 trunk/package/feeds/packages/triggerhappy/Makefile
 delete mode 100644 trunk/package/feeds/packages/triggerhappy/files/triggerhappy-example.conf
 delete mode 100644 trunk/package/feeds/packages/triggerhappy/files/triggerhappy.hotplug
 delete mode 100644 trunk/package/feeds/packages/triggerhappy/files/triggerhappy.init
 delete mode 100644 trunk/package/feeds/packages/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
 delete mode 100644 trunk/package/feeds/packages/uanytun/Makefile
 delete mode 100644 trunk/package/feeds/packages/uanytun/files/uanytun-nocrypt.config
 delete mode 100644 trunk/package/feeds/packages/uanytun/files/uanytun.config
 delete mode 100644 trunk/package/feeds/packages/uanytun/files/uanytun.init
 delete mode 100644 trunk/package/feeds/packages/udpxy/Makefile
 delete mode 100644 trunk/package/feeds/packages/udpxy/files/udpxy.conf
 delete mode 100644 trunk/package/feeds/packages/udpxy/files/udpxy.init
 delete mode 100644 trunk/package/feeds/packages/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch
 delete mode 100644 trunk/package/feeds/packages/ulogd/Makefile
 delete mode 100644 trunk/package/feeds/packages/ulogd/files/ulogd.init
 delete mode 100644 trunk/package/feeds/packages/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch
 delete mode 100644 trunk/package/feeds/packages/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
 delete mode 100644 trunk/package/feeds/packages/umurmur/Makefile
 delete mode 100644 trunk/package/feeds/packages/unbound/Makefile
 delete mode 100644 trunk/package/feeds/packages/unbound/files/named.cache
 delete mode 100644 trunk/package/feeds/packages/unbound/files/root.key
 delete mode 100755 trunk/package/feeds/packages/unbound/files/unbound.init
 delete mode 100644 trunk/package/feeds/packages/unbound/patches/001-conf.patch
 delete mode 100644 trunk/package/feeds/packages/unixodbc/Makefile
 delete mode 100644 trunk/package/feeds/packages/unixodbc/files/unixodbc_conf.h
 delete mode 100644 trunk/package/feeds/packages/unrar/Makefile
 delete mode 100644 trunk/package/feeds/packages/unrar/patches/100-makefile_fixes.patch
 delete mode 100644 trunk/package/feeds/packages/unzip/Makefile
 delete mode 100644 trunk/package/feeds/packages/unzip/patches/001-CVE-2014-8139-crc-overflow.patch
 delete mode 100644 trunk/package/feeds/packages/unzip/patches/002-CVE-2014-8140-test-compr-eb.patch
 delete mode 100644 trunk/package/feeds/packages/unzip/patches/003-CVE-2014-8141-getzip64data.patch
 delete mode 100644 trunk/package/feeds/packages/unzip/patches/004-CVE-2014-9636-test-compr-eb.patch
 delete mode 100644 trunk/package/feeds/packages/upmpdcli/Makefile
 delete mode 100644 trunk/package/feeds/packages/upmpdcli/files/upmpdcli.config
 delete mode 100644 trunk/package/feeds/packages/upmpdcli/files/upmpdcli.init
 delete mode 100644 trunk/package/feeds/packages/upmpdcli/files/upmpdcli.png
 delete mode 100644 trunk/package/feeds/packages/upmpdcli/patches/010-Add_icon_config.patch
 delete mode 100644 trunk/package/feeds/packages/usbmuxd/Makefile
 delete mode 100644 trunk/package/feeds/packages/uuid/Makefile
 delete mode 100644 trunk/package/feeds/packages/uvcdynctrl/Makefile
 delete mode 100644 trunk/package/feeds/packages/vala/Makefile
 delete mode 100644 trunk/package/feeds/packages/vim/Makefile
 delete mode 100644 trunk/package/feeds/packages/vim/files/vimrc
 delete mode 100644 trunk/package/feeds/packages/vim/files/vimrc.full
 delete mode 100644 trunk/package/feeds/packages/vim/patches/001-compile.patch
 delete mode 100644 trunk/package/feeds/packages/vips/Makefile
 delete mode 100644 trunk/package/feeds/packages/vips/patches/001-no_cpp.patch
 delete mode 100644 trunk/package/feeds/packages/vnstat/Makefile
 delete mode 100644 trunk/package/feeds/packages/vnstat/files/vnstat.config
 delete mode 100644 trunk/package/feeds/packages/vnstat/files/vnstat.defaults
 delete mode 100644 trunk/package/feeds/packages/vnstat/files/vnstat.init
 delete mode 100644 trunk/package/feeds/packages/vnstat/patches/001-conf.patch
 delete mode 100644 trunk/package/feeds/packages/vnstat/patches/002-no_install_strip.patch
 delete mode 100644 trunk/package/feeds/packages/vnstat/patches/003-no_install_uname.patch
 delete mode 100644 trunk/package/feeds/packages/vpnc-scripts/Makefile
 delete mode 100755 trunk/package/feeds/packages/vpnc-scripts/files/vpnc-script
 delete mode 100644 trunk/package/feeds/packages/vpnc/Config.in
 delete mode 100644 trunk/package/feeds/packages/vpnc/Makefile
 delete mode 100644 trunk/package/feeds/packages/vpnc/README
 delete mode 100755 trunk/package/feeds/packages/vpnc/files/vpnc.sh
 delete mode 100644 trunk/package/feeds/packages/vpnc/files/vpnc.upgrade
 delete mode 100644 trunk/package/feeds/packages/vpnc/patches/001-cross.patch
 delete mode 100644 trunk/package/feeds/packages/vsftpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/vsftpd/files/vsftpd.conf
 delete mode 100644 trunk/package/feeds/packages/vsftpd/files/vsftpd.init
 delete mode 100644 trunk/package/feeds/packages/vsftpd/patches/001-destdir.patch
 delete mode 100644 trunk/package/feeds/packages/vsftpd/patches/002-find_libs.patch
 delete mode 100644 trunk/package/feeds/packages/vsftpd/patches/003-chroot.patch
 delete mode 100644 trunk/package/feeds/packages/vsftpd/patches/004-disable-capabilities.patch
 delete mode 100644 trunk/package/feeds/packages/vsftpd/patches/005-disable-pam.patch
 delete mode 100644 trunk/package/feeds/packages/watchcat/Makefile
 delete mode 100644 trunk/package/feeds/packages/watchcat/files/initd_watchcat
 delete mode 100644 trunk/package/feeds/packages/watchcat/files/uci_defaults_watchcat
 delete mode 100644 trunk/package/feeds/packages/watchcat/files/watchcat.sh
 delete mode 100644 trunk/package/feeds/packages/wavemon/Makefile
 delete mode 100644 trunk/package/feeds/packages/wget/Makefile
 delete mode 100644 trunk/package/feeds/packages/wifitoggle/Makefile
 delete mode 100755 trunk/package/feeds/packages/wifitoggle/files/wifitoggle.config
 delete mode 100755 trunk/package/feeds/packages/wifitoggle/files/wifitoggle.hotplug
 delete mode 100644 trunk/package/feeds/packages/wshaper/Makefile
 delete mode 100644 trunk/package/feeds/packages/wshaper/files/wshaper.config
 delete mode 100755 trunk/package/feeds/packages/wshaper/files/wshaper.htb
 delete mode 100644 trunk/package/feeds/packages/wshaper/files/wshaper.iface
 delete mode 100644 trunk/package/feeds/packages/wshaper/files/wshaper.init
 delete mode 100644 trunk/package/feeds/packages/xinetd/Makefile
 delete mode 100644 trunk/package/feeds/packages/xinetd/files/xinetd.conf
 delete mode 100644 trunk/package/feeds/packages/xinetd/files/xinetd.init
 delete mode 100644 trunk/package/feeds/packages/xinetd/patches/001-ar.patch
 delete mode 100644 trunk/package/feeds/packages/xinetd/patches/002-destdir.patch
 delete mode 100644 trunk/package/feeds/packages/xinetd/patches/003-rpc_fix.patch
 delete mode 100644 trunk/package/feeds/packages/xinetd/patches/004-ident-bind.patch
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/README
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/l2tp.sh
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/options.xl2tpd
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/xl2tp-secrets
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf.sample
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/files/xl2tpd.init
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/patches/100-makefile_opt_flags.patch
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/patches/110-makefile_dont_build_pfc.patch
 delete mode 100644 trunk/package/feeds/packages/xl2tpd/patches/120-no-bsd-signal-in-musl.patch
 delete mode 100644 trunk/package/feeds/packages/xmlrpc-c/Makefile
 delete mode 100644 trunk/package/feeds/packages/xmlrpc-c/patches/001-config.mk.in.patch
 delete mode 100644 trunk/package/feeds/packages/xmlrpc-c/patches/002-automake-compat.patch
 delete mode 100644 trunk/package/feeds/packages/xupnpd/Makefile
 delete mode 100644 trunk/package/feeds/packages/xupnpd/files/xupnpd.init
 delete mode 100644 trunk/package/feeds/packages/xupnpd/patches/100-default_config.patch
 delete mode 100644 trunk/package/feeds/packages/xupnpd/patches/101-root_dir_param.patch
 delete mode 100644 trunk/package/feeds/packages/zabbix/Makefile
 delete mode 100644 trunk/package/feeds/packages/zabbix/files/mac80211
 delete mode 100644 trunk/package/feeds/packages/zabbix/files/network
 delete mode 100644 trunk/package/feeds/packages/zabbix/files/wifi
 delete mode 100644 trunk/package/feeds/packages/zabbix/files/zabbix_agentd.init
 delete mode 100644 trunk/package/feeds/packages/zabbix/files/zabbix_helper_mac80211.c
 delete mode 100644 trunk/package/feeds/packages/zabbix/patches/002-fix-res_send-on-uclibc.patch
 delete mode 100644 trunk/package/feeds/packages/zabbix/patches/002-uclibc_loadavg.patch
 delete mode 100644 trunk/package/feeds/packages/zabbix/patches/010-change-agentd-config.patch
 delete mode 100644 trunk/package/feeds/packages/zile/Makefile
 delete mode 100644 trunk/package/feeds/packages/zip/Makefile
 delete mode 100644 trunk/package/feeds/packages/znc/Makefile
 delete mode 100644 trunk/package/feeds/packages/znc/files/znc.conf
 delete mode 100644 trunk/package/feeds/packages/znc/files/znc.init
 delete mode 100644 trunk/package/feeds/packages/znc/patches/001-move_rootcheck_after_config.patch
 delete mode 100644 trunk/package/feeds/packages/znc/patches/003-Reduce_rebuild_time.patch
 delete mode 100644 trunk/package/feeds/packages/znc/patches/004-restore_droproot.patch
 delete mode 100644 trunk/package/feeds/packages/zoneinfo/Makefile
 delete mode 100644 trunk/package/feeds/packages/zsh/Makefile

diff --git a/trunk/package/feeds/packages/acl/Makefile b/trunk/package/feeds/packages/acl/Makefile
deleted file mode 100644
index 8f3ea7dc..00000000
--- a/trunk/package/feeds/packages/acl/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=acl
-PKG_REV:=62ce6354ef5a8eb5644908748f79c8cd18474d4c
-PKG_VERSION:=20140812
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://git.sv.gnu.org/acl.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-
-PKG_LICENSE:=LGPL-2.1 GPL-2.0
-PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/acl/Default
-  TITLE:=Access control list (ACL) manipulation
-  URL:=http://savannah.nongnu.org/projects/acl
-  SUBMENU:=Filesystem
-endef
-
-define Package/acl/Default/description
-  Access control list support
-endef
-
-define Package/acl
-$(call Package/acl/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+=utils
-  DEPENDS:=+libacl
-endef
-
-define Package/libacl
-$(call Package/acl/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+=library
-  DEPENDS:=+libattr
-endef
-
-define Package/libacl/description
-$(call Package/acl/Default/description)
- This package provides libacl
-endef
-
-define Package/acl/description
-$(call Package/acl/Default/description)
- This package provides ACL manipulation utilities
- - chacl
- - getfacl
- - setfacl
-endef
-
-CONFIGURE_ARGS += --enable-static --enable-shared
-
-define Package/acl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/libacl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	mkdir -p $(1)/usr/lib/pkgconfig
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
-endef
-
-$(eval $(call BuildPackage,acl))
-$(eval $(call BuildPackage,libacl))
diff --git a/trunk/package/feeds/packages/acl/patches/100-no-gettext_configure.patch b/trunk/package/feeds/packages/acl/patches/100-no-gettext_configure.patch
deleted file mode 100644
index e7b419e7..00000000
--- a/trunk/package/feeds/packages/acl/patches/100-no-gettext_configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2182e81..4836b3d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,9 +31,6 @@ AC_FUNC_GCC_VISIBILITY
- AM_PROG_AR
- LT_INIT
- 
--AM_GNU_GETTEXT_VERSION([0.18.2])
--AM_GNU_GETTEXT([external])
--
- AC_ARG_ENABLE([debug],
- 	[AS_HELP_STRING([--enable-debug], [Enable extra debugging])])
- AS_IF([test "x$enable_debug" = "xyes"],
-@@ -61,6 +58,5 @@ AC_CONFIG_COMMANDS([include/sys],
- AC_CONFIG_FILES([
- 	libacl.pc
- 	Makefile
--	po/Makefile.in
- ])
- AC_OUTPUT
diff --git a/trunk/package/feeds/packages/acl/patches/101-no-gettext_autogen.patch b/trunk/package/feeds/packages/acl/patches/101-no-gettext_autogen.patch
deleted file mode 100644
index 1fad67a1..00000000
--- a/trunk/package/feeds/packages/acl/patches/101-no-gettext_autogen.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-index a98a3c5..982aff1 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,2 @@
- #!/bin/sh -ex
--po/update-potfiles
--autopoint --force
- exec autoreconf -f -i
diff --git a/trunk/package/feeds/packages/acl/patches/102-no-gettext_Makefile.patch b/trunk/package/feeds/packages/acl/patches/102-no-gettext_Makefile.patch
deleted file mode 100644
index d7e7377a..00000000
--- a/trunk/package/feeds/packages/acl/patches/102-no-gettext_Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 47d2a4e..d02ee91 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = \
- 	exports
- 
--SUBDIRS = po
--
- AM_CPPFLAGS = \
- 	-I$(top_builddir)/include \
- 	-I$(top_srcdir)/include \
diff --git a/trunk/package/feeds/packages/aiccu/Makefile b/trunk/package/feeds/packages/aiccu/Makefile
deleted file mode 100644
index 50839f35..00000000
--- a/trunk/package/feeds/packages/aiccu/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=aiccu
-PKG_VERSION:=20070115
-PKG_RELEASE:=12
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix
-PKG_MD5SUM:=c9bcc83644ed788e22a7c3f3d4021350
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=doc/LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/aiccu
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun
-  TITLE:=SixXS Automatic IPv6 Connectivity Client Utility
-  URL:=http://www.sixxs.net/tools/aiccu/
-  MAINTAINER:=Ondrej Caletka <ondrej@caletka.cz>
-endef
-
-define Build/Configure
-	$(SED) "s,strip,/bin/true," $(PKG_BUILD_DIR)/unix-console/Makefile
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" OS_NAME="Linux" OS_VERSION="$(LINUX_VERSION)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-		EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -pthread" \
-		DEBUG=0
-endef
-
-define Package/aiccu/conffiles
-/etc/config/aiccu
-endef
-
-define Package/aiccu/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/lib/netifd/proto $(1)/etc/hotplug.d/ntp
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/aiccu.sh $(1)/lib/netifd/proto/aiccu.sh
-	$(INSTALL_DATA) ./files/aiccu.hotplug $(1)/etc/hotplug.d/ntp/10-aiccu
-endef
-
-$(eval $(call BuildPackage,aiccu))
diff --git a/trunk/package/feeds/packages/aiccu/files/aiccu.hotplug b/trunk/package/feeds/packages/aiccu/files/aiccu.hotplug
deleted file mode 100644
index b5213717..00000000
--- a/trunk/package/feeds/packages/aiccu/files/aiccu.hotplug
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-NTPSTRATUMFILE="/var/run/aiccu_ntp_stratum"
-echo $stratum > "$NTPSTRATUMFILE"
diff --git a/trunk/package/feeds/packages/aiccu/files/aiccu.sh b/trunk/package/feeds/packages/aiccu/files/aiccu.sh
deleted file mode 100755
index 584574b7..00000000
--- a/trunk/package/feeds/packages/aiccu/files/aiccu.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-# aiccu.sh - AICCU proto
-# Copyright (c) 2014 OpenWrt.org
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_aiccu_setup() {
-	local cfg="$1"
-	local iface="$2"
-	local link="aiccu-$cfg"
-
-	local username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr ntpsynctimeout
-	json_get_vars username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr ntpsynctimeout
-
-	[ -z "$username" -o -z "$password" ] && {
-		proto_notify_error "$cfg" "MISSING_USERNAME_OR_PASSWORD"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	( proto_add_host_dependency "$cfg" 0.0.0.0 )
-
-	CFGFILE="/var/etc/${link}.conf"
-	PIDFILE="/var/run/${link}.pid"
-	NTPSTRATUMFILE="/var/run/aiccu_ntp_stratum"
-	mkdir -p /var/run /var/etc
-
-	echo "username $username" > "$CFGFILE"
-	echo "password $password" >> "$CFGFILE"
-	echo "ipv6_interface $link" >> "$CFGFILE"
-	[ -n "$server" ] && echo "server $server" >> "$CFGFILE"
-	[ -n "$protocol" ] && echo "protocol $protocol" >> "$CFGFILE"
-	[ -n "$tunnelid" ] && echo "tunnel_id $tunnelid" >> "$CFGFILE"
-	[ "$requiretls" == 1 ] && echo "requiretls true" >> "$CFGFILE"
-	[ "$nat" == 1 ] && echo "behindnat true" >> "$CFGFILE"
-	[ "$heartbeat" == 1 ] && echo "makebeats true" >> "$CFGFILE"
-	[ "$verbose" == 1 ] && echo "verbose true" >> "$CFGFILE"
-	echo "defaultroute false" >> "$CFGFILE"
-	echo "daemonize true" >> "$CFGFILE"
-	echo "pidfile $PIDFILE" >> "$CFGFILE"
-
-	# By default, wait at most 90 seconds for NTP sync
-	[ -z "$ntpsynctimeout" ] && ntpsynctimeout=90
-	for i in $(seq 1 $ntpsynctimeout); do
-		[ -f "$NTPSTRATUMFILE" ] && \
-		[ "$(cat $NTPSTRATUMFILE)" -lt 16 ] && \
-		echo "NTP synced, stratum $(cat $NTPSTRATUMFILE)" && break
-		[ "$(( $i % 10 ))" -eq 0 ] && echo "Waiting ${i} secs for NTP sync..."
-		sleep 1
-	done
-
-	aiccu start "$CFGFILE"
-
-	[ "$?" -ne 0 ] && {
-		proto_notify_error "$cfg" "AICCU_FAILED_SEE_LOG"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	proto_init_update "$link" 1
-
-	local source=""
-	[ "$sourcerouting" != "0" ] && source="::/128"
-	[ "$defaultroute" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$source"
-
-	[ -n "$ip6addr" ] && {
-		local local6="${ip6addr%%/*}"
-		local mask6="${ip6addr##*/}"
-		[[ "$local6" = "$mask6" ]] && mask6=
-		proto_add_ipv6_address "$local6" "$mask6"
-		[ "$defaultroute" != "0" -a "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
-	}
-
-	[ -n "$ip6prefix" ] && {
-		proto_add_ipv6_prefix "$ip6prefix"
-		[ "$defaultroute" != "0" -a "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
-	}
-
-	proto_send_update "$cfg"
-
-}
-
-proto_aiccu_teardown() {
-	local cfg="$1"
-	local link="aiccu-$cfg"
-	CFGFILE="/var/etc/${link}.conf"
-	PIDFILE="/var/run/${link}.pid"
-	[ -f "$CFGFILE" -a -f "$PIDFILE" ] && {
-		local pid="$(cat "$PIDFILE")"
-		[ -d /proc/$pid -a $(cat /proc/$pid/comm) = "aiccu" ] && \
-		aiccu stop "$CFGFILE"
-	}
-}
-
-proto_aiccu_init_config() {
-	no_device=1
-	available=1
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "protocol"
-	proto_config_add_string "server"
-	proto_config_add_string "ip6addr:ip6addr"
-	proto_config_add_string "ip6prefix:ip6addr"
-	proto_config_add_string "tunnelid"
-	proto_config_add_boolean "requiretls"
-	proto_config_add_boolean "defaultroute"
-	proto_config_add_boolean "sourcerouting"
-	proto_config_add_boolean "nat"
-	proto_config_add_boolean "heartbeat"
-	proto_config_add_boolean "verbose"
-	proto_config_add_int "ntpsynctimeout"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol aiccu
-}
diff --git a/trunk/package/feeds/packages/aiccu/patches/100-cross_compile.patch b/trunk/package/feeds/packages/aiccu/patches/100-cross_compile.patch
deleted file mode 100644
index dbdc50aa..00000000
--- a/trunk/package/feeds/packages/aiccu/patches/100-cross_compile.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- aiccu/unix-console/Makefile.orig	2007-09-02 23:19:39.000000000 +0200
-+++ aiccu/unix-console/Makefile	2007-09-02 23:20:11.000000000 +0200
-@@ -25,7 +25,8 @@
- # CWARNS += -Wpacked
- 
- #CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
--CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
-+CFLAGS	+= $(CWARNS) $(EXTRA_CFLAGS) -D_GNU_SOURCE
-+LDFLAGS += $(EXTRA_LDFLAGS)
- CC      = @gcc
- RM      = rm
- 
-@@ -40,25 +41,25 @@
- # GnuTLS Support ?
- # Used by TIC to secure that communication
- # Currently defaultly builds only on Linux, but other platforms might easily also support it
--ifeq ($(shell uname | grep -c "Linux"),1)
-+ifneq ($(HAVE_GNUTLS),)
- CFLAGS	+= -D AICCU_GNUTLS
- LDFLAGS += -lgnutls
- endif
- 
- # Linux
--ifeq ($(shell uname | grep -c "Linux"),1)
-+ifeq ($(OS_NAME),Linux)
- CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
- SRCS	+= ../common/aiccu_linux.c
- OBJS	+= ../common/aiccu_linux.o
--LDFLAGS	+= -lpthread -lresolv
-+LDFLAGS	+= -pthread -lresolv
- endif
- 
- # FreeBSD
--ifeq ($(shell uname | grep -c "FreeBSD"),1)
-+ifeq ($(OS_NAME),FreeBSD)
- CFLAGS	+= -D_FREEBSD
- 
- # FreeBSD 4.x
--ifeq ($(shell uname -r | cut -c 1),4)
-+ifeq ($(shell echo $(OS_VERSION) | cut -c 1),4)
- CFLAGS	+= -D AICCU_TYPE="\"freebsd4\""
- SRCS	+= ../common/aiccu_freebsd4.c
- OBJS	+= ../common/aiccu_freebsd4.o
-@@ -71,7 +72,7 @@
- endif
- 
- # DragonFlyBSD
--ifeq ($(shell uname | grep -c "DragonFly"),1)
-+ifeq ($(OS_NAME),DragonFly)
- CFLAGS	+= -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
- SRCS	+= ../common/aiccu_freebsd4.c
- OBJS	+= ../common/aiccu_freebsd4.o
-@@ -79,7 +80,7 @@
- endif
- 
- # NetBSD
--ifeq ($(shell uname | grep -c "NetBSD"),1)
-+ifeq ($(OS_NAME),NetBSD)
- CFLAGS	+= -D_NETBSD -D AICCU_TYPE="\"kame\""
- 
- # Check if net/if_tun.h has TUNSIFHEAD and enable support for it
-@@ -97,10 +98,10 @@
- endif
- 
- # OpenBSD
--ifeq ($(shell uname | grep -c "OpenBSD"),1)
-+ifeq ($(OS_NAME),OpenBSD)
- CFLAGS	+= -D_OPENBSD -D HAS_IFHEAD
- # 2.7-2.9
--ifeq ($(shell uname -r | cut -c 1),2)
-+ifeq ($(shell echo $(OS_VERSION) | cut -c 1),2)
- CFLAGS	+= -D AICCU_TYPE="\"openbsd2\""
- SRCS	+= ../common/aiccu_openbsd2.c
- OBJS	+= ../common/aiccu_openbsd2.o
-@@ -114,7 +115,7 @@
- endif
- 
- # Darwin
--ifeq ($(shell uname | grep -c "Darwin"),1)
-+ifeq ($(OS_NAME),Darwin)
- CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
- SRCS	+= ../common/aiccu_darwin.c
- OBJS	+= ../common/aiccu_darwin.o
-@@ -122,7 +123,7 @@
- endif
- 
- # SunOS / Solaris
--ifeq ($(shell uname | grep -c "SunOS"),1)
-+ifeq ($(OS_NAME),SunOS)
- CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
- SRCS	+= ../common/aiccu_sunos.c
- OBJS	+= ../common/aiccu_sunos.o
-@@ -130,7 +131,7 @@
- endif
- 
- # AIX
--ifeq ($(shell uname | grep -c "AIX"),1)
-+ifeq ($(OS_NAME),AIX)
- CC	= @/usr/vac/bin/xlc_r
- CFLAGS	= -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
- CFLAGS	+= -D AICCU_CONSOLE
diff --git a/trunk/package/feeds/packages/aiccu/patches/200-add_dn_skipname.patch b/trunk/package/feeds/packages/aiccu/patches/200-add_dn_skipname.patch
deleted file mode 100644
index ca6afcea..00000000
--- a/trunk/package/feeds/packages/aiccu/patches/200-add_dn_skipname.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nru aiccu.old/common/dn_skipname.c aiccu/common/dn_skipname.c
---- aiccu.old/common/dn_skipname.c	1970-01-01 02:00:00.000000000 +0200
-+++ aiccu/common/dn_skipname.c	2006-11-04 00:50:23.000000000 +0200
-@@ -0,0 +1,51 @@
-+#include <errno.h>
-+#include <resolv.h>
-+
-+/* Ripped from glibc 2.4 sources. */
-+
-+/*
-+ * ns_name_skip(ptrptr, eom)
-+ *      Advance *ptrptr to skip over the compressed name it points at.
-+ * return:
-+ *      0 on success, -1 (with errno set) on failure.
-+ */
-+int ns_name_skip(const u_char **ptrptr, const u_char *eom)
-+{
-+	const u_char *cp;
-+	u_int n;
-+
-+	cp = *ptrptr;
-+	while (cp < eom && (n = *cp++) != 0)
-+	{
-+		/* Check for indirection. */
-+		switch (n & NS_CMPRSFLGS) {
-+		case 0:                 /* normal case, n == len */
-+			cp += n;
-+			continue;
-+		case NS_CMPRSFLGS:      /* indirection */
-+			cp++;
-+			break;
-+		default:                /* illegal type */
-+			errno = EMSGSIZE;
-+			return (-1);
-+		}
-+		break;
-+	}
-+	if (cp > eom)
-+	{
-+		errno = EMSGSIZE;
-+		return (-1);
-+	}
-+	*ptrptr = cp;
-+	return (0);
-+}
-+
-+int dn_skipname(const u_char *ptr, const u_char *eom)
-+{
-+	const u_char *saveptr = ptr;
-+
-+	if(ns_name_skip(&ptr, eom) == -1)
-+		return (-1);
-+	return (ptr - saveptr);
-+}
-+
-diff -Nru aiccu.old/unix-console/Makefile aiccu/unix-console/Makefile
---- aiccu.old/unix-console/Makefile	2006-11-04 00:51:20.000000000 +0200
-+++ aiccu/unix-console/Makefile	2006-11-04 00:48:51.000000000 +0200
-@@ -10,9 +10,9 @@
- #  $Date: 2006-07-25 09:20:48 $
- # **********************************************************/
- 
--SRCS	= main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c
-+SRCS	= main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c ../common/dn_skipname.c
- INCS	= ../common/tun.h ../common/aiccu.h ../common/hash_md5.h ../common/hash_sha1.h ../common/common.h ../common/heartbeat.h ../common/tic.h ../common/ayiya.h ../common/resolver.h
--OBJS	= main.o ../common/tun.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o ../common/resolver.o
-+OBJS	= main.o ../common/tun.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o ../common/resolver.o ../common/dn_skipname.o
- 
- # New features not fully implemented and thus disabled for now
- #CFLAGS	+= -D NEWSTUFF_TSP -D NEWSTUFF_TEEPEE
diff --git a/trunk/package/feeds/packages/aiccu/patches/300-resolver-uclibc.patch b/trunk/package/feeds/packages/aiccu/patches/300-resolver-uclibc.patch
deleted file mode 100644
index fbd6a509..00000000
--- a/trunk/package/feeds/packages/aiccu/patches/300-resolver-uclibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- aiccu/common/resolver.c.orig	2007-09-02 23:10:58.000000000 +0200
-+++ aiccu/common/resolver.c	2007-09-02 23:11:01.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
- {
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- 	struct __res_state	res;
- #endif
- 	unsigned char		answer[8192];
-@@ -38,7 +38,7 @@
- 	uint16_t		type = 0, class = 0;
- 	uint32_t		ttl = 0;
- 
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- 	memset(&res, 0, sizeof(res));
- 	res.options = RES_DEBUG;
- 	res_ninit(&res);
-@@ -47,7 +47,7 @@
- #endif
- 
- 	memset(answer, 0, sizeof(answer));
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
diff --git a/trunk/package/feeds/packages/aircrack-ng/Makefile b/trunk/package/feeds/packages/aircrack-ng/Makefile
deleted file mode 100644
index 960ef856..00000000
--- a/trunk/package/feeds/packages/aircrack-ng/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=aircrack-ng
-PKG_VERSION:=1.2-rc1
-PKG_RELEASE:=1
-PKG_LICENSE:=GPLv2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.aircrack-ng.org/ \
-		http://archive.aircrack-ng.org/aircrack-ng/$(PKG_VERSION)/
-PKG_MD5SUM:=c2f8648c92f7e46051c86c618d4fb0d5
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/aircrack-ng
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcap +libpthread +libopenssl +libnl +wireless-tools +ethtool
-  TITLE:=WLAN tools for breaking 802.11 WEP/WPA keys
-  URL:=http://www.aircrack-ng.org/
-  MAINTAINER:=Rick Farina <zerochaos@gentoo.org>
-  SUBMENU:=wireless
-endef
-
-define Package/aircrack-ng/description
-  WLAN tools for breaking 802.11 WEP/WPA keys
-endef
-
-MAKE_FLAGS += prefix=/usr \
-	libnl=true \
-	sqlite=false \
-	unstable=false \
-	OSNAME=Linux
-
-define Package/aircrack-ng/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,aircrack-ng))
diff --git a/trunk/package/feeds/packages/alpine/Makefile b/trunk/package/feeds/packages/alpine/Makefile
deleted file mode 100644
index 322e954b..00000000
--- a/trunk/package/feeds/packages/alpine/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=alpine
-PKG_VERSION:=2.20
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://patches.freeiz.com/alpine/release/src/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MD5SUM:=043b67666af73b26f9627ad97e2aaf92
-
-PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/alpine/Default
-  SECTION:=mail
-  CATEGORY:=Mail
-  DEPENDS:=+libopenssl +libncurses +libpthread +libpam $(ICONV_DEPENDS) $(INTL_DEPENDS)
-  TITLE:=Alternatively Licensed Program for Internet News and Email
-  URL:=http://www.washington.edu/alpine
-endef
-
-define Package/alpine/Default/description
- Alpine (Alternatively Licenced Program for Internet News and Email) is a
- free software email client developed at the University of Washington.
- It is suitable for both the inexperienced email user as well as for
- the most demanding power user.
-endef
-
-define Package/alpine
-$(call Package/alpine/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+= +libcrypto +libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/alpine/description
-$(call Package/alpine/Default/description)
- This package is built with OpenSSL support.
-endef
-
-define Package/alpine-nossl
-$(call Package/alpine/Default)
-  TITLE+= (without OpenSSL support)
-  VARIANT:=nossl
-endef
-
-define Package/alpine-nossl/description
-$(call Package/alpine/Default/description)
- This package is built without OpenSSL support.
-endef
-
-CONFIGURE_ARGS += \
-	--with-libiconv-prefix=$(ICONV_PREFIX) \
-	--with-libintl-prefix=$(INTL_PREFIX) \
-	--without-tcl \
-	--without-ldap \
-	--without-krb5 \
-	--with-system-pinerc=/etc/pine.conf \
-	--with-system-fixed-pinerc=/etc/pine.conf.fixed \
-	--with-supplied-regex \
-	--with-default-sshpath=/usr/bin/ssh \
-	--disable-debug \
-	--disable-mouse \
-	--with-c-client-target=slx \
-
-CONFIGURE_VARS += \
-	top_builddir=$(PKG_BUILD_DIR)
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl-include-dir=$(STAGING_DIR)/usr/include/openssl/. \
-		--with-ssl-lib-dir=$(STAGING_DIR)/usr/lib
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--without-ssl
-endif
-
-ifeq ($(CONFIG_BUILD_NLS),y)
-  DISABLE_NLS:=
-endif
-
-ifeq ($(CONFIG_IPV6),y)
-  DISABLE_IPV6:=
-else
-  DISABLE_IPV6:=--without-ipv6
-endif
-
-define Build/Compile
-	( cd $(PKG_BUILD_DIR)/pith ; \
-		$(HOSTCC) help_h_gen.c -c -o help_h_gen.o ; \
-		$(HOSTCC) help_h_gen.o -o help_h_gen ; \
-		$(HOSTCC) help_c_gen.c -c -o help_c_gen.o ; \
-		$(HOSTCC) help_c_gen.o -o help_c_gen ; \
-	)
-	$(call Build/Compile/Default)
-endef
-
-define Package/alpine/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
-endef
-
-Package/alpine-nossl/install = $(Package/alpine/install)
-
-$(eval $(call BuildPackage,alpine))
-$(eval $(call BuildPackage,alpine-nossl))
diff --git a/trunk/package/feeds/packages/alpine/patches/100-no-openssl-check-cross-compile.patch b/trunk/package/feeds/packages/alpine/patches/100-no-openssl-check-cross-compile.patch
deleted file mode 100644
index 40430986..00000000
--- a/trunk/package/feeds/packages/alpine/patches/100-no-openssl-check-cross-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nru alpine-2.20-orig/configure alpine-2.20/configure
---- alpine-2.20-orig/configure	2015-01-18 09:00:42.100645053 +0200
-+++ alpine-2.20/configure	2015-01-25 12:01:11.831015443 +0200
-@@ -17643,10 +17643,8 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.1c" >&5
- $as_echo_n "checking Openssl library version >= 1.0.1c... " >&6; }
-   if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-diff -Nru alpine-2.20-orig/configure.ac alpine-2.20/configure.ac
---- alpine-2.20-orig/configure.ac	2015-01-18 08:38:08.893495949 +0200
-+++ alpine-2.20/configure.ac	2015-01-25 12:01:02.773015236 +0200
-@@ -1370,7 +1370,8 @@
- }
- 	]])],
- 	[ AC_MSG_RESULT(yes) ],
--	[ alpine_SSLTYPE="none" ])
-+	[ alpine_SSLTYPE="none" ],
-+	[ AC_MSG_WARN([cross compiling: not checking])])
- 
-     if test "x$alpine_SSLTYPE" = "xnone" ; then
- 	AC_MSG_ERROR(Install openssl version >= 1.0.1c)
diff --git a/trunk/package/feeds/packages/alsa-lib/Makefile b/trunk/package/feeds/packages/alsa-lib/Makefile
deleted file mode 100644
index a4ccc233..00000000
--- a/trunk/package/feeds/packages/alsa-lib/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=alsa-lib
-PKG_VERSION:=1.0.28
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
-		http://alsa.cybermirror.org/lib/
-PKG_MD5SUM:=c9e21b88a2b3e6e12ea7ba0f3b271fc3
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=LGPLv2.1 GPLv2
-PKG_LICENSE_FILES:=COPYING aserver/COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/alsa-lib
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=ALSA (Advanced Linux Sound Architecture) library
-  URL:=http://www.alsa-project.org/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  DEPENDS:=@AUDIO_SUPPORT +kmod-sound-core +libpthread +librt
-endef
-
-define Package/alsa-lib/description
- This is the library package for alsa, needed by some userspace programs.
- You must have enabled the ALSA support in the kernel.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-python \
-		--disable-debug \
-		--without-debug \
-		$(SOFT_FLOAT_CONFIG_OPTION) \
-		--with-versioned=no \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/alsa \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libasound.{la,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(1)/usr/share/aclocal
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/alsa.m4 \
-		$(1)/usr/share/aclocal/
-endef
-
-define Package/alsa-lib/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libasound.so.* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/share/alsa/{cards,pcm}
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/alsa/alsa.conf \
-		$(1)/usr/share/alsa/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/alsa/pcm/* \
-		$(1)/usr/share/alsa/pcm/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/alsa/cards/* \
-		$(1)/usr/share/alsa/cards/
-endef
-
-$(eval $(call BuildPackage,alsa-lib))
diff --git a/trunk/package/feeds/packages/alsa-lib/patches/001-link_fix.patch b/trunk/package/feeds/packages/alsa-lib/patches/001-link_fix.patch
deleted file mode 100644
index 001a8bc6..00000000
--- a/trunk/package/feeds/packages/alsa-lib/patches/001-link_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -418,7 +418,7 @@ clean-libLTLIBRARIES:
- 	  rm -f $${locs}; \
- 	}
- libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
---- a/src/pcm/scopes/Makefile.in
-+++ b/src/pcm/scopes/Makefile.in
-@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES:
- 	  rm -f $${locs}; \
- 	}
- scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/trunk/package/feeds/packages/alsa-lib/patches/002-remove_cross_compile_guess.patch b/trunk/package/feeds/packages/alsa-lib/patches/002-remove_cross_compile_guess.patch
deleted file mode 100644
index d8f9f122..00000000
--- a/trunk/package/feeds/packages/alsa-lib/patches/002-remove_cross_compile_guess.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
- 
- dnl Checks for programs.
- 
--dnl try to gues cross-compiler if not set
--if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
--then
--  AC_MSG_CHECKING(for cross-compiler)
--
--  which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
--  which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
--  && CC=${host_cpu}-${host_os}-gcc
--  which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
--  && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
--
--  AC_MSG_RESULT($CC)
--fi
--	    
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
- 
- 
diff --git a/trunk/package/feeds/packages/alsa-utils/Makefile b/trunk/package/feeds/packages/alsa-utils/Makefile
deleted file mode 100644
index f7c87526..00000000
--- a/trunk/package/feeds/packages/alsa-utils/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=alsa-utils
-PKG_VERSION:=1.0.28
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \
-		http://alsa.cybermirror.org/utils/
-PKG_MD5SUM:=361552d5b1cacd0a1e7ba09e69990211
-PKG_INSTALL:=1
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/alsa-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+alsa-lib +libncurses +libpthread
-  TITLE:=ALSA (Advanced Linux Sound Architecture) utilities
-  URL:=http://www.alsa-project.org/
-endef
-
-define Package/alsa-utils-seq
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+alsa-lib +libpthread
-  TITLE:=ALSA sequencer utilities
-  URL:=http://www.alsa-project.org/
-endef
-
-define Package/alsa-utils-tests
-  $(call Package/alsa-utils/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=ALSA utilities test data (adds ~1.3M to image)
-  DEPENDS:=+alsa-lib +libpthread
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-rpath \
-		--disable-alsatest \
-		--disable-xmlto \
-		, \
-		ac_cv_prog_ncurses5_config=no \
-		ac_cv_prog_ncursesw5_config=no \
-	)
-endef
-
-define Package/alsa-utils/install
-	$(INSTALL_DIR) $(1)/usr/{s,}bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amixer $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alsamixer $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aplay $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/arecord $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/alsactl $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/usr/share/alsa/init
-	$(INSTALL_DATA) \
-	    $(PKG_INSTALL_DIR)/usr/share/alsa/init/* \
-	    $(1)/usr/share/alsa/init/
-endef
-
-define Package/alsa-utils-seq/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aconnect $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aplaymidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/arecordmidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aseqdump $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aseqnet $(1)/usr/bin/
-endef
-
-define Package/alsa-utils-tests/install
-	$(INSTALL_DIR) $(1)/usr/{s,}bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/speaker-test $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/sounds/alsa
-	$(INSTALL_DATA) \
-	    $(PKG_INSTALL_DIR)/usr/share/sounds/alsa/* \
-	    $(1)/usr/share/sounds/alsa/
-endef
-
-$(eval $(call BuildPackage,alsa-utils))
-$(eval $(call BuildPackage,alsa-utils-seq))
-$(eval $(call BuildPackage,alsa-utils-tests))
diff --git a/trunk/package/feeds/packages/alsa-utils/patches/100-uClibc-compat.patch b/trunk/package/feeds/packages/alsa-utils/patches/100-uClibc-compat.patch
deleted file mode 100644
index 987c9b8b..00000000
--- a/trunk/package/feeds/packages/alsa-utils/patches/100-uClibc-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/alsamixer/volume_mapping.c
-+++ b/alsamixer/volume_mapping.c
-@@ -114,9 +114,9 @@ static double get_normalized_volume(snd_
- 	if (use_linear_dB_scale(min, max))
- 		return (value - min) / (double)(max - min);
- 
--	normalized = exp10((value - max) / 6000.0);
-+	normalized = pow(10, (value - max) / 6000.0);
- 	if (min != SND_CTL_TLV_DB_GAIN_MUTE) {
--		min_norm = exp10((min - max) / 6000.0);
-+		min_norm = pow(10, (min - max) / 6000.0);
- 		normalized = (normalized - min_norm) / (1 - min_norm);
- 	}
- 
-@@ -149,7 +149,7 @@ static int set_normalized_volume(snd_mix
- 	}
- 
- 	if (min != SND_CTL_TLV_DB_GAIN_MUTE) {
--		min_norm = exp10((min - max) / 6000.0);
-+		min_norm = pow(10, (min - max) / 6000.0);
- 		volume = volume * (1 - min_norm) + min_norm;
- 	}
- 	value = lrint_dir(6000.0 * log10(volume), dir) + max;
diff --git a/trunk/package/feeds/packages/announce/Makefile b/trunk/package/feeds/packages/announce/Makefile
deleted file mode 100644
index 60d9e63f..00000000
--- a/trunk/package/feeds/packages/announce/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=announce
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=src/LICENSE.txt
-PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/probonopd/announce.git
-PKG_SOURCE_VERSION:=1368525c7305ca5bb4134242f332344f5f7e94e3
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_BUILD_DEPENDS:= +libpthread
-
-define Package/announce
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=IP Addresses and Names
-	TITLE:=Announce services on the network with Zeroconf/Bonjour 
-	URL:=https://github.com/probonopd/announce
-	DEPENDS:= +libpthread 
-endef
-
-define Package/announce/description
-  Announce services on the network with Zeroconf/Bonjour.
-  This announces services such as ssh, sftp, and http running on the local machine
-  to the network.
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) $(PKG_BUILD_DIR)/src/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/announce/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/announce $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/announce.initscript $(1)/etc/init.d/announce
-endef
-
-$(eval $(call BuildPackage,announce))
diff --git a/trunk/package/feeds/packages/apache/Makefile b/trunk/package/feeds/packages/apache/Makefile
deleted file mode 100644
index dde5bcae..00000000
--- a/trunk/package/feeds/packages/apache/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apache
-PKG_VERSION:=2.2.29
-PKG_RELEASE:=1
-PKG_SOURCE_NAME:=httpd
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=Apache License
-
-PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://mirrors.ibiblio.org/apache/httpd/ \
-		http://apache.imsam.info/httpd/
-PKG_MD5SUM:=579342fdeaa7b8b68d17fee91f8fab6e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/apache/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The Apache Web Server
-  URL:=http://httpd.apache.org/
-endef
-
-define Package/apache/Default/description
- The Apache Web Server is a powerful and flexible HTTP/1.1 compliant
- web server.  Originally designed as a replacement for the NCSA HTTP
- Server, it has grown to be the most popular web server on the Internet.
-endef
-
-define Package/apache
-$(call Package/apache/Default)
-  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc
-endef
-
-define Package/apache/description
-$(call Package/apache/Default/description)
- .
- This package contains the Apache web server and utility programs.
- .
- Take care that you don't include apache at the moment into your image
- please select it only as module because busybox will override
- /usr/sbin/httpd. It'll be solved soon. If you need to include this
- package in the image anyway, remove httpd from busybox
- (Base system --> Configuration --> Networking Utilities --> httpd).
- Also you should take care for the initscripts, apache's httpd isn't
- compatible with the one from busybox, so if you want to use apache
- for running your webif, you'll need to change the parameters in the
- scripts and configure the rest in /etc/httpd.conf.
-endef
-
-define Package/apache/conffiles
-/etc/apache/httpd.conf
-/etc/apache/extra/httpd-autoindex.conf
-/etc/apache/extra/httpd-dav.conf
-/etc/apache/extra/httpd-default.conf
-/etc/apache/extra/httpd-info.conf
-/etc/apache/extra/httpd-languages.conf
-/etc/apache/extra/httpd-manual.conf
-/etc/apache/extra/httpd-mpm.conf
-/etc/apache/extra/httpd-multilang-errordoc.conf
-/etc/apache/extra/httpd-ssl.conf
-/etc/apache/extra/httpd-userdir.conf
-/etc/apache/extra/httpd-vhosts.conf
-/etc/apache/magic
-/etc/apache/mime.types
-endef
-
-define Package/apache-icons
-$(call Package/apache/Default)
-  TITLE:=Icons from Apache
-  DEPENDS:=apache
-endef
-
-define Package/apache-icons/description
-$(call Package/apache/Default/description)
- .
- This package contains the icons from Apache.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-		--with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
-		--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
-		--enable-http \
-		--enable-ssl \
-		--enable-proxy \
-		--disable-disk-cache \
-		--enable-maintainer-mode \
-		--enable-mime-magic \
-		--without-suexec-bin \
-		--sysconfdir=/etc/apache \
-		ap_cv_void_ptr_lt_long=no \
-		logfiledir="/var/log" \
-		runtimedir="/var/run" \
-	)
-endef
-
-define Build/InstallDev
-	rm -rf	$(PKG_INSTALL_DIR)/usr/man/ \
-		$(PKG_INSTALL_DIR)/usr/share/manual/
-	# if you need docs take a look into the build-dir :)
-	$(INSTALL_DIR) $(1)/etc
-	$(CP)   $(PKG_INSTALL_DIR)/etc/* \
-		$(1)/etc
-	$(INSTALL_DIR) $(1)/usr/include/apache
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/apache
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/httpd.exp \
-		$(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP)   $(PKG_INSTALL_DIR)/usr/sbin/* \
-		$(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP)   $(PKG_INSTALL_DIR)/usr/share/* \
-		$(1)/usr/share
-endef
-
-define Package/apache/preinst
-	rm /usr/sbin/httpd
-	echo -e "You should take a look in the initscripts, busybox's httpd \n\
-	uses some parameters which are maybe unsupported by apache."
-endef
-
-define Package/apache/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	# we don't need apxs on the router, it's just for building apache modules.
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/httpd.exp $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/
-	$(INSTALL_DIR) $(1)/etc/apache
-	$(CP) $(PKG_INSTALL_DIR)/etc/apache/{httpd.conf,magic,mime.types,extra} $(1)/etc/apache/
-endef
-
-define Package/apache/postrm
-	rm -rf /usr/sbin/httpd
-	ln -s /bin/busybox /usr/sbin/httpd
-	echo -e "You may need to change your initscripts back for the use \n\
-		with busybox's httpd."
-endef
-
-define Package/apache-icons/install
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/icons $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,apache))
-$(eval $(call BuildPackage,apache-icons))
diff --git a/trunk/package/feeds/packages/apache/patches/001-Makefile_in.patch b/trunk/package/feeds/packages/apache/patches/001-Makefile_in.patch
deleted file mode 100644
index 0bccfd3b..00000000
--- a/trunk/package/feeds/packages/apache/patches/001-Makefile_in.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/server/Makefile.in
-+++ b/server/Makefile.in
-@@ -26,7 +26,10 @@ gen_test_char: $(gen_test_char_OBJECTS)
- 	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
- 
- test_char.h: gen_test_char
--	./gen_test_char > test_char.h
-+	true
-+#	./gen_test_char > test_char.h
-+#	doesn't matter if you run it on the buildhost or on an wl500gd,
-+#	same output on both, so i just patched in the test_char.h :).
- 
- util.lo: test_char.h
- 
diff --git a/trunk/package/feeds/packages/apache/patches/002-test_char_h.patch b/trunk/package/feeds/packages/apache/patches/002-test_char_h.patch
deleted file mode 100644
index e8ea3cd1..00000000
--- a/trunk/package/feeds/packages/apache/patches/002-test_char_h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- /dev/null
-+++ b/server/test_char.h
-@@ -0,0 +1,23 @@
-+/* this file is automatically generated by gen_test_char, do not edit */
-+#define T_ESCAPE_SHELL_CMD     (1)
-+#define T_ESCAPE_PATH_SEGMENT  (2)
-+#define T_OS_ESCAPE_PATH       (4)
-+#define T_HTTP_TOKEN_STOP      (8)
-+#define T_ESCAPE_LOGITEM       (16)
-+#define T_ESCAPE_FORENSIC      (32)
-+
-+static const unsigned char test_char_table[256] = {
-+    32,62,62,62,62,62,62,62,62,62,63,62,62,62,62,62,62,62,62,62,
-+    62,62,62,62,62,62,62,62,62,62,62,62,14,0,23,6,1,38,1,1,
-+    9,9,1,0,8,0,0,10,0,0,0,0,0,0,0,0,0,0,40,15,
-+    15,8,15,15,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,15,31,15,7,0,7,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,15,39,15,1,62,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
-+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
-+};
diff --git a/trunk/package/feeds/packages/apache/patches/003-logdir_fix.patch b/trunk/package/feeds/packages/apache/patches/003-logdir_fix.patch
deleted file mode 100644
index 635c65ca..00000000
--- a/trunk/package/feeds/packages/apache/patches/003-logdir_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/build/mkconfNW.awk
-+++ b/build/mkconfNW.awk
-@@ -24,7 +24,7 @@ BEGIN {
-     A["sysconfdir"] = "conf"
-     A["iconsdir"] = "icons"
-     A["manualdir"] = "manual"
--    A["runtimedir"] = "logs"
-+    A["runtimedir"] = "log"
-     A["errordir"] = "error"
-     A["proxycachedir"] = "proxy"
- 
---- a/config.layout
-+++ b/config.layout
-@@ -28,8 +28,8 @@
-     cgidir:        ${datadir}/cgi-bin
-     includedir:    ${prefix}/include
-     localstatedir: ${prefix}
--    runtimedir:    ${localstatedir}/logs
--    logfiledir:    ${localstatedir}/logs
-+    runtimedir:    ${localstatedir}/log
-+    logfiledir:    ${localstatedir}/log
-     proxycachedir: ${localstatedir}/proxy
- </Layout>
- 
-@@ -150,7 +150,7 @@
-     includedir:    ${prefix}/include
-     localstatedir: /var${prefix}
-     runtimedir:    ${localstatedir}/run
--    logfiledir:    ${localstatedir}/logs
-+    logfiledir:    ${localstatedir}/log
-     proxycachedir: ${localstatedir}/proxy
- </Layout>
- 
diff --git a/trunk/package/feeds/packages/apache/patches/004-pidfile_fix.patch b/trunk/package/feeds/packages/apache/patches/004-pidfile_fix.patch
deleted file mode 100644
index e9f0b6de..00000000
--- a/trunk/package/feeds/packages/apache/patches/004-pidfile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/scoreboard.h
-+++ b/include/scoreboard.h
-@@ -42,7 +42,7 @@ extern "C" {
- 
- /* Scoreboard file, if there is one */
- #ifndef DEFAULT_SCOREBOARD
--#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
-+#define DEFAULT_SCOREBOARD "log/apache_runtime_status"
- #endif
- 
- /* Scoreboard info on a process is, for now, kept very brief --- 
diff --git a/trunk/package/feeds/packages/apache/patches/005-httpd_conf.patch b/trunk/package/feeds/packages/apache/patches/005-httpd_conf.patch
deleted file mode 100644
index 60f0dca9..00000000
--- a/trunk/package/feeds/packages/apache/patches/005-httpd_conf.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/docs/conf/httpd.conf.in
-+++ b/docs/conf/httpd.conf.in
-@@ -51,7 +51,6 @@ Listen @@Port@@
- # Example:
- # LoadModule foo_module modules/mod_foo.so
- #
--@@LoadModule@@
- 
- <IfModule !mpm_netware_module>
- <IfModule !mpm_winnt_module>
-@@ -63,8 +62,8 @@ Listen @@Port@@
- # It is usually good practice to create a dedicated user and group for
- # running httpd, as with most system services.
- #
--User daemon
--Group daemon
-+User nobody
-+Group nogroup
- 
- </IfModule>
- </IfModule>
-@@ -191,7 +190,7 @@ ErrorLog "@rel_logfiledir@/error_log"
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- #
--LogLevel warn
-+LogLevel debug
- 
- <IfModule log_config_module>
-     #
-@@ -336,7 +335,7 @@ DefaultType text/plain
- # contents of the file itself to determine its type.  The MIMEMagicFile
- # directive tells the module where the hint definitions are located.
- #
--#MIMEMagicFile @rel_sysconfdir@/magic
-+MIMEMagicFile @rel_sysconfdir@/magic
- 
- #
- # Customizable error responses come in three flavors:
-@@ -358,7 +357,7 @@ DefaultType text/plain
- # broken on your system.
- #
- #EnableMMAP off
--#EnableSendfile off
-+EnableSendfile off
- 
- # Supplemental configuration
- #
-@@ -404,7 +403,7 @@ DefaultType text/plain
- #       starting without SSL on platforms with no /dev/random equivalent
- #       but a statically compiled-in mod_ssl.
- #
--<IfModule ssl_module>
--SSLRandomSeed startup builtin
--SSLRandomSeed connect builtin
--</IfModule>
-+#<IfModule ssl_module>
-+#SSLRandomSeed startup builtin
-+#SSLRandomSeed connect builtin
-+#</IfModule>
diff --git a/trunk/package/feeds/packages/apcupsd/Makefile b/trunk/package/feeds/packages/apcupsd/Makefile
deleted file mode 100644
index fd8236d8..00000000
--- a/trunk/package/feeds/packages/apcupsd/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apcupsd
-PKG_VERSION:=3.14.13
-PKG_RELEASE:=4
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/apcupsd
-PKG_MD5SUM:=c291d9d3923b4d9c0e600b755ad4f489
-
-PKG_BUILD_DEPENDS:=libgd
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/apcupsd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +libusb-compat
-  TITLE:=UPS control software
-  URL:=http://www.apcupsd.org/
-endef
-
-define Package/apcupsd-cgi
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +libgd
-  TITLE:=UPS control software CGI module
-  URL:=http://www.apcupsd.org/
-endef
-
-define Build/Configure
-	$(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/autoconf/
-	$(call Build/Configure/Default, \
-		--with-distname=unknown \
-		--sysconfdir=/etc/apcupsd \
-		--enable-cgi \
-		--enable-usb \
-		--enable-modbus-usb \
-		--without-x \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LD="$(TARGET_CC)" \
-		all install
-endef
-
-define Package/apcupsd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcupsd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smtp $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apctest $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcaccess $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/apcupsd
-	$(INSTALL_CONF) ./files/apcupsd.conf $(1)/etc/apcupsd/
-	$(INSTALL_CONF) ./files/apcupsd_mail.conf $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/changeme $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/commfailure $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/commok $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/offbattery $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/onbattery $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/apccontrol $(1)/etc/apcupsd/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN)	./files/apcupsd.init $(1)/etc/init.d/apcupsd
-endef
-
-define Package/apcupsd-cgi/install
-	$(INSTALL_DIR) $(1)/www/cgi-bin/apcupsd
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/apcupsd/*.cgi $(1)/www/cgi-bin/apcupsd
-	$(INSTALL_DIR) $(1)/etc/apcupsd
-	$(INSTALL_CONF) ./files/apcupsd.css $(1)/etc/apcupsd/
-	$(INSTALL_CONF) ./files/hosts.conf $(1)/etc/apcupsd/
-	$(INSTALL_CONF) ./files/multimon.conf $(1)/etc/apcupsd/
-endef
-
-define Package/apcupsd/conffiles
-/etc/apcupsd/apcupsd.conf
-/etc/apcupsd/apcupsd_mail.conf
-/etc/apcupsd/changeme
-/etc/apcupsd/commfailure
-/etc/apcupsd/commok
-/etc/apcupsd/offbattery
-/etc/apcupsd/onbattery
-endef
-
-define Package/apcupsd-cgi/conffiles
-/etc/apcupsd/apcupsd.css
-/etc/apcupsd/hosts.conf
-/etc/apcupsd/multimon.conf
-endef
-
-$(eval $(call BuildPackage,apcupsd))
-$(eval $(call BuildPackage,apcupsd-cgi))
diff --git a/trunk/package/feeds/packages/apcupsd/files/apccontrol b/trunk/package/feeds/packages/apcupsd/files/apccontrol
deleted file mode 100644
index 25493541..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/apccontrol
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
-#
-#  for apcupsd release 3.14.1 (04 May 2007) - unknown
-#
-# platforms/apccontrol.  Generated from apccontrol.in by configure.
-#
-#  Note, this is a generic file that can be used by most
-#   systems. If a particular system needs to have something
-#   special, start with this file, and put a copy in the
-#   platform subdirectory.
-#
-
-#
-# These variables are needed for set up the autoconf other variables.
-#
-prefix=/usr
-exec_prefix=/usr
-
-APCPID=/var/run/apcupsd.pid
-APCUPSD=/usr/sbin/apcupsd
-SHUTDOWN=/sbin/shutdown
-SCRIPTSHELL=/bin/sh
-SCRIPTDIR=/etc/apcupsd
-WALL=true
-
-#
-# Concatenate all output from this script to the events file
-#  Note, the following kills the script in a power fail situation
-#   where the disks are mounted read-only.
-# exec >>/var/log/apcupsd.events 2>&1
-
-#
-# This piece is to substitute the default behaviour with your own script,
-# perl, or C program.
-# You can customize every single command creating an executable file (may be a
-# script or a compiled program) and calling it the same as the $1 parameter
-# passed by apcupsd to this script.
-#
-# After executing your script, apccontrol continues with the default action.
-# If you do not want apccontrol to continue, exit your script with exit 
-# code 99. E.g. "exit 99".
-#
-# WARNING: the apccontrol file will be overwritten every time you update your
-# apcupsd, doing `make install'. Your own customized scripts will _not_ be
-# overwritten. If you wish to make changes to this file (discouraged), you
-# should change apccontrol.sh.in and then rerun the configure process.
-#
-if [ -f ${SCRIPTDIR}/${1} -a -x ${SCRIPTDIR}/${1} ]
-then
-    ${SCRIPTDIR}/${1} ${2} ${3} ${4}
-    # exit code 99 means he does not want us to do default action
-    if [ $? = 99 ] ; then
-	exit 0
-    fi
-fi
-
-case "$1" in
-    killpower)
-	echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}"
-	sleep 10
-	${APCUPSD} --killpower
-	echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
-    ;;
-    commfailure)
-	echo "Warning communications lost with UPS ${2}" | ${WALL}
-    ;;
-    commok)
-	echo "Communications restored with UPS ${2}" | ${WALL}
-    ;;
-#
-# powerout, onbattery, offbattery, mainsback events occur
-#   in that order.
-#
-    powerout)
-	echo "Warning power loss detected on UPS ${2}" | ${WALL}
-    ;;
-    onbattery)
-	echo "Power failure on UPS ${2}. Running on batteries." | ${WALL}
-    ;;
-    offbattery)
-    ;;
-    mainsback)
-	echo "Power has returned on UPS ${2}..." | ${WALL}
-	if [ -f /etc/powerfail ] ; then
-	   printf "Continuing with shutdown."  | ${WALL}
-	fi
-    ;;
-    failing)
-	echo "Battery power exhaused on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    timeout)
-	echo "Battery time limit exceeded on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    loadlimit)
-	echo "Remaining battery charge below limit on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    runlimit)
-	echo "Remaining battery runtime below limit on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    doreboot)
-	echo "UPS ${2} initiating Reboot Sequence" | ${WALL}
-	${SHUTDOWN} -r now "apcupsd UPS ${2} initiated reboot"
-    ;;
-    doshutdown)
-	echo "UPS ${2} initiated Shutdown Sequence" | ${WALL}
-	${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown"
-    ;;
-    annoyme)
-	echo "Power problems with UPS ${2}. Please logoff." | ${WALL}
-    ;;
-    emergency)
-	echo "Emergency Shutdown. Possible battery failure on UPS ${2}." | ${WALL}
-    ;;
-    changeme)
-	echo "Emergency! Batteries have failed on UPS ${2}. Change them NOW" | ${WALL}
-    ;;
-    remotedown)
-	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-    ;;
-    restartme)
-	echo -n "Restarting APCUPSD Power Management: "
-	THEPID=`cat ${APCPID}`
-	kill ${THEPID}
-	rm -f ${APCPID}
-	rm -f /etc/powerfail
-	rm -f /etc/nologin
-	sleep 5
-	`${APCUPSD}`
-	echo "apcupsd"
-    ;;
-    startselftest)
-    ;;
-    endselftest)
-    ;;
-    battdetach)
-    ;;
-    battattach)
-    ;;
-    *)	echo "Usage: ${0##*/} command"
-	echo "	     warning: this script is intended to be launched by"
-	echo "	     apcupsd and should never be launched by users."
-	exit 1
-    ;;
-esac
diff --git a/trunk/package/feeds/packages/apcupsd/files/apcupsd.conf b/trunk/package/feeds/packages/apcupsd/files/apcupsd.conf
deleted file mode 100644
index b9acd61d..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/apcupsd.conf
+++ /dev/null
@@ -1,322 +0,0 @@
-## apcupsd.conf v1.1 ##
-# 
-#  for apcupsd release 3.14.1 (04 May 2007) - unknown
-#
-# "apcupsd" POSIX config file
-
-#
-# ========= General configuration parameters ============
-#
-
-# UPSNAME xxx
-#   Use this to give your UPS a name in log files and such. This
-#   is particulary useful if you have multiple UPSes. This does not
-#   set the EEPROM. It should be 8 characters or less.
-UPSNAME ups1
-
-# UPSCABLE <cable>
-#   Defines the type of cable connecting the UPS to your computer.
-#
-#   Possible generic choices for <cable> are:
-#     simple, smart, ether, usb
-#
-#   Or a specific cable model number may be used:
-#     940-0119A, 940-0127A, 940-0128A, 940-0020B,
-#     940-0020C, 940-0023A, 940-0024B, 940-0024C,
-#     940-1524C, 940-0024G, 940-0095A, 940-0095B,
-#     940-0095C, M-04-02-2000
-#
-UPSCABLE smart
-
-# To get apcupsd to work, in addition to defining the cable
-# above, you must also define a UPSTYPE, which corresponds to
-# the type of UPS you have (see the Description for more details).
-# You must also specify a DEVICE, sometimes referred to as a port.
-# For USB UPSes, please leave the DEVICE directive blank. For
-# other UPS types, you must specify an appropriate port or address.
-#
-# UPSTYPE   DEVICE           Description
-# apcsmart  /dev/tty**       Newer serial character device,
-#                            appropriate for SmartUPS models using
-#                            a serial cable (not USB).
-#
-# usb       <BLANK>          Most new UPSes are USB. A blank DEVICE
-#                            setting enables autodetection, which is
-#                            the best choice for most installations.
-#
-# net       hostname:port    Network link to a master apcupsd
-#                            through apcupsd's Network Information
-#                            Server. This is used if you don't have
-#                            a UPS directly connected to your computer.
-#
-# snmp      hostname:port:vendor:community
-#                            SNMP Network link to an SNMP-enabled
-#                            UPS device. Vendor is the MIB used by
-#                            the UPS device: can be "APC", "APC_NOTRAP"
-#                            or "RFC" where APC is the powernet MIB,
-#                            "APC_NOTRAP" is powernet with SNMP trap
-#                            catching disabled, and RFC is the IETF's 
-#                            rfc1628 UPS-MIB. You usually want "APC".
-#                            Port is usually 161. Community is usually
-#                            "private".
-#
-# dumb      /dev/tty**       Old serial character device for use 
-#                            with simple-signaling UPSes.
-#
-# pcnet    ipaddr:username:passphrase
-#                            PowerChute Network Shutdown protocol
-#                            which can be used as an alternative to SNMP
-#                            with AP9617 family of smart slot cards.
-#                            ipaddr is the IP address of the UPS mgmt
-#                            card. username and passphrase are the
-#                            credentials for which the card has been
-#                            configured.
-#
-UPSTYPE apcsmart
-DEVICE /dev/ttyS0
-
-
-# LOCKFILE <path to lockfile>
-#   Path for device lock file. Not used on Win32.
-LOCKFILE /var/lock
-
-# SCRIPTDIR <path to script directory>
-#   Directory in which apccontrol and event scripts are located.
-SCRIPTDIR /etc/apcupsd
-
-# PWRFAILDIR <path to powerfail directory>
-#   Directory in which to write the powerfail flag file. This file
-#   is created when apcupsd initiates a system shutdown and is
-#   checked in the OS halt scripts to determine if a killpower
-#   (turning off UPS output power) is required.
-PWRFAILDIR /etc
-
-# NOLOGINDIR <path to nologin directory>
-#   Directory in which to write the nologin file. The existence
-#   of this flag file tells the OS to disallow new logins.
-NOLOGINDIR /etc
-
-
-#
-# ======== Configuration parameters used during power failures ==========
-#
-
-# The ONBATTERYDELAY is the time in seconds from when a power failure
-#   is detected until we react to it with an onbattery event.
-#
-#   This means that, apccontrol will be called with the powerout argument
-#   immediately when a power failure is detected.  However, the
-#   onbattery argument is passed to apccontrol only after the 
-#   ONBATTERYDELAY time.  If you don't want to be annoyed by short
-#   powerfailures, make sure that apccontrol powerout does nothing
-#   i.e. comment out the wall.
-#ONBATTERYDELAY 6
-
-# 
-# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so
-# the first that occurs will cause the initation of a shutdown.
-#
-
-# If during a power failure, the remaining battery percentage
-# (as reported by the UPS) is below or equal to BATTERYLEVEL, 
-# apcupsd will initiate a system shutdown.
-BATTERYLEVEL 5
-
-# If during a power failure, the remaining runtime in minutes 
-# (as calculated internally by the UPS) is below or equal to MINUTES,
-# apcupsd, will initiate a system shutdown.
-MINUTES 3
-
-# If during a power failure, the UPS has run on batteries for TIMEOUT
-# many seconds or longer, apcupsd will initiate a system shutdown.
-# A value of 0 disables this timer.
-#
-#  Note, if you have a Smart UPS, you will most likely want to disable
-#    this timer by setting it to zero. That way, you UPS will continue
-#    on batteries until either the % charge remaing drops to or below BATTERYLEVEL,
-#    or the remaining battery runtime drops to or below MINUTES.  Of course,
-#    if you are testing, setting this to 60 causes a quick system shutdown
-#    if you pull the power plug.   
-#  If you have an older dumb UPS, you will want to set this to less than
-#    the time you know you can run on batteries.
-TIMEOUT 0
-
-#  Time in seconds between annoying users to signoff prior to
-#  system shutdown. 0 disables.
-ANNOY 300
-
-# Initial delay after power failure before warning users to get
-# off the system.
-ANNOYDELAY 60
-
-# The condition which determines when users are prevented from
-# logging in during a power failure.
-# NOLOGON <string> [ disable | timeout | percent | minutes | always ]
-NOLOGON disable
-
-# If KILLDELAY is non-zero, apcupsd will continue running after a
-# shutdown has been requested, and after the specified time in
-# seconds attempt to kill the power. This is for use on systems
-# where apcupsd cannot regain control after a shutdown.
-# KILLDELAY <seconds>  0 disables
-KILLDELAY 0
-
-#
-# ==== Configuration statements for Network Information Server ====
-#
-
-# NETSERVER [ on | off ] on enables, off disables the network
-#  information server. If netstatus is on, a network information
-#  server process will be started for serving the STATUS and
-#  EVENT data over the network (used by CGI programs).
-NETSERVER on
-
-# NISIP <dotted notation ip address>
-#  IP address on which NIS server will listen for incoming connections.
-#  This is useful if your server is multi-homed (has more than one
-#  network interface and IP address). Default value is 0.0.0.0 which
-#  means any incoming request will be serviced. Alternatively, you can
-#  configure this setting to any specific IP address of your server and 
-#  NIS will listen for connections only on that interface. Use the
-#  loopback address (127.0.0.1) to accept connections only from the
-#  local machine.
-NISIP 0.0.0.0
-
-# NISPORT <port> default is 3551 as registered with the IANA
-#  port to use for sending STATUS and EVENTS data over the network.
-#  It is not used unless NETSERVER is on. If you change this port,
-#  you will need to change the corresponding value in the cgi directory
-#  and rebuild the cgi programs.
-NISPORT 3551
-
-# If you want the last few EVENTS to be available over the network
-# by the network information server, you must define an EVENTSFILE.
-EVENTSFILE /var/log/apcupsd.events
-
-# EVENTSFILEMAX <kilobytes>
-#  By default, the size of the EVENTSFILE will be not be allowed to exceed
-#  10 kilobytes.  When the file grows beyond this limit, older EVENTS will
-#  be removed from the beginning of the file (first in first out).  The
-#  parameter EVENTSFILEMAX can be set to a different kilobyte value, or set
-#  to zero to allow the EVENTSFILE to grow without limit.
-EVENTSFILEMAX 10
-
-#
-# ========== Configuration statements used if sharing =============
-#            a UPS with more than one machine
-
-# NETTIME <int>
-#   Interval (in seconds) at which the NIS client polls the server.
-#   Used only when this apcupsd is a network client (UPSTYPE net).
-#NETTIME 60
-
-#
-# Remaining items are for ShareUPS (APC expansion card) ONLY
-#
-
-# UPSCLASS [ standalone | shareslave | sharemaster ]
-#   Normally standalone unless you share an UPS using an APC ShareUPS
-#   card.
-UPSCLASS standalone
-
-# UPSMODE [ disable | share ]
-#   Normally disable unless you share an UPS using an APC ShareUPS card.
-UPSMODE disable
-
-#
-# ===== Configuration statements to control apcupsd system logging ========
-#
-
-# Time interval in seconds between writing the STATUS file; 0 disables
-STATTIME 0
-
-# Location of STATUS file (written to only if STATTIME is non-zero)
-STATFILE /var/log/apcupsd.status
-
-# LOGSTATS [ on | off ] on enables, off disables
-# Note! This generates a lot of output, so if         
-#       you turn this on, be sure that the
-#       file defined in syslog.conf for LOG_NOTICE is a named pipe.
-#  You probably do not want this on.
-LOGSTATS off
-
-# Time interval in seconds between writing the DATA records to
-#   the log file. 0 disables.
-DATATIME 0
-
-# FACILITY defines the logging facility (class) for logging to syslog. 
-#          If not specified, it defaults to "daemon". This is useful 
-#          if you want to separate the data logged by apcupsd from other
-#          programs.
-#FACILITY DAEMON
-
-#
-# ========== Configuration statements used in updating the UPS EPROM =========
-#
-
-#
-# These statements are used only by apctest when choosing "Set EEPROM with conf
-# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD.
-#
-
-# UPS name, max 8 characters 
-#UPSNAME UPS_IDEN
-
-# Battery date - 8 characters
-#BATTDATE mm/dd/yy
-
-# Sensitivity to line voltage quality (H cause faster transfer to batteries)  
-# SENSITIVITY H M L        (default = H)
-#SENSITIVITY H
-
-# UPS delay after power return (seconds)
-# WAKEUP 000 060 180 300   (default = 0)
-#WAKEUP 60
-
-# UPS Grace period after request to power off (seconds)
-# SLEEP 020 180 300 600    (default = 20)
-#SLEEP 180
-
-# Low line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 106 103 100 097
-#    M 177 172 168 182
-#    A 092 090 088 086
-#    I 208 204 200 196     (default = 0 => not valid)
-#LOTRANSFER  208
-
-# High line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 127 130 133 136
-#    M 229 234 239 224
-#    A 108 110 112 114
-#    I 253 257 261 265     (default = 0 => not valid)
-#HITRANSFER 253
-
-# Battery charge needed to restore power
-# RETURNCHARGE 00 15 50 90 (default = 15)
-#RETURNCHARGE 15
-
-# Alarm delay 
-# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never
-# BEEPSTATE 0 T L N        (default = 0)
-#BEEPSTATE T
-
-# Low battery warning delay in minutes
-# LOWBATT 02 05 07 10      (default = 02)
-#LOWBATT 2
-
-# UPS Output voltage when running on batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 115
-#    M 208
-#    A 100
-#    I 230 240 220 225     (default = 0 => not valid)
-#OUTPUTVOLTS 230
-
-# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on
-# SELFTEST 336 168 ON OFF  (default = 336)
-#SELFTEST 336
diff --git a/trunk/package/feeds/packages/apcupsd/files/apcupsd.css b/trunk/package/feeds/packages/apcupsd/files/apcupsd.css
deleted file mode 100644
index e98c75e5..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/apcupsd.css
+++ /dev/null
@@ -1,64 +0,0 @@
-body {
-        color: black;
-        background: white;
-}
-
-div.Center {
-        text-align: center;
-}
-
-img {
-        border-style: none;
-}
-
-pre {
-        text-align: left;
-}
-
-strong {
-        color: red;
-}
-
-table.Outer {
-        color: black;
-        background: #60a0a0;
-        empty-cells: show; border: solid #60a0a0
-}
-
-th.Outer {
-        color: black;
-        background: #60b0b0
-}
-
-.Title {
-        font-size: 18pt;
-}
-
-.SubTitle {
-        font-size: 12pt;
-}
-
-.Empty {
-        color: black;
-        background: aqua;
-}
-
-.Fault {
-        color: black;
-        background: red;
-}
-
-.Label {
-        color: black;
-        background: aqua;
-}
-
-.Normal {
-        color: black;
-        background: lime;
-}
-
-.Warning {
-        color: black;
-        background: yellow;
-}
diff --git a/trunk/package/feeds/packages/apcupsd/files/apcupsd.init b/trunk/package/feeds/packages/apcupsd/files/apcupsd.init
deleted file mode 100644
index 54543779..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/apcupsd.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
-STOP=50
-
-start() {
-	/usr/sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-}
-
-stop() {
-	kill $(cat /var/run/apcupsd.pid)
-}
diff --git a/trunk/package/feeds/packages/apcupsd/files/apcupsd_mail.conf b/trunk/package/feeds/packages/apcupsd/files/apcupsd_mail.conf
deleted file mode 100644
index 3ada8e52..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/apcupsd_mail.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-MAILPROG="/usr/sbin/smtp"
-MAILHOST="mail:25"
-FROM="OpenWrt"
-TO="apcups@example.com"
-HOSTNAME="OpenWrt"
diff --git a/trunk/package/feeds/packages/apcupsd/files/changeme b/trunk/package/feeds/packages/apcupsd/files/changeme
deleted file mode 100644
index bcf448ab..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/changeme
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# detects that the battery should be replaced.
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
-
-MSG="$HOSTNAME UPS battery needs changing NOW."
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
diff --git a/trunk/package/feeds/packages/apcupsd/files/commfailure b/trunk/package/feeds/packages/apcupsd/files/commfailure
deleted file mode 100644
index b899195f..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/commfailure
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# loses contact with the UPS (i.e. the serial connection is not responding).
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
-
-MSG="$HOSTNAME Communications with UPS lost"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
diff --git a/trunk/package/feeds/packages/apcupsd/files/commok b/trunk/package/feeds/packages/apcupsd/files/commok
deleted file mode 100644
index cd5d1c62..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/commok
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# restores contact with the UPS (i.e. the serial connection is restored).
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
-
-MSG="$HOSTNAME Communications with UPS restored"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
diff --git a/trunk/package/feeds/packages/apcupsd/files/hosts.conf b/trunk/package/feeds/packages/apcupsd/files/hosts.conf
deleted file mode 100644
index 854e0081..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/hosts.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Network UPS Tools - hosts.conf
-#
-# This file does double duty - it lists the systems that multimon will
-# monitor, and also specifies the systems that upsstats is allowed to
-# watch.  It keeps people from feeding random addresses to upsstats,
-# among other things.  upsimage also uses this file to know who it
-# may speak to. upsfstats too.
-#
-# Usage: list systems running upsd that you want to monitor
-#
-# MONITOR <address> "<host description>"
-#
-# Please note, MONITOR must start in column 1 (no spaces permitted)
-#
-# Example:
-# MONITOR 10.64.1.1 "Finance department"
-# MONITOR 10.78.1.1 "Sierra High School data room #1"
-#
-MONITOR 127.0.0.1 "Local Host"
diff --git a/trunk/package/feeds/packages/apcupsd/files/multimon.conf b/trunk/package/feeds/packages/apcupsd/files/multimon.conf
deleted file mode 100644
index 4cdf9b06..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/multimon.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-# Sample multimon configuration file
-#
-# This file is not required.  Without it, multimon will use the default
-# field layout.
-#
-# Temperature selection
-# 
-# Pick "TEMPC" for Celsius or "TEMPF" for Fahrenheit.  This will override
-# the --enable-celsius setting from the compile.  UPSTEMP (below) will 
-# use this setting by default.
-
-TEMPC
-
-# Format:
-# FIELD <variable> "<field name>" "<field suffix>"
-#
-# <variable> is either a word from the UPS protocol like battchg (see the
-# table in src/cgi/upsfetch.c) or a special word in uppercase.  
-#
-# Special words are:
-# MODEL    - Show the model name for this system in cyan
-#
-# STATUS   - Parse the status for this system using the appropriate color
-#
-# UPSTEMP and AMBTEMP use the default scale.  This is set to C if you use
-# --enable-celsius at compile time *or* if you use "TEMPC" above.
-#
-# UPSTEMP  - Show the UPS temperature in the default scale (suffix ignored)
-# AMBTEMP  - Show the ambient temperature in the default scale (suffix ignored)
-#
-# UPSTEMPC - Show the UPS temperature in degrees C (suffix ignored)
-# UPSTEMPF - Show the UPS temperature in degrees F (suffix ignored)
-# AMBTEMPC - Show the ambient temperature in degrees C (suffix ignored)
-# AMBTEMPF - Show the ambient temperature in degrees F (suffix ignored)
-# 
-# They're called "special" since they actually understand the content
-# being printed and do other things based on what's in there.
-# 
-# <field name> is what you'd like this column to be called on the page.
-# Remember that this is HTML, so you can actually embed markup in here.
-# This means you can even include images here.  You can include quotes
-# (and backslashes!) in the string by escaping them with a backslash (\).
-# 
-# <field suffix> is typically something like % or VAC.  It's useful if
-# you want to convey the units that apply to a value.
-#
-# Example config
-
-FIELD SYSTEM "System" ""
-FIELD MODEL "Model" ""
-FIELD STATUS "Status" ""
-FIELD battpct "Battery Chg" "%"
-FIELD utility "Utility" "VAC"
-FIELD loadpct "UPS Load" "%"
-FIELD UPSTEMP "UPS Temp" ""
-FIELD runtime "Batt. Run Time" "min."
-FIELD DATA   "Data" "All data"
-
-# These are only useful if you have a Smart-UPS model with the Measure-UPS II
-# measurement card.  No other models presently support these features.
-# 
-# FIELD AMBTEMP "Ambient Temp" ""
-# FIELD HUMIDITY "Ambient Humidity" "%"
diff --git a/trunk/package/feeds/packages/apcupsd/files/offbattery b/trunk/package/feeds/packages/apcupsd/files/offbattery
deleted file mode 100644
index cd5d1c62..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/offbattery
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# restores contact with the UPS (i.e. the serial connection is restored).
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
-
-MSG="$HOSTNAME Communications with UPS restored"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
diff --git a/trunk/package/feeds/packages/apcupsd/files/onbattery b/trunk/package/feeds/packages/apcupsd/files/onbattery
deleted file mode 100644
index ee5f6530..00000000
--- a/trunk/package/feeds/packages/apcupsd/files/onbattery
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when the UPS
-# goes on batteries.
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
-
-MSG="$HOSTNAME Power Failure !!!"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
diff --git a/trunk/package/feeds/packages/apcupsd/patches/010-fix-usb.patch b/trunk/package/feeds/packages/apcupsd/patches/010-fix-usb.patch
deleted file mode 100644
index b313bb22..00000000
--- a/trunk/package/feeds/packages/apcupsd/patches/010-fix-usb.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/include/libusb.h.in.orig	2015-02-21 18:53:51.023682068 +0100
-+++ a/include/libusb.h.in	2015-02-21 18:54:14.722788757 +0100
-@@ -6,4 +6,4 @@
-  * path at configure time and various apcupsd bits include this
-  * when they need libusb's usb.h.
-  */
--#include "@LIBUSBH@"
-+#include "usb.h"
diff --git a/trunk/package/feeds/packages/apinger/Makefile b/trunk/package/feeds/packages/apinger/Makefile
deleted file mode 100644
index 5d73ae1b..00000000
--- a/trunk/package/feeds/packages/apinger/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apinger
-PKG_VERSION:=0.6.1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/Jajcus/apinger.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c7da72f7ec26eedd7fd8d224c0e10787b204f94e
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
-PKG_LICENSE:= GPL-2.0
-
-PKG_FIXUP:=autoreconf
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/apinger
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tool which monitors various IP devices by simple ICMP echo requests
-  URL:=https://github.com/Jajcus/apinger
-  PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
-endef
-
-define Package/apinger/description
-	Alarm Pinger (apinger) is a little tool which monitors various IP devices by
-	simple ICMP echo requests. There are various other tools, that can do this,
-	but most of them are shell or perl scripts, spawning many processes, thus much
-	CPU-expensive, especially when one wants continuous monitoring and fast
-	response on target failure.  Alarm Pinger is a single program written in C, so
-	it doesn't need much CPU power even when monitoring many targets with frequent
-	probes.  Alarm Pinger supports both IPv4 and IPv6. The code have been tested
-	on Linux and FreeBSD.
-endef
-
-define Package/apinger/conffiles
-/etc/apinger.conf
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default)
-endef
-
-define Package/apinger/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apinger $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/apinger.conf $(1)/etc/apinger.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/apinger.init $(1)/etc/init.d/apinger
-endef
-
-$(eval $(call BuildPackage,apinger))
-
diff --git a/trunk/package/feeds/packages/apinger/files/apinger.init b/trunk/package/feeds/packages/apinger/files/apinger.init
deleted file mode 100644
index 8caac386..00000000
--- a/trunk/package/feeds/packages/apinger/files/apinger.init
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=80
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/sbin/apinger
-}
-
-stop() {
-	service_stop /usr/sbin/apinger
-}
-
-reload() {
-	service_reload /usr/sbin/apinger
-}
diff --git a/trunk/package/feeds/packages/apinger/patches/001-autoreconf.patch b/trunk/package/feeds/packages/apinger/patches/001-autoreconf.patch
deleted file mode 100644
index cb5bd454..00000000
--- a/trunk/package/feeds/packages/apinger/patches/001-autoreconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- apinger-0.6.1/acinclude.m4	2003-10-21 12:44:48.000000000 +0000
-+++ apinger-0.6.1/acinclude.m4	2015-04-08 15:27:37.451903960 +0000
-@@ -39,9 +39,7 @@
- 		[$jk_inet_includes
- $jk_icmp_includes])
- 
--AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code,\
--struct icmp.icmp_cksum, struct icmp.icmp_seq,\
--struct icmp.icmp_id],[],
-+AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code,struct icmp.icmp_cksum, struct icmp.icmp_seq,struct icmp.icmp_id],[],
- 		AC_MSG_ERROR(struct icmp not defined or not compatible),
- 		[$jk_inet_includes
- $jk_icmp_includes])
diff --git a/trunk/package/feeds/packages/apinger/patches/002-run_as_user.patch b/trunk/package/feeds/packages/apinger/patches/002-run_as_user.patch
deleted file mode 100644
index 16d64acc..00000000
--- a/trunk/package/feeds/packages/apinger/patches/002-run_as_user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apinger-0.6.1/src/apinger.conf.orig	2015-04-08 16:05:24.558919722 +0000
-+++ apinger-0.6.1/src/apinger.conf	2015-04-08 16:07:47.089170236 +0000
-@@ -9,7 +9,7 @@
- 
- ## User and group the pinger should run as
- user "nobody"
--group "nobody"
-+group "nogroup"
- 
- ## Mailer to use (default: "/usr/lib/sendmail -t")
- #mailer "/var/qmail/bin/qmail-inject" 
diff --git a/trunk/package/feeds/packages/apinger/patches/003-no_docs.patch b/trunk/package/feeds/packages/apinger/patches/003-no_docs.patch
deleted file mode 100644
index c08f44de..00000000
--- a/trunk/package/feeds/packages/apinger/patches/003-no_docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apinger-0.6.1/Makefile.am.orig	2015-04-08 16:47:40.999990050 +0000
-+++ apinger-0.6.1/Makefile.am	2015-04-08 16:48:07.565220137 +0000
-@@ -1,7 +1,7 @@
- 
- EXTRA_DIST = autogen.sh TODO BUGS
- 
--SUBDIRS = src doc
-+SUBDIRS = src
- 
- .PHONY: ChangeLog
- 
diff --git a/trunk/package/feeds/packages/apr-util/Makefile b/trunk/package/feeds/packages/apr-util/Makefile
deleted file mode 100644
index d5178d56..00000000
--- a/trunk/package/feeds/packages/apr-util/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apr-util
-PKG_VERSION:=1.5.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://archive.apache.org/dist/apr/
-PKG_MD5SUM:=2202b18f269ad606d70e1864857ed93c
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=Apache License
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libaprutil
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libapr +libexpat +libsqlite3 +libuuid $(ICONV_DEPENDS)
-  TITLE:=Apache Portable Runtime Utility Library
-  URL:=http://apr.apache.org/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
-CONFIGURE_ARGS += \
-	--with-pgsql=no \
-	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-	--with-expat="$(STAGING_DIR)/usr" \
-	--without-sqlite2 \
-	--with-sqlite3="$(STAGING_DIR)/usr" \
-	--with-iconv="$(ICONV_PREFIX)" \
-
-CONFIGURE_VARS += \
-	ac_cv_file_dbd_apr_dbd_mysql_c=no \
-	ac_cv_path_ODBC_CONFIG= \
-	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
-
-MAKE_FLAGS += \
-	APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib  $(1)/usr/lib/pkgconfig/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-	 	$(1)/usr/bin/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
-		$(1)/usr/include/apr-1/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
-		$(1)/usr/lib/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
-		$(1)/usr/lib/pkgconfig/
-	$(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(1)/usr/bin/apu-1-config
-	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config
-	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config
-	$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config
-	$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config
-endef
-
-define Package/libaprutil/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libaprutil))
diff --git a/trunk/package/feeds/packages/apr-util/patches/001-automake-compat.patch b/trunk/package/feeds/packages/apr-util/patches/001-automake-compat.patch
deleted file mode 100644
index 20c4cf2b..00000000
--- a/trunk/package/feeds/packages/apr-util/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -8,6 +8,7 @@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VER
- APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
- 
- srcdir = @srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
- 
- INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
---- a/configure.in
-+++ b/configure.in
-@@ -41,6 +41,8 @@ AC_SUBST(APU_CONFIG_LOCATION)
- AC_CANONICAL_SYSTEM
- 
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+LT_INIT
- 
- # Use -no-install or -no-fast-install to link the test 
- # programs on all platforms but Darwin, where it would cause
diff --git a/trunk/package/feeds/packages/apr/Makefile b/trunk/package/feeds/packages/apr/Makefile
deleted file mode 100644
index 69f5b5fd..00000000
--- a/trunk/package/feeds/packages/apr/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apr
-PKG_VERSION:=1.5.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://mirrors.ibiblio.org/apache/apr/
-PKG_MD5SUM:=5486180ec5a23efb5cae6d4292b300ab
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=Apache License
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libapr
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libpthread +librt +libuuid
-  TITLE:=Apache Portable Runtime Library
-  URL:=http://apr.apache.org/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
-CONFIGURE_ARGS += \
-	--with-devrandom=/dev/urandom \
-	--disable-dso \
-	--enable-ipv6
-
-# XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure
-CONFIGURE_VARS += \
-	ac_cv_sizeof_struct_iovec=1 \
-	ac_cv_struct_rlimit=yes \
-	apr_cv_process_shared_works=no \
-	apr_cv_mutex_robust_shared=no \
-	apr_cv_tcp_nodelay_with_cork=yes \
-	apr_cv_use_lfs64=yes \
-	LDFLAGS="$$$$LDFLAGS -lpthread" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
-	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
-		$(1)/usr/bin/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
-		$(1)/usr/include/apr-1/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
-		$(1)/usr/lib/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
-		$(1)/usr/lib/pkgconfig/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/* \
-		$(1)/usr/share/build-1/
-	$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config
-	$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
-endef
-
-define Package/libapr/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libapr))
diff --git a/trunk/package/feeds/packages/apr/patches/001-autoconf-compat.patch b/trunk/package/feeds/packages/apr/patches/001-autoconf-compat.patch
deleted file mode 100644
index 8170572b..00000000
--- a/trunk/package/feeds/packages/apr/patches/001-autoconf-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3,6 +3,7 @@ srcdir=@srcdir@
- VPATH=@srcdir@
- top_srcdir=@apr_srcdir@
- top_blddir=@apr_builddir@
-+top_builddir=@top_builddir@
- 
- #
- # APR (Apache Portable Runtime) library Makefile.
---- a/configure.in
-+++ b/configure.in
-@@ -246,9 +246,6 @@ case $host in
-     gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
-     ;;
- *)
--    if test "x$LTFLAGS" = "x"; then
--        LTFLAGS='--silent'
--    fi
-     if test "$experimental_libtool" = "yes"; then
-         # Use a custom-made libtool replacement
-         echo "using jlibtool"
diff --git a/trunk/package/feeds/packages/apr/patches/101-fix_apr_time_now.patch b/trunk/package/feeds/packages/apr/patches/101-fix_apr_time_now.patch
deleted file mode 100644
index 6ad14a37..00000000
--- a/trunk/package/feeds/packages/apr/patches/101-fix_apr_time_now.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.openwrt.org/ticket/9287
-
---- a/time/unix/time.c
-+++ b/time/unix/time.c
-@@ -75,7 +75,7 @@ APR_DECLARE(apr_time_t) apr_time_now(voi
- {
-     struct timeval tv;
-     gettimeofday(&tv, NULL);
--    return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec;
-+    return tv.tv_sec * (apr_time_t)APR_USEC_PER_SEC + (apr_time_t)tv.tv_usec;
- }
- 
- static void explode_time(apr_time_exp_t *xt, apr_time_t t,
diff --git a/trunk/package/feeds/packages/apr/patches/201-upgrade-and-fix-1.5.1.patch b/trunk/package/feeds/packages/apr/patches/201-upgrade-and-fix-1.5.1.patch
deleted file mode 100644
index 42f4c0f0..00000000
--- a/trunk/package/feeds/packages/apr/patches/201-upgrade-and-fix-1.5.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Makefile.in: fix cross compiling failed
-
-The tools/gen_test_char was invoked at build time,
-and it didn't work for the cross compiling, so we
-compile it with $BUILDCC.
-
-Remove the 'tools' dir creation, it always existed.
-And it caused gen_test_char unexpected rebuilt at
-do_install time.
-
-Upstream-Status: inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile.in | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-Index: apr-1.5.1/Makefile.in
-===================================================================
---- apr-1.5.1.orig/Makefile.in
-+++ apr-1.5.1/Makefile.in
-@@ -20,7 +20,7 @@ INCDIR=./include
- OSDIR=$(top_srcdir)/include/arch/@OSDIR@
- DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
- INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private
--
-+BUILDCC=gcc
- #
- # Macros for target determination
- #
-@@ -47,7 +47,6 @@ LT_VERSION = @LT_VERSION@
- 
- CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
- 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
--	tools/gen_test_char.o tools/gen_test_char.lo \
- 	include/private/apr_escape_test_char.h
- DISTCLEAN_TARGETS = config.cache config.log config.status \
- 	include/apr.h include/arch/unix/apr_private.h \
-@@ -130,13 +129,8 @@ check: $(TARGET_LIB)
- etags:
- 	etags `find . -name '*.[ch]'`
- 
--make_tools_dir:
--	$(APR_MKDIR) tools
--
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
--tools/gen_test_char.lo: make_tools_dir
--tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
--	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
-+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
-+	$(BUILDCC) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
- 	$(APR_MKDIR) include/private
diff --git a/trunk/package/feeds/packages/argp-standalone/Makefile b/trunk/package/feeds/packages/argp-standalone/Makefile
deleted file mode 100644
index 8cf23fec..00000000
--- a/trunk/package/feeds/packages/argp-standalone/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=argp-standalone
-PKG_VERSION:=1.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/
-PKG_MD5SUM:=720704bac078d067111b32444e24ba69
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE:=Makefile.am
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/argp-standalone
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Hierarchial argument parsing broken out from glibc
-  URL:=http://www.lysator.liu.se/~nisse/misc/
-endef
-
-define Package/argp-standalone/description
-  GNU libc hierarchial argument parsing library broken out from glibc.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(FPIC)"
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP)   $(PKG_BUILD_DIR)/argp.h \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_BUILD_DIR)/libargp.a \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,argp-standalone))
diff --git a/trunk/package/feeds/packages/argp-standalone/patches/001-throw-in-funcdef.patch b/trunk/package/feeds/packages/argp-standalone/patches/001-throw-in-funcdef.patch
deleted file mode 100644
index 4a90751e..00000000
--- a/trunk/package/feeds/packages/argp-standalone/patches/001-throw-in-funcdef.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-No __THROW in function implementation.
-	--jsaw
-
---- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI extern inline
- # endif
- 
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -582,7 +582,7 @@
- }
- 
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
---- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
-  * argp.h */
- void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt) 
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -1310,7 +1310,7 @@
- }
- 
- int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt) 
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
diff --git a/trunk/package/feeds/packages/aria2/Config.in b/trunk/package/feeds/packages/aria2/Config.in
deleted file mode 100644
index ec21fafe..00000000
--- a/trunk/package/feeds/packages/aria2/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-menu "Aria2 configuration"
-	depends on PACKAGE_aria2
-
-choice
-	prompt "SSL library"
-	default ARIA2_OPENSSL
-
-config ARIA2_OPENSSL
-	bool "OpenSSL"
-
-config ARIA2_GNUTLS
-	bool "GNUTLS"
-
-config ARIA2_NOSSL
-	bool "No SSL support"
-
-endchoice
-
-config ARIA2_BITTORRENT
-	bool "Enable bittorrent support"
-	depends on ARIA2_OPENSSL
-	default n
-
-config ARIA2_METALINK
-	bool "Enable metalink support"
-	default N
-
-endmenu
diff --git a/trunk/package/feeds/packages/aria2/Makefile b/trunk/package/feeds/packages/aria2/Makefile
deleted file mode 100644
index cac017a6..00000000
--- a/trunk/package/feeds/packages/aria2/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=aria2
-PKG_VERSION:=1.18.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/aria2
-PKG_MD5SUM:=36e92af92b4370817c577ed802546842
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_CONFIG_DEPENDS := \
-  ARIA2_NOSSL \
-  ARIA2_OPENSSL \
-  ARIA2_GNUTLS \
-  ARIA2_BITTORRENT \
-  ARIA2_METALINK
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/aria2/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/aria2
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=File Transfer
-  TITLE:=lightweight download utility
-  URL:=http://aria2.sourceforge.net/
-  DEPENDS:=+zlib +ARIA2_METALINK:libxml2 +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
-endef
-
-define Package/aria2/description
- aria2 is a lightweight multi-protocol & multi-source command-line download
- utility
-endef
-
-CONFIGURE_ARGS += \
-	--disable-nls \
-	$(if $(CONFIG_ARIA2_NOSSL),--disable,--enable)-ssl \
-	$(if $(CONFIG_ARIA2_OPENSSL),--with,--without)-openssl \
-	$(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
-	$(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
-	$(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
-	$(if $(CONFIG_ARIA2_METALINK),--with,--without)-libxml2 \
-	--without-libnettle \
-	--without-libgmp \
-	--without-libgcrypt \
-	--without-libexpat \
-	--without-libcares \
-	--without-sqlite3 \
-	--with-libz
-
-define Package/aria2/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,aria2))
diff --git a/trunk/package/feeds/packages/attr/Makefile b/trunk/package/feeds/packages/attr/Makefile
deleted file mode 100644
index 80da9ccd..00000000
--- a/trunk/package/feeds/packages/attr/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=attr
-PKG_REV:=c252ef434219891f616d891b46aad6b06efdd185
-PKG_VERSION:=20150220
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://git.sv.gnu.org/attr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-
-PKG_LICENSE:=LGPL-2.1 GPL-2.0
-PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/attr/Default
-  TITLE:=Extended attributes (xattr) manipulation
-  URL:=http://savannah.nongnu.org/projects/attr
-  SUBMENU:=Filesystem
-endef
-
-define Package/attr/Default/description
-  Extended attributes support
-endef
-
-define Package/attr
-$(call Package/attr/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+=utils
-  DEPENDS:=+libattr
-endef
-
-define Package/libattr
-$(call Package/attr/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+=library
-endef
-
-define Package/libattr/description
-$(call Package/attr/Default/description)
- This package provides libattr
-endef
-
-define Package/attr/description
-$(call Package/attr/Default/description)
- This package provides xattr manipulation utilities
- - attr
- - getfattr
- - setfattr
-endef
-
-CONFIGURE_ARGS += --enable-static --enable-shared
-
-define Package/attr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/libattr/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc $(1)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-define Package/attr/conffiles
-/etc/xattr.conf
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	mkdir -p $(1)/usr/lib/pkgconfig
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/{include,lib} $(1)/usr/
-endef
-
-$(eval $(call BuildPackage,attr))
-$(eval $(call BuildPackage,libattr))
diff --git a/trunk/package/feeds/packages/attr/patches/100-no-gettext_configure.patch b/trunk/package/feeds/packages/attr/patches/100-no-gettext_configure.patch
deleted file mode 100644
index 2e8b4f4c..00000000
--- a/trunk/package/feeds/packages/attr/patches/100-no-gettext_configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a1ca39..ceee757 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,9 +33,6 @@ AC_FUNC_ALLOCA
- AM_PROG_AR
- LT_INIT
- 
--AM_GNU_GETTEXT_VERSION([0.18.2])
--AM_GNU_GETTEXT([external])
--
- dnl Most people get these man(2) pages from the system now.
- AC_ARG_ENABLE([man2],
- 	[AS_HELP_STRING([--enable-man2], [Install man(2) pages])])
-@@ -59,6 +56,5 @@ AC_CONFIG_COMMANDS([include/attr],
- AC_CONFIG_FILES([
- 	libattr.pc
- 	Makefile
--	po/Makefile.in
- ])
- AC_OUTPUT
diff --git a/trunk/package/feeds/packages/attr/patches/101-no-gettext_autogen.patch b/trunk/package/feeds/packages/attr/patches/101-no-gettext_autogen.patch
deleted file mode 100644
index 1fad67a1..00000000
--- a/trunk/package/feeds/packages/attr/patches/101-no-gettext_autogen.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-index a98a3c5..982aff1 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,2 @@
- #!/bin/sh -ex
--po/update-potfiles
--autopoint --force
- exec autoreconf -f -i
diff --git a/trunk/package/feeds/packages/attr/patches/102-no-gettext_Makefile.patch b/trunk/package/feeds/packages/attr/patches/102-no-gettext_Makefile.patch
deleted file mode 100644
index 76c8dcd3..00000000
--- a/trunk/package/feeds/packages/attr/patches/102-no-gettext_Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index a3e8353..381bb55 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = \
- 	exports
- 
--SUBDIRS = po
--
- AM_CPPFLAGS = \
- 	-I$(top_builddir)/include \
- 	-I$(top_srcdir)/include \
diff --git a/trunk/package/feeds/packages/avahi/Makefile b/trunk/package/feeds/packages/avahi/Makefile
deleted file mode 100644
index 2d1a64b3..00000000
--- a/trunk/package/feeds/packages/avahi/Makefile
+++ /dev/null
@@ -1,404 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=avahi
-PKG_VERSION:=0.6.31
-PKG_RELEASE:=12
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://avahi.org/download/
-PKG_MD5SUM:=2f22745b8f7368ad5a0a3fddac343f2d
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-ifeq ($(BUILD_VARIANT),dbus)
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)
-else
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/avahi/Default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=An mDNS/DNS-SD implementation
-  URL:=http://www.avahi.org/
-endef
-
-define Package/avahi/Default/description
- Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf)
- implementation (library). It facilitates
- service discovery on a local network -- this means that
- you can plug your laptop or computer into a network and
- instantly be able to view other people who you can chat with,
- find printers to print to or find files being shared.
- This kind of technology is already found in MacOS X
- (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
- and is very convenient.
-endef
-
-define Package/libavahi/Default
-  $(call Package/avahi/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  PROVIDES:=libavahi
-  DEPENDS:=+libpthread
-endef
-
-define Package/libavahi/description
-$(call Package/avahi/Default/description)
- .
- The libavahi package contains the mDNS/DNS-SD shared libraries,
- used by other programs. Specifically, it provides
- libavahi-core and libavahi-common libraries.
-endef
-
-define Package/avahi-autoipd
-  $(call Package/avahi/Default)
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+libdaemon
-  TITLE:=IPv4LL network address configuration daemon
-endef
-
-define Package/avahi-autoipd/description
-$(call Package/avahi/Default/description)
- .
- This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local
- Addresses" (IETF RFC3927), a protocol for automatic IP address configuration
- from the link-local 169.254.0.0/16 range without the need for a central
- server. It is primarily intended to be used in ad-hoc networks which lack a
- DHCP server.
-endef
-
-define Package/avahi-dbus-daemon
-  $(call Package/avahi/Default)
-  PROVIDES:=avahi-daemon
-  VARIANT:=dbus
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+libavahi-dbus-support +libexpat +librt +libdaemon
-  TITLE+= (daemon)
-endef
-
-define Package/avahi-nodbus-daemon
-  $(call Package/avahi/Default)
-  PROVIDES:=avahi-daemon
-  VARIANT:=nodbus
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+libavahi-nodbus-support +libexpat +librt +libdaemon
-  TITLE+= (daemon)
-  USERID:=avahi=105:avahi=105
-endef
-
-define Package/avahi-daemon/description
-$(call Package/avahi/Default/description)
- .
- This package contains an mDNS/DNS-SD daemon.
-endef
-
-Package/avahi-dbus-daemon/description=$(Package/avahi-daemon/description)
-Package/avahi-nodbus-daemon/description=$(Package/avahi-daemon/description)
-
-define Package/avahi-daemon/conffiles
-/etc/avahi/avahi-daemon.conf
-endef
-
-Package/avahi-dbus-daemon/conffiles=$(Package/avahi-daemon/conffiles)
-Package/avahi-nodbus-daemon/conffiles=$(Package/avahi-daemon/conffiles)
-
-define Package/avahi-daemon-service-http
-  $(call Package/avahi/Default)
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+avahi-daemon
-  TITLE:=Announce HTTP service
-endef
-
-define Package/avahi-daemon-service-http/description
-$(call Package/avahi/Default/description)
- .
- This package contains the service definition for announcing HTTP service.
-endef
-
-define Package/avahi-daemon-service-http/conffiles
-/etc/avahi/services/http.service
-endef
-
-define Package/avahi-daemon-service-ssh
-  $(call Package/avahi/Default)
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+avahi-daemon
-  TITLE:=Announce SSH service
-endef
-
-define Package/avahi-daemon-service-ssh/description
-$(call Package/avahi/Default/description)
- .
- This package contains the service definition for announcing SSH service.
-endef
-
-define Package/avahi-daemon-service-ssh/conffiles
-/etc/avahi/services/ssh.service
-endef
-
-define Package/avahi-dnsconfd
-  $(call Package/avahi/Default)
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+libavahi +libdaemon +libpthread
-  TITLE:=A Unicast DNS server using avahi-daemon
-endef
-
-define Package/avahi-dnsconfd/description
-$(call Package/avahi/Default/description)
- .
- This package contains a Unicast DNS server from mDNS/DNS-SD configuration
- daemon, which may be used to configure conventional DNS servers using mDNS
- in a DHCP-like fashion. Especially useful on IPv6.
-endef
-
-define Package/libavahi-dbus-support
-  $(call Package/libavahi/Default)
-  VARIANT:=dbus
-  DEPENDS:=+dbus
-  TITLE+= (D-Bus support)
-endef
-
-define Package/libavahi-nodbus-support
-  $(call Package/libavahi/Default)
-  VARIANT:=nodbus
-  TITLE+= (No D-Bus)
-endef
-
-define Package/libavahi-dbus-support/description
-$(call Package/libavahi/description)
- .
- The libavahi-dbus-support package enables
- D-Bus support in avahi, needed to support
- the libavahi-client library and avahi-utils.
- .
- Selecting this package modifies the build configuration
- so that avahi packages are built with support for D-BUS enabled;
- it does not generate a separate binary of its own.
- It also automatically adds the D-Bus package to the build.
- libavahi-dbus-support is selected automatically if you select
- libavahi-client or avahi-utils.
-endef
-
-define Package/libavahi-nodbus-support/description
-$(call Package/libavahi/description)
- .
- Selecting this package modifies the build configuration
- so that avahi packages are built without support for D-BUS enabled;
- it does not generate a separate binary of its own.
-endef
-
-define Package/libavahi-client
-  $(call Package/avahi/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  VARIANT:=dbus
-  DEPENDS:=+avahi-dbus-daemon
-  TITLE+= (libavahi-client library)
-endef
-
-define Package/libavahi-client/description
-$(call Package/avahi/Default/description)
- .
- This packages adds the libavahi-client library.
- It also automatically adds the required
- libavahi-dbus-support and the avahi-dbus-daemon packages.
- For more information please see the avahi documentation.
-endef
-
-define Package/libavahi-compat-libdnssd
-  $(call Package/avahi/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  VARIANT:=dbus
-  DEPENDS:=+libavahi-client
-  TITLE+= (libdnssd)
-endef
-
-define Package/libavahi-compat-libdnssd/description
-$(call Package/avahi/Default/description)
- .
- This packages adds the libavahi-compat-libdnssd library.
- It also automatically adds the required libavahi-client package.
- For more information please see the avahi documentation.
-endef
-
-define Package/avahi-utils
-  $(call Package/avahi/Default)
-  SUBMENU:=IP Addresses and Names
-  VARIANT:=dbus
-  DEPENDS:=libavahi-client +libgdbm
-  TITLE+= (utilities)
-endef
-
-define Package/avahi-utils/description
-$(call Package/avahi/Default/description)
- .
- This packages installs the following avahi utility programs:
- avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name.
- It also automatically adds the required libavahi-client package.
- For more information please see the avahi documentation.
-endef
-
-TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-glib \
-	--disable-gobject \
-	--disable-qt3 \
-	--disable-qt4 \
-	--disable-gtk \
-	--disable-gtk3 \
-	--with-xml=expat \
-	--disable-dbm \
-	--enable-gdbm \
-	--enable-libdaemon \
-	$(and $(CONFIG_PACKAGE_libavahi-compat-libdnssd),ifeq ($(BUILD_VARIANT),dbus),\
-		--enable-compat-libdns_sd) \
-	--disable-python \
-	--disable-pygtk \
-	--disable-python-dbus \
-	--disable-mono \
-	--disable-monodoc \
-	--disable-doxygen-doc \
-	--disable-doxygen-dot \
-	--disable-doxygen-man \
-	--disable-doxygen-rtf \
-	--disable-doxygen-xml \
-	--disable-doxygen-chm \
-	--disable-doxygen-chi \
-	--disable-doxygen-html \
-	--disable-doxygen-ps \
-	--disable-doxygen-pdf \
-	--disable-xmltoman \
-	--with-distro=none \
-	--with-avahi-user=nobody \
-	--with-avahi-group=nogroup \
-	--with-autoipd-user=nobody \
-	--with-autoipd-group=nogroup
-
-ifneq ($(CONFIG_SSP_SUPPORT),y)
-CONFIGURE_ARGS+= \
-	--disable-stack-protector
-endif
-
-ifeq ($(BUILD_VARIANT),dbus)
-CONFIGURE_ARGS += \
-	--enable-dbus
-else
-CONFIGURE_ARGS += \
-	--disable-dbus
-endif
-
-CONFIGURE_VARS+= \
-	CFLAGS="$$$$CFLAGS -DNDEBUG -DDISABLE_SYSTEMD" \
-	ac_cv_header_sys_capability_h=no \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-* $(1)/usr/lib/
-ifeq ($(CONFIG_PACKAGE_libavahi-compat-libdnssd)-$(BUILD_VARIANT),y-dbus)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd* $(1)/usr/lib/
-endif
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libavahi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/
-endef
-
-define Package/libavahi-dbus-support/install
-	$(call Package/libavahi/install,$(1))
-	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d
-endef
-
-Package/libavahi-nodbus-support/install=$(Package/libavahi/install)
-
-define Package/libavahi-client/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-client.so.* $(1)/usr/lib/
-endef
-
-define Package/libavahi-compat-libdnssd/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.* $(1)/usr/lib/
-endef
-
-define Package/avahi-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/avahi-autoipd/install
-	$(INSTALL_DIR) $(1)/etc/avahi
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/
-endef
-
-define Package/avahi-daemon/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/avahi
-	$(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/
-	# install empty service directory so that user knows where
-	# to place custom service files
-	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon
-endef
-
-Package/avahi-dbus-daemon/install=$(Package/avahi-daemon/install)
-Package/avahi-nodbus-daemon/install=$(Package/avahi-daemon/install)
-
-define Package/avahi-daemon-service-http/install
-	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service
-endef
-
-define Package/avahi-daemon-service-ssh/install
-	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service
-endef
-
-define Package/avahi-dnsconfd/install
-	$(INSTALL_DIR) $(1)/etc/avahi
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,libavahi-client))
-$(eval $(call BuildPackage,libavahi-compat-libdnssd))
-$(eval $(call BuildPackage,avahi-utils))
-$(eval $(call BuildPackage,libavahi-dbus-support))
-$(eval $(call BuildPackage,libavahi-nodbus-support))
-$(eval $(call BuildPackage,avahi-autoipd))
-$(eval $(call BuildPackage,avahi-dbus-daemon))
-$(eval $(call BuildPackage,avahi-nodbus-daemon))
-$(eval $(call BuildPackage,avahi-daemon-service-http))
-$(eval $(call BuildPackage,avahi-daemon-service-ssh))
-$(eval $(call BuildPackage,avahi-dnsconfd))
diff --git a/trunk/package/feeds/packages/avahi/files/avahi-daemon.conf b/trunk/package/feeds/packages/avahi/files/avahi-daemon.conf
deleted file mode 100644
index 3ef0788e..00000000
--- a/trunk/package/feeds/packages/avahi/files/avahi-daemon.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[server]
-#host-name=foo
-#domain-name=local
-use-ipv4=yes
-use-ipv6=yes
-check-response-ttl=no
-use-iff-running=no
-
-[publish]
-publish-addresses=yes
-publish-hinfo=yes
-publish-workstation=no
-publish-domain=yes
-#publish-dns-servers=192.168.1.1
-#publish-resolv-conf-dns-servers=yes
-
-[reflector]
-enable-reflector=no
-reflect-ipv=no
-
-[rlimits]
-#rlimit-as=
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=30
-rlimit-stack=4194304
-rlimit-nproc=3
diff --git a/trunk/package/feeds/packages/avahi/files/avahi-daemon.init b/trunk/package/feeds/packages/avahi/files/avahi-daemon.init
deleted file mode 100644
index b2ae4580..00000000
--- a/trunk/package/feeds/packages/avahi/files/avahi-daemon.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=61
-
-BIN=avahi-daemon
-DEFAULT=/etc/default/$BIN
-OPTIONS="-D"
-RUN_D=/var/run/$BIN
-
-start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	mkdir -p $RUN_D
-	$BIN $OPTIONS
-}
-
-stop() {
-  $BIN -k
-}
-
-reload() {
-  $BIN -r
-}
-
diff --git a/trunk/package/feeds/packages/avahi/files/service-http b/trunk/package/feeds/packages/avahi/files/service-http
deleted file mode 100644
index 32620379..00000000
--- a/trunk/package/feeds/packages/avahi/files/service-http
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
-  <service>
-   <type>_http._tcp</type>
-   <port>80</port>
-   <txt-record>path=/</txt-record>
-  </service>
-</service-group>
diff --git a/trunk/package/feeds/packages/avahi/files/service-ssh b/trunk/package/feeds/packages/avahi/files/service-ssh
deleted file mode 100644
index b4458515..00000000
--- a/trunk/package/feeds/packages/avahi/files/service-ssh
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
-  <service>
-   <type>_ssh._tcp</type>
-   <port>22</port>
-  </service>
-</service-group>
diff --git a/trunk/package/feeds/packages/avahi/patches/010-step_back_autotools-no-gettext.patch b/trunk/package/feeds/packages/avahi/patches/010-step_back_autotools-no-gettext.patch
deleted file mode 100644
index fab87aae..00000000
--- a/trunk/package/feeds/packages/avahi/patches/010-step_back_autotools-no-gettext.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -75,8 +75,7 @@ SUBDIRS = \
- 	avahi-compat-howl \
- 	avahi-autoipd \
- 	avahi-ui \
--	avahi-ui-sharp \
--	po
-+	avahi-ui-sharp
- 
- DX_INPUT = \
- 	$(srcdir)/avahi-common/address.h \
---- a/avahi-python/avahi-discover/Makefile.am
-+++ b/avahi-python/avahi-discover/Makefile.am
-@@ -38,7 +38,6 @@ if HAVE_GDBM
- pythonscripts += \
- 	avahi-discover
- desktop_DATA += avahi-discover.desktop
--@INTLTOOL_DESKTOP_RULE@
- avahi_discover_PYTHON += __init__.py
- endif
- 
-@@ -46,7 +45,6 @@ if HAVE_DBM
- pythonscripts += \
- 	avahi-discover
- desktop_DATA += avahi-discover.desktop
--@INTLTOOL_DESKTOP_RULE@
- avahi_discover_PYTHON += __init__.py
- endif
- 
---- a/avahi-ui/Makefile.am
-+++ b/avahi-ui/Makefile.am
-@@ -78,7 +78,6 @@ endif
- 
- bin_PROGRAMS = bssh
- desktop_DATA += bssh.desktop bvnc.desktop
--@INTLTOOL_DESKTOP_RULE@
- 
- bssh_SOURCES = bssh.c
- 
-@@ -106,6 +105,4 @@ endif # HAVE_GLIB
- endif
- endif
- 
--@INTLTOOL_DESKTOP_RULE@
--
- CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_INIT([avahi],[0.6.29],[avahi (at) lis
- AC_CONFIG_SRCDIR([avahi-core/server.c])
- AC_CONFIG_MACRO_DIR([common])
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
-+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax])
- 
- AC_SUBST(PACKAGE_URL, [http://avahi.org/])
- 
-@@ -43,8 +43,6 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
- 
- AC_CANONICAL_HOST
- 
--AM_SILENT_RULES([yes])
--
- AC_CHECK_PROG([STOW], [stow], [yes], [no])
- 
- AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
-@@ -412,12 +410,6 @@ if test "x$have_kqueue" = "xyes" ; then
-     AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
- fi
- 
--IT_PROG_INTLTOOL([0.35.0])
--GETTEXT_PACKAGE=avahi
--AC_SUBST([GETTEXT_PACKAGE])
--AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--AM_GLIB_GNU_GETTEXT
--
- avahilocaledir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(avahilocaledir)
- 
diff --git a/trunk/package/feeds/packages/bash/Makefile b/trunk/package/feeds/packages/bash/Makefile
deleted file mode 100644
index df97e097..00000000
--- a/trunk/package/feeds/packages/bash/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-BASE_VERSION:=4.3
-
-PKG_NAME:=bash
-PKG_VERSION:=$(BASE_VERSION).33
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(BASE_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/bash
-PKG_MD5SUM:=81348932d5da294953e15d4814c74dd1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_VERSION)
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_CHECK_FORMAT_SECURITY:=0
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bash
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The GNU Bourne Again SHell
-  DEPENDS:=+libncurses
-  URL:=http://www.gnu.org/software/bash/
-endef
-
-define Package/bash/description
-  Bash is an sh-compatible command language interpreter that executes
-  commands read from the standard input or from a file. Bash also
-  incorporates useful features from the Korn and C shells (ksh and csh).
-endef
-
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--without-bash-malloc \
-                --bindir=/bin \
-	)
-endef
-
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/builtins LDFLAGS_FOR_BUILD= mkbuiltins
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		SHELL="/bin/bash" \
-		all install
-endef
-
-define Package/bash/postinst
-#!/bin/sh
-grep bash $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/bash" >> $${IPKG_INSTROOT}/etc/shells
-	echo "/bin/rbash" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/bash/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/bash $(1)/bin/
-	ln -sf bash $(1)/bin/rbash
-endef
-
-
-$(eval $(call BuildPackage,bash))
diff --git a/trunk/package/feeds/packages/bash/patches/001-compile-fix.patch b/trunk/package/feeds/packages/bash/patches/001-compile-fix.patch
deleted file mode 100644
index 7efa97b3..00000000
--- a/trunk/package/feeds/packages/bash/patches/001-compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2369,7 +2369,11 @@ execute_pipeline (command, asynchronous,
-   /* If the `lastpipe' option is set with shopt, and job control is not
-      enabled, execute the last element of non-async pipelines in the
-      current shell environment. */
--  if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+  if (lastpipe_opt &&
-+#if defined(JOB_CONTROL)
-+               job_control == 0 && 
-+#endif
-+               asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
-       lstdin = move_to_high_fd (0, 1, -1);
-       if (lstdin > 0)
diff --git a/trunk/package/feeds/packages/bash/patches/002-force-internal-readline.patch b/trunk/package/feeds/packages/bash/patches/002-force-internal-readline.patch
deleted file mode 100644
index 050e4763..00000000
--- a/trunk/package/feeds/packages/bash/patches/002-force-internal-readline.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5430,8 +5430,7 @@ if test $opt_readline = yes; then
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
--		*)		READLINE_LIB=-lreadline ;;
-+		*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		esac
- 	fi
- else
---- a/configure.ac
-+++ b/configure.ac
-@@ -578,8 +578,7 @@ if test $opt_readline = yes; then
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[[89]]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
--		*)		READLINE_LIB=-lreadline ;;
-+		*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		esac
- 	fi
- else
diff --git a/trunk/package/feeds/packages/bash/patches/101-upstream-bash43-001.patch b/trunk/package/feeds/packages/bash/patches/101-upstream-bash43-001.patch
deleted file mode 100644
index 3231273a..00000000
--- a/trunk/package/feeds/packages/bash/patches/101-upstream-bash43-001.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-001
-
-Bug-Reported-by:	NBaH <nbah@sfr.fr>
-Bug-Reference-ID:	<ler0b5$iu9$1@speranza.aioe.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00092.html
-
-Bug-Description:
-
-A missing check for a valid option prevented `test -R' from working.  There
-is another problem that causes bash to look up the wrong variable name when
-processing the argument to `test -R'.
-
-Patch (apply with `patch -p0'):
-
---- a/test.c
-+++ b/test.c
-@@ -646,8 +646,8 @@ unary_test (op, arg)
-       return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE);
- 
-     case 'R':
--      v = find_variable (arg);
--      return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE);
-+      v = find_variable_noref (arg);
-+      return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
-     }
- 
-   /* We can't actually get here, but this shuts up gcc. */
-@@ -723,6 +723,7 @@ test_unop (op)
-     case 'o': case 'p': case 'r': case 's': case 't':
-     case 'u': case 'v': case 'w': case 'x': case 'z':
-     case 'G': case 'L': case 'O': case 'S': case 'N':
-+    case 'R':
-       return (1);
-     }
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 1
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/102-upstream-bash43-002.patch b/trunk/package/feeds/packages/bash/patches/102-upstream-bash43-002.patch
deleted file mode 100644
index 35421e86..00000000
--- a/trunk/package/feeds/packages/bash/patches/102-upstream-bash43-002.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-002
-
-Bug-Reported-by:	Moe Tunes <moetunes42@gmail.com>
-Bug-Reference-ID:	<53103F49.3070100@gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00086.html
-
-Bug-Description:
-
-A change to save state while running the DEBUG trap caused pipelines to hang
-on systems which need process group synchronization while building pipelines.
-
-Patch (apply with `patch -p0'):
-
---- a/trap.c
-+++ b/trap.c
-@@ -920,7 +920,8 @@ _run_trap_internal (sig, tag)
-       subst_assign_varlist = 0;
- 
- #if defined (JOB_CONTROL)
--      save_pipeline (1);	/* XXX only provides one save level */
-+      if (sig != DEBUG_TRAP)	/* run_debug_trap does this */
-+	save_pipeline (1);	/* XXX only provides one save level */
- #endif
- 
-       /* If we're in a function, make sure return longjmps come here, too. */
-@@ -940,7 +941,8 @@ _run_trap_internal (sig, tag)
-       trap_exit_value = last_command_exit_value;
- 
- #if defined (JOB_CONTROL)
--      restore_pipeline (1);
-+      if (sig != DEBUG_TRAP)	/* run_debug_trap does this */
-+	restore_pipeline (1);
- #endif
- 
-       subst_assign_varlist = save_subst_varlist;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 1
-+#define PATCHLEVEL 2
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/103-upstream-bash43-003.patch b/trunk/package/feeds/packages/bash/patches/103-upstream-bash43-003.patch
deleted file mode 100644
index 7c9e56bc..00000000
--- a/trunk/package/feeds/packages/bash/patches/103-upstream-bash43-003.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-003
-
-Bug-Reported-by:	Anatol Pomozov <anatol.pomozov@gmail.com>
-Bug-Reference-ID:	<CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
-
-Bug-Description:
-
-When in callback mode, some readline commands can cause readline to seg
-fault by passing invalid contexts to callback functions.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/readline.c
-+++ b/lib/readline/readline.c
-@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt)
-     r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
- 
-   RL_CHECK_SIGNALS ();
--  if (r == 0)			/* success! */
-+  /* We only treat values < 0 specially to simulate recursion. */
-+  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
-     {
-       _rl_keyseq_chain_dispose ();
-       RL_UNSETSTATE (RL_STATE_MULTIKEY);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 2
-+#define PATCHLEVEL 3
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/104-upstream-bash43-004.patch b/trunk/package/feeds/packages/bash/patches/104-upstream-bash43-004.patch
deleted file mode 100644
index 40ac35fd..00000000
--- a/trunk/package/feeds/packages/bash/patches/104-upstream-bash43-004.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-004
-
-Bug-Reported-by:	Daan van Rossum <daan@flash.uchicago.edu>
-Bug-Reference-ID:	<20140307072523.GA14250@flash.uchicago.edu>
-Bug-Reference-URL:	
-
-Bug-Description:
-
-The `.' command in vi mode cannot undo multi-key commands beginning with
-`c', `d', and `y' (command plus motion specifier).
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/readline.c
-+++ b/lib/readline/readline.c
-@@ -965,7 +965,7 @@ _rl_dispatch_subseq (key, map, got_subse
- #if defined (VI_MODE)
-   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
-       key != ANYOTHERKEY &&
--      rl_key_sequence_length == 1 &&	/* XXX */
-+      _rl_dispatching_keymap == vi_movement_keymap &&
-       _rl_vi_textmod_command (key))
-     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
- #endif
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 3
-+#define PATCHLEVEL 4
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/105-upstream-bash43-005.patch b/trunk/package/feeds/packages/bash/patches/105-upstream-bash43-005.patch
deleted file mode 100644
index 1cc54738..00000000
--- a/trunk/package/feeds/packages/bash/patches/105-upstream-bash43-005.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-005
-
-Bug-Reported-by:	David Sines <dave.gma@googlemail.com>
-Bug-Reference-ID:	<CAO3BAa_CK_Rgkhdfzs+NJ4KFYdB9qW3pvXQK0xLCi6GMmDU8bw@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00037.html
-
-Bug-Description:
-
-When in Posix mode, bash did not correctly interpret the ANSI-C-style
-$'...' quoting mechanism when performing pattern substitution word
-expansions within double quotes.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -3398,7 +3398,7 @@ parse_matched_pair (qc, open, close, len
-          within a double-quoted ${...} construct "an even number of
-          unescaped double-quotes or single-quotes, if any, shall occur." */
-       /* This was changed in Austin Group Interp 221 */
--      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
-+      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- 	continue;
- 
-       /* Could also check open == '`' if we want to parse grouping constructs
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -5710,7 +5710,7 @@ parse_matched_pair (qc, open, close, len
-          within a double-quoted ${...} construct "an even number of
-          unescaped double-quotes or single-quotes, if any, shall occur." */
-       /* This was changed in Austin Group Interp 221 */
--      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
-+      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- 	continue;
- 
-       /* Could also check open == '`' if we want to parse grouping constructs
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 4
-+#define PATCHLEVEL 5
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/106-upstream-bash43-006.patch b/trunk/package/feeds/packages/bash/patches/106-upstream-bash43-006.patch
deleted file mode 100644
index c5f52b1d..00000000
--- a/trunk/package/feeds/packages/bash/patches/106-upstream-bash43-006.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-006
-
-Bug-Reported-by:	Eduardo A . Bustamante Lopez <dualbus@gmail.com>
-Bug-Reference-ID:	<20140228170013.GA16015@dualbus.me>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00091.html
-
-Bug-Description:
-
-A shell that started with job control active but was not interactive left
-the terminal in the wrong process group when exiting, causing its parent
-shell to get a stop signal when it attempted to read from the terminal.
-
-Patch (apply with `patch -p0'):
-
---- a/jobs.c
-+++ b/jobs.c
-@@ -4374,7 +4374,7 @@ without_job_control ()
- void
- end_job_control ()
- {
--  if (interactive_shell)		/* XXX - should it be interactive? */
-+  if (interactive_shell || job_control)		/* XXX - should it be just job_control? */
-     {
-       terminate_stopped_jobs ();
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 5
-+#define PATCHLEVEL 6
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/107-upstream-bash43-007.patch b/trunk/package/feeds/packages/bash/patches/107-upstream-bash43-007.patch
deleted file mode 100644
index 8578bd45..00000000
--- a/trunk/package/feeds/packages/bash/patches/107-upstream-bash43-007.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-007
-
-Bug-Reported-by:	geir.hauge@gmail.com
-Bug-Reference-ID:	<20140318093650.B181C1C5B0B@gina.itea.ntnu.no>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html
-
-Bug-Description:
-
-Using compound assignments for associative arrays like
-
-assoc=( [x]= [y]=bar )
-
-left the value corresponding to the key `x' NULL.  This caused subsequent
-lookups to interpret it as unset.
-
-Patch (apply with `patch -p0'):
-
---- a/arrayfunc.c
-+++ b/arrayfunc.c
-@@ -597,6 +597,11 @@ assign_compound_array_list (var, nlist,
-       if (assoc_p (var))
- 	{
- 	  val = expand_assignment_string_to_string (val, 0);
-+	  if (val == 0)
-+	    {
-+	      val = (char *)xmalloc (1);
-+	      val[0] = '\0';	/* like do_assignment_internal */
-+	    }
- 	  free_val = 1;
- 	}
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 6
-+#define PATCHLEVEL 7
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/108-upstream-bash43-008.patch b/trunk/package/feeds/packages/bash/patches/108-upstream-bash43-008.patch
deleted file mode 100644
index 24020216..00000000
--- a/trunk/package/feeds/packages/bash/patches/108-upstream-bash43-008.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-008
-
-Bug-Reported-by:	Stephane Chazelas <stephane.chazelas@gmail.com>
-Bug-Reference-ID:	<20140318135901.GB22158@chaz.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00098.html
-
-Bug-Description:
-
-Some extended glob patterns incorrectly matched filenames with a leading
-dot, regardless of the setting of the `dotglob' option.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/glob/gmisc.c
-+++ b/lib/glob/gmisc.c
-@@ -210,6 +210,7 @@ extglob_pattern_p (pat)
-     case '+':
-     case '!':
-     case '@':
-+    case '?':
-       return (pat[1] == LPAREN);
-     default:
-       return 0;
---- a/lib/glob/glob.c
-+++ b/lib/glob/glob.c
-@@ -179,42 +179,50 @@ extglob_skipname (pat, dname, flags)
-      char *pat, *dname;
-      int flags;
- {
--  char *pp, *pe, *t;
--  int n, r;
-+  char *pp, *pe, *t, *se;
-+  int n, r, negate;
- 
-+  negate = *pat == '!';
-   pp = pat + 2;
--  pe = pp + strlen (pp) - 1;	/*(*/
--  if (*pe != ')')
--    return 0;
--  if ((t = strchr (pp, '|')) == 0)	/* easy case first */
-+  se = pp + strlen (pp) - 1;		/* end of string */
-+  pe = glob_patscan (pp, se, 0);	/* end of extglob pattern (( */
-+  /* we should check for invalid extglob pattern here */
-+  /* if pe != se we have more of the pattern at the end of the extglob
-+     pattern. Check the easy case first ( */
-+  if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
-     {
-       *pe = '\0';
-+#if defined (HANDLE_MULTIBYTE)
-+      r = mbskipname (pp, dname, flags);
-+#else
-       r = skipname (pp, dname, flags);	/*(*/
-+#endif
-       *pe = ')';
-       return r;
-     }
-+
-+  /* check every subpattern */
-   while (t = glob_patscan (pp, pe, '|'))
-     {
-       n = t[-1];
-       t[-1] = '\0';
-+#if defined (HANDLE_MULTIBYTE)
-+      r = mbskipname (pp, dname, flags);
-+#else
-       r = skipname (pp, dname, flags);
-+#endif
-       t[-1] = n;
-       if (r == 0)	/* if any pattern says not skip, we don't skip */
-         return r;
-       pp = t;
-     }	/*(*/
- 
--  if (pp == pe)		/* glob_patscan might find end of pattern */
-+  /* glob_patscan might find end of pattern */
-+  if (pp == se)
-     return r;
- 
--  *pe = '\0';
--#  if defined (HANDLE_MULTIBYTE)
--  r = mbskipname (pp, dname, flags);	/*(*/
--#  else
--  r = skipname (pp, dname, flags);	/*(*/
--#  endif
--  *pe = ')';
--  return r;
-+  /* but if it doesn't then we didn't match a leading dot */
-+  return 0;
- }
- #endif
- 
-@@ -277,20 +285,23 @@ wextglob_skipname (pat, dname, flags)
-      int flags;
- {
- #if EXTENDED_GLOB
--  wchar_t *pp, *pe, *t, n;
--  int r;
-+  wchar_t *pp, *pe, *t, n, *se;
-+  int r, negate;
- 
-+  negate = *pat == L'!';
-   pp = pat + 2;
--  pe = pp + wcslen (pp) - 1;	/*(*/
--  if (*pe != L')')
--    return 0;
--  if ((t = wcschr (pp, L'|')) == 0)
-+  se = pp + wcslen (pp) - 1;	/*(*/
-+  pe = glob_patscan_wc (pp, se, 0);
-+
-+  if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0)
-     {
-       *pe = L'\0';
-       r = wchkname (pp, dname); /*(*/
-       *pe = L')';
-       return r;
-     }
-+
-+  /* check every subpattern */
-   while (t = glob_patscan_wc (pp, pe, '|'))
-     {
-       n = t[-1];
-@@ -305,10 +316,8 @@ wextglob_skipname (pat, dname, flags)
-   if (pp == pe)		/* glob_patscan_wc might find end of pattern */
-     return r;
- 
--  *pe = L'\0';
--  r = wchkname (pp, dname);	/*(*/
--  *pe = L')';
--  return r;
-+  /* but if it doesn't then we didn't match a leading dot */
-+  return 0;
- #else
-   return (wchkname (pat, dname));
- #endif
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 7
-+#define PATCHLEVEL 8
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/109-upstream-bash43-009.patch b/trunk/package/feeds/packages/bash/patches/109-upstream-bash43-009.patch
deleted file mode 100644
index f222bd67..00000000
--- a/trunk/package/feeds/packages/bash/patches/109-upstream-bash43-009.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-009
-
-Bug-Reported-by:	Matthias Klose <doko@debian.org>
-Bug-Reference-ID:	<53346FC8.6090005@debian.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00171.html
-
-Bug-Description:
-
-There is a problem with unsigned sign extension when attempting to reallocate
-the input line when it is fewer than 3 characters long and there has been a
-history expansion.  The sign extension causes the shell to not reallocate the
-line, which results in a segmentation fault when it writes past the end.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -2424,7 +2424,7 @@ shell_getc (remove_quoted_newline)
- 	 not already end in an EOF character.  */
-       if (shell_input_line_terminator != EOF)
- 	{
--	  if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
-+	  if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- 	    shell_input_line = (char *)xrealloc (shell_input_line,
- 					1 + (shell_input_line_size += 2));
- 
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -4736,7 +4736,7 @@ shell_getc (remove_quoted_newline)
- 	 not already end in an EOF character.  */
-       if (shell_input_line_terminator != EOF)
- 	{
--	  if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
-+	  if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- 	    shell_input_line = (char *)xrealloc (shell_input_line,
- 					1 + (shell_input_line_size += 2));
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 8
-+#define PATCHLEVEL 9
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/110-upstream-bash43-010.patch b/trunk/package/feeds/packages/bash/patches/110-upstream-bash43-010.patch
deleted file mode 100644
index 22d9f1ba..00000000
--- a/trunk/package/feeds/packages/bash/patches/110-upstream-bash43-010.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-010
-
-Bug-Reported-by:	Albert Shih <Albert.Shih@obspm.fr>
-Bug-Reference-ID:	Wed, 5 Mar 2014 23:01:40 +0100
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00028.html
-
-Bug-Description:
-
-Patch (apply with `patch -p0'):
-
-This patch changes the behavior of programmable completion to compensate
-for two assumptions made by the bash-completion package.  Bash-4.3 changed
-to dequote the argument to programmable completion only under certain
-circumstances, to make the behavior of compgen more consistent when run
-from the command line -- closer to the behavior when run by a shell function
-run as part of programmable completion.  Bash-completion can pass quoted
-arguments to compgen when the original word to be completed was not quoted,
-expecting programmable completion to dequote the word before attempting
-completion.
-
-This patch fixes two cases:
-
-1.  An empty string that bash-completion passes to compgen as a quoted null
-    string ('').
-
-2.  An unquoted word that bash-completion quotes using single quotes or
-    backslashes before passing it to compgen.
-
-In these cases, since readline did not detect a quote character in the original
-word to be completed, bash-4.3 
-
---- a/externs.h
-+++ b/externs.h
-@@ -324,6 +324,7 @@ extern char *sh_un_double_quote __P((cha
- extern char *sh_backslash_quote __P((char *, const char *, int));
- extern char *sh_backslash_quote_for_double_quotes __P((char *));
- extern int sh_contains_shell_metas __P((char *));
-+extern int sh_contains_quotes __P((char *));
- 
- /* declarations for functions defined in lib/sh/spell.c */
- extern int spname __P((char *, char *));
---- a/lib/sh/shquote.c
-+++ b/lib/sh/shquote.c
-@@ -311,3 +311,17 @@ sh_contains_shell_metas (string)
- 
-   return (0);
- }
-+
-+int
-+sh_contains_quotes (string)
-+     char *string;
-+{
-+  char *s;
-+
-+  for (s = string; s && *s; s++)
-+    {
-+      if (*s == '\'' || *s == '"' || *s == '\\')
-+	return 1;
-+    }
-+  return 0;
-+}
---- a/pcomplete.c
-+++ b/pcomplete.c
-@@ -183,6 +183,7 @@ ITEMLIST it_variables = { LIST_DYNAMIC,
- 
- COMPSPEC *pcomp_curcs;
- const char *pcomp_curcmd;
-+const char *pcomp_curtxt;
- 
- #ifdef DEBUG
- /* Debugging code */
-@@ -753,6 +754,32 @@ pcomp_filename_completion_function (text
- 	     quoted strings. */
- 	  dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
- 	}
-+      /* Intended to solve a mismatched assumption by bash-completion.  If
-+	 the text to be completed is empty, but bash-completion turns it into
-+	 a quoted string ('') assuming that this code will dequote it before
-+	 calling readline, do the dequoting. */
-+      else if (iscompgen && iscompleting &&
-+	       pcomp_curtxt && *pcomp_curtxt == 0 &&
-+	       text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 && 
-+	       rl_filename_dequoting_function)
-+	dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
-+      /* Another mismatched assumption by bash-completion.  If compgen is being
-+      	 run as part of bash-completion, and the argument to compgen is not
-+      	 the same as the word originally passed to the programmable completion
-+      	 code, dequote the argument if it has quote characters.  It's an
-+      	 attempt to detect when bash-completion is quoting its filename
-+      	 argument before calling compgen. */
-+      /* We could check whether gen_shell_function_matches is in the call
-+	 stack by checking whether the gen-shell-function-matches tag is in
-+	 the unwind-protect stack, but there's no function to do that yet.
-+	 We could simply check whether we're executing in a function by
-+	 checking variable_context, and may end up doing that. */
-+      else if (iscompgen && iscompleting && rl_filename_dequoting_function &&
-+	       pcomp_curtxt && text &&
-+	       STREQ (pcomp_curtxt, text) == 0 &&
-+	       variable_context &&
-+	       sh_contains_quotes (text))	/* guess */
-+	dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
-       else
- 	dfn = savestring (text);
-     }
-@@ -1522,7 +1549,7 @@ gen_progcomp_completions (ocmd, cmd, wor
-      COMPSPEC **lastcs;
- {
-   COMPSPEC *cs, *oldcs;
--  const char *oldcmd;
-+  const char *oldcmd, *oldtxt;
-   STRINGLIST *ret;
- 
-   cs = progcomp_search (ocmd);
-@@ -1545,14 +1572,17 @@ gen_progcomp_completions (ocmd, cmd, wor
- 
-   oldcs = pcomp_curcs;
-   oldcmd = pcomp_curcmd;
-+  oldtxt = pcomp_curtxt;
- 
-   pcomp_curcs = cs;
-   pcomp_curcmd = cmd;
-+  pcomp_curtxt = word;
- 
-   ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
- 
-   pcomp_curcs = oldcs;
-   pcomp_curcmd = oldcmd;
-+  pcomp_curtxt = oldtxt;
- 
-   /* We need to conditionally handle setting *retryp here */
-   if (retryp)
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 9
-+#define PATCHLEVEL 10
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/111-upstream-bash43-011.patch b/trunk/package/feeds/packages/bash/patches/111-upstream-bash43-011.patch
deleted file mode 100644
index b4c181a3..00000000
--- a/trunk/package/feeds/packages/bash/patches/111-upstream-bash43-011.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-011
-
-Bug-Reported-by:	Egmont Koblinger <egmont@gmail.com>
-Bug-Reference-ID:	<CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
-
-Bug-Description:
-
-The signal handling changes to bash and readline (to avoid running any code
-in a signal handler context) cause the cursor to be placed on the wrong
-line of a multi-line command after a ^C interrupts editing.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/display.c
-+++ b/lib/readline/display.c
-@@ -2677,7 +2677,8 @@ _rl_clean_up_for_exit ()
- {
-   if (_rl_echoing_p)
-     {
--      _rl_move_vert (_rl_vis_botlin);
-+      if (_rl_vis_botlin > 0)	/* minor optimization plus bug fix */
-+	_rl_move_vert (_rl_vis_botlin);
-       _rl_vis_botlin = 0;
-       fflush (rl_outstream);
-       rl_restart_output (1, 0);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 10
-+#define PATCHLEVEL 11
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/112-upstream-bash43-012.patch b/trunk/package/feeds/packages/bash/patches/112-upstream-bash43-012.patch
deleted file mode 100644
index 8fd2ea67..00000000
--- a/trunk/package/feeds/packages/bash/patches/112-upstream-bash43-012.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-012
-
-Bug-Reported-by:	Eduardo A. Bustamante López<dualbus@gmail.com>
-Bug-Reference-ID:	<5346B54C.4070205@case.edu>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00051.html
-
-Bug-Description:
-
-When a SIGCHLD trap runs a command containing a shell builtin while
-a script is running `wait' to wait for all running children to complete,
-the SIGCHLD trap will not be run once for each child that terminates.
-
-Patch (apply with `patch -p0'):
-
---- a/jobs.c
-+++ b/jobs.c
-@@ -3597,6 +3597,7 @@ run_sigchld_trap (nchild)
-   unwind_protect_int (jobs_list_frozen);
-   unwind_protect_pointer (the_pipeline);
-   unwind_protect_pointer (subst_assign_varlist);
-+  unwind_protect_pointer (this_shell_builtin);
- 
-   /* We have to add the commands this way because they will be run
-      in reverse order of adding.  We don't want maybe_set_sigchld_trap ()
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 11
-+#define PATCHLEVEL 12
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/113-upstream-bash43-013.patch b/trunk/package/feeds/packages/bash/patches/113-upstream-bash43-013.patch
deleted file mode 100644
index 63c6c1ed..00000000
--- a/trunk/package/feeds/packages/bash/patches/113-upstream-bash43-013.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-013
-
-Bug-Reported-by:	<Trond.Endrestol@ximalas.info>
-Bug-Reference-ID:	<alpine.BSF.2.03.1404192114310.1973@enterprise.ximalas.info>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
-
-Bug-Description:
-
-Using reverse-i-search when horizontal scrolling is enabled does not redisplay
-the entire line containing the successful search results.
-
-Patch (apply with `patch -p0'):
---- a/lib/readline/display.c
-+++ b/lib/readline/display.c
-@@ -1637,7 +1637,7 @@ update_line (old, new, current_line, oma
-   /* If we are changing the number of invisible characters in a line, and
-      the spot of first difference is before the end of the invisible chars,
-      lendiff needs to be adjusted. */
--  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
-+  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
-       current_invis_chars != visible_wrap_offset)
-     {
-       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1825,8 +1825,13 @@ update_line (old, new, current_line, oma
- 	      else
- 		_rl_last_c_pos += bytes_to_insert;
- 
-+	      /* XXX - we only want to do this if we are at the end of the line
-+		 so we move there with _rl_move_cursor_relative */
- 	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
--		goto clear_rest_of_line;
-+		{
-+		  _rl_move_cursor_relative (ne-new, new);
-+		  goto clear_rest_of_line;
-+		}
- 	    }
- 	}
-       /* Otherwise, print over the existing material. */
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 12
-+#define PATCHLEVEL 13
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/114-upstream-bash43-014.patch b/trunk/package/feeds/packages/bash/patches/114-upstream-bash43-014.patch
deleted file mode 100644
index 99e16b9a..00000000
--- a/trunk/package/feeds/packages/bash/patches/114-upstream-bash43-014.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-014
-
-Bug-Reported-by:	Greg Wooledge <wooledg@eeg.ccf.org>
-Bug-Reference-ID:	<20140418202123.GB7660@eeg.ccf.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html
-
-Bug-Description:
-
-Under certain circumstances, $@ is expanded incorrectly in contexts where
-word splitting is not performed.
-
-Patch (apply with `patch -p0'):
---- a/subst.c
-+++ b/subst.c
-@@ -3248,8 +3248,10 @@ cond_expand_word (w, special)
-   if (w->word == 0 || w->word[0] == '\0')
-     return ((char *)NULL);
- 
-+  expand_no_split_dollar_star = 1;
-   w->flags |= W_NOSPLIT2;
-   l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);
-+  expand_no_split_dollar_star = 0;
-   if (l)
-     {
-       if (special == 0)			/* LHS */
-@@ -7847,6 +7849,10 @@ param_expand (string, sindex, quoted, ex
- 	 We also want to make sure that splitting is done no matter what --
- 	 according to POSIX.2, this expands to a list of the positional
- 	 parameters no matter what IFS is set to. */
-+      /* XXX - what to do when in a context where word splitting is not
-+	 performed? Even when IFS is not the default, posix seems to imply
-+	 that we behave like unquoted $* ?  Maybe we should use PF_NOSPLIT2
-+	 here. */
-       temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted);
- 
-       tflag |= W_DOLLARAT;
-@@ -8816,6 +8822,7 @@ finished_with_string:
-   else
-     {
-       char *ifs_chars;
-+      char *tstring;
- 
-       ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char *)NULL;
- 
-@@ -8830,11 +8837,36 @@ finished_with_string:
- 	 regardless of what else has happened to IFS since the expansion. */
-       if (split_on_spaces)
- 	list = list_string (istring, " ", 1);	/* XXX quoted == 1? */
-+      /* If we have $@ (has_dollar_at != 0) and we are in a context where we
-+	 don't want to split the result (W_NOSPLIT2), and we are not quoted,
-+	 we have already separated the arguments with the first character of
-+	 $IFS.  In this case, we want to return a list with a single word
-+	 with the separator possibly replaced with a space (it's what other
-+	 shells seem to do).
-+	 quoted_dollar_at is internal to this function and is set if we are
-+	 passed an argument that is unquoted (quoted == 0) but we encounter a
-+	 double-quoted $@ while expanding it. */
-+      else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars && quoted == 0 && (word->flags & W_NOSPLIT2))
-+	{
-+	  /* Only split and rejoin if we have to */
-+	  if (*ifs_chars && *ifs_chars != ' ')
-+	    {
-+	      list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-+	      tstring = string_list (list);
-+	    }
-+	  else
-+	    tstring = istring;
-+	  tword = make_bare_word (tstring);
-+	  if (tstring != istring)
-+	    free (tstring);
-+	  goto set_word_flags;
-+	}
-       else if (has_dollar_at && ifs_chars)
- 	list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-       else
- 	{
- 	  tword = make_bare_word (istring);
-+set_word_flags:
- 	  if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state == WHOLLY_QUOTED))
- 	    tword->flags |= W_QUOTED;
- 	  if (word->flags & W_ASSIGNMENT)
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 13
-+#define PATCHLEVEL 14
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/115-upstream-bash43-015.patch b/trunk/package/feeds/packages/bash/patches/115-upstream-bash43-015.patch
deleted file mode 100644
index ae8be2d9..00000000
--- a/trunk/package/feeds/packages/bash/patches/115-upstream-bash43-015.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-015
-
-Bug-Reported-by:	Clark Wang <dearvoid@gmail.com>
-Bug-Reference-ID:	<CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html
-
-Bug-Description:
-
-When completing directory names, the directory name is dequoted twice.
-This causes problems for directories with single and double quotes in
-their names.
-
-Patch (apply with `patch -p0'):
---- a/bashline.c
-+++ b/bashline.c
-@@ -4167,9 +4167,16 @@ bash_directory_completion_matches (text)
-   int qc;
- 
-   qc = rl_dispatching ? rl_completion_quote_character : 0;  
--  dfn = bash_dequote_filename ((char *)text, qc);
-+  /* If rl_completion_found_quote != 0, rl_completion_matches will call the
-+     filename dequoting function, causing the directory name to be dequoted
-+     twice. */
-+  if (rl_dispatching && rl_completion_found_quote == 0)
-+    dfn = bash_dequote_filename ((char *)text, qc);
-+  else
-+    dfn = (char *)text;
-   m1 = rl_completion_matches (dfn, rl_filename_completion_function);
--  free (dfn);
-+  if (dfn != text)
-+    free (dfn);
- 
-   if (m1 == 0 || m1[0] == 0)
-     return m1;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 14
-+#define PATCHLEVEL 15
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/116-upstream-bash43-016.patch b/trunk/package/feeds/packages/bash/patches/116-upstream-bash43-016.patch
deleted file mode 100644
index 3ce37f62..00000000
--- a/trunk/package/feeds/packages/bash/patches/116-upstream-bash43-016.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-016
-
-Bug-Reported-by:	Pierre Gaston <pierre.gaston@gmail.com>
-Bug-Reference-ID:	<CAPSX3sTCD61k1VQLJ5r-LWzEt+e7Xc-fxXmwn2u8EA5gJJej8Q@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00100.html
-
-Bug-Description:
-
-An extended glob pattern containing a slash (`/') causes the globbing code
-to misinterpret it as a directory separator.
-
-Patch (apply with `patch -p0'):
---- a/lib/glob/glob.c
-+++ b/lib/glob/glob.c
-@@ -123,6 +123,8 @@ static char **glob_dir_to_array __P((cha
- extern char *glob_patscan __P((char *, char *, int));
- extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));
- 
-+extern char *glob_dirscan __P((char *, int));
-+
- /* Compile `glob_loop.c' for single-byte characters. */
- #define CHAR	unsigned char
- #define INT	int
-@@ -187,6 +189,9 @@ extglob_skipname (pat, dname, flags)
-   se = pp + strlen (pp) - 1;		/* end of string */
-   pe = glob_patscan (pp, se, 0);	/* end of extglob pattern (( */
-   /* we should check for invalid extglob pattern here */
-+  if (pe == 0)
-+    return 0;
-+
-   /* if pe != se we have more of the pattern at the end of the extglob
-      pattern. Check the easy case first ( */
-   if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
-@@ -1015,7 +1020,7 @@ glob_filename (pathname, flags)
- {
-   char **result;
-   unsigned int result_size;
--  char *directory_name, *filename, *dname;
-+  char *directory_name, *filename, *dname, *fn;
-   unsigned int directory_len;
-   int free_dirname;			/* flag */
-   int dflags;
-@@ -1031,6 +1036,18 @@ glob_filename (pathname, flags)
- 
-   /* Find the filename.  */
-   filename = strrchr (pathname, '/');
-+#if defined (EXTENDED_GLOB)
-+  if (filename && extended_glob)
-+    {
-+      fn = glob_dirscan (pathname, '/');
-+#if DEBUG_MATCHING
-+      if (fn != filename)
-+	fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename);
-+#endif
-+      filename = fn;
-+    }
-+#endif
-+
-   if (filename == NULL)
-     {
-       filename = pathname;
---- a/lib/glob/gmisc.c
-+++ b/lib/glob/gmisc.c
-@@ -42,6 +42,8 @@
- #define WLPAREN         L'('
- #define WRPAREN         L')'
- 
-+extern char *glob_patscan __P((char *, char *, int));
-+
- /* Return 1 of the first character of WSTRING could match the first
-    character of pattern WPAT.  Wide character version. */
- int
-@@ -375,3 +377,34 @@ bad_bracket:
- 
-   return matlen;
- }
-+
-+/* Skip characters in PAT and return the final occurrence of DIRSEP.  This
-+   is only called when extended_glob is set, so we have to skip over extglob
-+   patterns x(...) */
-+char *
-+glob_dirscan (pat, dirsep)
-+     char *pat;
-+     int dirsep;
-+{
-+  char *p, *d, *pe, *se;
-+
-+  d = pe = se = 0;
-+  for (p = pat; p && *p; p++)
-+    {
-+      if (extglob_pattern_p (p))
-+	{
-+	  if (se == 0)
-+	    se = p + strlen (p) - 1;
-+	  pe = glob_patscan (p + 2, se, 0);
-+	  if (pe == 0)
-+	    continue;
-+	  else if (*pe == 0)
-+	    break;
-+	  p = pe - 1;	/* will do increment above */
-+	  continue;
-+	}
-+      if (*p ==  dirsep)
-+	d = p;
-+    }
-+  return d;
-+}
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 15
-+#define PATCHLEVEL 16
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/117-upstream-bash43-017.patch b/trunk/package/feeds/packages/bash/patches/117-upstream-bash43-017.patch
deleted file mode 100644
index 9c7eecc9..00000000
--- a/trunk/package/feeds/packages/bash/patches/117-upstream-bash43-017.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-017
-
-Bug-Reported-by:	Dan Douglas <ormaaj@gmail.com>
-Bug-Reference-ID:	<7781746.RhfoTROLxF@smorgbox>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00026.html
-
-Bug-Description:
-
-The code that creates local variables should not clear the `invisible'
-attribute when returning an existing local variable.  Let the code that
-actually assigns a value clear it.
-
-Patch (apply with `patch -p0'):
---- a/variables.c
-+++ b/variables.c
-@@ -2197,10 +2197,7 @@ make_local_variable (name)
-   /* local foo; local foo;  is a no-op. */
-   old_var = find_variable (name);
-   if (old_var && local_p (old_var) && old_var->context == variable_context)
--    {
--      VUNSETATTR (old_var, att_invisible);	/* XXX */
--      return (old_var);
--    }
-+    return (old_var);
- 
-   was_tmpvar = old_var && tempvar_p (old_var);
-   /* If we're making a local variable in a shell function, the temporary env
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 16
-+#define PATCHLEVEL 17
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/118-upstream-bash43-018.patch b/trunk/package/feeds/packages/bash/patches/118-upstream-bash43-018.patch
deleted file mode 100644
index 095ca932..00000000
--- a/trunk/package/feeds/packages/bash/patches/118-upstream-bash43-018.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-018
-
-Bug-Reported-by:	Geir Hauge <geir.hauge@gmail.com>
-Bug-Reference-ID:	<CAO-BiTLOvfPXDypg61jcBausADrxUKJejakV2WTWP26cW0=rgA@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00040.html
-
-Bug-Description:
-
-When assigning an array variable using the compound assignment syntax,
-but using `declare' with the rhs of the compound assignment quoted, the
-shell did not mark the variable as visible after successfully performing
-the assignment.
-
-Patch (apply with `patch -p0'):
---- a/arrayfunc.c
-+++ b/arrayfunc.c
-@@ -179,6 +179,7 @@ bind_array_var_internal (entry, ind, key
-     array_insert (array_cell (entry), ind, newval);
-   FREE (newval);
- 
-+  VUNSETATTR (entry, att_invisible);	/* no longer invisible */
-   return (entry);
- }
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 17
-+#define PATCHLEVEL 18
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/119-upstream-bash43-019.patch b/trunk/package/feeds/packages/bash/patches/119-upstream-bash43-019.patch
deleted file mode 100644
index 2d0fa440..00000000
--- a/trunk/package/feeds/packages/bash/patches/119-upstream-bash43-019.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-019
-
-Bug-Reported-by:	John Lenton
-Bug-Reference-ID:
-Bug-Reference-URL:	https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476
-
-Bug-Description:
-
-The -t timeout option to `read' does not work when the -e option is used.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/input.c
-+++ b/lib/readline/input.c
-@@ -534,8 +534,16 @@ rl_getc (stream)
- 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
-       else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
- 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
-+      /* keyboard-generated signals of interest */
-       else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
-         RL_CHECK_SIGNALS ();
-+      /* non-keyboard-generated signals of interest */
-+      else if (_rl_caught_signal == SIGALRM
-+#if defined (SIGVTALRM)
-+		|| _rl_caught_signal == SIGVTALRM
-+#endif
-+	      )
-+        RL_CHECK_SIGNALS ();
- 
-       if (rl_signal_event_hook)
- 	(*rl_signal_event_hook) ();
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -442,7 +442,10 @@ read_builtin (list)
-       add_unwind_protect (reset_alarm, (char *)NULL);
- #if defined (READLINE)
-       if (edit)
--	add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
-+	{
-+	  add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
-+	  add_unwind_protect (bashline_reset_event_hook, (char *)NULL);
-+	}
- #endif
-       falarm (tmsec, tmusec);
-     }
-@@ -1021,6 +1024,7 @@ edit_line (p, itext)
- 
-   old_attempted_completion_function = rl_attempted_completion_function;
-   rl_attempted_completion_function = (rl_completion_func_t *)NULL;
-+  bashline_set_event_hook ();
-   if (itext)
-     {
-       old_startup_hook = rl_startup_hook;
-@@ -1032,6 +1036,7 @@ edit_line (p, itext)
- 
-   rl_attempted_completion_function = old_attempted_completion_function;
-   old_attempted_completion_function = (rl_completion_func_t *)NULL;
-+  bashline_reset_event_hook ();
- 
-   if (ret == 0)
-     return ret;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 18
-+#define PATCHLEVEL 19
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/120-upstream-bash43-020.patch b/trunk/package/feeds/packages/bash/patches/120-upstream-bash43-020.patch
deleted file mode 100644
index abf0c301..00000000
--- a/trunk/package/feeds/packages/bash/patches/120-upstream-bash43-020.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-020
-
-Bug-Reported-by:	Jared Yanovich <slovichon@gmail.com>
-Bug-Reference-ID:	<20140417073654.GB26875@nightderanger.psc.edu>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00065.html
-
-Bug-Description:
-
-When PS2 contains a command substitution, here-documents entered in an
-interactive shell can sometimes cause a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
---- a/shell.h
-+++ b/shell.h
-@@ -168,7 +168,8 @@ typedef struct _sh_parser_state_t {
-   /* flags state affecting the parser */
-   int expand_aliases;
-   int echo_input_at_read;
--  
-+  int need_here_doc;
-+
- } sh_parser_state_t;
- 
- typedef struct _sh_input_line_state_t {
---- a/parse.y
-+++ b/parse.y
-@@ -2642,7 +2642,7 @@ gather_here_documents ()
-   int r;
- 
-   r = 0;
--  while (need_here_doc)
-+  while (need_here_doc > 0)
-     {
-       parser_state |= PST_HEREDOC;
-       make_here_document (redir_stack[r++], line_number);
-@@ -6075,6 +6075,7 @@ save_parser_state (ps)
- 
-   ps->expand_aliases = expand_aliases;
-   ps->echo_input_at_read = echo_input_at_read;
-+  ps->need_here_doc = need_here_doc;
- 
-   ps->token = token;
-   ps->token_buffer_size = token_buffer_size;
-@@ -6123,6 +6124,7 @@ restore_parser_state (ps)
- 
-   expand_aliases = ps->expand_aliases;
-   echo_input_at_read = ps->echo_input_at_read;
-+  need_here_doc = ps->need_here_doc;
- 
-   FREE (token);
-   token = ps->token;
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -4954,7 +4954,7 @@ gather_here_documents ()
-   int r;
- 
-   r = 0;
--  while (need_here_doc)
-+  while (need_here_doc > 0)
-     {
-       parser_state |= PST_HEREDOC;
-       make_here_document (redir_stack[r++], line_number);
-@@ -8387,6 +8387,7 @@ save_parser_state (ps)
- 
-   ps->expand_aliases = expand_aliases;
-   ps->echo_input_at_read = echo_input_at_read;
-+  ps->need_here_doc = need_here_doc;
- 
-   ps->token = token;
-   ps->token_buffer_size = token_buffer_size;
-@@ -8435,6 +8436,7 @@ restore_parser_state (ps)
- 
-   expand_aliases = ps->expand_aliases;
-   echo_input_at_read = ps->echo_input_at_read;
-+  need_here_doc = ps->need_here_doc;
- 
-   FREE (token);
-   token = ps->token;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 19
-+#define PATCHLEVEL 20
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/121-upstream-bash43-021.patch b/trunk/package/feeds/packages/bash/patches/121-upstream-bash43-021.patch
deleted file mode 100644
index b7367a08..00000000
--- a/trunk/package/feeds/packages/bash/patches/121-upstream-bash43-021.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-021
-
-Bug-Reported-by:	Jared Yanovich <slovichon@gmail.com>
-Bug-Reference-ID:	<20140625225019.GJ17044@nightderanger.psc.edu>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
-
-Bug-Description:
-
-When the readline `revert-all-at-newline' option is set, pressing newline
-when the current line is one retrieved from history results in a double free
-and a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
---- a/lib/readline/misc.c
-+++ b/lib/readline/misc.c
-@@ -461,6 +461,7 @@ _rl_revert_all_lines ()
- 	    saved_undo_list = 0;
- 	  /* Set up rl_line_buffer and other variables from history entry */
- 	  rl_replace_from_history (entry, 0);	/* entry->line is now current */
-+	  entry->data = 0;			/* entry->data is now current undo list */
- 	  /* Undo all changes to this history entry */
- 	  while (rl_undo_list)
- 	    rl_do_undo ();
-@@ -468,7 +469,6 @@ _rl_revert_all_lines ()
- 	     the timestamp. */
- 	  FREE (entry->line);
- 	  entry->line = savestring (rl_line_buffer);
--	  entry->data = 0;
- 	}
-       entry = previous_history ();
-     }
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 20
-+#define PATCHLEVEL 21
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/122-upstream-bash43-022.patch b/trunk/package/feeds/packages/bash/patches/122-upstream-bash43-022.patch
deleted file mode 100644
index 4762be2a..00000000
--- a/trunk/package/feeds/packages/bash/patches/122-upstream-bash43-022.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-022
-
-Bug-Reported-by:	scorp.dev.null@gmail.com
-Bug-Reference-ID:	<E1WxXw8-0007iE-Bi@pcm14>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00061.html
-
-Bug-Description:
-
-Using nested pipelines within loops with the `lastpipe' option set can result
-in a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2409,7 +2409,16 @@ execute_pipeline (command, asynchronous,
- #endif
-       lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
--      exec_result = job_exit_status (lastpipe_jid);
-+      /* If wait_for removes the job from the jobs table, use result of last
-+	 command as pipeline's exit status as usual.  The jobs list can get
-+	 frozen and unfrozen at inconvenient times if there are multiple pipelines
-+	 running simultaneously. */
-+      if (INVALID_JOB (lastpipe_jid) == 0)
-+	exec_result = job_exit_status (lastpipe_jid);
-+      else if (pipefail_opt)
-+	exec_result = exec_result | lstdin;	/* XXX */
-+      /* otherwise we use exec_result */
-+        
- #endif
-       unfreeze_jobs_list ();
-     }
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 21
-+#define PATCHLEVEL 22
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/123-upstream-bash43-023.patch b/trunk/package/feeds/packages/bash/patches/123-upstream-bash43-023.patch
deleted file mode 100644
index 8684c137..00000000
--- a/trunk/package/feeds/packages/bash/patches/123-upstream-bash43-023.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-023
-
-Bug-Reported-by:	Tim Friske <me@timfriske.com>
-Bug-Reference-ID:	<CAM1RzOcOR9zzC2i+aeES6LtbHNHoOV+0pZEYPrqxv_QAii-RXA@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00056.html
-
-Bug-Description:
-
-Bash does not correctly parse process substitution constructs that contain
-unbalanced parentheses as part of the contained command.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.h
-+++ b/subst.h
-@@ -82,7 +82,7 @@ extern char *extract_arithmetic_subst __
- /* Extract the <( or >( construct in STRING, and return a new string.
-    Start extracting at (SINDEX) as if we had just seen "<(".
-    Make (SINDEX) get the position just after the matching ")". */
--extern char *extract_process_subst __P((char *, char *, int *));
-+extern char *extract_process_subst __P((char *, char *, int *, int));
- #endif /* PROCESS_SUBSTITUTION */
- 
- /* Extract the name of the variable to bind to from the assignment string. */
---- a/subst.c
-+++ b/subst.c
-@@ -1192,12 +1192,18 @@ extract_arithmetic_subst (string, sindex
-    Start extracting at (SINDEX) as if we had just seen "<(".
-    Make (SINDEX) get the position of the matching ")". */ /*))*/
- char *
--extract_process_subst (string, starter, sindex)
-+extract_process_subst (string, starter, sindex, xflags)
-      char *string;
-      char *starter;
-      int *sindex;
-+     int xflags;
- {
-+#if 0
-   return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));
-+#else
-+  xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0);
-+  return (xparse_dolparen (string, string+*sindex, sindex, xflags));
-+#endif
- }
- #endif /* PROCESS_SUBSTITUTION */
- 
-@@ -1785,7 +1791,7 @@ skip_to_delim (string, start, delims, fl
- 	  si = i + 2;
- 	  if (string[si] == '\0')
- 	    CQ_RETURN(si);
--	  temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si);
-+	  temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0);
- 	  free (temp);		/* no SX_ALLOC here */
- 	  i = si;
- 	  if (string[i] == '\0')
-@@ -8249,7 +8255,7 @@ add_string:
- 	    else
- 	      t_index = sindex + 1; /* skip past both '<' and LPAREN */
- 
--	    temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index); /*))*/
-+	    temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index, 0); /*))*/
- 	    sindex = t_index;
- 
- 	    /* If the process substitution specification is `<()', we want to
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 22
-+#define PATCHLEVEL 23
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/124-upstream-bash43-024.patch b/trunk/package/feeds/packages/bash/patches/124-upstream-bash43-024.patch
deleted file mode 100644
index 79414550..00000000
--- a/trunk/package/feeds/packages/bash/patches/124-upstream-bash43-024.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-024
-
-Bug-Reported-by:	Corentin Peuvrel <cpeuvrel@pom-monitoring.com>
-Bug-Reference-ID:	<53CE9E5D.6050203@pom-monitoring.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html
-
-Bug-Description:
-
-Indirect variable references do not work correctly if the reference
-variable expands to an array reference using a subscript other than 0
-(e.g., foo='bar[1]' ; echo ${!foo}).
-
-Patch (apply with `patch -p0'):
-
---- a/subst.c
-+++ b/subst.c
-@@ -7374,7 +7374,13 @@ parameter_brace_expand (string, indexp,
-     }
- 
-   if (want_indir)
--    tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-+    {
-+      tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-+      /* Turn off the W_ARRAYIND flag because there is no way for this function
-+	 to return the index we're supposed to be using. */
-+      if (tdesc && tdesc->flags)
-+	tdesc->flags &= ~W_ARRAYIND;
-+    }
-   else
-     tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 23
-+#define PATCHLEVEL 24
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/125-upstream-bash43-025.patch b/trunk/package/feeds/packages/bash/patches/125-upstream-bash43-025.patch
deleted file mode 100644
index 6b2ef4b3..00000000
--- a/trunk/package/feeds/packages/bash/patches/125-upstream-bash43-025.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-025
-
-Bug-Reported-by:	Stephane Chazelas <stephane.chazelas@gmail.com>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-Under certain circumstances, bash will execute user code while processing the
-environment for exported function definitions.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/common.h
-+++ b/builtins/common.h
-@@ -33,6 +33,8 @@
- #define SEVAL_RESETLINE	0x010
- #define SEVAL_PARSEONLY	0x020
- #define SEVAL_NOLONGJMP 0x040
-+#define SEVAL_FUNCDEF	0x080		/* only allow function definitions */
-+#define SEVAL_ONECMD	0x100		/* only allow a single command */
- 
- /* Flags for describe_command, shared between type.def and command.def */
- #define CDESC_ALL		0x001	/* type -a */
---- a/builtins/evalstring.c
-+++ b/builtins/evalstring.c
-@@ -308,6 +308,14 @@ parse_and_execute (string, from_file, fl
- 	    {
- 	      struct fd_bitmap *bitmap;
- 
-+	      if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
-+		{
-+		  internal_warning ("%s: ignoring function definition attempt", from_file);
-+		  should_jump_to_top_level = 0;
-+		  last_result = last_command_exit_value = EX_BADUSAGE;
-+		  break;
-+		}
-+
- 	      bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
- 	      begin_unwind_frame ("pe_dispose");
- 	      add_unwind_protect (dispose_fd_bitmap, bitmap);
-@@ -368,6 +376,9 @@ parse_and_execute (string, from_file, fl
- 	      dispose_command (command);
- 	      dispose_fd_bitmap (bitmap);
- 	      discard_unwind_frame ("pe_dispose");
-+
-+	      if (flags & SEVAL_ONECMD)
-+		break;
- 	    }
- 	}
-       else
---- a/variables.c
-+++ b/variables.c
-@@ -358,13 +358,11 @@ initialize_shell_variables (env, privmod
- 	  temp_string[char_index] = ' ';
- 	  strcpy (temp_string + char_index + 1, string);
- 
--	  if (posixly_correct == 0 || legal_identifier (name))
--	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
--
--	  /* Ancient backwards compatibility.  Old versions of bash exported
--	     functions like name()=() {...} */
--	  if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
--	    name[char_index - 2] = '\0';
-+	  /* Don't import function names that are invalid identifiers from the
-+	     environment, though we still allow them to be defined as shell
-+	     variables. */
-+	  if (legal_identifier (name))
-+	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
- 
- 	  if (temp_var = find_function (name))
- 	    {
-@@ -381,10 +379,6 @@ initialize_shell_variables (env, privmod
- 	      last_command_exit_value = 1;
- 	      report_error (_("error importing function definition for `%s'"), name);
- 	    }
--
--	  /* ( */
--	  if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
--	    name[char_index - 2] = '(';		/* ) */
- 	}
- #if defined (ARRAY_VARS)
- #  if ARRAY_EXPORT
---- a/subst.c
-+++ b/subst.c
-@@ -8047,7 +8047,9 @@ comsub:
- 
- 	  goto return0;
- 	}
--      else if (var = find_variable_last_nameref (temp1))
-+      else if (var && (invisible_p (var) || var_isset (var) == 0))
-+	temp = (char *)NULL;
-+      else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0)
- 	{
- 	  temp = nameref_cell (var);
- #if defined (ARRAY_VARS)
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 24
-+#define PATCHLEVEL 25
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/126-upstream-bash43-026.patch b/trunk/package/feeds/packages/bash/patches/126-upstream-bash43-026.patch
deleted file mode 100644
index e9535beb..00000000
--- a/trunk/package/feeds/packages/bash/patches/126-upstream-bash43-026.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-026
-
-Bug-Reported-by:	Tavis Ormandy <taviso@cmpxchg8b.com>
-Bug-Reference-ID:
-Bug-Reference-URL:	http://twitter.com/taviso/statuses/514887394294652929
-
-Bug-Description:
-
-Under certain circumstances, bash can incorrectly save a lookahead character and
-return it on a subsequent call, even when reading a new line.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -2953,6 +2953,8 @@ reset_parser ()
-   FREE (word_desc_to_read);
-   word_desc_to_read = (WORD_DESC *)NULL;
- 
-+  eol_ungetc_lookahead = 0;
-+
-   current_token = '\n';		/* XXX */
-   last_read_token = '\n';
-   token_to_read = '\n';
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -5265,6 +5265,8 @@ reset_parser ()
-   FREE (word_desc_to_read);
-   word_desc_to_read = (WORD_DESC *)NULL;
- 
-+  eol_ungetc_lookahead = 0;
-+
-   current_token = '\n';		/* XXX */
-   last_read_token = '\n';
-   token_to_read = '\n';
-@@ -8539,4 +8541,3 @@ set_line_mbstate ()
-     }
- }
- #endif /* HANDLE_MULTIBYTE */
--
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 25
-+#define PATCHLEVEL 26
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/127-upstream-bash43-027.patch b/trunk/package/feeds/packages/bash/patches/127-upstream-bash43-027.patch
deleted file mode 100644
index 6e8a51a2..00000000
--- a/trunk/package/feeds/packages/bash/patches/127-upstream-bash43-027.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-027
-
-Bug-Reported-by:	Florian Weimer <fweimer@redhat.com>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-This patch changes the encoding bash uses for exported functions to avoid
-clashes with shell variables and to avoid depending only on an environment
-variable's contents to determine whether or not to interpret it as a shell
-function.
-
-Patch (apply with `patch -p0'):
-
---- a/variables.c
-+++ b/variables.c
-@@ -83,6 +83,11 @@
- 
- #define ifsname(s)	((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0')
- 
-+#define BASHFUNC_PREFIX		"BASH_FUNC_"
-+#define BASHFUNC_PREFLEN	10	/* == strlen(BASHFUNC_PREFIX */
-+#define BASHFUNC_SUFFIX		"%%"
-+#define BASHFUNC_SUFFLEN	2	/* == strlen(BASHFUNC_SUFFIX) */
-+
- extern char **environ;
- 
- /* Variables used here and defined in other files. */
-@@ -279,7 +284,7 @@ static void push_temp_var __P((PTR_T));
- static void propagate_temp_var __P((PTR_T));
- static void dispose_temporary_env __P((sh_free_func_t *));     
- 
--static inline char *mk_env_string __P((const char *, const char *));
-+static inline char *mk_env_string __P((const char *, const char *, int));
- static char **make_env_array_from_var_list __P((SHELL_VAR **));
- static char **make_var_export_array __P((VAR_CONTEXT *));
- static char **make_func_export_array __P((void));
-@@ -349,22 +354,33 @@ initialize_shell_variables (env, privmod
- 
-       /* If exported function, define it now.  Don't import functions from
- 	 the environment in privileged mode. */
--      if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
-+      if (privmode == 0 && read_but_dont_execute == 0 && 
-+          STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
-+          STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
-+	  STREQN ("() {", string, 4))
- 	{
-+	  size_t namelen;
-+	  char *tname;		/* desired imported function name */
-+
-+	  namelen = char_index - BASHFUNC_PREFLEN - BASHFUNC_SUFFLEN;
-+
-+	  tname = name + BASHFUNC_PREFLEN;	/* start of func name */
-+	  tname[namelen] = '\0';		/* now tname == func name */
-+
- 	  string_length = strlen (string);
--	  temp_string = (char *)xmalloc (3 + string_length + char_index);
-+	  temp_string = (char *)xmalloc (namelen + string_length + 2);
- 
--	  strcpy (temp_string, name);
--	  temp_string[char_index] = ' ';
--	  strcpy (temp_string + char_index + 1, string);
-+	  memcpy (temp_string, tname, namelen);
-+	  temp_string[namelen] = ' ';
-+	  memcpy (temp_string + namelen + 1, string, string_length + 1);
- 
- 	  /* Don't import function names that are invalid identifiers from the
- 	     environment, though we still allow them to be defined as shell
- 	     variables. */
--	  if (legal_identifier (name))
--	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-+	  if (absolute_program (tname) == 0 && (posixly_correct == 0 || legal_identifier (tname)))
-+	    parse_and_execute (temp_string, tname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
- 
--	  if (temp_var = find_function (name))
-+	  if (temp_var = find_function (tname))
- 	    {
- 	      VSETATTR (temp_var, (att_exported|att_imported));
- 	      array_needs_making = 1;
-@@ -377,8 +393,11 @@ initialize_shell_variables (env, privmod
- 		  array_needs_making = 1;
- 		}
- 	      last_command_exit_value = 1;
--	      report_error (_("error importing function definition for `%s'"), name);
-+	      report_error (_("error importing function definition for `%s'"), tname);
- 	    }
-+
-+	  /* Restore original suffix */
-+	  tname[namelen] = BASHFUNC_SUFFIX[0];
- 	}
- #if defined (ARRAY_VARS)
- #  if ARRAY_EXPORT
-@@ -2954,7 +2973,7 @@ assign_in_env (word, flags)
-   var->context = variable_context;	/* XXX */
- 
-   INVALIDATE_EXPORTSTR (var);
--  var->exportstr = mk_env_string (name, value);
-+  var->exportstr = mk_env_string (name, value, 0);
- 
-   array_needs_making = 1;
- 
-@@ -3852,21 +3871,42 @@ merge_temporary_env ()
- /* **************************************************************** */
- 
- static inline char *
--mk_env_string (name, value)
-+mk_env_string (name, value, isfunc)
-      const char *name, *value;
-+     int isfunc;
- {
--  int name_len, value_len;
--  char	*p;
-+  size_t name_len, value_len;
-+  char	*p, *q;
- 
-   name_len = strlen (name);
-   value_len = STRLEN (value);
--  p = (char *)xmalloc (2 + name_len + value_len);
--  strcpy (p, name);
--  p[name_len] = '=';
-+
-+  /* If we are exporting a shell function, construct the encoded function
-+     name. */
-+  if (isfunc && value)
-+    {
-+      p = (char *)xmalloc (BASHFUNC_PREFLEN + name_len + BASHFUNC_SUFFLEN + value_len + 2);
-+      q = p;
-+      memcpy (q, BASHFUNC_PREFIX, BASHFUNC_PREFLEN);
-+      q += BASHFUNC_PREFLEN;
-+      memcpy (q, name, name_len);
-+      q += name_len;
-+      memcpy (q, BASHFUNC_SUFFIX, BASHFUNC_SUFFLEN);
-+      q += BASHFUNC_SUFFLEN;
-+    }
-+  else
-+    {
-+      p = (char *)xmalloc (2 + name_len + value_len);
-+      memcpy (p, name, name_len);
-+      q = p + name_len;
-+    }
-+
-+  q[0] = '=';
-   if (value && *value)
--    strcpy (p + name_len + 1, value);
-+    memcpy (q + 1, value, value_len + 1);
-   else
--    p[name_len + 1] = '\0';
-+    q[1] = '\0';
-+
-   return (p);
- }
- 
-@@ -3952,7 +3992,7 @@ make_env_array_from_var_list (vars)
- 	  /* Gee, I'd like to get away with not using savestring() if we're
- 	     using the cached exportstr... */
- 	  list[list_index] = USE_EXPORTSTR ? savestring (value)
--					   : mk_env_string (var->name, value);
-+					   : mk_env_string (var->name, value, function_p (var));
- 
- 	  if (USE_EXPORTSTR == 0)
- 	    SAVE_EXPORTSTR (var, list[list_index]);
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 26
-+#define PATCHLEVEL 27
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/128-upstream-bash43-028.patch b/trunk/package/feeds/packages/bash/patches/128-upstream-bash43-028.patch
deleted file mode 100644
index b4b1b6dc..00000000
--- a/trunk/package/feeds/packages/bash/patches/128-upstream-bash43-028.patch
+++ /dev/null
@@ -1,1526 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-028
-
-Bug-Reported-by:	Florian Weimer <fweimer@redhat.com>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-There are two local buffer overflows in parse.y that can cause the shell
-to dump core when given many here-documents attached to a single command
-or many nested loops.
-
-Patch (apply with `patch -p0'):
-
---- a/parse.y
-+++ b/parse.y
-@@ -168,6 +168,9 @@ static char *read_a_line __P((int));
- 
- static int reserved_word_acceptable __P((int));
- static int yylex __P((void));
-+
-+static void push_heredoc __P((REDIRECT *));
-+static char *mk_alexpansion __P((char *));
- static int alias_expand_token __P((char *));
- static int time_command_acceptable __P((void));
- static int special_case_tokens __P((char *));
-@@ -265,7 +268,9 @@ int parser_state;
- 
- /* Variables to manage the task of reading here documents, because we need to
-    defer the reading until after a complete command has been collected. */
--static REDIRECT *redir_stack[10];
-+#define HEREDOC_MAX 16
-+
-+static REDIRECT *redir_stack[HEREDOC_MAX];
- int need_here_doc;
- 
- /* Where shell input comes from.  History expansion is performed on each
-@@ -307,7 +312,7 @@ static int global_extglob;
-    or `for WORD' begins.  This is a nested command maximum, since the array
-    index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST	128
--static int word_lineno[MAX_CASE_NEST];
-+static int word_lineno[MAX_CASE_NEST+1];
- static int word_top = -1;
- 
- /* If non-zero, it is the token that we want read_token to return
-@@ -520,42 +525,42 @@ redirection:	'>' WORD
- 			  source.dest = 0;
- 			  redir.filename = $2;
- 			  $$ = make_redirection (source, r_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	NUMBER LESS_LESS WORD
- 			{
- 			  source.dest = $1;
- 			  redir.filename = $3;
- 			  $$ = make_redirection (source, r_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	REDIR_WORD LESS_LESS WORD
- 			{
- 			  source.filename = $1;
- 			  redir.filename = $3;
- 			  $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	LESS_LESS_MINUS WORD
- 			{
- 			  source.dest = 0;
- 			  redir.filename = $2;
- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	NUMBER LESS_LESS_MINUS WORD
- 			{
- 			  source.dest = $1;
- 			  redir.filename = $3;
- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	REDIR_WORD  LESS_LESS_MINUS WORD
- 			{
- 			  source.filename = $1;
- 			  redir.filename = $3;
- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
--			  redir_stack[need_here_doc++] = $$;
-+			  push_heredoc ($$);
- 			}
- 	|	LESS_LESS_LESS WORD
- 			{
-@@ -2636,6 +2641,21 @@ yylex ()
-    which allow ESAC to be the next one read. */
- static int esacs_needed_count;
- 
-+static void
-+push_heredoc (r)
-+     REDIRECT *r;
-+{
-+  if (need_here_doc >= HEREDOC_MAX)
-+    {
-+      last_command_exit_value = EX_BADUSAGE;
-+      need_here_doc = 0;
-+      report_syntax_error (_("maximum here-document count exceeded"));
-+      reset_parser ();
-+      exit_shell (last_command_exit_value);
-+    }
-+  redir_stack[need_here_doc++] = r;
-+}
-+
- void
- gather_here_documents ()
- {
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -168,7 +168,7 @@
- 
- 
- /* Copy the first part of user declarations.  */
--#line 21 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- 
- #include "config.h"
- 
-@@ -319,6 +319,9 @@ static char *read_a_line __P((int));
- 
- static int reserved_word_acceptable __P((int));
- static int yylex __P((void));
-+
-+static void push_heredoc __P((REDIRECT *));
-+static char *mk_alexpansion __P((char *));
- static int alias_expand_token __P((char *));
- static int time_command_acceptable __P((void));
- static int special_case_tokens __P((char *));
-@@ -416,7 +419,9 @@ int parser_state;
- 
- /* Variables to manage the task of reading here documents, because we need to
-    defer the reading until after a complete command has been collected. */
--static REDIRECT *redir_stack[10];
-+#define HEREDOC_MAX 16
-+
-+static REDIRECT *redir_stack[HEREDOC_MAX];
- int need_here_doc;
- 
- /* Where shell input comes from.  History expansion is performed on each
-@@ -458,7 +463,7 @@ static int global_extglob;
-    or `for WORD' begins.  This is a nested command maximum, since the array
-    index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST	128
--static int word_lineno[MAX_CASE_NEST];
-+static int word_lineno[MAX_CASE_NEST+1];
- static int word_top = -1;
- 
- /* If non-zero, it is the token that we want read_token to return
-@@ -492,7 +497,7 @@ static REDIRECTEE redir;
- 
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
--#line 324 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 329 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
-   WORD_DESC *word;		/* the word that we read. */
-   int number;			/* the number that we read. */
-@@ -503,7 +508,7 @@ typedef union YYSTYPE
-   PATTERN_LIST *pattern;
- }
- /* Line 193 of yacc.c.  */
--#line 507 "y.tab.c"
-+#line 512 "y.tab.c"
- 	YYSTYPE;
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
- # define YYSTYPE_IS_DECLARED 1
-@@ -516,7 +521,7 @@ typedef union YYSTYPE
- 
- 
- /* Line 216 of yacc.c.  */
--#line 520 "y.tab.c"
-+#line 525 "y.tab.c"
- 
- #ifdef short
- # undef short
-@@ -886,23 +891,23 @@ static const yytype_int8 yyrhs[] =
- /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
- static const yytype_uint16 yyrline[] =
- {
--       0,   377,   377,   388,   397,   412,   422,   424,   428,   434,
--     440,   446,   452,   458,   464,   470,   476,   482,   488,   494,
--     500,   506,   512,   518,   525,   532,   539,   546,   553,   560,
--     566,   572,   578,   584,   590,   596,   602,   608,   614,   620,
--     626,   632,   638,   644,   650,   656,   662,   668,   674,   680,
--     686,   692,   700,   702,   704,   708,   712,   723,   725,   729,
--     731,   733,   749,   751,   755,   757,   759,   761,   763,   765,
--     767,   769,   771,   773,   775,   779,   784,   789,   794,   799,
--     804,   809,   814,   821,   826,   831,   836,   843,   848,   853,
--     858,   863,   868,   875,   880,   885,   892,   895,   898,   902,
--     904,   935,   942,   947,   964,   969,   986,   993,   995,   997,
--    1002,  1006,  1010,  1014,  1016,  1018,  1022,  1023,  1027,  1029,
--    1031,  1033,  1037,  1039,  1041,  1043,  1045,  1047,  1051,  1053,
--    1062,  1070,  1071,  1077,  1078,  1085,  1089,  1091,  1093,  1100,
--    1102,  1104,  1108,  1109,  1112,  1114,  1116,  1120,  1121,  1130,
--    1143,  1159,  1174,  1176,  1178,  1185,  1188,  1192,  1194,  1200,
--    1206,  1223,  1243,  1245,  1268,  1272,  1274,  1276
-+       0,   382,   382,   393,   402,   417,   427,   429,   433,   439,
-+     445,   451,   457,   463,   469,   475,   481,   487,   493,   499,
-+     505,   511,   517,   523,   530,   537,   544,   551,   558,   565,
-+     571,   577,   583,   589,   595,   601,   607,   613,   619,   625,
-+     631,   637,   643,   649,   655,   661,   667,   673,   679,   685,
-+     691,   697,   705,   707,   709,   713,   717,   728,   730,   734,
-+     736,   738,   754,   756,   760,   762,   764,   766,   768,   770,
-+     772,   774,   776,   778,   780,   784,   789,   794,   799,   804,
-+     809,   814,   819,   826,   831,   836,   841,   848,   853,   858,
-+     863,   868,   873,   880,   885,   890,   897,   900,   903,   907,
-+     909,   940,   947,   952,   969,   974,   991,   998,  1000,  1002,
-+    1007,  1011,  1015,  1019,  1021,  1023,  1027,  1028,  1032,  1034,
-+    1036,  1038,  1042,  1044,  1046,  1048,  1050,  1052,  1056,  1058,
-+    1067,  1075,  1076,  1082,  1083,  1090,  1094,  1096,  1098,  1105,
-+    1107,  1109,  1113,  1114,  1117,  1119,  1121,  1125,  1126,  1135,
-+    1148,  1164,  1179,  1181,  1183,  1190,  1193,  1197,  1199,  1205,
-+    1211,  1228,  1248,  1250,  1273,  1277,  1279,  1281
- };
- #endif
- 
-@@ -2093,7 +2098,7 @@ yyreduce:
-   switch (yyn)
-     {
-         case 2:
--#line 378 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  /* Case of regular command.  Discard the error
- 			     safety net,and return the command just parsed. */
-@@ -2107,7 +2112,7 @@ yyreduce:
-     break;
- 
-   case 3:
--#line 389 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  /* Case of regular command, but not a very
- 			     interesting one.  Return a NULL command. */
-@@ -2119,7 +2124,7 @@ yyreduce:
-     break;
- 
-   case 4:
--#line 398 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  /* Error during parsing.  Return NULL command. */
- 			  global_command = (COMMAND *)NULL;
-@@ -2137,7 +2142,7 @@ yyreduce:
-     break;
- 
-   case 5:
--#line 413 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  /* Case of EOF seen by itself.  Do ignoreeof or
- 			     not. */
-@@ -2148,17 +2153,17 @@ yyreduce:
-     break;
- 
-   case 6:
--#line 423 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
-     break;
- 
-   case 7:
--#line 425 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
-     break;
- 
-   case 8:
--#line 429 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2167,7 +2172,7 @@ yyreduce:
-     break;
- 
-   case 9:
--#line 435 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2176,7 +2181,7 @@ yyreduce:
-     break;
- 
-   case 10:
--#line 441 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2185,7 +2190,7 @@ yyreduce:
-     break;
- 
-   case 11:
--#line 447 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2194,7 +2199,7 @@ yyreduce:
-     break;
- 
-   case 12:
--#line 453 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2203,7 +2208,7 @@ yyreduce:
-     break;
- 
-   case 13:
--#line 459 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2212,7 +2217,7 @@ yyreduce:
-     break;
- 
-   case 14:
--#line 465 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2221,7 +2226,7 @@ yyreduce:
-     break;
- 
-   case 15:
--#line 471 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2230,7 +2235,7 @@ yyreduce:
-     break;
- 
-   case 16:
--#line 477 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2239,7 +2244,7 @@ yyreduce:
-     break;
- 
-   case 17:
--#line 483 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2248,7 +2253,7 @@ yyreduce:
-     break;
- 
-   case 18:
--#line 489 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2257,7 +2262,7 @@ yyreduce:
-     break;
- 
-   case 19:
--#line 495 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2266,7 +2271,7 @@ yyreduce:
-     break;
- 
-   case 20:
--#line 501 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2275,7 +2280,7 @@ yyreduce:
-     break;
- 
-   case 21:
--#line 507 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2284,7 +2289,7 @@ yyreduce:
-     break;
- 
-   case 22:
--#line 513 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2293,67 +2298,67 @@ yyreduce:
-     break;
- 
-   case 23:
--#line 519 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
- 			  (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 24:
--#line 526 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
- 			  (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 25:
--#line 533 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
- 			  (yyval.redirect) = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 26:
--#line 540 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
- 			  (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 27:
--#line 547 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
- 			  (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 28:
--#line 554 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
- 			  (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
--			  redir_stack[need_here_doc++] = (yyval.redirect);
-+			  push_heredoc ((yyval.redirect));
- 			}
-     break;
- 
-   case 29:
--#line 561 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2362,7 +2367,7 @@ yyreduce:
-     break;
- 
-   case 30:
--#line 567 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2371,7 +2376,7 @@ yyreduce:
-     break;
- 
-   case 31:
--#line 573 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2380,7 +2385,7 @@ yyreduce:
-     break;
- 
-   case 32:
--#line 579 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.dest = (yyvsp[(2) - (2)].number);
-@@ -2389,7 +2394,7 @@ yyreduce:
-     break;
- 
-   case 33:
--#line 585 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2398,7 +2403,7 @@ yyreduce:
-     break;
- 
-   case 34:
--#line 591 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2407,7 +2412,7 @@ yyreduce:
-     break;
- 
-   case 35:
--#line 597 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.dest = (yyvsp[(2) - (2)].number);
-@@ -2416,7 +2421,7 @@ yyreduce:
-     break;
- 
-   case 36:
--#line 603 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2425,7 +2430,7 @@ yyreduce:
-     break;
- 
-   case 37:
--#line 609 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2434,7 +2439,7 @@ yyreduce:
-     break;
- 
-   case 38:
--#line 615 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2443,7 +2448,7 @@ yyreduce:
-     break;
- 
-   case 39:
--#line 621 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2452,7 +2457,7 @@ yyreduce:
-     break;
- 
-   case 40:
--#line 627 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2461,7 +2466,7 @@ yyreduce:
-     break;
- 
-   case 41:
--#line 633 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2470,7 +2475,7 @@ yyreduce:
-     break;
- 
-   case 42:
--#line 639 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2479,7 +2484,7 @@ yyreduce:
-     break;
- 
-   case 43:
--#line 645 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2488,7 +2493,7 @@ yyreduce:
-     break;
- 
-   case 44:
--#line 651 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.dest = 0;
-@@ -2497,7 +2502,7 @@ yyreduce:
-     break;
- 
-   case 45:
--#line 657 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = 0;
-@@ -2506,7 +2511,7 @@ yyreduce:
-     break;
- 
-   case 46:
--#line 663 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = 0;
-@@ -2515,7 +2520,7 @@ yyreduce:
-     break;
- 
-   case 47:
--#line 669 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.dest = 0;
-@@ -2524,7 +2529,7 @@ yyreduce:
-     break;
- 
-   case 48:
--#line 675 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = 0;
-@@ -2533,7 +2538,7 @@ yyreduce:
-     break;
- 
-   case 49:
--#line 681 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = 0;
-@@ -2542,7 +2547,7 @@ yyreduce:
-     break;
- 
-   case 50:
--#line 687 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2551,7 +2556,7 @@ yyreduce:
-     break;
- 
-   case 51:
--#line 693 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2560,29 +2565,29 @@ yyreduce:
-     break;
- 
-   case 52:
--#line 701 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
-     break;
- 
-   case 53:
--#line 703 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
-     break;
- 
-   case 54:
--#line 705 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
-     break;
- 
-   case 55:
--#line 709 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
- 			}
-     break;
- 
-   case 56:
--#line 713 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  register REDIRECT *t;
- 
-@@ -2594,27 +2599,27 @@ yyreduce:
-     break;
- 
-   case 57:
--#line 724 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
-     break;
- 
-   case 58:
--#line 726 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
-     break;
- 
-   case 59:
--#line 730 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
-     break;
- 
-   case 60:
--#line 732 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 61:
--#line 734 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2633,72 +2638,72 @@ yyreduce:
-     break;
- 
-   case 62:
--#line 750 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 63:
--#line 752 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 64:
--#line 756 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 65:
--#line 758 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 66:
--#line 760 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
-     break;
- 
-   case 67:
--#line 762 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
-     break;
- 
-   case 68:
--#line 764 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 69:
--#line 766 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 70:
--#line 768 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 71:
--#line 770 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 72:
--#line 772 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 73:
--#line 774 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 74:
--#line 776 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 75:
--#line 780 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2706,7 +2711,7 @@ yyreduce:
-     break;
- 
-   case 76:
--#line 785 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2714,7 +2719,7 @@ yyreduce:
-     break;
- 
-   case 77:
--#line 790 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2722,7 +2727,7 @@ yyreduce:
-     break;
- 
-   case 78:
--#line 795 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2730,7 +2735,7 @@ yyreduce:
-     break;
- 
-   case 79:
--#line 800 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2738,7 +2743,7 @@ yyreduce:
-     break;
- 
-   case 80:
--#line 805 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2746,7 +2751,7 @@ yyreduce:
-     break;
- 
-   case 81:
--#line 810 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2754,7 +2759,7 @@ yyreduce:
-     break;
- 
-   case 82:
--#line 815 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2762,7 +2767,7 @@ yyreduce:
-     break;
- 
-   case 83:
--#line 822 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2770,7 +2775,7 @@ yyreduce:
-     break;
- 
-   case 84:
--#line 827 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2778,7 +2783,7 @@ yyreduce:
-     break;
- 
-   case 85:
--#line 832 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2786,7 +2791,7 @@ yyreduce:
-     break;
- 
-   case 86:
--#line 837 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2794,7 +2799,7 @@ yyreduce:
-     break;
- 
-   case 87:
--#line 844 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2802,7 +2807,7 @@ yyreduce:
-     break;
- 
-   case 88:
--#line 849 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2810,7 +2815,7 @@ yyreduce:
-     break;
- 
-   case 89:
--#line 854 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2818,7 +2823,7 @@ yyreduce:
-     break;
- 
-   case 90:
--#line 859 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2826,7 +2831,7 @@ yyreduce:
-     break;
- 
-   case 91:
--#line 864 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2834,7 +2839,7 @@ yyreduce:
-     break;
- 
-   case 92:
--#line 869 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2842,7 +2847,7 @@ yyreduce:
-     break;
- 
-   case 93:
--#line 876 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2850,7 +2855,7 @@ yyreduce:
-     break;
- 
-   case 94:
--#line 881 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2858,7 +2863,7 @@ yyreduce:
-     break;
- 
-   case 95:
--#line 886 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2866,27 +2871,27 @@ yyreduce:
-     break;
- 
-   case 96:
--#line 893 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 97:
--#line 896 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 98:
--#line 899 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 99:
--#line 903 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 100:
--#line 905 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2918,7 +2923,7 @@ yyreduce:
-     break;
- 
-   case 101:
--#line 936 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL;
-@@ -2926,7 +2931,7 @@ yyreduce:
-     break;
- 
-   case 102:
--#line 943 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2934,7 +2939,7 @@ yyreduce:
-     break;
- 
-   case 103:
--#line 948 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2954,7 +2959,7 @@ yyreduce:
-     break;
- 
-   case 104:
--#line 965 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2962,7 +2967,7 @@ yyreduce:
-     break;
- 
-   case 105:
--#line 970 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2982,7 +2987,7 @@ yyreduce:
-     break;
- 
-   case 106:
--#line 987 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2990,117 +2995,117 @@ yyreduce:
-     break;
- 
-   case 107:
--#line 994 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
-     break;
- 
-   case 108:
--#line 996 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
-     break;
- 
-   case 109:
--#line 998 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
-     break;
- 
-   case 110:
--#line 1003 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
-     break;
- 
-   case 111:
--#line 1007 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
-     break;
- 
-   case 112:
--#line 1011 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(2) - (3)].command); }
-     break;
- 
-   case 113:
--#line 1015 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
-     break;
- 
-   case 114:
--#line 1017 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
-     break;
- 
-   case 115:
--#line 1019 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
-     break;
- 
-   case 117:
--#line 1024 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
-     break;
- 
-   case 118:
--#line 1028 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
-     break;
- 
-   case 119:
--#line 1030 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
-     break;
- 
-   case 120:
--#line 1032 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
-     break;
- 
-   case 121:
--#line 1034 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
-     break;
- 
-   case 122:
--#line 1038 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 123:
--#line 1040 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 124:
--#line 1042 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 125:
--#line 1044 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 126:
--#line 1046 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 127:
--#line 1048 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 128:
--#line 1052 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
-     break;
- 
-   case 129:
--#line 1054 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
-     break;
- 
-   case 130:
--#line 1063 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(2) - (2)].command);
- 			  if (need_here_doc)
-@@ -3109,14 +3114,14 @@ yyreduce:
-     break;
- 
-   case 132:
--#line 1072 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(2) - (2)].command);
- 			}
-     break;
- 
-   case 134:
--#line 1079 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(1) - (3)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (COMMAND *)NULL, '&');
-@@ -3126,17 +3131,17 @@ yyreduce:
-     break;
- 
-   case 136:
--#line 1090 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
-     break;
- 
-   case 137:
--#line 1092 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
-     break;
- 
-   case 138:
--#line 1094 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(1) - (4)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '&');
-@@ -3146,37 +3151,37 @@ yyreduce:
-     break;
- 
-   case 139:
--#line 1101 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
-     break;
- 
-   case 140:
--#line 1103 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
-     break;
- 
-   case 141:
--#line 1105 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 144:
--#line 1113 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = '\n'; }
-     break;
- 
-   case 145:
--#line 1115 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = ';'; }
-     break;
- 
-   case 146:
--#line 1117 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = yacc_EOF; }
-     break;
- 
-   case 149:
--#line 1131 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(1) - (1)].command);
- 			  if (need_here_doc)
-@@ -3192,7 +3197,7 @@ yyreduce:
-     break;
- 
-   case 150:
--#line 1144 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(1) - (2)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (2)].command), (COMMAND *)NULL, '&');
-@@ -3211,7 +3216,7 @@ yyreduce:
-     break;
- 
-   case 151:
--#line 1160 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(1) - (2)].command);
- 			  if (need_here_doc)
-@@ -3227,17 +3232,17 @@ yyreduce:
-     break;
- 
-   case 152:
--#line 1175 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
-     break;
- 
-   case 153:
--#line 1177 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
-     break;
- 
-   case 154:
--#line 1179 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(1) - (3)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), '&');
-@@ -3247,22 +3252,22 @@ yyreduce:
-     break;
- 
-   case 155:
--#line 1186 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
-     break;
- 
-   case 156:
--#line 1189 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 157:
--#line 1193 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 158:
--#line 1195 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(2) - (2)].command))
- 			    (yyvsp[(2) - (2)].command)->flags ^= CMD_INVERT_RETURN;	/* toggle */
-@@ -3271,7 +3276,7 @@ yyreduce:
-     break;
- 
-   case 159:
--#line 1201 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  if ((yyvsp[(2) - (2)].command))
- 			    (yyvsp[(2) - (2)].command)->flags |= (yyvsp[(1) - (2)].number);
-@@ -3280,7 +3285,7 @@ yyreduce:
-     break;
- 
-   case 160:
--#line 1207 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  ELEMENT x;
- 
-@@ -3300,7 +3305,7 @@ yyreduce:
-     break;
- 
-   case 161:
--#line 1224 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  ELEMENT x;
- 
-@@ -3321,12 +3326,12 @@ yyreduce:
-     break;
- 
-   case 162:
--#line 1244 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
-     break;
- 
-   case 163:
--#line 1246 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     {
- 			  /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
- 			  COMMAND *tc;
-@@ -3352,28 +3357,28 @@ yyreduce:
-     break;
- 
-   case 164:
--#line 1269 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 165:
--#line 1273 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE; }
-     break;
- 
-   case 166:
--#line 1275 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
-     break;
- 
-   case 167:
--#line 1277 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
-     break;
- 
- 
- /* Line 1267 of yacc.c.  */
--#line 3377 "y.tab.c"
-+#line 3382 "y.tab.c"
-       default: break;
-     }
-   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-@@ -3587,7 +3592,7 @@ yyreturn:
- }
- 
- 
--#line 1279 "/usr/homes/chet/src/bash/src/parse.y"
-+#line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- 
- 
- /* Initial size to allocate for tokens, and the
-@@ -4948,6 +4953,21 @@ yylex ()
-    which allow ESAC to be the next one read. */
- static int esacs_needed_count;
- 
-+static void
-+push_heredoc (r)
-+     REDIRECT *r;
-+{
-+  if (need_here_doc >= HEREDOC_MAX)
-+    {
-+      last_command_exit_value = EX_BADUSAGE;
-+      need_here_doc = 0;
-+      report_syntax_error (_("maximum here-document count exceeded"));
-+      reset_parser ();
-+      exit_shell (last_command_exit_value);
-+    }
-+  redir_stack[need_here_doc++] = r;
-+}
-+
- void
- gather_here_documents ()
- {
-@@ -8541,3 +8561,4 @@ set_line_mbstate ()
-     }
- }
- #endif /* HANDLE_MULTIBYTE */
-+
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 27
-+#define PATCHLEVEL 28
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/129-upstream-bash43-029.patch b/trunk/package/feeds/packages/bash/patches/129-upstream-bash43-029.patch
deleted file mode 100644
index be824034..00000000
--- a/trunk/package/feeds/packages/bash/patches/129-upstream-bash43-029.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-029
-
-Bug-Reported-by:	Michal Zalewski <lcamtuf@coredump.cx>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-When bash is parsing a function definition that contains a here-document
-delimited by end-of-file (or end-of-string), it leaves the closing delimiter
-uninitialized.  This can result in an invalid memory access when the parsed
-function is later copied.
-
-Patch (apply with `patch -p0'):
-
---- a/make_cmd.c
-+++ b/make_cmd.c
-@@ -692,6 +692,7 @@ make_redirection (source, instruction, d
-   /* First do the common cases. */
-   temp->redirector = source;
-   temp->redirectee = dest_and_filename;
-+  temp->here_doc_eof = 0;
-   temp->instruction = instruction;
-   temp->flags = 0;
-   temp->rflags = flags;
---- a/copy_cmd.c
-+++ b/copy_cmd.c
-@@ -126,7 +126,7 @@ copy_redirect (redirect)
-     {
-     case r_reading_until:
-     case r_deblank_reading_until:
--      new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);
-+      new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;
-       /*FALLTHROUGH*/
-     case r_reading_string:
-     case r_appending_to:
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 28
-+#define PATCHLEVEL 29
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/130-upstream-bash43-030.patch b/trunk/package/feeds/packages/bash/patches/130-upstream-bash43-030.patch
deleted file mode 100644
index 0eadc5c0..00000000
--- a/trunk/package/feeds/packages/bash/patches/130-upstream-bash43-030.patch
+++ /dev/null
@@ -1,1396 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-030
-
-Bug-Reported-by:	Michal Zalewski <lcamtuf@coredump.cx>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-A combination of nested command substitutions and function importing from
-the environment can cause bash to execute code appearing in the environment
-variable value following the function definition.
-
-Patch (apply with `patch -p0'):
-
---- a/builtins/evalstring.c
-+++ b/builtins/evalstring.c
-@@ -308,12 +308,25 @@ parse_and_execute (string, from_file, fl
- 	    {
- 	      struct fd_bitmap *bitmap;
- 
--	      if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
-+	      if (flags & SEVAL_FUNCDEF)
- 		{
--		  internal_warning ("%s: ignoring function definition attempt", from_file);
--		  should_jump_to_top_level = 0;
--		  last_result = last_command_exit_value = EX_BADUSAGE;
--		  break;
-+		  char *x;
-+
-+		  /* If the command parses to something other than a straight
-+		     function definition, or if we have not consumed the entire
-+		     string, or if the parser has transformed the function
-+		     name (as parsing will if it begins or ends with shell
-+		     whitespace, for example), reject the attempt */
-+		  if (command->type != cm_function_def ||
-+		      ((x = parser_remaining_input ()) && *x) ||
-+		      (STREQ (from_file, command->value.Function_def->name->word) == 0))
-+		    {
-+		      internal_warning (_("%s: ignoring function definition attempt"), from_file);
-+		      should_jump_to_top_level = 0;
-+		      last_result = last_command_exit_value = EX_BADUSAGE;
-+		      reset_parser ();
-+		      break;
-+		    }
- 		}
- 
- 	      bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
-@@ -378,7 +391,10 @@ parse_and_execute (string, from_file, fl
- 	      discard_unwind_frame ("pe_dispose");
- 
- 	      if (flags & SEVAL_ONECMD)
--		break;
-+		{
-+		  reset_parser ();
-+		  break;
-+		}
- 	    }
- 	}
-       else
---- a/parse.y
-+++ b/parse.y
-@@ -2538,6 +2538,16 @@ shell_ungetc (c)
-     eol_ungetc_lookahead = c;
- }
- 
-+char *
-+parser_remaining_input ()
-+{
-+  if (shell_input_line == 0)
-+    return 0;
-+  if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
-+    return '\0';	/* XXX */
-+  return (shell_input_line + shell_input_line_index);
-+}
-+
- #ifdef INCLUDE_UNUSED
- /* Back the input pointer up by one, effectively `ungetting' a character. */
- static void
-@@ -4027,8 +4037,8 @@ xparse_dolparen (base, string, indp, fla
-   reset_parser ();
-   /* reset_parser clears shell_input_line and associated variables */
-   restore_input_line_state (&ls);
--  if (interactive)
--    token_to_read = 0;
-+
-+  token_to_read = 0;
- 
-   /* Need to find how many characters parse_and_execute consumed, update
-      *indp, if flags != 0, copy the portion of the string parsed into RET
---- a/shell.h
-+++ b/shell.h
-@@ -180,6 +180,8 @@ typedef struct _sh_input_line_state_t {
- } sh_input_line_state_t;
- 
- /* Let's try declaring these here. */
-+extern char *parser_remaining_input __P((void));
-+
- extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
- extern void restore_parser_state __P((sh_parser_state_t *));
- 
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -168,7 +168,7 @@
- 
- 
- /* Copy the first part of user declarations.  */
--#line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 21 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- 
- #include "config.h"
- 
-@@ -497,7 +497,7 @@ static REDIRECTEE redir;
- 
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
--#line 329 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 329 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
-   WORD_DESC *word;		/* the word that we read. */
-   int number;			/* the number that we read. */
-@@ -2098,7 +2098,7 @@ yyreduce:
-   switch (yyn)
-     {
-         case 2:
--#line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 383 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  /* Case of regular command.  Discard the error
- 			     safety net,and return the command just parsed. */
-@@ -2112,7 +2112,7 @@ yyreduce:
-     break;
- 
-   case 3:
--#line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 394 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  /* Case of regular command, but not a very
- 			     interesting one.  Return a NULL command. */
-@@ -2124,7 +2124,7 @@ yyreduce:
-     break;
- 
-   case 4:
--#line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 403 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  /* Error during parsing.  Return NULL command. */
- 			  global_command = (COMMAND *)NULL;
-@@ -2142,7 +2142,7 @@ yyreduce:
-     break;
- 
-   case 5:
--#line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 418 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  /* Case of EOF seen by itself.  Do ignoreeof or
- 			     not. */
-@@ -2153,17 +2153,17 @@ yyreduce:
-     break;
- 
-   case 6:
--#line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 428 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
-     break;
- 
-   case 7:
--#line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 430 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
-     break;
- 
-   case 8:
--#line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 434 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2172,7 +2172,7 @@ yyreduce:
-     break;
- 
-   case 9:
--#line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 440 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2181,7 +2181,7 @@ yyreduce:
-     break;
- 
-   case 10:
--#line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 446 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2190,7 +2190,7 @@ yyreduce:
-     break;
- 
-   case 11:
--#line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 452 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2199,7 +2199,7 @@ yyreduce:
-     break;
- 
-   case 12:
--#line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 458 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2208,7 +2208,7 @@ yyreduce:
-     break;
- 
-   case 13:
--#line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 464 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2217,7 +2217,7 @@ yyreduce:
-     break;
- 
-   case 14:
--#line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 470 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2226,7 +2226,7 @@ yyreduce:
-     break;
- 
-   case 15:
--#line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 476 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2235,7 +2235,7 @@ yyreduce:
-     break;
- 
-   case 16:
--#line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 482 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2244,7 +2244,7 @@ yyreduce:
-     break;
- 
-   case 17:
--#line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 488 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2253,7 +2253,7 @@ yyreduce:
-     break;
- 
-   case 18:
--#line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 494 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2262,7 +2262,7 @@ yyreduce:
-     break;
- 
-   case 19:
--#line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 500 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2271,7 +2271,7 @@ yyreduce:
-     break;
- 
-   case 20:
--#line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 506 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2280,7 +2280,7 @@ yyreduce:
-     break;
- 
-   case 21:
--#line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 512 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2289,7 +2289,7 @@ yyreduce:
-     break;
- 
-   case 22:
--#line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 518 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2298,7 +2298,7 @@ yyreduce:
-     break;
- 
-   case 23:
--#line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 524 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2308,7 +2308,7 @@ yyreduce:
-     break;
- 
-   case 24:
--#line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 531 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2318,7 +2318,7 @@ yyreduce:
-     break;
- 
-   case 25:
--#line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 538 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2328,7 +2328,7 @@ yyreduce:
-     break;
- 
-   case 26:
--#line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 545 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2338,7 +2338,7 @@ yyreduce:
-     break;
- 
-   case 27:
--#line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 552 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2348,7 +2348,7 @@ yyreduce:
-     break;
- 
-   case 28:
--#line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 559 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2358,7 +2358,7 @@ yyreduce:
-     break;
- 
-   case 29:
--#line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 566 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2367,7 +2367,7 @@ yyreduce:
-     break;
- 
-   case 30:
--#line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 572 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2376,7 +2376,7 @@ yyreduce:
-     break;
- 
-   case 31:
--#line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 578 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2385,7 +2385,7 @@ yyreduce:
-     break;
- 
-   case 32:
--#line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 584 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.dest = (yyvsp[(2) - (2)].number);
-@@ -2394,7 +2394,7 @@ yyreduce:
-     break;
- 
-   case 33:
--#line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 590 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2403,7 +2403,7 @@ yyreduce:
-     break;
- 
-   case 34:
--#line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 596 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2412,7 +2412,7 @@ yyreduce:
-     break;
- 
-   case 35:
--#line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 602 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.dest = (yyvsp[(2) - (2)].number);
-@@ -2421,7 +2421,7 @@ yyreduce:
-     break;
- 
-   case 36:
--#line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 608 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2430,7 +2430,7 @@ yyreduce:
-     break;
- 
-   case 37:
--#line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 614 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = (yyvsp[(3) - (3)].number);
-@@ -2439,7 +2439,7 @@ yyreduce:
-     break;
- 
-   case 38:
--#line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 620 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2448,7 +2448,7 @@ yyreduce:
-     break;
- 
-   case 39:
--#line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 626 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2457,7 +2457,7 @@ yyreduce:
-     break;
- 
-   case 40:
--#line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 632 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2466,7 +2466,7 @@ yyreduce:
-     break;
- 
-   case 41:
--#line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 638 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2475,7 +2475,7 @@ yyreduce:
-     break;
- 
-   case 42:
--#line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 644 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2484,7 +2484,7 @@ yyreduce:
-     break;
- 
-   case 43:
--#line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 650 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.filename = (yyvsp[(3) - (3)].word);
-@@ -2493,7 +2493,7 @@ yyreduce:
-     break;
- 
-   case 44:
--#line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 656 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.dest = 0;
-@@ -2502,7 +2502,7 @@ yyreduce:
-     break;
- 
-   case 45:
--#line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 662 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = 0;
-@@ -2511,7 +2511,7 @@ yyreduce:
-     break;
- 
-   case 46:
--#line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 668 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = 0;
-@@ -2520,7 +2520,7 @@ yyreduce:
-     break;
- 
-   case 47:
--#line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 674 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 0;
- 			  redir.dest = 0;
-@@ -2529,7 +2529,7 @@ yyreduce:
-     break;
- 
-   case 48:
--#line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 680 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = (yyvsp[(1) - (3)].number);
- 			  redir.dest = 0;
-@@ -2538,7 +2538,7 @@ yyreduce:
-     break;
- 
-   case 49:
--#line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 686 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.filename = (yyvsp[(1) - (3)].word);
- 			  redir.dest = 0;
-@@ -2547,7 +2547,7 @@ yyreduce:
-     break;
- 
-   case 50:
--#line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 692 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2556,7 +2556,7 @@ yyreduce:
-     break;
- 
-   case 51:
--#line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 698 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  source.dest = 1;
- 			  redir.filename = (yyvsp[(2) - (2)].word);
-@@ -2565,29 +2565,29 @@ yyreduce:
-     break;
- 
-   case 52:
--#line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 706 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
-     break;
- 
-   case 53:
--#line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 708 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
-     break;
- 
-   case 54:
--#line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 710 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
-     break;
- 
-   case 55:
--#line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 714 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
- 			}
-     break;
- 
-   case 56:
--#line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 718 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  register REDIRECT *t;
- 
-@@ -2599,27 +2599,27 @@ yyreduce:
-     break;
- 
-   case 57:
--#line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 729 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
-     break;
- 
-   case 58:
--#line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 731 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
-     break;
- 
-   case 59:
--#line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 735 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
-     break;
- 
-   case 60:
--#line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 737 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 61:
--#line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 739 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2638,72 +2638,72 @@ yyreduce:
-     break;
- 
-   case 62:
--#line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 755 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 63:
--#line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 757 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 64:
--#line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 761 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 65:
--#line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 763 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 66:
--#line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 765 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
-     break;
- 
-   case 67:
--#line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 767 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
-     break;
- 
-   case 68:
--#line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 769 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 69:
--#line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 771 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 70:
--#line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 773 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 71:
--#line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 775 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 72:
--#line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 777 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 73:
--#line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 779 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 74:
--#line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 781 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 75:
--#line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 785 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2711,7 +2711,7 @@ yyreduce:
-     break;
- 
-   case 76:
--#line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 790 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2719,7 +2719,7 @@ yyreduce:
-     break;
- 
-   case 77:
--#line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 795 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2727,7 +2727,7 @@ yyreduce:
-     break;
- 
-   case 78:
--#line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 800 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2735,7 +2735,7 @@ yyreduce:
-     break;
- 
-   case 79:
--#line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 805 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2743,7 +2743,7 @@ yyreduce:
-     break;
- 
-   case 80:
--#line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 810 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2751,7 +2751,7 @@ yyreduce:
-     break;
- 
-   case 81:
--#line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 815 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2759,7 +2759,7 @@ yyreduce:
-     break;
- 
-   case 82:
--#line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 820 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2767,7 +2767,7 @@ yyreduce:
-     break;
- 
-   case 83:
--#line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 827 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2775,7 +2775,7 @@ yyreduce:
-     break;
- 
-   case 84:
--#line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 832 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2783,7 +2783,7 @@ yyreduce:
-     break;
- 
-   case 85:
--#line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 837 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2791,7 +2791,7 @@ yyreduce:
-     break;
- 
-   case 86:
--#line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 842 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 				  (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
- 				  if (word_top > 0) word_top--;
-@@ -2799,7 +2799,7 @@ yyreduce:
-     break;
- 
-   case 87:
--#line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 849 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2807,7 +2807,7 @@ yyreduce:
-     break;
- 
-   case 88:
--#line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 854 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2815,7 +2815,7 @@ yyreduce:
-     break;
- 
-   case 89:
--#line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 859 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2823,7 +2823,7 @@ yyreduce:
-     break;
- 
-   case 90:
--#line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 864 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2831,7 +2831,7 @@ yyreduce:
-     break;
- 
-   case 91:
--#line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 869 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2839,7 +2839,7 @@ yyreduce:
-     break;
- 
-   case 92:
--#line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 874 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2847,7 +2847,7 @@ yyreduce:
-     break;
- 
-   case 93:
--#line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 881 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2855,7 +2855,7 @@ yyreduce:
-     break;
- 
-   case 94:
--#line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 886 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2863,7 +2863,7 @@ yyreduce:
-     break;
- 
-   case 95:
--#line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 891 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
- 			  if (word_top > 0) word_top--;
-@@ -2871,27 +2871,27 @@ yyreduce:
-     break;
- 
-   case 96:
--#line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 898 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 97:
--#line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 901 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 98:
--#line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 904 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
-     break;
- 
-   case 99:
--#line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 908 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 100:
--#line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 910 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2923,7 +2923,7 @@ yyreduce:
-     break;
- 
-   case 101:
--#line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 941 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL;
-@@ -2931,7 +2931,7 @@ yyreduce:
-     break;
- 
-   case 102:
--#line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 948 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2939,7 +2939,7 @@ yyreduce:
-     break;
- 
-   case 103:
--#line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 953 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2959,7 +2959,7 @@ yyreduce:
-     break;
- 
-   case 104:
--#line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 970 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2967,7 +2967,7 @@ yyreduce:
-     break;
- 
-   case 105:
--#line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 975 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  COMMAND *tc;
- 
-@@ -2987,7 +2987,7 @@ yyreduce:
-     break;
- 
-   case 106:
--#line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 992 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
- 			  (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
-@@ -2995,117 +2995,117 @@ yyreduce:
-     break;
- 
-   case 107:
--#line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 999 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
-     break;
- 
-   case 108:
--#line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1001 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
-     break;
- 
-   case 109:
--#line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1003 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
-     break;
- 
-   case 110:
--#line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1008 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
-     break;
- 
-   case 111:
--#line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1012 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
-     break;
- 
-   case 112:
--#line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1016 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(2) - (3)].command); }
-     break;
- 
-   case 113:
--#line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1020 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
-     break;
- 
-   case 114:
--#line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1022 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
-     break;
- 
-   case 115:
--#line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1024 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
-     break;
- 
-   case 117:
--#line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1029 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
-     break;
- 
-   case 118:
--#line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1033 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
-     break;
- 
-   case 119:
--#line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1035 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
-     break;
- 
-   case 120:
--#line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1037 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
-     break;
- 
-   case 121:
--#line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1039 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
-     break;
- 
-   case 122:
--#line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1043 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 123:
--#line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1045 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 124:
--#line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1047 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 125:
--#line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1049 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 126:
--#line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1051 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
-     break;
- 
-   case 127:
--#line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1053 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
-     break;
- 
-   case 128:
--#line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1057 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
-     break;
- 
-   case 129:
--#line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1059 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
-     break;
- 
-   case 130:
--#line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1068 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(2) - (2)].command);
- 			  if (need_here_doc)
-@@ -3114,14 +3114,14 @@ yyreduce:
-     break;
- 
-   case 132:
--#line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1077 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(2) - (2)].command);
- 			}
-     break;
- 
-   case 134:
--#line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1084 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(1) - (3)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (COMMAND *)NULL, '&');
-@@ -3131,17 +3131,17 @@ yyreduce:
-     break;
- 
-   case 136:
--#line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1095 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
-     break;
- 
-   case 137:
--#line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1097 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
-     break;
- 
-   case 138:
--#line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1099 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(1) - (4)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '&');
-@@ -3151,37 +3151,37 @@ yyreduce:
-     break;
- 
-   case 139:
--#line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1106 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
-     break;
- 
-   case 140:
--#line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1108 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
-     break;
- 
-   case 141:
--#line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1110 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 144:
--#line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1118 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = '\n'; }
-     break;
- 
-   case 145:
--#line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1120 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = ';'; }
-     break;
- 
-   case 146:
--#line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1122 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = yacc_EOF; }
-     break;
- 
-   case 149:
--#line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1136 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(1) - (1)].command);
- 			  if (need_here_doc)
-@@ -3197,7 +3197,7 @@ yyreduce:
-     break;
- 
-   case 150:
--#line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1149 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(1) - (2)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (2)].command), (COMMAND *)NULL, '&');
-@@ -3216,7 +3216,7 @@ yyreduce:
-     break;
- 
-   case 151:
--#line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1165 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  (yyval.command) = (yyvsp[(1) - (2)].command);
- 			  if (need_here_doc)
-@@ -3232,17 +3232,17 @@ yyreduce:
-     break;
- 
-   case 152:
--#line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1180 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
-     break;
- 
-   case 153:
--#line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1182 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
-     break;
- 
-   case 154:
--#line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1184 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(1) - (3)].command)->type == cm_connection)
- 			    (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), '&');
-@@ -3252,22 +3252,22 @@ yyreduce:
-     break;
- 
-   case 155:
--#line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1191 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
-     break;
- 
-   case 156:
--#line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1194 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 157:
--#line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1198 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 158:
--#line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1200 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(2) - (2)].command))
- 			    (yyvsp[(2) - (2)].command)->flags ^= CMD_INVERT_RETURN;	/* toggle */
-@@ -3276,7 +3276,7 @@ yyreduce:
-     break;
- 
-   case 159:
--#line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1206 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  if ((yyvsp[(2) - (2)].command))
- 			    (yyvsp[(2) - (2)].command)->flags |= (yyvsp[(1) - (2)].number);
-@@ -3285,7 +3285,7 @@ yyreduce:
-     break;
- 
-   case 160:
--#line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1212 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  ELEMENT x;
- 
-@@ -3305,7 +3305,7 @@ yyreduce:
-     break;
- 
-   case 161:
--#line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1229 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  ELEMENT x;
- 
-@@ -3326,12 +3326,12 @@ yyreduce:
-     break;
- 
-   case 162:
--#line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1249 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
-     break;
- 
-   case 163:
--#line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1251 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     {
- 			  /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
- 			  COMMAND *tc;
-@@ -3357,22 +3357,22 @@ yyreduce:
-     break;
- 
-   case 164:
--#line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1274 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.command) = (yyvsp[(1) - (1)].command); }
-     break;
- 
-   case 165:
--#line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1278 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE; }
-     break;
- 
-   case 166:
--#line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1280 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
-     break;
- 
-   case 167:
--#line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1282 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-     { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
-     break;
- 
-@@ -3592,7 +3592,7 @@ yyreturn:
- }
- 
- 
--#line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-+#line 1284 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- 
- 
- /* Initial size to allocate for tokens, and the
-@@ -4850,6 +4850,16 @@ shell_ungetc (c)
-     eol_ungetc_lookahead = c;
- }
- 
-+char *
-+parser_remaining_input ()
-+{
-+  if (shell_input_line == 0)
-+    return 0;
-+  if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
-+    return '\0';	/* XXX */
-+  return (shell_input_line + shell_input_line_index);
-+}
-+
- #ifdef INCLUDE_UNUSED
- /* Back the input pointer up by one, effectively `ungetting' a character. */
- static void
-@@ -6339,8 +6349,8 @@ xparse_dolparen (base, string, indp, fla
-   reset_parser ();
-   /* reset_parser clears shell_input_line and associated variables */
-   restore_input_line_state (&ls);
--  if (interactive)
--    token_to_read = 0;
-+
-+  token_to_read = 0;
- 
-   /* Need to find how many characters parse_and_execute consumed, update
-      *indp, if flags != 0, copy the portion of the string parsed into RET
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 29
-+#define PATCHLEVEL 30
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/131-upstream-bash43-031.patch b/trunk/package/feeds/packages/bash/patches/131-upstream-bash43-031.patch
deleted file mode 100644
index a22cb071..00000000
--- a/trunk/package/feeds/packages/bash/patches/131-upstream-bash43-031.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-031
-
-Bug-Reported-by:	lolilolicon <lolilolicon@gmail.com>
-Bug-Reference-ID:	<CAMtVo_Nz=32Oq=zWTb6=+8gUNXOo2rRvud1W4oPnA-cgVk_ZqQ@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html
-
-Bug-Description:
-
-The new nameref assignment functionality introduced in bash-4.3 did not perform
-enough validation on the variable value and would create variables with
-invalid names.
-
-Patch (apply with `patch -p0'):
-
---- a/subst.h
-+++ b/subst.h
-@@ -47,6 +47,7 @@
- #define ASS_MKASSOC	0x0004
- #define ASS_MKGLOBAL	0x0008	/* force global assignment */
- #define ASS_NAMEREF	0x0010	/* assigning to nameref variable */
-+#define ASS_FROMREF	0x0020	/* assigning from value of nameref variable */
- 
- /* Flags for the string extraction functions. */
- #define SX_NOALLOC	0x0001	/* just skip; don't return substring */
---- a/variables.c
-+++ b/variables.c
-@@ -2516,10 +2516,27 @@ bind_variable_internal (name, value, tab
-      HASH_TABLE *table;
-      int hflags, aflags;
- {
--  char *newval;
-+  char *newname, *newval;
-   SHELL_VAR *entry;
-+#if defined (ARRAY_VARS)
-+  arrayind_t ind;
-+  char *subp;
-+  int sublen;
-+#endif
- 
-+  newname = 0;
-+#if defined (ARRAY_VARS)
-+  if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
-+    {
-+      newname = array_variable_name (name, &subp, &sublen);
-+      if (newname == 0)
-+	return (SHELL_VAR *)NULL;	/* XXX */
-+      entry = hash_lookup (newname, table);
-+    }
-+  else
-+#endif
-   entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
-+
-   /* Follow the nameref chain here if this is the global variables table */
-   if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
-     {
-@@ -2550,6 +2567,16 @@ bind_variable_internal (name, value, tab
-       var_setvalue (entry, make_variable_value (entry, value, 0));
-       }
-     }
-+#if defined (ARRAY_VARS)
-+  else if (entry == 0 && newname)
-+    {
-+      entry = make_new_array_variable (newname);	/* indexed array by default */
-+      if (entry == 0)
-+	return entry;
-+      ind = array_expand_index (name, subp, sublen);
-+      bind_array_element (entry, ind, value, aflags);
-+    }
-+#endif
-   else if (entry == 0)
-     {
-       entry = make_new_variable (name, table);
-@@ -2670,7 +2697,8 @@ bind_variable (name, value, flags)
- 			 normal. */
- 		      if (nameref_cell (nv) == 0)
- 			return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
--		      return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags));
-+		      /* XXX - bug here with ref=array[index] */
-+		      return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF));
- 		    }
- 		  else
- 		    v = nv;
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 30
-+#define PATCHLEVEL 31
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/132-upstream-bash43-032.patch b/trunk/package/feeds/packages/bash/patches/132-upstream-bash43-032.patch
deleted file mode 100644
index 96a86c98..00000000
--- a/trunk/package/feeds/packages/bash/patches/132-upstream-bash43-032.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-032
-
-Bug-Reported-by:	crispusfairbairn@gmail.com
-Bug-Reference-ID:	<b5e499f7-3b98-408d-9f94-c0387580e73a@googlegroups.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html
-
-Bug-Description:
-
-When bash is running in Posix mode, it allows signals -- including SIGCHLD --
-to interrupt the `wait' builtin, as Posix requires.  However, the interrupt
-causes bash to not run a SIGCHLD trap for all exited children.  This patch
-fixes the issue and restores the documented behavior in Posix mode.
-
-Patch (apply with `patch -p0'):
-
---- a/jobs.c
-+++ b/jobs.c
-@@ -3339,7 +3339,9 @@ itrace("waitchld: waitpid returns %d blo
-       if (posixly_correct && this_shell_builtin && this_shell_builtin == wait_builtin)
- 	{
- 	  interrupt_immediately = 0;
--	  trap_handler (SIGCHLD);	/* set pending_traps[SIGCHLD] */
-+	  /* This was trap_handler (SIGCHLD) but that can lose traps if
-+	     children_exited > 1 */
-+	  queue_sigchld_trap (children_exited);
- 	  wait_signal_received = SIGCHLD;
- 	  /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
- 	     run_pending_traps will call run_sigchld_trap later  */
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 31
-+#define PATCHLEVEL 32
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/133-upstream-bash43-033.patch b/trunk/package/feeds/packages/bash/patches/133-upstream-bash43-033.patch
deleted file mode 100644
index 6210b5ea..00000000
--- a/trunk/package/feeds/packages/bash/patches/133-upstream-bash43-033.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.3
-Patch-ID:	bash43-033
-
-Bug-Reported-by:	mickael9@gmail.com, Jan Rome <jan.rome@gmail.com>
-Bug-Reference-ID:	<20140907224046.382ED3610CC@mickael-laptop.localdomain>,
-			<540D661D.50908@gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html
-			http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html
-
-Bug-Description:
-
-Bash does not clean up the terminal state in all cases where bash or
-readline  modifies it and bash is subsequently terminated by a fatal signal.
-This happens when the `read' builtin modifies the terminal settings, both
-when readline is active and when it is not.  It occurs most often when a script
-installs a trap that exits on a signal without re-sending the signal to itself.
-
-Patch (apply with `patch -p0'):
-
---- a/shell.c
-+++ b/shell.c
-@@ -73,6 +73,7 @@
- #endif
- 
- #if defined (READLINE)
-+#  include <readline/readline.h>
- #  include "bashline.h"
- #endif
- 
-@@ -909,6 +910,14 @@ exit_shell (s)
-   fflush (stdout);		/* XXX */
-   fflush (stderr);
- 
-+  /* Clean up the terminal if we are in a state where it's been modified. */
-+#if defined (READLINE)
-+  if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
-+    (*rl_deprep_term_function) ();
-+#endif
-+  if (read_tty_modified ())
-+    read_tty_cleanup ();
-+
-   /* Do trap[0] if defined.  Allow it to override the exit status
-      passed to us. */
-   if (signal_is_trapped (0))
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -140,10 +140,12 @@ static void reset_alarm __P((void));
- procenv_t alrmbuf;
- int sigalrm_seen;
- 
--static int reading;
-+static int reading, tty_modified;
- static SigHandler *old_alrm;
- static unsigned char delim;
- 
-+static struct ttsave termsave;
-+
- /* In all cases, SIGALRM just sets a flag that we check periodically.  This
-    avoids problems with the semi-tricky stuff we do with the xfree of
-    input_string at the top of the unwind-protect list (see below). */
-@@ -188,7 +190,6 @@ read_builtin (list)
-   struct stat tsb;
-   SHELL_VAR *var;
-   TTYSTRUCT ttattrs, ttset;
--  struct ttsave termsave;
- #if defined (ARRAY_VARS)
-   WORD_LIST *alist;
- #endif
-@@ -221,7 +222,7 @@ read_builtin (list)
-   USE_VAR(ps2);
-   USE_VAR(lastsig);
- 
--  sigalrm_seen = reading = 0;
-+  sigalrm_seen = reading = tty_modified = 0;
- 
-   i = 0;		/* Index into the string that we are reading. */
-   raw = edit = 0;	/* Not reading raw input by default. */
-@@ -438,6 +439,8 @@ read_builtin (list)
- 	  retval = 128+SIGALRM;
- 	  goto assign_vars;
- 	}
-+      if (interactive_shell == 0)
-+	initialize_terminating_signals ();
-       old_alrm = set_signal_handler (SIGALRM, sigalrm);
-       add_unwind_protect (reset_alarm, (char *)NULL);
- #if defined (READLINE)
-@@ -482,7 +485,10 @@ read_builtin (list)
- 	  i = silent ? ttfd_cbreak (fd, &ttset) : ttfd_onechar (fd, &ttset);
- 	  if (i < 0)
- 	    sh_ttyerror (1);
-+	  tty_modified = 1;
- 	  add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
-+	  if (interactive_shell == 0)
-+	    initialize_terminating_signals ();
- 	}
-     }
-   else if (silent)	/* turn off echo but leave term in canonical mode */
-@@ -497,7 +503,10 @@ read_builtin (list)
-       if (i < 0)
- 	sh_ttyerror (1);
- 
-+      tty_modified = 1;
-       add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
-+      if (interactive_shell == 0)
-+	initialize_terminating_signals ();
-     }
- 
-   /* This *must* be the top unwind-protect on the stack, so the manipulation
-@@ -588,6 +597,8 @@ read_builtin (list)
- 	    }
- 	  else
- 	    lastsig = 0;
-+	  if (terminating_signal && tty_modified)
-+	    ttyrestore (&termsave);	/* fix terminal before exiting */
- 	  CHECK_TERMSIG;
- 	  eof = 1;
- 	  break;
-@@ -978,6 +989,20 @@ ttyrestore (ttp)
-      struct ttsave *ttp;
- {
-   ttsetattr (ttp->fd, ttp->attrs);
-+  tty_modified = 0;
-+}
-+
-+void
-+read_tty_cleanup ()
-+{
-+  if (tty_modified)
-+    ttyrestore (&termsave);
-+}
-+
-+int
-+read_tty_modified ()
-+{
-+  return (tty_modified);
- }
- 
- #if defined (READLINE)
---- a/builtins/common.h
-+++ b/builtins/common.h
-@@ -122,6 +122,10 @@ extern void bash_logout __P((void));
- /* Functions from getopts.def */
- extern void getopts_reset __P((int));
- 
-+/* Functions from read.def */
-+extern void read_tty_cleanup __P((void));
-+extern int read_tty_modified __P((void));
-+
- /* Functions from set.def */
- extern int minus_o_option_value __P((char *));
- extern void list_minus_o_opts __P((int, int));
---- a/bashline.c
-+++ b/bashline.c
-@@ -202,6 +202,7 @@ extern int current_command_line_count, s
- extern int last_command_exit_value;
- extern int array_needs_making;
- extern int posixly_correct, no_symbolic_links;
-+extern int sigalrm_seen;
- extern char *current_prompt_string, *ps1_prompt;
- extern STRING_INT_ALIST word_token_alist[];
- extern sh_builtin_func_t *last_shell_builtin, *this_shell_builtin;
-@@ -4208,8 +4209,9 @@ bash_event_hook ()
- {
-   /* If we're going to longjmp to top_level, make sure we clean up readline.
-      check_signals will call QUIT, which will eventually longjmp to top_level,
--     calling run_interrupt_trap along the way. */
--  if (interrupt_state)
-+     calling run_interrupt_trap along the way.  The check for sigalrm_seen is
-+     to clean up the read builtin's state. */
-+  if (terminating_signal || interrupt_state || sigalrm_seen)
-     rl_cleanup_after_signal ();
-   bashline_reset_event_hook ();
-   check_signals_and_traps ();	/* XXX */
---- a/sig.c
-+++ b/sig.c
-@@ -532,8 +532,10 @@ termsig_sighandler (sig)
- #if defined (READLINE)
-   /* Set the event hook so readline will call it after the signal handlers
-      finish executing, so if this interrupted character input we can get
--     quick response. */
--  if (interactive_shell && interactive && no_line_editing == 0)
-+     quick response.  If readline is active or has modified the terminal we
-+     need to set this no matter what the signal is, though the check for
-+     RL_STATE_TERMPREPPED is possibly redundant. */
-+  if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
-     bashline_set_event_hook ();
- #endif
- 
---- a/patchlevel.h
-+++ b/patchlevel.h
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 32
-+#define PATCHLEVEL 33
- 
- #endif /* _PATCHLEVEL_H_ */
diff --git a/trunk/package/feeds/packages/bash/patches/900-no_doc.patch b/trunk/package/feeds/packages/bash/patches/900-no_doc.patch
deleted file mode 100644
index 3e7be421..00000000
--- a/trunk/package/feeds/packages/bash/patches/900-no_doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -741,10 +741,8 @@ reconfig: force
- #	$(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
- 
- doc documentation:  force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
- 
- info dvi ps: force
--	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
- 
- force:
- 
diff --git a/trunk/package/feeds/packages/bcp38/Makefile b/trunk/package/feeds/packages/bcp38/Makefile
deleted file mode 100644
index 280bcc50..00000000
--- a/trunk/package/feeds/packages/bcp38/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2014 Openwrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bcp38
-PKG_VERSION:=4
-PKG_RELEASE:=1
-PKG_LICENCE:=GPL-3.0+
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bcp38
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=BCP38 compliance
-  URL:=https://github.com/dtaht/ceropackages-3.10
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  DEPENDS:=+ipset
-endef
-
-define Package/bcp38/description
- bcp38 implements IETF BCP38 for home routers. See https://tools.ietf.org/html/bcp38.
-endef
-
-define Package/bcp38/conffiles
-/etc/config/bcp38
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/bcp38/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/bcp38.config $(1)/etc/config/bcp38
-	$(INSTALL_DIR) $(1)/usr/lib/bcp38
-	$(INSTALL_BIN) ./files/run.sh $(1)/usr/lib/bcp38/run.sh
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/bcp38.defaults $(1)/etc/uci-defaults/bcp38
-endef
-
-define Package/bcp38/postinst
-#!/bin/sh
-[ -x /etc/uci-defaults/bcp38 ] && /etc/uci-defaults/bcp38 || exit 0
-endef
-
-define Package/bcp38/postrm
-#!/bin/sh
-uci delete firewall.bcp38
-uci commit
-endef
-
-$(eval $(call BuildPackage,bcp38))
diff --git a/trunk/package/feeds/packages/bcp38/files/bcp38.config b/trunk/package/feeds/packages/bcp38/files/bcp38.config
deleted file mode 100644
index 08e8e20b..00000000
--- a/trunk/package/feeds/packages/bcp38/files/bcp38.config
+++ /dev/null
@@ -1,22 +0,0 @@
-config bcp38
-	option enabled 0
-	option interface 'eth1'
-	option detect_upstream 1
-	list match '127.0.0.0/8'
-	list match '0.0.0.0/8'       # RFC 1700
-	list match '240.0.0.0/4'     # RFC 5745
-	list match '192.0.2.0/24'    # RFC 5737
-	list match '198.51.100.0/24' # RFC 5737
-	list match '203.0.113.0/24'  # RFC 5737
-	list match '192.168.0.0/16'  # RFC 1918
-	list match '10.0.0.0/8'      # RFC 1918
-	list match '172.16.0.0/12'   # RFC 1918
-	list match '169.254.0.0/16'  # RFC 3927
-
-# 	list nomatch '172.26.0.0/21' # Example of something not to match
-#	There is a dhcp trigger to do this for the netmask of a 
-#	double natted connection needed
-
-#	I will argue that this level of indirection doesn't scale
-# 	very well - see how to block china as an example
-#	http://www.okean.com/china.txt
diff --git a/trunk/package/feeds/packages/bcp38/files/bcp38.defaults b/trunk/package/feeds/packages/bcp38/files/bcp38.defaults
deleted file mode 100644
index d7e0d806..00000000
--- a/trunk/package/feeds/packages/bcp38/files/bcp38.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOT
-	delete firewall.bcp38
-	set firewall.bcp38=include
-	set firewall.bcp38.type=script
-	set firewall.bcp38.path=/usr/lib/bcp38/run.sh
-	set firewall.bcp38.family=IPv4
-	set firewall.bcp38.reload=1
-	commit firewall
-EOT
-
-exit 0
diff --git a/trunk/package/feeds/packages/bcp38/files/run.sh b/trunk/package/feeds/packages/bcp38/files/run.sh
deleted file mode 100755
index bafdf3bb..00000000
--- a/trunk/package/feeds/packages/bcp38/files/run.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# BCP38 filtering implementation for CeroWrt.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
-#
-# Author: Toke Høiland-Jørgensen <toke@toke.dk>
-
-STOP=$1
-IPSET_NAME=bcp38-ipv4
-IPTABLES_CHAIN=BCP38
-
-. /lib/functions.sh
-
-config_load bcp38
-
-add_bcp38_rule()
-{
-	local subnet="$1"
-	local action="$2"
-
-	if [ "$action" == "nomatch" ]; then
-		ipset add "$IPSET_NAME" "$subnet" nomatch
-	else
-		ipset add "$IPSET_NAME" "$subnet"
-	fi
-}
-
-detect_upstream()
-{
-	local interface="$1"
-
-	subnets=$(ip route show dev "$interface"  | grep 'scope link' | awk '{print $1}')
-	for subnet in $subnets; do
-		# ipset test doesn't work for subnets, so strip out the subnet part
-		# and test for that; add as exception if there's a match
-		addr=$(echo $subnet | sed 's|/[0-9]\+$||')
-		ipset test "$IPSET_NAME" $addr 2>/dev/null && add_bcp38_rule $subnet nomatch
-	done
-}
-
-run() {
-    	local section="$1"
-    	local enabled
-	local interface
-	local detect_upstream
-	config_get_bool enabled "$section" enabled 0
-	config_get interface "$section" interface
-	config_get detect_upstream "$section" detect_upstream
-
-	if [ "$enabled" -eq "1" -a -n "$interface" -a -z "$STOP" ] ; then
-		setup_ipset
-		setup_iptables "$interface"
-		config_list_foreach "$section" match add_bcp38_rule match
-		config_list_foreach "$section" nomatch add_bcp38_rule nomatch
-		[ "$detect_upstream" -eq "1" ] && detect_upstream "$interface"
-	fi
-	exit 0
-}
-
-setup_ipset()
-{
-	ipset create "$IPSET_NAME" hash:net family ipv4
-	ipset flush "$IPSET_NAME"
-}
-
-setup_iptables()
-{
-	local interface="$1"
-	iptables -N "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -F "$IPTABLES_CHAIN" 2>/dev/null
-
-	iptables -I output_rule -j "$IPTABLES_CHAIN"
-	iptables -I input_rule -j "$IPTABLES_CHAIN"
-	iptables -I forwarding_rule -j "$IPTABLES_CHAIN"
-
-	# always accept DHCP traffic
-	iptables -A "$IPTABLES_CHAIN" -p udp --dport 67:68 --sport 67:68 -j RETURN
-	iptables -A "$IPTABLES_CHAIN" -o "$interface" -m set --match-set "$IPSET_NAME" dst -j REJECT --reject-with icmp-net-unreachable
-	iptables -A "$IPTABLES_CHAIN" -i "$interface" -m set --match-set "$IPSET_NAME" src -j DROP
-}
-
-destroy_ipset()
-{
-	ipset flush "$IPSET_NAME" 2>/dev/null
-	ipset destroy "$IPSET_NAME" 2>/dev/null
-}
-
-destroy_iptables()
-{
-	iptables -D output_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -D input_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -D forwarding_rule -j "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -F "$IPTABLES_CHAIN" 2>/dev/null
-	iptables -X "$IPTABLES_CHAIN" 2>/dev/null
-}
-
-destroy_iptables
-destroy_ipset
-config_foreach run bcp38
-
-exit 0
diff --git a/trunk/package/feeds/packages/bind/Makefile b/trunk/package/feeds/packages/bind/Makefile
deleted file mode 100644
index e4ee053d..00000000
--- a/trunk/package/feeds/packages/bind/Makefile
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#               2014 Noah Meyerhans <frodo@morgul.net>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bind
-PKG_VERSION:=9.9.6-P1
-PKG_RELEASE:=2
-USERID:=bind=57:bind=57
-
-PKG_MAINTAINER := Noah Meyerhans <frodo@morgul.net>
-PKG_LICENSE := BSD-3-Clause
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
-	http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=ca9d8f4d26e740668d361bfc50d90fc7
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bind/Default
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+bind-libs
-  TITLE:=bind
-  URL:=https://www.isc.org/software/bind
-  SUBMENU:=IP Addresses and Names
-endef
-
-define Package/bind-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl
-  TITLE:=bind shared libraries
-  URL:=https://www.isc.org/software/bind
-endef
-
-define Package/bind-server
-  $(call Package/bind/Default)
-  TITLE+= DNS server
-endef
-
-define Package/bind-client
-  $(call Package/bind/Default)
-  TITLE+= dynamic DNS client
-endef
-
-define Package/bind-tools
-  $(call Package/bind/Default)
-  TITLE+= administration tools (all)
-endef
-
-define Package/bind-rndc
-  $(call Package/bind/Default)
-  TITLE+= administration tools (rndc and rndc-confgen only)
-endef
-
-define Package/bind-check
-  $(call Package/bind/Default)
-  TITLE+= administration tools (named-checkconf and named-checkzone only)
-endef
-
-define Package/bind-dnssec
-  $(call Package/bind/Default)
-  TITLE+= administration tools (dnssec-keygen and dnssec-signzone only)
-endef
-
-define Package/bind-host
-  $(call Package/bind/Default)
-  TITLE+= simple DNS client
-endef
-
-define Package/bind-dig
-  $(call Package/bind/Default)
-  TITLE+= DNS excavation tool
-endef
-
-export BUILD_CC="$(TARGET_CC)"
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-randomdev="/dev/urandom" \
-	--disable-threads \
-	--disable-linux-caps \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--with-libtool \
-	--with-libxml2=no \
-	--enable-epoll=yes \
-	--with-gost=no \
-	--with-gssapi=no \
-	--with-ecdsa=no \
-	--with-readline=no
-
-CONFIGURE_VARS += \
-	BUILD_CC="$(TARGET_CC)" \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
-		BUILD_CC="$(HOSTCC)" \
-		CC="$(HOSTCC)" \
-		CFLAGS="-O2" \
-		LIBS="" \
-		gen
-	$(call Build/Compile/Default)
-endef
-
-define Package/bind-libs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
-define Package/bind-server/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bind
-	$(CP) \
-		./files/bind/db.0 \
-		./files/bind/db.127 \
-		./files/bind/db.255 \
-		./files/bind/db.local \
-		./files/bind/db.root \
-		$(1)/etc/bind/
-	$(CP) ./files/bind/named.conf.example $(1)/etc/bind/named.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/named.init $(1)/etc/init.d/named
-	find $(1)/etc/bind/ -name ".svn" | xargs rm -rf
-endef
-
-define Package/bind-server/conffiles
-/etc/bind/db.0
-/etc/bind/db.127
-/etc/bind/db.255
-/etc/bind/db.local
-/etc/bind/db.root
-/etc/bind/named.conf
-endef
-
-define Package/bind-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/
-endef
-
-define Package/bind-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/
-endef
-
-define Package/bind-rndc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/
-endef
-
-define Package/bind-check/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/
-endef
-
-define Package/bind-dnssec/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/
-endef
-
-define Package/bind-host/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/
-endef
-
-define Package/bind-dig/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bind-libs))
-$(eval $(call BuildPackage,bind-server))
-$(eval $(call BuildPackage,bind-client))
-$(eval $(call BuildPackage,bind-tools))
-$(eval $(call BuildPackage,bind-rndc))
-$(eval $(call BuildPackage,bind-check))
-$(eval $(call BuildPackage,bind-dnssec))
-$(eval $(call BuildPackage,bind-host))
-$(eval $(call BuildPackage,bind-dig))
diff --git a/trunk/package/feeds/packages/bind/files/bind/db.0 b/trunk/package/feeds/packages/bind/files/bind/db.0
deleted file mode 100644
index e3aabdbe..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/db.0
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
diff --git a/trunk/package/feeds/packages/bind/files/bind/db.127 b/trunk/package/feeds/packages/bind/files/bind/db.127
deleted file mode 100644
index cd05bef1..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/db.127
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; BIND reverse data file for local loopback interface
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
-1.0.0	IN	PTR	localhost.
diff --git a/trunk/package/feeds/packages/bind/files/bind/db.255 b/trunk/package/feeds/packages/bind/files/bind/db.255
deleted file mode 100644
index e3aabdbe..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/db.255
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
diff --git a/trunk/package/feeds/packages/bind/files/bind/db.local b/trunk/package/feeds/packages/bind/files/bind/db.local
deleted file mode 100644
index 66b48923..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/db.local
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL	604800
-@	IN	SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-;
-@	IN	NS	localhost.
-@	IN	A	127.0.0.1
diff --git a/trunk/package/feeds/packages/bind/files/bind/db.root b/trunk/package/feeds/packages/bind/files/bind/db.root
deleted file mode 100644
index 0eb52af7..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/db.root
+++ /dev/null
@@ -1,45 +0,0 @@
-
-; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
-;; global options:  printcmd
-;; Got answer:
-;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
-;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
-
-;; QUESTION SECTION:
-;.				IN	NS
-
-;; ANSWER SECTION:
-.			518400	IN	NS	A.ROOT-SERVERS.NET.
-.			518400	IN	NS	B.ROOT-SERVERS.NET.
-.			518400	IN	NS	C.ROOT-SERVERS.NET.
-.			518400	IN	NS	D.ROOT-SERVERS.NET.
-.			518400	IN	NS	E.ROOT-SERVERS.NET.
-.			518400	IN	NS	F.ROOT-SERVERS.NET.
-.			518400	IN	NS	G.ROOT-SERVERS.NET.
-.			518400	IN	NS	H.ROOT-SERVERS.NET.
-.			518400	IN	NS	I.ROOT-SERVERS.NET.
-.			518400	IN	NS	J.ROOT-SERVERS.NET.
-.			518400	IN	NS	K.ROOT-SERVERS.NET.
-.			518400	IN	NS	L.ROOT-SERVERS.NET.
-.			518400	IN	NS	M.ROOT-SERVERS.NET.
-
-;; ADDITIONAL SECTION:
-A.ROOT-SERVERS.NET.	3600000	IN	A	198.41.0.4
-B.ROOT-SERVERS.NET.	3600000	IN	A	192.228.79.201
-C.ROOT-SERVERS.NET.	3600000	IN	A	192.33.4.12
-D.ROOT-SERVERS.NET.	3600000	IN	A	128.8.10.90
-E.ROOT-SERVERS.NET.	3600000	IN	A	192.203.230.10
-F.ROOT-SERVERS.NET.	3600000	IN	A	192.5.5.241
-G.ROOT-SERVERS.NET.	3600000	IN	A	192.112.36.4
-H.ROOT-SERVERS.NET.	3600000	IN	A	128.63.2.53
-I.ROOT-SERVERS.NET.	3600000	IN	A	192.36.148.17
-J.ROOT-SERVERS.NET.	3600000	IN	A	192.58.128.30
-K.ROOT-SERVERS.NET.	3600000	IN	A	193.0.14.129
-L.ROOT-SERVERS.NET.	3600000	IN	A	199.7.83.42
-M.ROOT-SERVERS.NET.	3600000	IN	A	202.12.27.33
-
-;; Query time: 81 msec
-;; SERVER: 198.41.0.4#53(a.root-servers.net.)
-;; WHEN: Sun Feb  1 11:27:14 2004
-;; MSG SIZE  rcvd: 436
-
diff --git a/trunk/package/feeds/packages/bind/files/bind/named.conf.example b/trunk/package/feeds/packages/bind/files/bind/named.conf.example
deleted file mode 100644
index 16245495..00000000
--- a/trunk/package/feeds/packages/bind/files/bind/named.conf.example
+++ /dev/null
@@ -1,45 +0,0 @@
-// This is the primary configuration file for the BIND DNS server named.
-
-options {
-	directory "/tmp";
-
-	// If your ISP provided one or more IP addresses for stable 
-	// nameservers, you probably want to use them as forwarders.  
-	// Uncomment the following block, and insert the addresses replacing 
-	// the all-0's placeholder.
-
-	// forwarders {
-	// 	0.0.0.0;
-	// };
-
-	auth-nxdomain no;    # conform to RFC1035
-};
-
-// prime the server with knowledge of the root servers
-zone "." {
-	type hint;
-	file "/etc/bind/db.root";
-};
-
-// be authoritative for the localhost forward and reverse zones, and for
-// broadcast zones as per RFC 1912
-
-zone "localhost" {
-	type master;
-	file "/etc/bind/db.local";
-};
-
-zone "127.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.127";
-};
-
-zone "0.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.0";
-};
-
-zone "255.in-addr.arpa" {
-	type master;
-	file "/etc/bind/db.255";
-};
diff --git a/trunk/package/feeds/packages/bind/files/named.init b/trunk/package/feeds/packages/bind/files/named.init
deleted file mode 100644
index 2ef7797b..00000000
--- a/trunk/package/feeds/packages/bind/files/named.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 Noah Meyerhans <frodo@morgul.net>
-# Licensed under the terms of the GNU General Public License version 2
-# or (at your discretion) any later later version
-
-USE_PROCD=1
-
-START=50
-
-config_file=/etc/bind/named.conf
-pid_file=/var/run/named/named.pid
-
-logdir=/var/log/named/
-cachedir=/var/cache/bind
-libdir=/var/lib/bind
-config_file=/etc/bind/named.conf
-
-fix_perms() {
-    for dir in $libdir $logdir $cachedir; do
-	test -e "$dir" || {
-            mkdir -p "$dir"
-            chgrp bind "$dir"
-            chmod g+w "$dir"
-	}
-    done
-}
-
-start_service() {
-    user_exists bind 57 || user_add bind 57
-    group_exists bind 57 || group_add bind 57
-    fix_perms
-    procd_open_instance
-    procd_set_param command /usr/sbin/named -u bind -f -c $config_file
-    procd_set_param respawn
-    procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/bind/patches/001-no-tests.patch b/trunk/package/feeds/packages/bind/patches/001-no-tests.patch
deleted file mode 100644
index c969c5e9..00000000
--- a/trunk/package/feeds/packages/bind/patches/001-no-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: bind-9.9.4/bin/Makefile.in
-===================================================================
---- bind-9.9.4.orig/bin/Makefile.in
-+++ bind-9.9.4/bin/Makefile.in
-@@ -19,7 +19,7 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
-+SUBDIRS =	named rndc dig dnssec tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
-Index: bind-9.9.4/lib/Makefile.in
-===================================================================
---- bind-9.9.4.orig/lib/Makefile.in
-+++ bind-9.9.4/lib/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc isccc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/trunk/package/feeds/packages/bind/patches/002-autoconf-ar-fix.patch b/trunk/package/feeds/packages/bind/patches/002-autoconf-ar-fix.patch
deleted file mode 100644
index 501fa7d3..00000000
--- a/trunk/package/feeds/packages/bind/patches/002-autoconf-ar-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -93,26 +93,11 @@ esac
- #
- AC_CONFIG_FILES([make/rules make/includes])
- 
--AC_PATH_PROG(AR, ar)
--ARFLAGS="cruv"
--AC_SUBST(AR)
--AC_SUBST(ARFLAGS)
--
- # The POSIX ln(1) program.  Non-POSIX systems may substitute
- # "copy" or something.
- LN=ln
- AC_SUBST(LN)
- 
--case "$AR" in
--	"")
--		AC_MSG_ERROR([
--ar program not found.  Please fix your PATH to include the directory in
--which ar resides, or set AR in the environment with the full path to ar.
--])
--
--		;;
--esac
--
- #
- # Etags.
- #
diff --git a/trunk/package/feeds/packages/bluelog/Makefile b/trunk/package/feeds/packages/bluelog/Makefile
deleted file mode 100644
index 2fe10d87..00000000
--- a/trunk/package/feeds/packages/bluelog/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (C) 2012-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bluelog
-PKG_VERSION:=1.1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.digifail.com/software/bluelog
-PKG_MD5SUM:=614d0fe65bae68acff1d33d9f86e4805
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bluelog/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Bluetooth scanner and logger
-  URL:=http://www.digifail.com/software/bluelog.shtml
-  DEPENDS:=+bluez-libs +kmod-bluetooth
-endef
-
-define Package/bluelog/Default/description
-  Bluelog is a simple Bluetooth scanner designed to tell you how many
-  discoverable devices there are in an area as quickly as possible. It is
-  intended to be used as a site survey tool, identifying the number of possible
-  Bluetooth targets there are in the surrounding environment.
-endef
-
-define Package/bluelog
-  $(call Package/bluelog/Default)
-endef
-
-define Package/bluelog/description
-  $(call Package/bluelog/Default/description)
-endef
-
-define Package/bluelog-live
-  $(call Package/bluelog/Default)
-  TITLE+= (live output)
-  DEPENDS+= bluelog
-endef
-
-define Package/bluelog-live/description
-  $(call Package/bluelog/Default/description)
-  This package contains the files for "Bluelog Live", an optional mode of
-  Bluelog which creates a real-time webpage of discovered Bluetooth devices.
-endef
-
-TARGET_CFLAGS += -DOPENWRT
-
-MAKE_FLAGS += \
-	 LIBS="$(TARGET_LDFLAGS) -lbluetooth -lm"
-
-define Package/bluelog/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bluelog $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/bluelog.init $(1)/etc/init.d/bluelog
-endef
-
-define Package/bluelog-live/install
-	$(INSTALL_DIR) $(1)/www/bluelog
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/bluelog/*.html $(1)/www/bluelog/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/openwrt.css \
-		$(1)/www/bluelog/style.css
-	$(INSTALL_DIR) $(1)/www/bluelog/images
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/images/digifail_logo.png \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/images/email.png \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/images/favicon.png \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/images/openwrt_logo.png \
-		$(PKG_INSTALL_DIR)/usr/share/bluelog/images/qrcontact.png \
-		$(1)/www/bluelog/images/
-	$(INSTALL_DIR) $(1)/www/cgi-bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/bluelog/cgi-bin/* $(1)/www/cgi-bin/
-endef
-
-$(eval $(call BuildPackage,bluelog))
-$(eval $(call BuildPackage,bluelog-live))
diff --git a/trunk/package/feeds/packages/bluelog/files/bluelog.init b/trunk/package/feeds/packages/bluelog/files/bluelog.init
deleted file mode 100644
index efae2886..00000000
--- a/trunk/package/feeds/packages/bluelog/files/bluelog.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=65
-
-SERVICE_DAEMONIZE=1
-
-start() {
-	service_start /usr/bin/bluelog
-}
-
-stop() {
-	service_stop /usr/bin/bluelog
-}
diff --git a/trunk/package/feeds/packages/bluez/Makefile b/trunk/package/feeds/packages/bluez/Makefile
deleted file mode 100644
index d2bc8fab..00000000
--- a/trunk/package/feeds/packages/bluez/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bluez
-PKG_VERSION:=5.30
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/bluetooth/
-PKG_MD5SUM:=24ba1d1e8e7ef5b8f4033a3059d7600e
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/bluez/Default
-  TITLE:=Bluetooth
-  URL:=http://www.bluez.org/
-endef
-
-define Package/bluez-examples
-$(call Package/bluez/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= python example apps
-  DEPENDS:=+python
-endef
-
-define Package/bluez-examples/description
-  contains many examples apps for bluetooth, requiring python
-endef
-
-define Package/bluez-libs
-$(call Package/bluez/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+libpthread
-endef
-
-define Package/bluez-utils
-$(call Package/bluez/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS:=+bluez-libs +libpthread +librt +dbus +glib2 +libical +libncurses +libreadline $(INTL_DEPENDS) $(ICONV_DEPENDS)
-endef
-
-define Package/bluez-utils/conffiles
-/etc/bluetooth/main.conf
-/etc/bluetooth/network.conf
-/etc/bluetooth/input.conf
-/etc/bluetooth/proximity.conf
-/etc/config/bluetooth
-endef
-
-CONFIGURE_ARGS += \
-	--enable-static \
-	--enable-shared \
-	--enable-client \
-	--enable-datafiles \
-	--enable-experimental \
-	--enable-library \
-	--enable-monitor \
-	--enable-obex \
-	--enable-threads \
-	--enable-tools \
-	--disable-android \
-	--disable-cups \
-	--disable-manpages \
-	--disable-sixaxis \
-	--disable-systemd \
-	--disable-test \
-	--disable-udev \
-
-TARGET_CPPFLAGS += \
-	-D_GNU_SOURCE
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/bluez-examples/install
-	$(INSTALL_DIR) $(1)/usr/bin/bluez
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/test/* $(1)/usr/bin/bluez/
-endef
-
-define Package/bluez-libs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
-endef
-
-define Package/bluez-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/bluetooth/bluetoothd $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/bluetooth/obexd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/bluetooth.config $(1)/etc/config/bluetooth
-	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d/
-	$(INSTALL_DATA) ./files/bluetooth.dbus $(1)/etc/dbus-1/system.d/bluetooth.conf
-	$(INSTALL_DIR) $(1)/etc/bluetooth
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/main.conf $(1)/etc/bluetooth/main.conf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/network/network.conf $(1)/etc/bluetooth/network.conf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/input/input.conf $(1)/etc/bluetooth/input.conf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/proximity/proximity.conf $(1)/etc/bluetooth/proximity.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/bluetoothd.init $(1)/etc/init.d/bluetoothd
-endef
-
-$(eval $(call BuildPackage,bluez-examples))
-$(eval $(call BuildPackage,bluez-libs))
-$(eval $(call BuildPackage,bluez-utils))
diff --git a/trunk/package/feeds/packages/bluez/files/bluetooth.config b/trunk/package/feeds/packages/bluez/files/bluetooth.config
deleted file mode 100644
index 6f23617a..00000000
--- a/trunk/package/feeds/packages/bluez/files/bluetooth.config
+++ /dev/null
@@ -1,15 +0,0 @@
-config bluetoothd
-#	option config	/etc/bluetooth/main.conf
-	option enabled	1
-
-config hciattach
-	option initspeed	115200
-	option tty	ttyS1
-	option type	csr
-	option speed	115200
-	option flow	noflow
-	option enabled 	0
-
-config rfcomm
-#	option config	/etc/bluetooth/rfcomm.conf
-	option enabled	0
diff --git a/trunk/package/feeds/packages/bluez/files/bluetooth.dbus b/trunk/package/feeds/packages/bluez/files/bluetooth.dbus
deleted file mode 100644
index 88545fac..00000000
--- a/trunk/package/feeds/packages/bluez/files/bluetooth.dbus
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy user="root">
-    <allow own="org.bluez"/>
-  </policy>
-
-  <policy at_console="true">
-    <allow send_path="/"/>
-    <allow send_path="/org/bluez"/>
-
-    <allow send_destination="org.bluez.Manager"/>
-    <allow receive_sender="org.bluez.Manager"/>
-
-    <allow send_destination="org.bluez.Adapter"/>
-    <allow receive_sender="org.bluez.Adapter"/>
-
-    <allow send_destination="org.bluez.Device"/>
-    <allow receive_sender="org.bluez.Device"/>
-
-    <allow send_destination="org.bluez.Service"/>
-    <allow receive_sender="org.bluez.Service"/>
-
-    <allow send_destination="org.bluez.Database"/>
-    <allow receive_sender="org.bluez.Database"/>
-
-    <allow send_destination="org.bluez.Security"/>
-    <allow receive_sender="org.bluez.Security"/>
-  </policy>
-
-</busconfig>
diff --git a/trunk/package/feeds/packages/bluez/files/bluetoothd.init b/trunk/package/feeds/packages/bluez/files/bluetoothd.init
deleted file mode 100644
index 75f4d966..00000000
--- a/trunk/package/feeds/packages/bluez/files/bluetoothd.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-
-#start after dbus (60)
-START=62
-USE_PROCD=1
-PROG=/usr/bin/bluetoothd
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "$PROG" -n
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/bluez/files/givepin b/trunk/package/feeds/packages/bluez/files/givepin
deleted file mode 100644
index e52a3384..00000000
--- a/trunk/package/feeds/packages/bluez/files/givepin
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Write bluetooth PIN number here:
-pin=
-
-if [ -z "$pin" ]; then
-	msg="Set bluetooth PIN in file $0"
-	logger -p user.err "$msg"
-	for i in /dev/pts/* ; do
-		[ -w $i ] && echo "$msg" > $i
-	done
-else
-	echo "PIN:$pin"
-fi
diff --git a/trunk/package/feeds/packages/bluez/patches/200-uart-speed.patch b/trunk/package/feeds/packages/bluez/patches/200-uart-speed.patch
deleted file mode 100644
index ebe0153e..00000000
--- a/trunk/package/feeds/packages/bluez/patches/200-uart-speed.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/tools/hciattach.c
-+++ b/tools/hciattach.c
-@@ -101,20 +101,37 @@ int uart_speed(int s)
- 		return B230400;
- 	case 460800:
- 		return B460800;
-+/* FIX: Not all platform support this high serial speed
-+   claudyus84 @gamil.com
-+*/
-+#ifdef B500000
- 	case 500000:
- 		return B500000;
-+#endif
-+#ifdef B576000
- 	case 576000:
- 		return B576000;
-+#endif
-+#ifdef B921600
- 	case 921600:
- 		return B921600;
-+#endif
-+#ifdef B1000000
- 	case 1000000:
- 		return B1000000;
-+#endif
-+#ifdef B1152000
- 	case 1152000:
- 		return B1152000;
-+#endif
-+#ifdef B1500000
- 	case 1500000:
- 		return B1500000;
-+#endif
-+#ifdef B2000000
- 	case 2000000:
- 		return B2000000;
-+#endif
- #ifdef B2500000
- 	case 2500000:
- 		return B2500000;
diff --git a/trunk/package/feeds/packages/bluez/patches/201-readline.patch b/trunk/package/feeds/packages/bluez/patches/201-readline.patch
deleted file mode 100644
index 58396dcb..00000000
--- a/trunk/package/feeds/packages/bluez/patches/201-readline.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -2055,7 +2055,7 @@ unit_tests = $(am__append_32) unit/test-
- @CLIENT_TRUE@					monitor/uuid.h monitor/uuid.c
- 
- @CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \
--@CLIENT_TRUE@				-lreadline
-+@CLIENT_TRUE@				-lreadline -lncurses
- 
- @MONITOR_TRUE@monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
- @MONITOR_TRUE@				monitor/display.h monitor/display.c \
-@@ -2226,7 +2226,7 @@ unit_tests = $(am__append_32) unit/test-
- @EXPERIMENTAL_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
- @EXPERIMENTAL_TRUE@tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
- @EXPERIMENTAL_TRUE@tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
--@EXPERIMENTAL_TRUE@				-lreadline
-+@EXPERIMENTAL_TRUE@				-lreadline -lncurses
- 
- @EXPERIMENTAL_TRUE@tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
- @EXPERIMENTAL_TRUE@tools_btinfo_LDADD = src/libshared-mainloop.la
-@@ -2266,13 +2266,13 @@ unit_tests = $(am__append_32) unit/test-
- @READLINE_TRUE@				client/display.h
- 
- @READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
--@READLINE_TRUE@			src/libshared-glib.la @GLIB_LIBS@ -lreadline
-+@READLINE_TRUE@			src/libshared-glib.la @GLIB_LIBS@ -lreadline -lncurses
- 
- @READLINE_TRUE@tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
- @READLINE_TRUE@						tools/obex-client-tool.c
- 
- @READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
--@READLINE_TRUE@						@GLIB_LIBS@ -lreadline
-+@READLINE_TRUE@						@GLIB_LIBS@ -lreadline -lncurses
- 
- @READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
- @READLINE_TRUE@						tools/obex-server-tool.c
-@@ -2282,13 +2282,13 @@ unit_tests = $(am__append_32) unit/test-
- @READLINE_TRUE@				client/display.h client/display.c
- 
- @READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
--@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
-+@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline -lncurses
- 
- @READLINE_TRUE@tools_obexctl_SOURCES = tools/obexctl.c \
- @READLINE_TRUE@				client/display.h client/display.c
- 
- @READLINE_TRUE@tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
--@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
-+@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline -lncurses
- 
- @EXPERIMENTAL_TRUE@tools_gatt_service_SOURCES = tools/gatt-service.c
- @EXPERIMENTAL_TRUE@tools_gatt_service_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ gdbus/libgdbus-internal.la
diff --git a/trunk/package/feeds/packages/bmon/Makefile b/trunk/package/feeds/packages/bmon/Makefile
deleted file mode 100644
index 44da26c0..00000000
--- a/trunk/package/feeds/packages/bmon/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bmon
-PKG_VERSION:=3.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/tgraf/bmon/releases/download/v$(PKG_VERSION)/
-PKG_MD5SUM:=b7d0d055727f2cf1e452f26dfbf6a825
-PKG_MAINTAINER:=Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bmon
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libnl +confuse
-  TITLE:=bmon is a portable bandwidth monitor
-  URL:=https://github.com/tgraf/bmon/
-endef
-
-define Package/bmon/description
-	bmon is a portable bandwidth monitor
-	and rate estimator running on various
-	operating systems. It supports various
-	input methods for different architectures.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-cnt-workaround \
-
-CONFIGURE_VARS += \
-	ac_cv_lib_nl_nl_connect=no \
-
-define Package/bmon/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bmon $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,bmon))
diff --git a/trunk/package/feeds/packages/bogofilter/Makefile b/trunk/package/feeds/packages/bogofilter/Makefile
deleted file mode 100644
index d31dfa8c..00000000
--- a/trunk/package/feeds/packages/bogofilter/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bogofilter
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=3
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/bogofilter
-PKG_MD5SUM:=d0a5eebb3274b23ceabe766a6443a1c5
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bogofilter
-  SECTION:=mail
-  CATEGORY:=Mail
-  DEPENDS:=+libdb47
-  TITLE:=bogofilter
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  URL:=http://bogofilter.sourceforge.net/
-endef
-
-define Package/bogofilter/description
-	Bogofilter is a fast Bayesian spam filter
-endef
-
-CONFIGURE_ARGS += \
-	--disable-unicode \
-	--with-libdb-prefix=$(STAGING_DIR) \
-	--with-included-gsl
-
-define Package/bogofilter/install
-	$(INSTALL_DIR)  $(1)/etc/ \
-                        $(1)/usr/bin \
-                        $(1)/usr/sbin
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/bogofilter.cf.example $(1)/etc/bogofilter.cf
-	$(INSTALL_BIN) ./files/postfix-bogofilter $(1)/usr/sbin/postfix-bogofilter
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_compact $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_copy $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bf_tar $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bogofilter $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bogolexer $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bogotune $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/bogoutil $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bogofilter))
diff --git a/trunk/package/feeds/packages/bogofilter/files/postfix-bogofilter b/trunk/package/feeds/packages/bogofilter/files/postfix-bogofilter
deleted file mode 100755
index 952d8cda..00000000
--- a/trunk/package/feeds/packages/bogofilter/files/postfix-bogofilter
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-FILTER=/usr/bin/bogofilter
-FILTER_DIR=/mnt/sda1/var/spool/bogofilter
-# WARNING! The -i is crucial, else you may see
-# messages truncated at the first period that is alone on a line
-# (which can happen with several kinds of messages, particularly
-# quoted-printable)
-# -G is ignored before Postfix 2.3 and tells it that the message
-# does not originate on the local system (Gateway submission),
-# so Postfix avoids some of the local expansions that can leave
-# misleading traces in headers, such as local address
-# canonicalizations.
-POSTFIX="/usr/sbin/sendmail -G -i"
-export BOGOFILTER_DIR=/etc/bogofilter
-
-# Exit codes from <sysexits.h>
-EX_TEMPFAIL=75
-EX_UNAVAILABLE=69
-
-cd $FILTER_DIR || \
-    { echo $FILTER_DIR does not exist; exit $EX_TEMPFAIL; }
-
-# Clean up when done or when aborting.
-trap "rm -f msg.$$ ; exit $EX_TEMPFAIL" 0 1 2 3 15
-
-# bogofilter -e returns: 0 for OK, nonzero for error
-rm -f msg.$$ || exit $EX_TEMPFAIL
-$FILTER -p -e > msg.$$ || exit $EX_TEMPFAIL
-
-exec <msg.$$ || exit $EX_TEMPFAIL
-rm -f msg.$$ # safe, we hold the file descriptor
-exec $POSTFIX "$@"
-exit $EX_TEMPFAIL
diff --git a/trunk/package/feeds/packages/boost/Makefile b/trunk/package/feeds/packages/boost/Makefile
deleted file mode 100644
index 56e294c6..00000000
--- a/trunk/package/feeds/packages/boost/Makefile
+++ /dev/null
@@ -1,277 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-# 
-# Original Boost 1.51 Makefile by Mirko Vogt <mirko@openwrt.org>
-# Dude, this "boost" is really one of the most crude stuff I ported yet.
-#
-
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/target.mk 
-
-PKG_NAME:=boost
-PKG_VERSION:=1_57_0
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/boost
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION)
-PKG_MD5SUM:=25f9a8ac28beeb5ab84aa98510305299
-PKG_LICENSE:=Boost Software License <http://www.boost.org/users/license.html>
-PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com>
-
-PKG_BUILD_DEPENDS += boost/host 
-PKG_BUILD_PARALLEL:=0
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/boost/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Boost C++ source library
-  URL:=http://www.boost.org
-  DEPENDS:=+libstdcpp +libpthread +librt
-endef
-
-define Package/boost/description/Default
-  Boost provides free peer-reviewed portable C++ source libraries
-endef
-
-BOOST_LIBS =
-
-define Package/boost-libs
-$(call Package/boost/Default)
-  TITLE+= (all libs)
-  DEPENDS+= $(BOOST_DEPENDS)
-  HIDDEN:=1
-endef
-
-define Package/boost-libs/description
-$(call Package/boost/description/Default)
- .
- This meta package contains only dependencies to the other libraries from
- the boost libraries collection.
-endef
-
-# Create a meta-package of dependent libraries (for ALL)
-define Package/boost-libs/install
-  true
-endef
-
-define Package/boost
-  $(call Package/boost/Default)
-  TITLE+= packages
-  DEPENDS:=+ALL:boost-libs +ALL:boost-test
-endef
-
-define Package/boost/config
-    menu "Select Boost libraries"
-      depends on PACKAGE_boost
-
-    config boost-libs-all
-      bool "Include all Boost libraries"
-      select PACKAGE_boost-libs
-
-   config boost-test-pkg
-     bool "Boost test package"
-     select PACKAGE_boost-test
-
-    comment "Libraries"
-
-    $(foreach lib,$(BOOST_LIBS), \
-        config PACKAGE_boost-$(lib)
-           prompt "Boost $(lib) library"
-
-   )
-
-  endmenu
-
-endef
-
-PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_boost-test
-
-define Package/boost-test
-  $(call Package/boost/Default)
-  TITLE+= (test)
-  HIDDEN:=1
-endef
-
-define Build/Configure
-endef
-
-# 1: short name
-# 2: dependencies on other boost libraries (short name)
-# 3: dependencies on other packages
-define DefineBoostLibrary
-
-  BOOST_DEPENDS+= +boost-$(1) 
-  BOOST_LIBS+= $(1)
-
-  PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_boost-$(1)
-
-  define Package/boost-$(1)
-    $(call Package/boost/Default)
-    TITLE+= ($(1))
-    DEPENDS+= $$(foreach lib,$(2),+boost-$$(lib)) $(3)
-    HIDDEN:=1
-  endef
-
-  define Package/boost-$(1)/description
-   $(call Package/boost/description/Default)
-   .
-   This package contains the Boost $(1) library.
-  endef
-endef
-
-$(eval $(call DefineBoostLibrary,atomic,system,))
-$(eval $(call DefineBoostLibrary,chrono,system,))
-$(eval $(call DefineBoostLibrary,container,,))
-$(eval $(call DefineBoostLibrary,context,,))
-$(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,))
-$(eval $(call DefineBoostLibrary,date_time,,))
-#$(eval $(call DefineBoostLibrary,exception,,))
-$(eval $(call DefineBoostLibrary,filesystem,system,))
-$(eval $(call DefineBoostLibrary,graph,regex,))
-#$(eval $(call DefineBoostLibrary,graph_parallel,,))
-$(eval $(call DefineBoostLibrary,iostreams,,+zlib))
-$(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS)))
-$(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex,))
-$(eval $(call DefineBoostLibrary,math,,))
-#$(eval $(call DefineBoostLibrary,mpi,,))
-$(eval $(call DefineBoostLibrary,program_options,,))
-$(eval $(call DefineBoostLibrary,random,system,))
-$(eval $(call DefineBoostLibrary,python,,+PACKAGE_boost-python:python))
-$(eval $(call DefineBoostLibrary,regex,,))
-$(eval $(call DefineBoostLibrary,serialization,,))
-$(eval $(call DefineBoostLibrary,signals,,))
-$(eval $(call DefineBoostLibrary,system,,))
-$(eval $(call DefineBoostLibrary,thread,system chrono atomic,))
-$(eval $(call DefineBoostLibrary,timer,chrono))
-$(eval $(call DefineBoostLibrary,wave,date_time thread filesystem,))
-
-define Host/Compile
-	# bjam does not provide a configure-script nor a Makefile
-	( cd $(HOST_BUILD_DIR)/tools/build/src/engine ; ./build.sh gcc )
-endef
-
-CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR)
-TARGET_LDFLAGS += -pthread -lrt
-
-
-ifneq ($(findstring mips,$(ARCH)),)
-    BOOST_ABI = o32
-    ifneq ($(findstring 64,$(ARCH)),)
-        BOOST_ABI = o64
-    endif
-else ifneq ($(findstring arm,$(ARCH)),)
-    BOOST_ABI = aapcs
-else ifeq ($(ARCH),aarch64)
-    BOOST_ABI = aapcs
-else
-    BOOST_ABI = sysv
-endif
-
-
-define Build/Compile
-	$(info Selected Boost API $(BOOST_ABI) for architecture $(ARCH) and cpu $(CPU_TYPE) $(CPU_SUBTYPE))
-	( cd $(PKG_BUILD_DIR) ; \
-		echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/src/user-config.jam ; \
-		$(if $(CONFIG_PACKAGE_boost-python), \
-			echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python :	$(STAGING_DIR)/usr/include/python2.7/ ;" >> \
-				tools/build/src/user-config.jam; \
-		) \
-		bjam \
-			'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
-			--toolset=gcc-$(ARCH) --build-type=minimal --layout=system abi=$(BOOST_ABI) \
-			--disable-long-double \
-			$(CONFIGURE_ARGS) \
-			--without-mpi \
-			$(if $(CONFIG_PACKAGE_boost-test),,--without-test) \
-			$(foreach lib,$(BOOST_LIBS), \
-				$(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib)) \
-			) \
-			$(if $(CONFIG_PACKAGE_boost-locale),boost.locale.iconv=on -sICONV_PATH=$(ICONV_PREFIX) boost.locale.posix=$(if $(USE_UCLIBC),on,off), \
-				boost.locale.iconv=off) \
-			\
-			$(if $(CONFIG_PACKAGE_boost-iostreams),-sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGING_DIR)/usr/include \
-				-sZLIB_LIBPATH=$(STAGING_DIR)/usr/lib) \
-			install \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/include/boost/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/include/boost/* \
-		$(1)/usr/include/boost/ \
-		# copies _all_ header files - independent of <--with-library>-argument above
-
-	if [ -d $(PKG_INSTALL_DIR)/lib ]; then \
-		$(INSTALL_DIR) \
-			$(1)/usr/lib; \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/lib/*.a \
-			$(1)/usr/lib/; \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/lib/*.so* \
-			$(1)/usr/lib/; \
-	fi
-endef
-
-define Host/Install
-	$(INSTALL_DIR) \
-		$(STAGING_DIR_HOST)/bin
-
-	$(CP) \
-		$(HOST_BUILD_DIR)/tools/build/src/engine/bin.*/bjam \
-		$(STAGING_DIR_HOST)/bin/
-endef
-
-define Package/boost/Default/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/boost-test/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_unit_test_framework*.so* \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_prg_exec_monitor*.so* \
-		$(1)/usr/lib/
-endef
-
-define BuildBoostLibrary
-  define Package/boost-$(1)/install
-	$(call Package/boost/Default/install,$$(1),$(1))
-  endef
-
-  $$(eval $$(call BuildPackage,boost-$(1)))
-endef
-
-$(eval $(call HostBuild))
-
-$(foreach lib,$(BOOST_LIBS),$(eval $(call BuildBoostLibrary,$(lib))))
-$(eval $(call BuildPackage,boost-test))
-
-$(eval $(call BuildPackage,boost-libs))
-$(eval $(call BuildPackage,boost))
diff --git a/trunk/package/feeds/packages/boost/patches/100-do-not-use-librt.patch b/trunk/package/feeds/packages/boost/patches/100-do-not-use-librt.patch
deleted file mode 100644
index a7560c6f..00000000
--- a/trunk/package/feeds/packages/boost/patches/100-do-not-use-librt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: boost_1_57_0/tools/build/src/tools/gcc.jam
-===================================================================
---- boost_1_57_0.orig/tools/build/src/tools/gcc.jam
-+++ boost_1_57_0/tools/build/src/tools/gcc.jam
-@@ -1037,7 +1037,7 @@ rule setup-threading ( targets * : sourc
-             case *bsd    : option = -pthread ;  # There is no -lrt on BSD.
-             case sgi     : # gcc on IRIX does not support multi-threading.
-             case darwin  : # No threading options.
--            case *       : option = -pthread ; libs = rt ;
-+            case *       : # pass appropriate options via OpenWrt
-         }
- 
-         if $(option)
-Index: boost_1_57_0/tools/build/src/tools/gcc.py
-===================================================================
---- boost_1_57_0.orig/tools/build/src/tools/gcc.py
-+++ boost_1_57_0/tools/build/src/tools/gcc.py
-@@ -700,8 +700,8 @@ elif bjam.variable('UNIX'):
-         # Darwin has no threading options, don't set anything here.
-         pass
-     else:
--        flags('gcc', 'OPTIONS', ['<threading>multi'], ['-pthread'])
--        flags('gcc', 'FINDLIBS-SA', [], ['rt'])
-+        # pass appropriate options via OpenWrt
-+        pass
- 
- def cpu_flags(toolset, variable, architecture, instruction_set, values, default=None):
-     #FIXME: for some reason this fails.  Probably out of date feature code
diff --git a/trunk/package/feeds/packages/btrfs-progs/Makefile b/trunk/package/feeds/packages/btrfs-progs/Makefile
deleted file mode 100644
index 12513e15..00000000
--- a/trunk/package/feeds/packages/btrfs-progs/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=btrfs-progs
-PKG_VERSION:=3.19.1
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/
-PKG_MD5SUM:=ec3b3c99df18633ddc9e41f0680c5a51
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
-
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=libacl
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/btrfs-progs
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  DEPENDS:=+libattr +libuuid +zlib +libblkid +liblzo +libpthread
-  TITLE:=Btrfs filesystems utilities
-  URL:=http://btrfs.wiki.kernel.org/
-endef
-
-define Package/btrfs-progs/description
- Btrfs is a new copy on write filesystem for Linux aimed at implementing
- advanced features while focusing on fault tolerance, repair and easy
- administration. Initially developed by Oracle, Btrfs is licensed under the
- GPL and open for contribution from anyone.
-endef
-
-progs = btrfs btrfs-debug-tree btrfs-find-root btrfs-image btrfs-map-logical \
-	btrfs-show-super btrfstune btrfs-zero-log fsck.btrfs mkfs.btrfs
-
-CONFIGURE_ARGS += \
-	--disable-backtrace \
-	--disable-convert \
-	--disable-documentation
-
-define Package/btrfs-progs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libbtrfs.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/
-	$(LN) btrfs $(1)/usr/bin/btrfsck
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/btrfs-scan.init $(1)/etc/init.d/btrfs-scan
-endef
-
-$(eval $(call BuildPackage,btrfs-progs))
diff --git a/trunk/package/feeds/packages/btrfs-progs/files/btrfs-scan.init b/trunk/package/feeds/packages/btrfs-progs/files/btrfs-scan.init
deleted file mode 100644
index 762e0b84..00000000
--- a/trunk/package/feeds/packages/btrfs-progs/files/btrfs-scan.init
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=19
-
-start() {
-	grep -q btrfs /proc/filesystems && /usr/bin/btrfs device scan
-}
-
diff --git a/trunk/package/feeds/packages/btrfs-progs/patches/001-fix-xattr-h-include-location.patch b/trunk/package/feeds/packages/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
deleted file mode 100644
index aff55855..00000000
--- a/trunk/package/feeds/packages/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: btrfs-progs-v3.19.1/mkfs.c
-===================================================================
---- btrfs-progs-v3.19.1.orig/mkfs.c
-+++ btrfs-progs-v3.19.1/mkfs.c
-@@ -31,7 +31,7 @@
- #include <getopt.h>
- #include <uuid/uuid.h>
- #include <ctype.h>
--#include <sys/xattr.h>
-+#include <attr/xattr.h>
- #include <limits.h>
- #include <linux/limits.h>
- #include <blkid/blkid.h>
-Index: btrfs-progs-v3.19.1/props.c
-===================================================================
---- btrfs-progs-v3.19.1.orig/props.c
-+++ btrfs-progs-v3.19.1/props.c
-@@ -17,7 +17,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
--#include <sys/xattr.h>
-+#include <attr/xattr.h>
- #include <fcntl.h>
- #include <unistd.h>
- 
-Index: btrfs-progs-v3.19.1/cmds-receive.c
-===================================================================
---- btrfs-progs-v3.19.1.orig/cmds-receive.c
-+++ btrfs-progs-v3.19.1/cmds-receive.c
-@@ -34,7 +34,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#include <sys/xattr.h>
-+#include <attr/xattr.h>
- #include <uuid/uuid.h>
- 
- #include "ctree.h"
-Index: btrfs-progs-v3.19.1/cmds-restore.c
-===================================================================
---- btrfs-progs-v3.19.1.orig/cmds-restore.c
-+++ btrfs-progs-v3.19.1/cmds-restore.c
-@@ -32,7 +32,7 @@
- #include <regex.h>
- #include <getopt.h>
- #include <sys/types.h>
--#include <sys/xattr.h>
-+#include <attr/xattr.h>
- 
- #include "ctree.h"
- #include "disk-io.h"
-Index: btrfs-progs-v3.19.1/Makefile.in
-===================================================================
---- btrfs-progs-v3.19.1.orig/Makefile.in
-+++ btrfs-progs-v3.19.1/Makefile.in
-@@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ \
- LDFLAGS = @LDFLAGS@ \
- 	  -rdynamic
- 
--LIBS = @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
-+LIBS = @ATTR_LIBS@ @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
- LIBBTRFS_LIBS = $(LIBS)
- 
- # Static compilation flags
-Index: btrfs-progs-v3.19.1/configure.ac
-===================================================================
---- btrfs-progs-v3.19.1.orig/configure.ac
-+++ btrfs-progs-v3.19.1/configure.ac
-@@ -115,6 +115,9 @@ dnl
- dnl The default PKG_CHECK_MODULES() action-if-not-found is end the
- dnl execution with error. The static libs are optional.
- 
-+PKG_CHECK_MODULES(ATTR, [libattr])
-+PKG_STATIC(BLKID_LIBS_STATIC, [libattr])
-+
- PKG_CHECK_MODULES(BLKID, [blkid])
- PKG_STATIC(BLKID_LIBS_STATIC, [blkid])
- 
diff --git a/trunk/package/feeds/packages/bwm-ng/Config.in b/trunk/package/feeds/packages/bwm-ng/Config.in
deleted file mode 100644
index d822e12f..00000000
--- a/trunk/package/feeds/packages/bwm-ng/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-# bwm-ng advanced configuration
-
-menu "Configuration"
-	depends on PACKAGE_bwm-ng
-
-config BWMNG_CONFIGFILE
-	bool "enable configfile support"
-	default n
-
-config BWMNG_HTML
-	bool "enable html output"
-	default n
-
-config BWMNG_CSV
-	bool "enable csv output"
-	default n
-
-config BWMNG_EXTENDEDSTATS
-	bool "enable max, sum and avg stats"
-	default y
-
-config BWMNG_LIBNCURSES
-	bool "enable libncurses support"
-	default n
-
-config BWMNG_TIME
-	bool "enable accurate time calculating"
-	default y
-
-config BWMNG_GETOPT_LONG
-	bool "enable long options"
-	default n
-
-endmenu
-
diff --git a/trunk/package/feeds/packages/bwm-ng/Makefile b/trunk/package/feeds/packages/bwm-ng/Makefile
deleted file mode 100644
index be017cc0..00000000
--- a/trunk/package/feeds/packages/bwm-ng/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bwm-ng
-PKG_VERSION:=0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.gropp.org/bwm-ng
-PKG_MD5SUM:=d3a02484fb7946371bfb4e10927cebfb
-PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
-PKG_LICENSE:=GPL2-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bwm-ng
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+BWMNG_LIBNCURSES:libncurses
-  TITLE:=bwm-ng
-  URL:=http://www.gropp.org/?id=projects&sub=bwm-ng
-  MENU:=1
-endef
-
-define Package/bwm-ng/description
-  Bandwidth Monitor NG is a small and simple console-based live
-  network and disk io bandwidth monitor.
-endef
-
-define Package/bwm-ng/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	$(if $(CONFIG_BWMNG_CONFIGFILE),--enable,--disable)-configfile \
-	$(if $(CONFIG_BWMNG_HTML),--enable,--disable)-html \
-	$(if $(CONFIG_BWMNG_CSV),--enable,--disable)-csv \
-	$(if $(CONFIG_BWMNG_EXTENDEDSTATS),--enable,--disable)-extendedstats \
-	$(if $(CONFIG_BWMNG_LIBNCURSES),--with,--without)-ncurses \
-	$(if $(CONFIG_BWMNG_TIME),--with,--without)-time \
-	$(if $(CONFIG_BWMNG_GETOPT_LONG),--with,--without)-getopt_long \
-	--with-strip \
-	--with-procnetdev \
-	--with-diskstats \
-	)
-endef
-
-define Package/bwm-ng/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bwm-ng $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bwm-ng))
diff --git a/trunk/package/feeds/packages/bzip2/Makefile b/trunk/package/feeds/packages/bzip2/Makefile
deleted file mode 100644
index c633344c..00000000
--- a/trunk/package/feeds/packages/bzip2/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bzip2
-PKG_VERSION:=1.0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)
-PKG_MD5SUM:=00b516f4704d4a7cb50a1d97e6e8e15b
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_LICENSE:=BZIP2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbz2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=
-  TITLE:=bzip2 library.
-  URL:=http://www.bzip.org/
-endef
-
-define Package/libbz2/description
-	bzip2 is a freely available, patent free, high-quality
-	data compressor. This packages provides libbz2 library.
-endef
-
-define Package/bzip2
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libbz2
-  TITLE:=bzip2 is a compression utility.
-  URL:=http://www.bzip.org/
-endef
-
-define Package/bzip2/description
-	bzip2 is a freely available, patent free, high-quality
-	data compressor. This package provides the binary.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-CONFIGURE_ARGS += --prefix=/usr
-
-MAKE_FLAGS += \
-	-f Makefile-libbz2_so \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDLAGS)" \
-	all
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/bzlib.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbz2.so.$(PKG_VERSION) $(1)/usr/lib/
-	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so.1.0
-	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so
-endef
-
-define Package/libbz2/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libbz2.so.$(PKG_VERSION) $(1)/usr/lib/
-	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so.1.0
-endef
-
-define Package/bzip2/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bzip2-shared $(1)/usr/bin/bzip2
-endef
-
-$(eval $(call BuildPackage,libbz2))
-$(eval $(call BuildPackage,bzip2))
diff --git a/trunk/package/feeds/packages/c-ares/Makefile b/trunk/package/feeds/packages/c-ares/Makefile
deleted file mode 100644
index 815a379a..00000000
--- a/trunk/package/feeds/packages/c-ares/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-# Copyright (C) 2009 Jakob Pfeiffer
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=c-ares
-PKG_VERSION:=1.10.0
-PKG_RELEASE:=1
-PKG_LICENSE:=MIT
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://c-ares.haxx.se/download
-PKG_MD5SUM:=1196067641411a75d3cbebe074fd36d8
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libcares
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for asyncronous DNS Requests (including name resolves)
-  URL:=http://c-ares.haxx.se/
-  MAINTAINER:=Karl Palsson <karlp@remake.is>
-endef
-
-define Package/libcares/description
-  c-ares is a C library for asynchronous DNS requests (including name resolves)
-
-C89 compatibility, MIT licensed, builds for and runs on POSIX, Windows,
-Netware, Android and many more operating systems.
-
-endef
-
-define Package/libcares/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-$(eval $(call BuildPackage,libcares))
diff --git a/trunk/package/feeds/packages/ccid/Makefile b/trunk/package/feeds/packages/ccid/Makefile
deleted file mode 100644
index ce059cbb..00000000
--- a/trunk/package/feeds/packages/ccid/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ccid
-PKG_VERSION:=1.4.18
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4111
-PKG_MD5SUM:=8d57342bda53aaee706ef2d02409c4f4
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=libtool
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ccid
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libusb-1.0 +libpcsclite
-  TITLE:=Generic USB CCID smart card reader driver
-  URL:=http://pcsclite.alioth.debian.org/ccid.html
-endef
-
-define Package/ccid/description
-  Generic USB CCID (Chip/Smart Card Interface Devices) driver and ICCD
-  (Integrated Circuit(s) Card Devices).
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-TARGET_LDFLAGS += "-lpthread"
-
-CONFIGURE_ARGS += \
-	--enable-embedded \
-	--enable-usbdropdir=/usr/lib/pcsc/drivers
-
-define Package/ccid/install
-	$(INSTALL_DIR) $(1)/usr/lib/pcsc
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pcsc/drivers $(1)/usr/lib/pcsc/
-endef
-
-$(eval $(call BuildPackage,ccid))
diff --git a/trunk/package/feeds/packages/ccrypt/Makefile b/trunk/package/feeds/packages/ccrypt/Makefile
deleted file mode 100644
index 2419ab74..00000000
--- a/trunk/package/feeds/packages/ccrypt/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ccrypt
-PKG_VERSION:=1.10
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/ccrypt
-PKG_MD5SUM:=44ddd763465c254df83f5d38851d04d7
-PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
-PKG_LICENSE:=GPLv2+
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ccrypt
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=ccrypt is a utility for encrypting and decrypting files and streams
-  URL:=http://ccrypt.sourceforge.net/
-endef
-
-define Package/ccrypt/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ccrypt $(1)/usr/bin/
-	ln -s ccrypt $(1)/usr/bin/ccencrypt
-	ln -s ccrypt $(1)/usr/bin/ccdecrypt
-	ln -s ccrypt $(1)/usr/bin/ccat
-endef
-
-$(eval $(call BuildPackage,ccrypt))
diff --git a/trunk/package/feeds/packages/ccrypt/patches/001-no-intl.patch b/trunk/package/feeds/packages/ccrypt/patches/001-no-intl.patch
deleted file mode 100644
index 4ac9abb2..00000000
--- a/trunk/package/feeds/packages/ccrypt/patches/001-no-intl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,17 +123,6 @@ AC_MSG_RESULT($UINT32_TYPE)
- AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type)
- 
- dnl ----------------------------------------------------------------------
--dnl Internationalization
--
--GETTEXT_PACKAGE=ccrypt
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
--
--AM_GNU_GETTEXT
--AM_GNU_GETTEXT_VERSION([0.14.3])
--IT_PO_SUBDIR(po)
--
--dnl ----------------------------------------------------------------------
- dnl Libtool (needed by intl/)
- 
- LT_INIT
-@@ -153,9 +142,7 @@ AC_SUBST(TAR)
- dnl ----------------------------------------------------------------------
- AC_CONFIG_FILES([doc/ccrypt.1
- 	   doc/ccguess.1
--	   po/Makefile.in 
- 	   m4/Makefile 
--	   intl/Makefile 
- 	   Makefile 
- 	   src/Makefile 
- 	   emacs/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- 
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = m4 po intl src emacs doc check
-+SUBDIRS = m4 src emacs doc check
- 
- EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -36,7 +36,7 @@ host_triplet = @host@
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
--	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
-+	$(top_srcdir)/configure \
- 	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \
- 	config.rpath config.sub depcomp elisp-comp install-sh \
- 	ltmain.sh missing mkinstalldirs
-@@ -66,7 +66,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
-  configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = intl/Makefile
-+CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
-@@ -277,7 +277,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4 po intl src emacs doc check
-+SUBDIRS = m4 src emacs doc check
- EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -56,4 +56,4 @@ uninstall-local:
- # internationalization stuff
- localedir = $(datadir)/locale
- INCLUDES = -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\"
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -159,7 +159,7 @@ LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
diff --git a/trunk/package/feeds/packages/check/Makefile b/trunk/package/feeds/packages/check/Makefile
deleted file mode 100644
index b565d4dd..00000000
--- a/trunk/package/feeds/packages/check/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=check
-PKG_VERSION:=0.9.14
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/check
-PKG_MD5SUM:=38263d115d784c17aa3b959ce94be8b8
-
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LESSER
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/check
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Unit testing framework for C
-  URL:=http://check.sourceforge.net/
-  DEPENDS:= +libpthread +librt
-endef
-
-define Package/check/description
-  Check features a simple interface for defining unit tests, putting little in
-  the way of the developer. Tests are run in a separate address space, so Check
-  can catch both assertion failures and code errors that cause segmentation
-  faults or other signals. The output from unit tests can be used within source
-  code editors and IDEs.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/check*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcheck.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/check.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/check/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcheck.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,check))
diff --git a/trunk/package/feeds/packages/cmdpad/Makefile b/trunk/package/feeds/packages/cmdpad/Makefile
deleted file mode 100644
index 5b9f52d1..00000000
--- a/trunk/package/feeds/packages/cmdpad/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cmdpad
-PKG_VERSION:=0.0.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=@SF/cmdpad
-PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=doc/COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/cmdpad
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=execute commands when a key is pressed, released or hold down
-  URL:=http://cmdpad.sourceforge.net/index.php
-endef
-
-CONFIGURE_ARGS += \
-	--enable-static \
-	--enable-shared
-
-define Package/cmdpad/description
-	cmdpad - execute commands when a key is pressed, released or hold down.
-	Should be started from /etc/rc or /etc/rc.local. To run it as deamon you
-	need to start it with '&'. All logs are printed to standard out and standard
-	error (to write the log to disk use cmdpad > /var/log/cmdpad). Cmdpad
-	searches for /etc/cmdpad.conf and load the key bindings. Then wait for
-	key event and check each command to see if it should be run.
-endef
-
-MAKE_FLAGS += \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(1)
-
-define Package/cmdpad/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cmdpad $(1)/usr/sbin/
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/cmdpad.conf $(1)/etc/
-	$(INSTALL_BIN) ./files/cmdpad.init $(1)/etc/init.d/cmdpad
-endef
-
-define Package/cmdpad/conffiles
-/etc/cmdpad.conf
-endef
-
-$(eval $(call BuildPackage,cmdpad))
diff --git a/trunk/package/feeds/packages/cmdpad/files/cmdpad.init b/trunk/package/feeds/packages/cmdpad/files/cmdpad.init
deleted file mode 100644
index f6120335..00000000
--- a/trunk/package/feeds/packages/cmdpad/files/cmdpad.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2011 OpenWrt.org
-
-START=93
-
-SSD_DAEMONIZE=1
-
-start() {
-	service_start /usr/sbin/cmdpad --quiet
-}
-
-stop() {
-	service_stop /usr/sbin/cmdpad
-}
diff --git a/trunk/package/feeds/packages/cmdpad/patches/100-Makefile.patch b/trunk/package/feeds/packages/cmdpad/patches/100-Makefile.patch
deleted file mode 100644
index 61a6c8f4..00000000
--- a/trunk/package/feeds/packages/cmdpad/patches/100-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- cmdpad-0.0.3/src/Makefile.orig	2008-01-05 23:29:44.000000000 +0100
-+++ cmdpad-0.0.3/src/Makefile	2008-01-05 23:30:23.000000000 +0100
-@@ -5,25 +5,25 @@
- TOP=..
- include $(TOP)/Makefile.common
- 
--INCLUDE= -I/usr/include
--LIBS= -L/usr/lib -lc 
--CFLAGS= -g3
--LDFLAGS= -Xlinker -Map -Xlinker $(PROG).map #,--stack,16Mb
-+#INCLUDE= -I/usr/include
-+#LIBS= -L/usr/lib -lc 
-+#CFLAGS= -g3
-+#LDFLAGS= -Xlinker -Map -Xlinker $(PROG).map #,--stack,16Mb
- OBJ= main.o command.o parse.o
- SCRIPTS= *.sh
- 
- build: $(PROG) 
- 	
- $(PROG): $(OBJ) 
--	gcc -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS)
-+	$(GCC) -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS)
- 	@echo "==============================================="
- 	@echo "edit $(PROG).conf file to set default preferences"
- 
- %.o : %.c 
--	gcc $(CFLAGS) -D__COPYLEFT__='$(COPYLEFT)' -c $<
-+	$(GCC) $(CFLAGS) -D__COPYLEFT__='$(COPYLEFT)' -c $<
- 
- %.o : %.c %.h
--	gcc $(CFLAGS) -D__COPYLEFT__='$(COPYLEFT)' -c $<
-+	$(GCC) $(CFLAGS) -D__COPYLEFT__='$(COPYLEFT)' -c $<
- 
- distclean clean:
- 	rm $(PROG) *~ *.o -vf
diff --git a/trunk/package/feeds/packages/cmdpad/patches/120-kernel26-compat.patch b/trunk/package/feeds/packages/cmdpad/patches/120-kernel26-compat.patch
deleted file mode 100644
index eb7beeb3..00000000
--- a/trunk/package/feeds/packages/cmdpad/patches/120-kernel26-compat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmdpad-0.0.3/src/parse.orig	2008-01-05 23:55:32.000000000 +0100
-+++ cmdpad-0.0.3/src/parse.c	2008-01-05 23:56:07.000000000 +0100
-@@ -289,6 +289,12 @@
-         pchEventDevice = strdup( pchValue) ;
-         return 1 ;
-       }
-+      if( (pchValue != NULL) && 
-+          (strncmp( pchValue, "/dev/event", 6) == 0) )
-+      {
-+        pchEventDevice = strdup( pchValue) ;
-+        return 1 ;
-+      }
-       printf( "Option 'device' expects a /dev/input/eventX argument\n");
-       return -1 ;
-     }
diff --git a/trunk/package/feeds/packages/cmdpad/patches/130-no_zombie.patch b/trunk/package/feeds/packages/cmdpad/patches/130-no_zombie.patch
deleted file mode 100644
index aa4fc6a0..00000000
--- a/trunk/package/feeds/packages/cmdpad/patches/130-no_zombie.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmdpad-0.0.3/src/command.c.orig	2003-03-29 17:54:12.000000000 +0100
-+++ cmdpad-0.0.3/src/command.c	2008-01-12 05:41:22.000000000 +0100
-@@ -68,6 +68,7 @@
- 
- void exec( char * command)
- {
-+    int status;
- 	if( fork() == 0) {
- 		char ** tmp ;
- 		int i ;
-@@ -88,6 +89,7 @@
- 		perror( "ERROR: execv") ;
- 		exit( 1) ;
- 	} // end if( fork())
-+        wait(&status);
- }
- 
- int getNumberofEntry()
diff --git a/trunk/package/feeds/packages/cmdpad/patches/140-compile_fix.patch b/trunk/package/feeds/packages/cmdpad/patches/140-compile_fix.patch
deleted file mode 100644
index c7a9bb3d..00000000
--- a/trunk/package/feeds/packages/cmdpad/patches/140-compile_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -125,7 +125,7 @@ int readCommandLine( int argc, char *arg
-       
- 	      		d2printf( "command line command %s found\n", pchCommandTranslations[ iCmd+1]) ;
- 	      
--	      		vsnprintf( achCommand, sizeof( achCommand), 
-+	      		snprintf( achCommand, sizeof( achCommand), 
- 			   	   pchCommandTranslations[ iCmd+1], 
- 				   &argv[ i+1]) ;
- 			
diff --git a/trunk/package/feeds/packages/collectd/Makefile b/trunk/package/feeds/packages/collectd/Makefile
deleted file mode 100644
index 61b05a88..00000000
--- a/trunk/package/feeds/packages/collectd/Makefile
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=collectd
-PKG_VERSION:=5.4.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=feff9fd0ed89e956d7cf12ba18cfc248
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-COLLECTD_PLUGINS_DISABLED:= \
-	amqp \
-	apple_sensors \
-	aquaero \
-	battery \
-	cgroups \
-	cpufreq \
-	curl_json \
-	curl_xml \
-	dbi \
-	entropy \
-	ethstat \
-	genericjmx \
-	gmond \
-	hddtemp \
-	ipmi \
-	ipvs \
-	java \
-	libvirt \
-	lpar \
-	mbmon \
-	md \
-	memcachec \
-	memcached \
-	mic \
-	monitorus \
-	multimeter \
-	netapp \
-	nfs \
-	notify_desktop \
-	notify_email \
-	numa \
-	nut \
-	openvz \
-	oracle \
-	perl \
-	pf \
-	pinba \
-	python \
-	redis \
-	routeros \
-	rrdcached \
-	serial \
-	sigrok \
-	statsd \
-	swap \
-	tape \
-	tokyotyrant \
-	uuid \
-	varnish \
-	vserver \
-	write_graphite \
-	write_mongodb \
-	write_redis \
-	write_riemann \
-	xmms \
-	zfs_arc \
-
-COLLECTD_PLUGINS_SELECTED:= \
-	apache \
-	apcups \
-	ascent \
-	bind \
-	conntrack \
-	contextswitch \
-	cpu \
-	csv \
-	curl \
-	df \
-	disk \
-	dns \
-	email \
-	exec \
-	filecount \
-	fscache \
-	interface \
-	iptables \
-	irq \
-	iwinfo \
-	load \
-	logfile \
-	madwifi \
-	memory \
-	modbus \
-	mysql \
-	netlink \
-	network \
-	nginx \
-	ntpd \
-	olsrd \
-	onewire \
-	openvpn \
-	ping \
-	postgresql \
-	powerdns \
-	processes \
-	protocols \
-	rrdtool \
-	sensors \
-	snmp \
-	syslog \
-	table \
-	tail \
-	tcpconns \
-	teamspeak2 \
-	ted \
-	thermal \
-	unixsock \
-	uptime \
-	users \
-	vmem \
-	wireless \
-	write_http \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-define Package/collectd/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Lightweight system statistics collection daemon
-  URL:=http://verplant.org/collectd/
-endef
-
-define Package/collectd
-$(call Package/collectd/Default)
-  DEPENDS:= +libpthread +zlib +libltdl +libip4tc
-  MENU:=1
-endef
-
-define Package/collectd/description
- collectd is a small daemon which collects system information periodically
- and provides mechanismns to store the values in a variety of ways.
-endef
-
-ifneq ($(CONFIG_avr32),)
-  TARGET_CFLAGS += -fsigned-char
-endif
-
-# common configure args
-CONFIGURE_ARGS+= \
-	--disable-debug \
-	--enable-daemon \
-	--enable-getifaddrs \
-	--with-nan-emulation \
-	--without-libgcrypt
-
-CONFIGURE_VARS+= \
-	CFLAGS="$$$$CFLAGS $(FPIC)" \
-	LDFLAGS="$$$$LDFLAGS -lm -lz" \
-	KERNEL_DIR="$(LINUX_DIR)" \
-
-CONFIGURE_PLUGIN= \
-	$(foreach m, $(1), \
-		$(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \
-	)
-
-CONFIGURE_ARGS+= \
-	$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_SELECTED)) \
-	$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_DISABLED)) \
-
-# exception: mod-ascent needs libxml2
-ifneq ($(CONFIG_PACKAGE_collectd-mod-ascent),)
-  CONFIGURE_VARS+= \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2"
-endif
-
-ifneq ($(CONFIG_BIG_ENDIAN),)
-  CONFIGURE_ARGS+= --with-fp-layout=endianflip
-else
-  CONFIGURE_ARGS+= --with-fp-layout=nothing
-endif
-
-ifneq ($(CONFIG_PACKAGE_collectd-mod-postgresql),)
-  CONFIGURE_ARGS+= --with-libpq="$(STAGING_DIR)/usr/"
-endif
-
-ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),)
-  CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/"
-endif
-
-# exception: mod-netlink needs libnetlink from iproute
-ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),)
-  CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-modbus needs libmodbus
-ifneq ($(CONFIG_PACKAGE_collectd-mod-modbus),)
-  CONFIGURE_ARGS+= --with-libmodbus="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-onewire needs libow-capi
-ifneq ($(CONFIG_PACKAGE_collectd-mod-onewire),)
-  CONFIGURE_ARGS+= --with-libowcapi="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-rrdtool needs rrdtool-1.0.x
-ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool),)
-  CONFIGURE_ARGS+= --with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0"
-endif
-
-define Package/collectd/conffiles
-/etc/collectd.conf
-endef
-
-define Package/collectd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share/collectd
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/collectd/types.db $(1)/usr/share/collectd/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/collectd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/collectd.init $(1)/etc/init.d/collectd
-endef
-
-# 1: plugin name
-# 2: plugin title/description
-# 3: files
-# 4: extra dependency
-define BuildPlugin
-
-  PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_collectd-mod-$(1)
-
-  define Package/collectd-mod-$(1)
-  $$(call Package/collectd/Default)
-    TITLE:=$(2) plugin
-    DEPENDS:= collectd $(4)
-  endef
-
-  define Package/collectd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/collectd
-	for m in $(3); do \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/usr/lib/collectd/$$$$$$$${m}.so \
-			$$(1)/usr/lib/collectd/ ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,collectd-mod-$(1)))
-
-endef
-
-$(eval $(call BuildPackage,collectd))
-
-#$(eval $(call BuildPlugin,NAME,DESCRIPTION,FILES,DEPENDENCIES))
-$(eval $(call BuildPlugin,apache,apache status input,apache,+PACKAGE_collectd-mod-apache:libcurl))
-$(eval $(call BuildPlugin,apcups,apcups status input,apcups,))
-$(eval $(call BuildPlugin,ascent,ascent status input,ascent,+PACKAGE_collectd-mod-ascent:libcurl +PACKAGE_collectd-mod-ascent:libxml2))
-$(eval $(call BuildPlugin,bind,BIND server/zone input,bind,+PACKAGE_collectd-mod-bind:libcurl +PACKAGE_collectd-mod-bind:libxml2))
-$(eval $(call BuildPlugin,conntrack,connection tracking table size input,conntrack,))
-$(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,))
-$(eval $(call BuildPlugin,cpu,CPU input,cpu,))
-$(eval $(call BuildPlugin,csv,CSV output,csv,))
-$(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl))
-#$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
-$(eval $(call BuildPlugin,df,disk space input,df,))
-$(eval $(call BuildPlugin,disk,disk usage/timing input,disk,))
-$(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap))
-$(eval $(call BuildPlugin,email,email output,email,))
-$(eval $(call BuildPlugin,exec,process exec input,exec,))
-$(eval $(call BuildPlugin,filecount,file count input,filecount,))
-$(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,))
-$(eval $(call BuildPlugin,interface,network interfaces input,interface,))
-$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables +libiptc))
-$(eval $(call BuildPlugin,irq,interrupt usage input,irq,))
-$(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_collectd-mod-iwinfo:libiwinfo))
-$(eval $(call BuildPlugin,load,system load input,load,))
-$(eval $(call BuildPlugin,logfile,log files output,logfile,))
-$(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
-#$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
-$(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
-$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus))
-$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN))
-$(eval $(call BuildPlugin,network,network input/output,network))
-$(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
-$(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
-#$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
-$(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
-$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN))
-$(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))
-$(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping))
-$(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq))
-$(eval $(call BuildPlugin,powerdns,PowerDNS server status input,powerdns,))
-$(eval $(call BuildPlugin,processes,process status input,processes,))
-$(eval $(call BuildPlugin,protocols,network protocols input,protocols,))
-$(eval $(call BuildPlugin,rrdtool,RRDtool output,rrdtool,+PACKAGE_collectd-mod-rrdtool:librrd1))
-$(eval $(call BuildPlugin,sensors,lm_sensors input,sensors,+PACKAGE_collectd-mod-sensors:libsensors))
-$(eval $(call BuildPlugin,snmp,SNMP input,snmp,+PACKAGE_collectd-mod-snmp:libnetsnmp))
-$(eval $(call BuildPlugin,syslog,syslog output,syslog,))
-$(eval $(call BuildPlugin,tail,tail input,tail,))
-$(eval $(call BuildPlugin,table,table-like structured file input,table,))
-$(eval $(call BuildPlugin,teamspeak2,TeamSpeak2 input,teamspeak2,))
-$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,@((!TARGET_avr32)||BROKEN))) # fails on avr32 because of warnings treated as errors
-$(eval $(call BuildPlugin,tcpconns,TCP connection tracking input,tcpconns,))
-$(eval $(call BuildPlugin,thermal,system temperatures input,thermal,))
-$(eval $(call BuildPlugin,unixsock,unix socket output,unixsock,))
-$(eval $(call BuildPlugin,uptime,uptime status input,uptime,))
-$(eval $(call BuildPlugin,users,user logged in status input,users,))
-$(eval $(call BuildPlugin,vmem,virtual memory usage input,vmem,))
-$(eval $(call BuildPlugin,wireless,wireless status input,wireless,))
-$(eval $(call BuildPlugin,write-http,HTTP POST output,write_http,+PACKAGE_collectd-mod-write-http:libcurl))
diff --git a/trunk/package/feeds/packages/collectd/files/collectd.conf b/trunk/package/feeds/packages/collectd/files/collectd.conf
deleted file mode 100644
index 2ef78fe7..00000000
--- a/trunk/package/feeds/packages/collectd/files/collectd.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# OpenWrt Config file for collectd(1).
-# Please read collectd.conf(5) for a list of options.
-# http://collectd.org/
-#
-
-#Hostname   "localhost"
-#FQDNLookup  true
-BaseDir     "/var/lib/collectd"
-PIDFile     "/var/run/collectd.pid"
-#PluginDir  "/usr/lib/collectd"
-#TypesDB    "/usr/share/collectd/types.db"
-Interval    30
-ReadThreads 2
-
-#LoadPlugin syslog
-#LoadPlugin logfile
-
-#<Plugin syslog>
-#	LogLevel info
-#</Plugin>
-
-#<Plugin logfile>
-#	LogLevel info
-#	File STDOUT
-#	Timestamp true
-#</Plugin>
-
-LoadPlugin cpu
-LoadPlugin df
-LoadPlugin disk
-LoadPlugin interface
-LoadPlugin load
-LoadPlugin memory
-LoadPlugin network
-#LoadPlugin ping
-#LoadPlugin processes
-#LoadPlugin rrdtool
-#LoadPlugin serial
-LoadPlugin wireless
-
-#<Plugin df>
-#	FSType tmpfs
-#	IgnoreSelected true
-#	ReportByDevice false
-#	ReportReserved false
-#	ReportInodes false
-#</Plugin>
-
-#<Plugin disk>
-#	Disk "/^[hs]d[a-f][0-9]?$/"
-#	IgnoreSelected false
-#</Plugin>
-
-#<Plugin interface>
-#	Interface "eth0"
-#	Interface "br-lan"
-#	IgnoreSelected false
-#</Plugin>
-
-<Plugin network>
-#	Server "ff18::efc0:4a42" "25826"
-	Server "239.192.74.66" "25826"
-#	Listen "ff18::efc0:4a42" "25826"
-#	Listen "239.192.74.66" "25826"
-#	TimeToLive "128"
-#	Forward false
-#	CacheFlush 1800
-#	ReportStats false
-</Plugin>
-
-#<Plugin ping>
-#	Host "host.foo.bar"
-#	Interval 1.0
-#	Timeout 0.9
-#	TTL 255
-#	SourceAddress "1.2.3.4"
-#	Device "eth0"
-#	MaxMissed -1
-#</Plugin>
-
-#<Plugin processes>
-#	Process "name"
-#</Plugin>
-
-#<Plugin rrdtool>
-#	DataDir "/var/lib/collectd/rrd"
-#	CacheTimeout 120
-#	CacheFlush   900
-#</Plugin>
diff --git a/trunk/package/feeds/packages/collectd/files/collectd.init b/trunk/package/feeds/packages/collectd/files/collectd.init
deleted file mode 100644
index 8204c38a..00000000
--- a/trunk/package/feeds/packages/collectd/files/collectd.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=80
-
-SERVICE_USE_PID=1
-
-start() {
-	mkdir -m 0755 -p /var/lib/collectd
-	service_start /usr/sbin/collectd
-}
-
-stop() {
-	service_stop /usr/sbin/collectd
-}
diff --git a/trunk/package/feeds/packages/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch b/trunk/package/feeds/packages/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch
deleted file mode 100644
index 0e01744b..00000000
--- a/trunk/package/feeds/packages/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch
+++ /dev/null
@@ -1,4 +0,0 @@
---- /dev/null
-+++ b/fake-am_path_libgcrypt.m4
-@@ -0,0 +1 @@
-+AC_DEFUN([AM_PATH_LIBGCRYPT],[:])
diff --git a/trunk/package/feeds/packages/collectd/patches/003-remove-werror.patch b/trunk/package/feeds/packages/collectd/patches/003-remove-werror.patch
deleted file mode 100644
index 12a05ee7..00000000
--- a/trunk/package/feeds/packages/collectd/patches/003-remove-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS += liboconfig
- endif
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
---- a/src/libcollectdclient/Makefile.am
-+++ b/src/libcollectdclient/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- pkginclude_HEADERS = collectd/client.h collectd/network.h collectd/network_buffer.h collectd/lcc_features.h
diff --git a/trunk/package/feeds/packages/collectd/patches/100-rrdtool-add-rrasingle-option.patch b/trunk/package/feeds/packages/collectd/patches/100-rrdtool-add-rrasingle-option.patch
deleted file mode 100644
index 30a71e8d..00000000
--- a/trunk/package/feeds/packages/collectd/patches/100-rrdtool-add-rrasingle-option.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/rrdtool.c
-+++ b/src/rrdtool.c
-@@ -82,6 +82,7 @@ static const char *config_keys[] =
- 	"HeartBeat",
- 	"RRARows",
- 	"RRATimespan",
-+	"RRASingle",
- 	"XFF",
- 	"WritesPerSecond",
- 	"RandomTimeout"
-@@ -103,6 +104,8 @@ static rrdcreate_config_t rrdcreate_conf
- 	/* timespans = */ NULL,
- 	/* timespans_num = */ 0,
- 
-+	/* rrasingle = */ 0,
-+
- 	/* consolidation_functions = */ NULL,
- 	/* consolidation_functions_num = */ 0,
- 
-@@ -1093,6 +1096,14 @@ static int rrd_config (const char *key,
- 
- 		free (value_copy);
- 	}
-+	else if (strcasecmp ("RRASingle", key) == 0)
-+	{
-+		if (IS_TRUE (value))
-+		{
-+			rrdcreate_config.rrasingle = 1;
-+			NOTICE ("rrdtool plugin: RRASingle = true: creating only AVERAGE RRAs");
-+		}
-+	}
- 	else if (strcasecmp ("XFF", key) == 0)
- 	{
- 		double tmp = atof (value);
---- a/src/utils_rrdcreate.c
-+++ b/src/utils_rrdcreate.c
-@@ -212,6 +212,9 @@ static int rra_get (char ***ret, const v
-     rts_num = rra_timespans_num;
-   }
- 
-+  if (cfg->rrasingle)
-+    rra_types_num = 1;
-+
-   rra_max = rts_num * rra_types_num;
- 
-   if ((rra_def = (char **) malloc ((rra_max + 1) * sizeof (char *))) == NULL)
---- a/src/utils_rrdcreate.h
-+++ b/src/utils_rrdcreate.h
-@@ -36,6 +36,8 @@ struct rrdcreate_config_s
-   int *timespans;
-   size_t timespans_num;
- 
-+  int rrasingle;
-+
-   char **consolidation_functions;
-   size_t consolidation_functions_num;
- 
diff --git a/trunk/package/feeds/packages/collectd/patches/110-net-device-stats.patch b/trunk/package/feeds/packages/collectd/patches/110-net-device-stats.patch
deleted file mode 100644
index 91e73aa3..00000000
--- a/trunk/package/feeds/packages/collectd/patches/110-net-device-stats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
----
- src/interface.c |   33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -203,7 +203,38 @@ static int interface_read (void)
- #  define IFA_RX_ERROR rx_errors
- #  define IFA_TX_ERROR tx_errors
- #else
--#  error "No suitable type for `struct ifaddrs->ifa_data' found."
-+struct net_device_stats {
-+	unsigned long	rx_packets;
-+	unsigned long	tx_packets;
-+	unsigned long	rx_bytes;
-+	unsigned long	tx_bytes;
-+	unsigned long	rx_errors;
-+	unsigned long	tx_errors;
-+	unsigned long	rx_dropped;
-+	unsigned long	tx_dropped;
-+	unsigned long	multicast;
-+	unsigned long	collisions;
-+	unsigned long	rx_length_errors;
-+	unsigned long	rx_over_errors;
-+	unsigned long	rx_crc_errors;
-+	unsigned long	rx_frame_errors;
-+	unsigned long	rx_fifo_errors;
-+	unsigned long	rx_missed_errors;
-+	unsigned long	tx_aborted_errors;
-+	unsigned long	tx_carrier_errors;
-+	unsigned long	tx_fifo_errors;
-+	unsigned long	tx_heartbeat_errors;
-+	unsigned long	tx_window_errors;
-+	unsigned long	rx_compressed;
-+	unsigned long	tx_compressed;
-+};
-+#  define IFA_DATA net_device_stats
-+#  define IFA_RX_BYTES rx_bytes
-+#  define IFA_TX_BYTES tx_bytes
-+#  define IFA_RX_PACKT rx_packets
-+#  define IFA_TX_PACKT tx_packets
-+#  define IFA_RX_ERROR rx_errors
-+#  define IFA_TX_ERROR tx_errors
- #endif
- 
- 	struct IFA_DATA *if_data;
diff --git a/trunk/package/feeds/packages/collectd/patches/140-fix-fqdnlookup.patch b/trunk/package/feeds/packages/collectd/patches/140-fix-fqdnlookup.patch
deleted file mode 100644
index d40463e8..00000000
--- a/trunk/package/feeds/packages/collectd/patches/140-fix-fqdnlookup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/configfile.c
-+++ b/src/configfile.c
-@@ -105,7 +105,7 @@ static cf_global_option_t cf_global_opti
- 	{"BaseDir",     NULL, PKGLOCALSTATEDIR},
- 	{"PIDFile",     NULL, PIDFILE},
- 	{"Hostname",    NULL, NULL},
--	{"FQDNLookup",  NULL, "true"},
-+	{"FQDNLookup",  NULL, "false"},
- 	{"Interval",    NULL, NULL},
- 	{"ReadThreads", NULL, "5"},
- 	{"WriteThreads", NULL, "5"},
diff --git a/trunk/package/feeds/packages/collectd/patches/150-fix-interface-af-link b/trunk/package/feeds/packages/collectd/patches/150-fix-interface-af-link
deleted file mode 100644
index 806a6837..00000000
--- a/trunk/package/feeds/packages/collectd/patches/150-fix-interface-af-link
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -244,8 +244,8 @@ struct net_device_stats {
- 
- 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
- 	{
--		if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
--			if_data = (struct IFA_DATA *) if_ptr->ifa_data;
-+		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
-+			continue;
- 
- 			if_submit (if_ptr->ifa_name, "if_octets",
- 				if_data->IFA_RX_BYTES,
-@@ -256,7 +256,6 @@ struct net_device_stats {
- 			if_submit (if_ptr->ifa_name, "if_errors",
- 				if_data->IFA_RX_ERROR,
- 				if_data->IFA_TX_ERROR);
--		}
- 	}
- 
- 	freeifaddrs (if_list);
diff --git a/trunk/package/feeds/packages/collectd/patches/200-fix-git-describe-error.patch b/trunk/package/feeds/packages/collectd/patches/200-fix-git-describe-error.patch
deleted file mode 100644
index ac0a3251..00000000
--- a/trunk/package/feeds/packages/collectd/patches/200-fix-git-describe-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version-gen.sh
-+++ b/version-gen.sh
-@@ -2,7 +2,7 @@
- 
- DEFAULT_VERSION="5.4.2.git"
- 
--VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
-+#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
- 
- if test -z "$VERSION"; then
- 	VERSION="$DEFAULT_VERSION"
diff --git a/trunk/package/feeds/packages/collectd/patches/400-fix-olsrd-get-all.patch b/trunk/package/feeds/packages/collectd/patches/400-fix-olsrd-get-all.patch
deleted file mode 100644
index b49a0e73..00000000
--- a/trunk/package/feeds/packages/collectd/patches/400-fix-olsrd-get-all.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/olsrd.c
-+++ b/src/olsrd.c
-@@ -653,7 +653,7 @@ static int olsrd_read (void) /* {{{ */
-   if (fh == NULL)
-     return (-1);
- 
--  fputs ("\r\n", fh);
-+  fputs ("/all \r\n", fh);
-   fflush (fh);
- 
-   while (fgets (buffer, sizeof (buffer), fh) != NULL)
diff --git a/trunk/package/feeds/packages/collectd/patches/900-add-iwinfo-plugin.patch b/trunk/package/feeds/packages/collectd/patches/900-add-iwinfo-plugin.patch
deleted file mode 100644
index cc95c0c7..00000000
--- a/trunk/package/feeds/packages/collectd/patches/900-add-iwinfo-plugin.patch
+++ /dev/null
@@ -1,279 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -580,6 +580,9 @@ AC_CHECK_HEADERS(net/pfvar.h,
- have_termios_h="no"
- AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
- 
-+# For the iwinfo plugin
-+AC_CHECK_LIB(iwinfo, iwinfo_backend, [with_iwinfo="yes"], [with_iwinfo="no (libiwinfo not found)"], [])
-+
- #
- # Checks for typedefs, structures, and compiler characteristics.
- #
-@@ -4841,6 +4844,7 @@ plugin_interface="no"
- plugin_ipmi="no"
- plugin_ipvs="no"
- plugin_irq="no"
-+plugin_iwinfo="no"
- plugin_libvirt="no"
- plugin_load="no"
- plugin_memory="no"
-@@ -5179,6 +5183,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi],
- AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
- AC_PLUGIN([ipvs],        [$plugin_ipvs],       [IPVS connection statistics])
- AC_PLUGIN([irq],         [$plugin_irq],        [IRQ statistics])
-+AC_PLUGIN([iwinfo],      [$with_iwinfo],       [Common iwinfo wireless statistics])
- AC_PLUGIN([java],        [$with_java],         [Embed the Java Virtual Machine])
- AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
- AC_PLUGIN([load],        [$plugin_load],       [System load])
-@@ -5480,6 +5485,7 @@ Configuration:
-     protobuf-c  . . . . . $have_protoc_c
-     oracle  . . . . . . . $with_oracle
-     python  . . . . . . . $with_python
-+    iwinfo  . . . . . . . $with_iwinfo
- 
-   Features:
-     daemon mode . . . . . $enable_daemon
-@@ -5524,6 +5530,7 @@ Configuration:
-     iptables  . . . . . . $enable_iptables
-     ipvs  . . . . . . . . $enable_ipvs
-     irq . . . . . . . . . $enable_irq
-+    iwinfo  . . . . . . . $enable_iwinfo
-     java  . . . . . . . . $enable_java
-     libvirt . . . . . . . $enable_libvirt
-     load  . . . . . . . . $enable_load
---- a/src/collectd.conf.in
-+++ b/src/collectd.conf.in
-@@ -109,6 +109,7 @@
- #@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
- #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
- #@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
-+#@BUILD_PLUGIN_IWINFO_TRUE@LoadPlugin iwinfo
- #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
- #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
- @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
-@@ -502,6 +503,12 @@
- #	IgnoreSelected true
- #</Plugin>
- 
-+#<Plugin iwinfo>
-+#   Interface "ath0"
-+#   Interface "ra0"
-+#   Interface "wlan0"
-+#</Plugin>
-+
- #<Plugin "java">
- #	JVMArg "-verbose:jni"
- #	JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
---- a/src/collectd.conf.pod
-+++ b/src/collectd.conf.pod
-@@ -2077,6 +2077,27 @@ and all other interrupts are collected.
- 
- =back
- 
-+=head2 Plugin C<iwinfo>
-+
-+=over 4
-+
-+=item B<Interface> I<Interface>
-+
-+Select this interface. By default all detected wireless interfaces will be
-+collected. For a more detailed description see B<IgnoreSelected> below.
-+
-+=item B<IgnoreSelected> I<true>|I<false>
-+
-+If no configuration if given, the B<iwinfo>-plugin will collect data from all
-+detected wireless interfaces. You can use the B<Interface>-option to pick the
-+interfaces you're interested in. Sometimes, however, it's easier/preferred to
-+collect all interfaces I<except> a few ones. This option enables you to do
-+that: By setting B<IgnoreSelected> to I<true> the effect of B<Interface> is
-+inverted: All selected interfaces are ignored and all other interfaces are
-+collected.
-+
-+=back
-+
- =head2 Plugin C<java>
- 
- The I<Java> plugin makes it possible to write extensions for collectd in Java.
---- /dev/null
-+++ b/src/iwinfo.c
-@@ -0,0 +1,150 @@
-+/**
-+ * collectd - src/iwinfo.c
-+ * Copyright (C) 2011  Jo-Philipp Wich
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; only version 2 of the License is applicable.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-+ **/
-+
-+#include "collectd.h"
-+#include "common.h"
-+#include "plugin.h"
-+#include "utils_ignorelist.h"
-+
-+#include <stdint.h>
-+#include <iwinfo.h>
-+
-+#define PROCNETDEV "/proc/net/dev"
-+
-+static const char *config_keys[] = {
-+	"Interface",
-+	"IgnoreSelected"
-+};
-+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-+
-+static ignorelist_t *ignorelist = NULL;
-+
-+static int iwinfo_config(const char *key, const char *value)
-+{
-+	if (ignorelist == NULL)
-+		ignorelist = ignorelist_create(1);
-+
-+	if (ignorelist == NULL)
-+		return 1;
-+
-+	if (strcasecmp(key, "Interface") == 0)
-+		ignorelist_add(ignorelist, value);
-+	else if (strcasecmp(key, "IgnoreSelected") == 0)
-+		ignorelist_set_invert(ignorelist, IS_TRUE(value) ? 0 : 1);
-+	else
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static void iwinfo_submit(const char *ifname, const char *type, int value)
-+{
-+	value_t values[1];
-+	value_list_t vl = VALUE_LIST_INIT;
-+
-+	values[0].gauge = value;
-+
-+	vl.values = values;
-+	vl.values_len = 1;
-+
-+	sstrncpy(vl.host, hostname_g, sizeof(vl.host));
-+	sstrncpy(vl.plugin, "iwinfo", sizeof(vl.plugin));
-+	sstrncpy(vl.plugin_instance, ifname, sizeof(vl.plugin_instance));
-+	sstrncpy(vl.type, type, sizeof(vl.type));
-+	/*sstrncpy(vl.type_instance, "", sizeof(vl.type_instance));*/
-+
-+	plugin_dispatch_values(&vl);
-+}
-+
-+static void iwinfo_process(const char *ifname)
-+{
-+	int val;
-+	char buf[IWINFO_BUFSIZE];
-+	const struct iwinfo_ops *iw = iwinfo_backend(ifname);
-+
-+	/* does appear to be a wifi iface */
-+	if (iw)
-+	{
-+		if (iw->bitrate(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "bitrate", val * 1000);
-+
-+		if (iw->signal(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_power", val);
-+
-+		if (iw->noise(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_noise", val);
-+
-+		if (iw->quality(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_quality", val);
-+
-+		if (iw->assoclist(ifname, buf, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "stations",
-+		              val / sizeof(struct iwinfo_assoclist_entry));
-+	}
-+
-+	iwinfo_finish();
-+}
-+
-+static int iwinfo_read(void)
-+{
-+	char line[1024];
-+	char ifname[128];
-+	FILE *f;
-+
-+	f = fopen(PROCNETDEV, "r");
-+	if (f == NULL)
-+	{
-+		char err[1024];
-+		WARNING("iwinfo: Unable to open " PROCNETDEV ": %s",
-+		        sstrerror(errno, err, sizeof(err)));
-+		return -1;
-+	}
-+
-+	while (fgets(line, sizeof(line), f))
-+	{
-+		if (!strchr(line, ':'))
-+			continue;
-+
-+		if (!sscanf(line, " %127[^:]", ifname))
-+			continue;
-+
-+		if (ignorelist_match(ignorelist, ifname))
-+			continue;
-+
-+		if (strstr(ifname, "mon.") || strstr(ifname, ".sta") ||
-+		    strstr(ifname, "tmp.") || strstr(ifname, "wifi"))
-+			continue;
-+
-+		iwinfo_process(ifname);
-+	}
-+
-+	fclose(f);
-+
-+	return 0;
-+}
-+
-+void module_register(void)
-+{
-+	plugin_register_config("iwinfo", iwinfo_config, config_keys, config_keys_num);
-+	plugin_register_read("iwinfo", iwinfo_read);
-+}
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -530,6 +530,15 @@ collectd_LDADD += "-dlopen" irq.la
- collectd_DEPENDENCIES += irq.la
- endif
- 
-+if BUILD_PLUGIN_IWINFO
-+pkglib_LTLIBRARIES += iwinfo.la
-+iwinfo_la_SOURCES = iwinfo.c
-+iwinfo_la_LDFLAGS = -module -avoid-version
-+iwinfo_la_LIBADD = -liwinfo
-+collectd_LDADD += "-dlopen" iwinfo.la
-+collectd_DEPENDENCIES += iwinfo.la
-+endif
-+
- if BUILD_PLUGIN_JAVA
- pkglib_LTLIBRARIES += java.la
- java_la_SOURCES = java.c
---- a/src/types.db
-+++ b/src/types.db
-@@ -195,7 +195,7 @@ voltage			value:GAUGE:U:U
- vs_memory		value:GAUGE:0:9223372036854775807
- vs_processes		value:GAUGE:0:65535
- vs_threads		value:GAUGE:0:65535
--
-+stations		value:GAUGE:0:256
- #
- # Legacy types
- # (required for the v5 upgrade target)
diff --git a/trunk/package/feeds/packages/collectd/patches/920-fix-ping-droprate.patch b/trunk/package/feeds/packages/collectd/patches/920-fix-ping-droprate.patch
deleted file mode 100644
index f7432990..00000000
--- a/trunk/package/feeds/packages/collectd/patches/920-fix-ping-droprate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/ping.c
-+++ b/src/ping.c
-@@ -651,7 +651,7 @@ static int ping_read (void) /* {{{ */
-           / ((double) (pkg_recv * (pkg_recv - 1))));
- 
-     /* Calculate drop rate. */
--    droprate = ((double) (pkg_sent - pkg_recv)) / ((double) pkg_sent);
-+    droprate = ((double) (pkg_sent - pkg_recv)) * 100 / ((double) pkg_sent);
- 
-     submit (hl->host, "ping", latency_average);
-     submit (hl->host, "ping_stddev", latency_stddev);
diff --git a/trunk/package/feeds/packages/confuse/Makefile b/trunk/package/feeds/packages/confuse/Makefile
deleted file mode 100644
index 5b236d5b..00000000
--- a/trunk/package/feeds/packages/confuse/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=confuse
-PKG_VERSION:=2.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://savannah.nongnu.org/download/confuse/
-PKG_MD5SUM:=45932fdeeccbb9ef4228f1c1a25e9c8f
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=ISC
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/confuse
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libConfuse is a configuration file parser library
-  URL:=http://www.nongnu.org/confuse/
-endef
-
-define Package/confuse/description
-	libConfuse is a configuration file parser library, licensed under the
-	terms of the ISC license, and written in C. It supports sections and
-	(lists of) values (strings, integers, floats, booleans or other
-	sections), as well as some other features (such as single/double-quoted
-	strings, environment variable expansion, functions and nested include
-	statements). It makes it very easy to add configuration file capability
-	to a program using a simple API.
-
-	The goal of libConfuse is not to be the configuration file parser
-	library with a gazillion of features. Instead, it aims to be easy to use
-	and quick to integrate with your code. libConfuse was called libcfg
-	before, but was changed to not confuse with other similar libraries.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-
-MAKE_FLAGS += \
-	-C $(PKG_BUILD_DIR)/src \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/confuse.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfuse.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-	$(STAGING_DIR)/usr/include/confuse.h \
-	$(STAGING_DIR)/usr/lib/libconfuse.{a,so*}
-endef
-
-define Package/confuse/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfuse.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,confuse))
diff --git a/trunk/package/feeds/packages/coova-chilli/Config.in b/trunk/package/feeds/packages/coova-chilli/Config.in
deleted file mode 100644
index c0c671f0..00000000
--- a/trunk/package/feeds/packages/coova-chilli/Config.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# CoovaChilli advanced configuration
-
-menu "Configuration"
-	depends on PACKAGE_coova-chilli
-
-config COOVACHILLI_PROXY
-        bool "Enable support for chilli proxy. Required for AAA Proxy through http"
-        default n
-
-config COOVACHILLI_REDIR
-	bool "Enable support for redir server. Required for uamregex"
-	default n
-
-config COOVACHILLI_MINIPORTAL
-	bool "Enable support Coova miniportal"
-	default n
-
-config COOVACHILLI_USERAGENT
-	bool "Enable recording user-agent"
-	default n
-
-config COOVACHILLI_DNSLOG
-	bool "Enable support to log DNS name queries"
-	default n
-
-config COOVACHILLI_UAMDOMAINFILE
-	bool "Enable loading of mass uamdomains from file"
-	default n
-
-config COOVACHILLI_LARGELIMITS
-	bool "Enable larger limits for use with non-embedded systems"
-	default n
-
-choice
-	prompt "SSL library"
-	default COOVACHILLI_NOSSL
-
-config COOVACHILLI_NOSSL
-	bool "No SSL support"
-
-config COOVACHILLI_MATRIXSSL
-	bool "MatrixSSL"
-
-config COOVACHILLI_CYASSL
-	bool "CyaSSL"
-
-config COOVACHILLI_OPENSSL
-	bool "OpenSSL"
-
-endchoice
-
-endmenu
diff --git a/trunk/package/feeds/packages/coova-chilli/Makefile b/trunk/package/feeds/packages/coova-chilli/Makefile
deleted file mode 100644
index 29bfca68..00000000
--- a/trunk/package/feeds/packages/coova-chilli/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=coova-chilli
-PKG_VERSION:=1.3.0+20141128
-PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/coova/coova-chilli
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b93de20a288c01c2ba28e96e31ad6da01627f45f
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=2adb27ec56172b18c5beee359dd7898d
-
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := \
-  COOVACHILLI_MINIPORTAL \
-  COOVACHILLI_REDIR \
-  COOVACHILLI_USERAGENT \
-  COOVACHILLI_DNSLOG \
-  COOVACHILLI_UAMDOMAINFILE \
-  COOVACHILLI_LARGELIMITS \
-  COOVACHILLI_NOSSL \
-  COOVACHILLI_MATRIXSSL \
-  COOVACHILLI_CYASSL \
-  COOVACHILLI_OPENSSL
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/coova-chilli
-  SUBMENU:=Captive Portals
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-tun +librt +COOVACHILLI_MATRIXSSL:libmatrixssl +COOVACHILLI_CYASSL:libcyassl +COOVACHILLI_OPENSSL:libopenssl
-  TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
-  URL:=http://www.coova.org/CoovaChilli
-  MENU:=1
-endef
-
-define Package/coova-chilli/description
-	CoovaChilli is an open source access controller for wireless LAN
-	access points and is based on ChilliSpot. It is used for authenticating
-	users of a wireless (or wired) LAN. It supports web based login (UAM)
-	which is today's standard for public HotSpots and it supports Wireless
-	Protected Access (WPA) which is the standard of the future.
-	Authentication,	authorization and accounting (AAA) is handled by your
-	favorite radius server.
-endef
-
-define Package/coova-chilli/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Build/Prepare
-$(call Build/Prepare/Default)
-	( cd $(PKG_BUILD_DIR) ; \
-		[ -f ./configure ] || { \
-			./bootstrap ; \
-		} \
-	)
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	$(if $(CONFIG_COOVACHILLI_PROXY),--enable,--disable)-chilliproxy \
-	$(if $(CONFIG_COOVACHILLI_REDIR),--enable,--disable)-chilliredir \
-	$(if $(CONFIG_COOVACHILLI_DNSLOG),--enable,--disable)-dnslog \
-	$(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \
-	$(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \
-	$(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \
-	$(if $(CONFIG_COOVACHILLI_UAMDOMAINFILE),--enable,--disable)-uamdomainfile \
-	$(if $(CONFIG_COOVACHILLI_MATRIXSSL),--with,--without)-matrixssl \
-	$(if $(CONFIG_COOVACHILLI_CYASSL),--with,--without)-cyassl \
-	$(if $(CONFIG_COOVACHILLI_OPENSSL),--with,--without)-openssl \
-	)
-endef
-
-define Package/coova-chilli/conffiles
-/etc/chilli.conf
-endef
-
-define Package/coova-chilli/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/chilli
-	$(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/chilli.hotplug $(1)/etc/hotplug.d/iface/30-chilli
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,coova-chilli))
diff --git a/trunk/package/feeds/packages/coova-chilli/files/chilli.hotplug b/trunk/package/feeds/packages/coova-chilli/files/chilli.hotplug
deleted file mode 100644
index e12812b4..00000000
--- a/trunk/package/feeds/packages/coova-chilli/files/chilli.hotplug
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" == "ifup" ] || exit 0
-
-[ "$INTERFACE" = "wan" ] && {
-	/etc/init.d/chilli restart
-}
diff --git a/trunk/package/feeds/packages/coova-chilli/patches/100-fix-sysinfo-redeclaration.patch b/trunk/package/feeds/packages/coova-chilli/patches/100-fix-sysinfo-redeclaration.patch
deleted file mode 100644
index 2efecbe2..00000000
--- a/trunk/package/feeds/packages/coova-chilli/patches/100-fix-sysinfo-redeclaration.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/system.h
-+++ b/src/system.h
-@@ -83,10 +83,6 @@
- #include <linux/sysinfo.h>
- #endif
- 
--#ifdef HAVE_SYS_SYSINFO_H
--#include <sys/sysinfo.h>
--#endif
--
- #ifdef HAVE_TIME_H
- #include <time.h>
- #endif
-@@ -139,6 +135,10 @@
- #include <linux/un.h>
- #endif
- 
-+#ifdef HAVE_SYS_SYSINFO_H
-+#include <sys/sysinfo.h>
-+#endif
-+
- #elif defined (__FreeBSD__)  || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__) 
- #include <net/if.h>
- #include <net/bpf.h>
diff --git a/trunk/package/feeds/packages/coreutils/Makefile b/trunk/package/feeds/packages/coreutils/Makefile
deleted file mode 100644
index 3b9f17d3..00000000
--- a/trunk/package/feeds/packages/coreutils/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=coreutils
-PKG_VERSION:=8.23
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/coreutils
-PKG_MD5SUM:=abed135279f87ad6762ce57ff6d89c41
-PKG_BUILD_DEPENDS:=libpthread
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-COREUTILS_APPLETS := \
-	base64 basename cat chcon chgrp chmod chown chroot cksum comm cp csplit \
-	cut date dd dir dircolors dirname du echo env expand expr factor	\
-	false fmt fold groups head hostid id install join kill link ln logname	\
-	ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup nproc od paste	\
-	pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir	\
-	runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred	\
-	shuf sleep sort split stat stdbuf stty sum sync tac tail tee test	\
-	timeout touch tr true truncate tsort tty uname unexpand	uniq unlink	\
-	uptime users vdir wc who whoami yes
-
-DEPENDS_sort = +libpthread
-DEPENDS_timeout = +librt
-DEPENDS_expr = +libgmp
-DEPENDS_factor = +libgmp
-DEPENDS_cp = +libacl
-DEPENDS_dir = +libacl
-DEPENDS_install = +libacl
-DEPENDS_ls = +libacl
-DEPENDS_mv = +libacl
-DEPENDS_vdir = +libacl
-
-define Package/coreutils/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The GNU core utilities
-  URL:=http://www.gnu.org/software/coreutils/
-endef
-
-define Package/coreutils
-  $(call Package/coreutils/Default)
-  TITLE:=The GNU core utilities
-  MENU:=1
-endef
-
-define Package/coreutils/description
- Full versions of standard GNU utilities. Normally, you would not use this
- package, since the functionality in BusyBox is more than sufficient and
- smaller.
-endef
-
-define GenPlugin
- define Package/$(1)
-   $(call Package/coreutils/Default)
-   DEPENDS:=coreutils $(DEPENDS_$(2))
-   TITLE:=Utility $(2) from the GNU core utilities
- endef
-
- define Package/$(1)/description
-  Full version of standard GNU $(2) utility. Normally, you would not use this
-  package, since the functionality in BusyBox is more than sufficient.
- endef
-endef
-
-$(foreach a,$(COREUTILS_APPLETS),$(eval $(call GenPlugin,coreutils-$(a),$(a))))
-
-CONFIGURE_VARS += \
-	gl_cv_func_mbrtowc_incomplete_state=yes \
-	gl_cv_func_mbrtowc_retval=yes \
-	gl_cv_func_wcrtomb_retval=yes
-
-ifneq ($(CONFIG_USE_UCLIBC),)
-  CONFIGURE_VARS += \
-	ac_cv_type_pthread_spinlock_t=$(if $(filter 0.9.30% 0.9.2% 0.9.31%,$(call qstrip,$(CONFIG_UCLIBC_VERSION))),no,yes)
-endif
-
-CONFIGURE_ARGS += \
-	--disable-xattr \
-	--enable-install-program=su
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		SHELL="/bin/bash" \
-		all install
-endef
-
-define Package/coreutils/install
-	true
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,coreutils))
-
-$(foreach a,$(COREUTILS_APPLETS),$(eval $(call BuildPlugin,coreutils-$(a),$(a))))
diff --git a/trunk/package/feeds/packages/coreutils/patches/001-no_docs_man_tests.patch b/trunk/package/feeds/packages/coreutils/patches/001-no_docs_man_tests.patch
deleted file mode 100644
index 60f2df2b..00000000
--- a/trunk/package/feeds/packages/coreutils/patches/001-no_docs_man_tests.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,7 +17,7 @@
- 
- ALL_RECURSIVE_TARGETS =
- 
--SUBDIRS = po . gnulib-tests
-+SUBDIRS = po
- 
- changelog_etc =				\
-   ChangeLog-2005			\
-@@ -213,6 +213,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
- 
- include $(top_srcdir)/lib/local.mk
- include $(top_srcdir)/src/local.mk
--include $(top_srcdir)/doc/local.mk
--include $(top_srcdir)/man/local.mk
--include $(top_srcdir)/tests/local.mk
-+
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -159,8 +159,7 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk \
- 	$(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk \
--	$(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk \
--	$(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk \
-+	$(top_srcdir)/src/single-binary.mk \
- 	INSTALL NEWS README AUTHORS ChangeLog $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
- 	$(am__configure_deps) $(top_srcdir)/lib/config.hin ABOUT-NLS \
-@@ -2276,11 +2275,7 @@ RECURSIVE_TARGETS = all-recursive check-
- 	install-ps-recursive install-recursive installcheck-recursive \
- 	installdirs-recursive pdf-recursive ps-recursive \
- 	tags-recursive uninstall-recursive
--am__can_run_installinfo = \
--  case $$AM_UPDATE_INFO_DIR in \
--    n|no|NO) false;; \
--    *) (install-info --version) >/dev/null 2>&1;; \
--  esac
-+am__can_run_installinfo = false
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -2606,7 +2601,7 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
- EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
- ERRNO_H = @ERRNO_H@
- EXEEXT = @EXEEXT@
--EXTRA_MANS = @EXTRA_MANS@
-+EXTRA_MANS = 
- FLOAT_H = @FLOAT_H@
- FNMATCH_H = @FNMATCH_H@
- GETADDRINFO_LIB = @GETADDRINFO_LIB@
-@@ -3820,7 +3815,7 @@ libexecdir = @libexecdir@
- lispdir = @lispdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--man1_MANS = @man1_MANS@
-+man1_MANS = 
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -3843,7 +3838,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ALL_RECURSIVE_TARGETS = distcheck-hook check-root
--SUBDIRS = po . gnulib-tests
-+SUBDIRS = po
- changelog_etc = \
-   ChangeLog-2005			\
-   ChangeLog-2006			\
-@@ -5767,7 +5762,7 @@ all: $(BUILT_SOURCES)
- .SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
- am--refresh: Makefile
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -5790,7 +5785,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- 	esac;
--$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk:
-+$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk:
- 
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
diff --git a/trunk/package/feeds/packages/coreutils/patches/002-fix_compile_with_uclibc.patch b/trunk/package/feeds/packages/coreutils/patches/002-fix_compile_with_uclibc.patch
deleted file mode 100644
index 94187e4b..00000000
--- a/trunk/package/feeds/packages/coreutils/patches/002-fix_compile_with_uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/pthread.in.h
-+++ b/lib/pthread.in.h
-@@ -252,6 +252,9 @@ pthread_mutex_unlock (pthread_mutex_t *m
- 
- /* Approximate spinlocks with mutexes.  */
- 
-+#ifdef __UCLIBC__
-+#define pthread_spinlock_t original_pthread_spinlock_t
-+#endif
- typedef pthread_mutex_t pthread_spinlock_t;
- 
- _GL_PTHREAD_INLINE int
diff --git a/trunk/package/feeds/packages/crtmpserver/Makefile b/trunk/package/feeds/packages/crtmpserver/Makefile
deleted file mode 100644
index 5f2a31eb..00000000
--- a/trunk/package/feeds/packages/crtmpserver/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# 
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=crtmpserver
-PKG_REV:=811
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-PKG_BUILD_PARALLEL:=2
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=GPL-3.0
-
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/branches/1.0
-PKG_SOURCE_SUBDIR:=crtmpserver-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crtmpserver
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libopenssl +libstdcpp +liblua
-  TITLE:=C++ RTMP Server
-  URL:=http://www.rtmpd.com/
-endef
-
-define Package/crtmpserver/description
-C++ RTMP Server it is a high performance streaming server able to
-stream (live or recorded) in the following technologies:
- * To and from Flash (RTMP,RTMPE, RTMPS, RTMPT, RTMPTE)
- * To and from embedded devices: iPhone, Android
- * From surveillance cameras
- * IP-TV using MPEG-TS and RTSP/RTCP/RTP protocols
-                
-Also, crtmpserver can be used as a high performance rendes-vous
-server. For example, it enables you to do:
- * Audio/Video conferencing
- * Online gaming
- * Online collaboration
- * Simple/complex chat applications
-endef
-
-define Package/crtmpserver/conffiles
-/etc/crtmpserver.lua
-endef
-
-# XXX: this hack handles the usr/bin vs bin difference of backfire and trunk
-TS_BASE:=$(wildcard $(TOOLCHAIN_DIR)/bin/$(TARGET_CC))
-TS_BASE:=$(dir $(if $(TS_BASE),$(TS_BASE),$(wildcard $(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CC))))
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/builders/make; \
-		cp linux.mk linux-openwrt-uclibc.mk; \
-		$(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TS_BASE),' \
-			-e 's,^TOOLCHAIN_PREFIX[[:space:]]*=.*,TOOLCHAIN_PREFIX=$(TARGET_CROSS),' \
-			-e 's,^CCOMPILER[[:space:]]*=.*,CCOMPILER=$(TARGET_CC),' \
-			-e 's,^CXXCOMPILER[[:space:]]*=.*,CXXCOMPILER=$(TARGET_CXX),' \
-			-e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \
-			-e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \
-			linux-openwrt-uclibc.mk)
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/builders/make \
-		PLATFORM=linux-openwrt-uclibc -Wno-error -j6
-endef
-
-define Package/crtmpserver/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/crtmpserver
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/crtmpserver/
-	$(foreach app,flvplayback samplefactory admin stresstest appselector vptests applestreamingclient proxypublish, \
-		$(INSTALL_DIR) $(1)/usr/lib/crtmpserver/$(app); \
-		$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/applications/$(app)/lib$(app).so \
-			$(1)/usr/lib/crtmpserver/$(app)/; \
-	)
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver.lua $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/share/crtmpserver/appselector
-	$(INSTALL_DIR) $(1)/usr/share/crtmpserver/media
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/crtmpserver.init $(1)/etc/init.d/crtmpserver
-endef
-
-$(eval $(call BuildPackage,crtmpserver))
-
diff --git a/trunk/package/feeds/packages/crtmpserver/files/crtmpserver.init b/trunk/package/feeds/packages/crtmpserver/files/crtmpserver.init
deleted file mode 100644
index cea35121..00000000
--- a/trunk/package/feeds/packages/crtmpserver/files/crtmpserver.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2010 OpenWrt.org
-
-START=99
-STOP=80
-
-SERVICE_USE_PID=1
-
-CRTMPSERVER_BIN="/usr/bin/crtmpserver"
-CRTMPSERVER_CONFIG="/etc/crtmpserver.lua"
-CRTMPSERVER_PID="/var/run/crtmpserver.pid"
-
-start()
-{
-        echo "start $CRTMPSERVER_BIN"
-        start-stop-daemon -S -x "$CRTMPSERVER_BIN" -- --daemon --pid="$CRTMPSERVER_PID" \
-                "$CRTMPSERVER_CONFIG"
-}
-stop() {
-
-        echo "stop $CRTMPSERVER_BIN"
-        start-stop-daemon  -K -x $CRTMPSERVER_BIN -p $CRTMPSERVER_PID
-}
-
-reload()
-{
-        stop
-        start
-}
-
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/010-link-crypt-for-lua.patch b/trunk/package/feeds/packages/crtmpserver/patches/010-link-crypt-for-lua.patch
deleted file mode 100644
index ec758188..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/010-link-crypt-for-lua.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/builders/make/compile.mk
-+++ b/builders/make/compile.mk
-@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
- 
- #common
- COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
--COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml
-+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt
- COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp")
- COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o)
- 
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/020-add-rpath.patch b/trunk/package/feeds/packages/crtmpserver/patches/020-add-rpath.patch
deleted file mode 100644
index 1ea83203..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/020-add-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/builders/make/linux.mk
-+++ b/builders/make/linux.mk
-@@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3
- COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS)
- 
- #linking flags
--dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,"\$$ORIGIN"
--dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,"\$$ORIGIN"
-+dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/crtmpserver
-+dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/crtmpserver
- 
- #compile switches
- PLATFORM_DEFINES = \
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/030-default-config.patch b/trunk/package/feeds/packages/crtmpserver/patches/030-default-config.patch
deleted file mode 100644
index c37644ce..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/030-default-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/builders/cmake/crtmpserver/crtmpserver.lua
-+++ b/builders/cmake/crtmpserver/crtmpserver.lua
-@@ -4,7 +4,7 @@ configuration=
- {
- 	-- if true, the server will run as a daemon.
- 	-- NOTE: all console appenders will be ignored if this is a daemon
--	daemon=false,
-+	daemon=true,
- 	-- the OS's path separator. Used in composing paths
- 	pathSeparator="/",
- 
-@@ -44,7 +44,7 @@ configuration=
- 	{
- 		-- this is the root directory of all applications
- 		-- usually this is relative to the binary execuable
--		rootDirectory="applications",
-+		rootDirectory="/usr/lib/crtmpserver",
- 		
- 		
- 		--this is where the applications array starts
-@@ -68,7 +68,7 @@ configuration=
- 			-- this is the folder from where the current application gets it's content.
- 			-- It is optional. If not specified, it will be defaulted to:
- 			-- <rootDirectory>/<name>/mediaFolder
--			-- mediaFolder="/some/directory/where/media/files/are/stored"
-+			mediaFolder="/usr/share/crtmpserver/appselector",
- 			-- the application will also be known by that names. It is optional
- 			--aliases=
- 			--{
-@@ -89,13 +89,6 @@ configuration=
- 				},
- 				{
- 					ip="0.0.0.0",
--					port=8081,
--					protocol="inboundRtmps",
--					sslKey="server.key",
--					sslCert="server.crt"
--				},
--				{
--					ip="0.0.0.0",
- 					port=8080,
- 					protocol="inboundRtmpt"
-                 },
-@@ -105,7 +98,7 @@ configuration=
- 			description="FLV Playback Sample",
- 			name="flvplayback",
- 			protocol="dynamiclinklibrary",
--			mediaFolder="/Volumes/android/backup/media/",
-+			mediaFolder="/media/",
- 			aliases=
- 			{
- 				"simpleLive",
-@@ -183,6 +176,7 @@ configuration=
- 			name="samplefactory",
- 			description="asdsadasdsa",
- 			protocol="dynamiclinklibrary",
-+			mediaFolder="/usr/share/ctmpserver/media",
- 			aliases=
- 			{
- 				"httpOutboundTest"
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/040-use-select.patch b/trunk/package/feeds/packages/crtmpserver/patches/040-use-select.patch
deleted file mode 100644
index 466f86c9..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/040-use-select.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: crtmpserver-r726/builders/make/linux.mk
-===================================================================
---- crtmpserver-r726.orig/builders/make/linux.mk
-+++ crtmpserver-r726/builders/make/linux.mk
-@@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT
- PLATFORM_DEFINES = \
- 	-DLINUX \
- 	-DLITTLE_ENDIAN_BYTE_ALIGNED \
--	-DNET_EPOLL
-+	-DNET_SELECT
- 
- SSL_BASE=/usr/local
- 
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/050-add-missing-make-defines.patch b/trunk/package/feeds/packages/crtmpserver/patches/050-add-missing-make-defines.patch
deleted file mode 100644
index f9ff617b..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/050-add-missing-make-defines.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/builders/make/compile.mk
-+++ b/builders/make/compile.mk
-@@ -43,17 +43,22 @@ FEATURES_DEFINES = \
- 	-DHAS_PROTOCOL_RTP \
- 	-DHAS_PROTOCOL_TS \
- 	-DHAS_PROTOCOL_VAR \
-+	-DHAS_PROTOCOL_CLI \
-+	-DHAS_PROTOCOL_HLS \
-+	-DHAS_PROTOCOL_RAWHTTPSTREAM \
- 	-DHAS_LUA \
- 	-DHAS_MEDIA_MP3 \
- 	-DHAS_MEDIA_MP4 \
--	-DHAS_MEDIA_FLV
-+	-DHAS_MEDIA_FLV \
-+	-DHAS_SYSLOG
-+	
- 
- 
- DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES)
- 
- #library paths
- SSL_INCLUDE=-I$(SSL_BASE)/include
--SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto
-+SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto -ldl
- 
- #lua
- LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev
-@@ -67,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
- 
- #common
- COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
--COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt
-+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) $(PROJECT_BASE_PATH)/builders/make/output/dynamic/liblua.so -ltinyxml -lcrypt -ldl
- COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp")
- COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o)
- 
- #thelib
- THELIB_INCLUDE=$(COMMON_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/thelib/include
--THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon
-+THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon -ldl
- THELIB_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/thelib/src -type f -name "*.cpp")
- THELIB_OBJS = $(THELIB_SRCS:.cpp=.thelib.o)
- 
- #tests
- TESTS_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/tests/include
--TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
-+TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
- TESTS_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/tests/src -type f -name "*.cpp")
- TESTS_OBJS=$(TESTS_SRCS:.cpp=.tests.o)
- 
- #crtmpserver
- CRTMPSERVER_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/crtmpserver/include
--CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
-+CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
- CRTMPSERVER_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/crtmpserver/src -type f -name "*.cpp")
- CRTMPSERVER_OBJS_DYNAMIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_dynamic.o)
- CRTMPSERVER_OBJS_STATIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_static.o)
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/060-add-missing-includes.patch b/trunk/package/feeds/packages/crtmpserver/patches/060-add-missing-includes.patch
deleted file mode 100644
index 505b5f33..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/060-add-missing-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/sources/common/include/common.h
-+++ b/sources/common/include/common.h
-@@ -20,6 +20,10 @@
- #ifndef _COMMON_H
- #define _COMMON_H
- 
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+
- #include "defines.h"
- #include "platform/platform.h"
- #include "utils/utils.h"
---- a/sources/common/src/utils/logging/fileloglocation.cpp
-+++ b/sources/common/src/utils/logging/fileloglocation.cpp
-@@ -18,6 +18,10 @@
-  */
- 
- 
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+
- #include "utils/logging/fileloglocation.h"
- #include "utils/lua/luautils.h"
- 
diff --git a/trunk/package/feeds/packages/crtmpserver/patches/070-missing-include-gcc-47.patch b/trunk/package/feeds/packages/crtmpserver/patches/070-missing-include-gcc-47.patch
deleted file mode 100644
index 94d80e79..00000000
--- a/trunk/package/feeds/packages/crtmpserver/patches/070-missing-include-gcc-47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/3rdparty/tinyxml/tinyxml.h
-+++ b/3rdparty/tinyxml/tinyxml.h
-@@ -39,6 +39,7 @@ distribution.
- #include <string>
- #include <iostream>
- #include <sstream>
-+#include "lstate.h"
- 
- // Help out windows:
- #if defined( _DEBUG ) && !defined( DEBUG )
diff --git a/trunk/package/feeds/packages/cryptodev-linux/Makefile b/trunk/package/feeds/packages/cryptodev-linux/Makefile
deleted file mode 100644
index e9af4ca9..00000000
--- a/trunk/package/feeds/packages/cryptodev-linux/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=cryptodev-linux
-PKG_VERSION:=1.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.gna.org/cryptodev-linux/
-PKG_MD5SUM:=0b63b3481cf2c90386b35f057481d36b
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-CRYPTODEV_AUTOLOAD:= \
-	cryptodev
-
-define KernelPackage/cryptodev
-  SUBMENU:=Cryptographic API modules
-  DEFAULT:=m if ALL
-  TITLE:=Driver for cryptographic acceleration
-  URL:=http://cryptodev-linux.org/
-  MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-authenc +kmod-crypto-hash
-  FILES:= \
-		$(PKG_BUILD_DIR)/cryptodev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,$(CRYPTODEV_AUTOLOAD))
-endef
-
-define KernelPackage/cryptodev/description
-  This is a driver for that allows to use the Linux kernel supported
-  hardware ciphers by user-space applications.
-endef
-
-CRYPTODEV_MAKEOPTS= -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		TOOLPREFIX="$(KERNEL_CROSS)" \
-		TOOLPATH="$(KERNEL_CROSS)" \
-		KERNEL_DIR="$(LINUX_DIR)" \
-		LDOPTS=" " \
-		DOMULTI=1
-
-define Build/Compile/cryptodev
-	$(MAKE) $(CRYPTODEV_MAKEOPTS)
-endef
-
-define Build/Compile
-	$(call Build/Compile/cryptodev)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/crypto
-	$(CP) $(PKG_BUILD_DIR)/crypto/cryptodev.h $(STAGING_DIR)/usr/include/crypto/
-endef
-
-define KernelPackage/cryptodev/install
-	$(INSTALL_DIR) $(1)/etc/modules.d
-	$(INSTALL_DATA) ./files/cryptodev.modules $(1)/etc/modules.d/80-cryptodev
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(INSTALL_DIR) $(1)/usr/sbin
-endef
-
-$(eval $(call KernelPackage,cryptodev))
diff --git a/trunk/package/feeds/packages/cryptodev-linux/files/cryptodev.modules b/trunk/package/feeds/packages/cryptodev-linux/files/cryptodev.modules
deleted file mode 100644
index fb39fcd6..00000000
--- a/trunk/package/feeds/packages/cryptodev-linux/files/cryptodev.modules
+++ /dev/null
@@ -1 +0,0 @@
-cryptodev
diff --git a/trunk/package/feeds/packages/cryptsetup/Makefile b/trunk/package/feeds/packages/cryptsetup/Makefile
deleted file mode 100644
index fb7fc121..00000000
--- a/trunk/package/feeds/packages/cryptsetup/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cryptsetup
-PKG_VERSION:=1.6.7
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING COPYING.LGPL
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v1.6
-PKG_MD5SUM:=918406eb5d2e2f5a7348c432ea9b1473
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/cryptsetup/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Cryptsetup
-  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +@KERNEL_DIRECT_IO
-  URL:=http://code.google.com/p/cryptsetup/
-endef
-
-define Package/cryptsetup
-$(call Package/cryptsetup/Default)
-  DEPENDS+=+libgcrypt
-  VARIANT:=gcrypt
-endef
-
-define Package/cryptsetup-openssl
-$(call Package/cryptsetup/Default)
-  TITLE+= (with openssl support)
-  DEPENDS+=+libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/cryptsetup/Default/description
-	Cryptsetup-luks
-endef
-
-define Package/cryptsetup/description
-$(call Package/cryptsetup/Default/description)
-linked against libgcrypt
-endef
-
-
-define Package/cryptsetup-openssl/description
-$(call Package/cryptsetup/Default/description)
-linked against openssl
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS+= \
-        --with-crypto_backend=openssl
-endif
-
-define Package/cryptsetup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/cryptsetup $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libcryptsetup.so* $(1)/usr/lib
-endef
-
-Package/cryptsetup-openssl/install = $(Package/cryptsetup/install)
-
-$(eval $(call BuildPackage,cryptsetup))
-$(eval $(call BuildPackage,cryptsetup-openssl))
diff --git a/trunk/package/feeds/packages/cshark/Makefile b/trunk/package/feeds/packages/cshark/Makefile
deleted file mode 100644
index cbfbed5f..00000000
--- a/trunk/package/feeds/packages/cshark/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2014-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cshark
-PKG_VERSION:=2015-03-13
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cloudshark/cshark.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ab2ae2fbd72b6cbd57c95e3192edc3c1f475412b
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/cshark
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=CloudShark capture tool
-  URL:=http://www.cloudshark.org/
-  DEPENDS:=+libjson-c +libpcap +libuci +libubox +libuclient +libustream-polarssl
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/luci-app-cshark
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=Cloudshark capture tool Web UI
-  DEPENDS:=+cshark +luci
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-CMAKE_OPTIONS = \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DWITH_DEBUG=OFF \
-
-define Package/cshark/conffiles
-/etc/config/cshark
-endef
-
-define Package/cshark/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/cshark \
-		$(1)/sbin/
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/config/cshark \
-		$(1)/etc/config/
-
-	$(INSTALL_DIR) $(1)/etc/ssl/certs
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/config/ca-the_usertrust_network.pem \
-		$(1)/etc/ssl/certs/
-endef
-
-define Package/luci-app-cshark/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
-	$(CP) -R $(PKG_BUILD_DIR)/openwrt/luci/luasrc/* $(1)/usr/lib/lua/luci/
-endef
-
-$(eval $(call BuildPackage,cshark))
-$(eval $(call BuildPackage,luci-app-cshark))
diff --git a/trunk/package/feeds/packages/ctorrent-svn/Makefile b/trunk/package/feeds/packages/ctorrent-svn/Makefile
deleted file mode 100644
index 60920632..00000000
--- a/trunk/package/feeds/packages/ctorrent-svn/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ctorrent-svn
-PKG_REV:=322
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://svn.code.sf.net/p/dtorrent/code/dtorrent/trunk
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ctorrent-svn/Default
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+uclibcxx
-  TITLE:=console-based BitTorrent client
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.rahul.net/dholmes/ctorrent/
-endef
-
-define Package/ctorrent-svn/Default/description
-	CTorrent is a BitTorrent client written in the C programming language,
-	known to be a very robust and mature programming language, which produces
-	fast and optimized application.
-endef
-
-define Package/ctorrent-svn
-$(call Package/ctorrent-svn/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+=+libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/ctorrent-svn/description
-$(call Package/ctorrent-svn/Default/description)
- This package is built with OpenSSL support.
-endef
-
-define Package/ctorrent-svn-nossl
-$(call Package/ctorrent-svn/Default)
-  TITLE+= (with builtin SHA-1)
-  VARIANT:=nossl
-endef
-
-define Package/ctorrent-svn-nossl/description
-$(call Package/ctorrent-svn/Default/description)
- This package is built with builtin (Steve Reid's public-domain) SHA-1 support
-endef
-
-CONFIGURE_VARS += \
-	CXX="g++-uc" \
-	LIBS="-nodefaultlibs -luClibc++ $(LIBGCC_S) -lc"
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--with-ssl=no
-endif
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.ac \
-		aclocal.m4 \
-		Makefile.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default)
-endef
-
-define Package/ctorrent-svn/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ctorrent $(1)/usr/bin/ctorrent
-endef
-
-Package/ctorrent-svn-nossl/install = $(Package/ctorrent-svn/install)
-
-$(eval $(call BuildPackage,ctorrent-svn))
-$(eval $(call BuildPackage,ctorrent-svn-nossl))
diff --git a/trunk/package/feeds/packages/ctorrent-svn/patches/100-compile-fix.patch b/trunk/package/feeds/packages/ctorrent-svn/patches/100-compile-fix.patch
deleted file mode 100644
index bb7d33fd..00000000
--- a/trunk/package/feeds/packages/ctorrent-svn/patches/100-compile-fix.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/btconfig.cpp b/btconfig.cpp
-index e1badd0..aaa6feb 100644
---- a/btconfig.cpp
-+++ b/btconfig.cpp
-@@ -828,7 +828,7 @@ void CfgCTCS(Config<const char *> *config)
-     strncpy(CTCS.m_host, *cfg_ctcs, MAXHOSTNAMELEN-1);
-     CTCS.m_host[MAXHOSTNAMELEN-1] = '\0';
-     if( (s = strchr(CTCS.m_host, ':')) ) *s='\0';
--    CTCS.m_port = atoi(s = (strchr(*cfg_ctcs, ':')+1));
-+    CTCS.m_port = atoi(s = (char*)(strchr(*cfg_ctcs, ':')+1));
-     if( strchr(s, ':') )
-       CONSOLE.Input("Enter CTCS password: ", CTCS.m_pass, CTCS_PASS_SIZE);
-     else *CTCS.m_pass = '\0';
-diff --git a/btcontent.cpp b/btcontent.cpp
-index d84f450..88ccb50 100644
---- a/btcontent.cpp
-+++ b/btcontent.cpp
-@@ -1408,27 +1408,27 @@ void btContent::CompletionCommand()
-         ptmp = cmdstr + strlen(cmdstr);
-         parg = strstr(parg, "&t") + 2;
-         strcat(pt, parg);
--        pt = strstr(ptmp, "&t");
--        if( pd ) pd = strstr(ptmp, "&d");
--        if( pw ) pw = strstr(ptmp, "&w");
-+        pt = (char *)strstr(ptmp, "&t");
-+        if( pd ) pd = (char *)strstr(ptmp, "&d");
-+        if( pw ) pw = (char *)strstr(ptmp, "&w");
-       }
-       if( pd && (!pt || pd < pt) && (!pw || pd < pw) ){
-         strcpy(pd, m_btfiles.GetDataName());
-         ptmp = cmdstr + strlen(cmdstr);
-         parg = strstr(parg, "&d") + 2;
-         strcat(pd, parg);
--        pd = strstr(ptmp, "&d");
--        if( pt ) pt = strstr(ptmp, "&t");
--        if( pw ) pw = strstr(ptmp, "&w");
-+        pd = (char *)strstr(ptmp, "&d");
-+        if( pt ) pt = (char *)strstr(ptmp, "&t");
-+        if( pw ) pw = (char *)strstr(ptmp, "&w");
-       }
-       if( pw && (!pt || pw < pt) && (!pd || pw < pd) ){
-         strcpy(pw, wd);
-         ptmp = cmdstr + strlen(cmdstr);
-         parg = strstr(parg, "&w") + 2;
-         strcat(pw, parg);
--        pw = strstr(ptmp, "&w");
--        if( pt ) pt = strstr(ptmp, "&t");
--        if( pd ) pd = strstr(ptmp, "&d");
-+        pw = (char *)strstr(ptmp, "&w");
-+        if( pt ) pt = (char *)strstr(ptmp, "&t");
-+        if( pd ) pd = (char *)strstr(ptmp, "&d");
-       }
-     }
-   }
-diff --git a/console.cpp b/console.cpp
-index bdadb61..5ab2492 100644
---- a/console.cpp
-+++ b/console.cpp
-@@ -511,11 +511,8 @@ void ConStream::Error(int sev, const char *message, ...)
-   va_list ap;
- 
-   va_start(ap, message);
--  if( g_console_ready ) CONSOLE.Error(sev, message, ap);
--  else{
-     vfprintf(stderr, message, ap);
-     fflush(stderr);
--  }
-   va_end(ap);
- }
- 
-@@ -1766,7 +1763,7 @@ void Console::Warning(int sev, const char *message, ...)
-   va_end(ap);
- }
- 
--
-+/*
- void Console::Error(int sev, const char *message, va_list ap)
- {
-   vsnprintf(m_buffer, sizeof(m_buffer), message, ap);
-@@ -1778,7 +1775,7 @@ void Console::Error(int sev, const char *message, va_list ap)
-   m_warnings.AddMessage(sev, m_buffer);
-   if( sev && *cfg_ctcs ) CTCS.Send_Info(sev, m_buffer);
- }
--
-+*/
- 
- void Console::Debug(const char *message, ...)
- {
diff --git a/trunk/package/feeds/packages/ctorrent-svn/patches/300-negative.patch b/trunk/package/feeds/packages/ctorrent-svn/patches/300-negative.patch
deleted file mode 100644
index e1e1e650..00000000
--- a/trunk/package/feeds/packages/ctorrent-svn/patches/300-negative.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/bencode.cpp b/bencode.cpp
-index fef82ba..b7f14bc 100644
---- a/bencode.cpp
-+++ b/bencode.cpp
-@@ -45,6 +45,9 @@ size_t buf_int(const char *b, size_t len, char beginchar, char endchar,
-     p++;
-     len--;
-   }
-+  if( *p == '-'){
-+    p++; len--;
-+  }
- 
-   for( psave = p; len && isdigit(*p); p++, len-- );
- 
diff --git a/trunk/package/feeds/packages/ctorrent/Makefile b/trunk/package/feeds/packages/ctorrent/Makefile
deleted file mode 100644
index 16504e2a..00000000
--- a/trunk/package/feeds/packages/ctorrent/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ctorrent
-PKG_VERSION:=dnh3.3.2
-PKG_RELEASE:=6
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/dtorrent \
-	http://www.rahul.net/dholmes/ctorrent/
-PKG_MD5SUM:=59b23dd05ff70791cd6449effa7fc3b6
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ctorrent/Default
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=$(CXX_DEPENDS)
-  TITLE:=console-based BitTorrent client
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.rahul.net/dholmes/ctorrent/
-endef
-
-define Package/ctorrent/Default/description
-	CTorrent is a BitTorrent client written in the C programming language,
-	known to be a very robust and mature programming language, which produces
-	fast and optimized application.
-endef
-
-define Package/ctorrent
-$(call Package/ctorrent/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+=+libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/ctorrent/description
-$(call Package/ctorrent/Default/description)
- This package is built with OpenSSL support.
-endef
-
-define Package/ctorrent-nossl
-$(call Package/ctorrent/Default)
-  TITLE+= (with builtin SHA-1)
-  VARIANT:=nossl
-endef
-
-define Package/ctorrent-nossl/description
-$(call Package/ctorrent/Default/description)
- This package is built with builtin (Steve Reid's public-domain) SHA-1 support
-endef
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--with-ssl=no
-endif
-
-define Package/ctorrent/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
-endef
-
-Package/ctorrent-nossl/install = $(Package/ctorrent/install)
-
-$(eval $(call BuildPackage,ctorrent))
-$(eval $(call BuildPackage,ctorrent-nossl))
diff --git a/trunk/package/feeds/packages/ctorrent/patches/100-CVE-2009-1759.patch b/trunk/package/feeds/packages/ctorrent/patches/100-CVE-2009-1759.patch
deleted file mode 100644
index 86ae1d7d..00000000
--- a/trunk/package/feeds/packages/ctorrent/patches/100-CVE-2009-1759.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-Patch for CVE-2009-1759.
-Source: Upstream SVN, rev 302 from the dtorrent-3 branch.
-
-Index: a/bencode.h
-===================================================================
---- a/bencode.h	(revision 300)
-+++ b/bencode.h	(revision 302)
-@@ -25,7 +25,7 @@
- size_t decode_list(const char *b,size_t len,const char *keylist);
- size_t decode_rev(const char *b,size_t len,const char *keylist);
- size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
--size_t decode_list2path(const char *b, size_t n, char *pathname);
-+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
- size_t bencode_buf(const char *str,size_t len,FILE *fp);
- size_t bencode_str(const char *str, FILE *fp);
- size_t bencode_int(const uint64_t integer, FILE *fp);
-Index: a/bencode.cpp
-===================================================================
---- a/bencode.cpp	(revision 300)
-+++ b/bencode.cpp	(revision 302)
-@@ -233,22 +233,28 @@
-   return bencode_end_dict_list(fp);
- }
- 
--size_t decode_list2path(const char *b, size_t n, char *pathname)
-+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
- {
-   const char *pb = b;
-   const char *s = (char *) 0;
-+  const char *endmax = pathname + maxlen - 1;
-   size_t r,q;
- 
-   if( 'l' != *pb ) return 0;
-   pb++;
-   n--;
-   if( !n ) return 0;
--  for(; n;){
-+  while( n && pathname < endmax ){
-     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
-+    if( q >= maxlen ) return 0;
-     memcpy(pathname, s, q);
-     pathname += q;
--    pb += r; n -= r; 
--    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
-+    maxlen -= q;
-+    pb += r;
-+    n -= r; 
-+    if( 'e' == *pb ) break;
-+    if( pathname >= endmax ) return 0;
-+    *pathname++ = PATH_SP;
-   }
-   *pathname = '\0';
-   return (pb - b + 1);
-Index: a/btfiles.cpp
-===================================================================
---- a/btfiles.cpp	(revision 300)
-+++ b/btfiles.cpp	(revision 302)
-@@ -449,7 +449,8 @@
-   return 0;
- }
- 
--int btFiles::BuildFromMI(const char *metabuf, const size_t metabuf_len, const char *saveas)
-+int btFiles::BuildFromMI(const char *metabuf, const size_t metabuf_len,
-+  const char *saveas, unsigned char exam_only)
- {
-   char path[MAXPATHLEN];
-   const char *s, *p;
-@@ -458,11 +459,19 @@
-   int f_warned = 0;
- 
-   if( !decode_query(metabuf, metabuf_len, "info|name", &s, &q, (int64_t*)0,
--      QUERY_STR) || MAXPATHLEN <= q )
-+        QUERY_STR) || MAXPATHLEN <= q ){
-+    errno = EINVAL;
-     return -1;
-+  }
- 
-   memcpy(path, s, q);
-   path[q] = '\0';
-+  if( !exam_only &&
-+      (PATH_SP == path[0] || '/' == path[0] || 0==strncmp("..", path, 2)) ){
-+    CONSOLE.Warning(1, "error, unsafe path \"%s\" in torrent data", path);
-+    errno = EINVAL;
-+    return -1;
-+  }
- 
-   r = decode_query(metabuf, metabuf_len, "info|files", (const char**)0, &q,
-                    (int64_t*)0, QUERY_POS);
-@@ -471,21 +480,31 @@
-     BTFILE *pbf_last = (BTFILE*) 0; 
-     BTFILE *pbf = (BTFILE*) 0;
-     size_t dl;
-+    unsigned long nfiles = 0;
-+
-     if( decode_query(metabuf,metabuf_len,"info|length",
--                    (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
-+                    (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) ){
-+      errno = EINVAL;
-       return -1;
-+    }
- 
-     if( saveas ){
-       m_directory = new char[strlen(saveas) + 1];
- #ifndef WINDOWS
--      if(!m_directory) return -1;
-+      if( !m_directory ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       strcpy(m_directory,saveas);
-     }else{
-       int f_conv;
-       char *tmpfn = new char[strlen(path)*2+5];
- #ifndef WINDOWS
--      if( !tmpfn ) return -1;
-+      if( !tmpfn ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       if( f_conv = ConvertFilename(tmpfn, path, strlen(path)*2+5) ){
-         if( arg_flg_convert_filenames ){
-@@ -493,6 +512,7 @@
- #ifndef WINDOWS
-           if( !m_directory ){
-             delete []tmpfn;
-+            errno = ENOMEM;
-             return -1;
-           }
- #endif
-@@ -507,7 +527,10 @@
-       if( !f_conv || !arg_flg_convert_filenames ){
-         m_directory = new char[strlen(path) + 1];
- #ifndef WINDOWS
--        if( !m_directory ) return -1;
-+        if( !m_directory ){
-+          errno = ENOMEM;
-+          return -1;
-+        }
- #endif
-         strcpy(m_directory,path);
-       }
-@@ -517,24 +540,50 @@
-     p = metabuf + r + 1; 
-     q--;
-     for(; q && 'e' != *p; p += dl, q -= dl){
--      if(!(dl = decode_dict(p, q, (const char*) 0)) ) return -1;
--      if( !decode_query(p, dl, "length", (const char**) 0,
--                       (size_t*) 0,&t,QUERY_LONG) ) return -1;
-+      if( !(dl = decode_dict(p, q, (const char*) 0)) ||
-+          !decode_query(p, dl, "length", (const char**) 0, (size_t*) 0, &t,
-+                        QUERY_LONG) ){
-+        errno = EINVAL;
-+        return -1;
-+      }
-       pbf = _new_bfnode();
- #ifndef WINDOWS
--      if( !pbf ) return -1;
-+      if( !pbf ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-+      nfiles++;
-       pbf->bf_length = t;
-       m_total_files_length += t;
-       r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0,
-                        QUERY_POS);
--      if( !r ) return -1;
--      if(!decode_list2path(p + r, n, path)) return -1;
-+      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
-+        CONSOLE.Warning(1,
-+          "error, invalid path in torrent data for file %lu at offset %llu",
-+          nfiles, m_total_files_length - t);
-+        delete pbf;
-+        errno = EINVAL;
-+        return -1;
-+      }
-+      if( !exam_only &&
-+          (PATH_SP == path[0] || '/' == path[0] || 0==strncmp("..", path, 2)) ){
-+        CONSOLE.Warning(1,
-+          "error, unsafe path \"%s\" in torrent data for file %lu",
-+          path, nfiles);
-+        delete pbf;
-+        errno = EINVAL;
-+        return -1;
-+      }
- 
-+
-       int f_conv;
-       char *tmpfn = new char[strlen(path)*2+5];
- #ifndef WINDOWS
--      if( !tmpfn ) return -1;
-+      if( !tmpfn ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       if( f_conv = ConvertFilename(tmpfn, path, strlen(path)*2+5) ){
-         if( arg_flg_convert_filenames ){
-@@ -542,6 +591,7 @@
- #ifndef WINDOWS
-           if( !pbf->bf_filename ){
-             delete []tmpfn;
-+            errno = ENOMEM;
-             return -1;
-           }
- #endif
-@@ -556,7 +606,10 @@
-       if( !f_conv || !arg_flg_convert_filenames ){
-         pbf->bf_filename = new char[strlen(path) + 1];
- #ifndef WINDOWS
--        if( !pbf->bf_filename ) return -1;
-+        if( !pbf->bf_filename ){
-+          errno = ENOMEM;
-+          return -1;
-+        }
- #endif
-         strcpy(pbf->bf_filename, path);
-       }
-@@ -564,30 +617,42 @@
-       pbf_last = pbf;
-     }
-   }else{
--    if( !decode_query(metabuf,metabuf_len,"info|length",
--                     (const char**) 0,(size_t*) 0,&t,QUERY_LONG) )
-+    if( !decode_query(metabuf,metabuf_len, "info|length",
-+                      (const char**)0, (size_t*) 0, &t, QUERY_LONG) ){
-+      errno = EINVAL;
-       return -1;
-+    }
-     m_btfhead = _new_bfnode();
- #ifndef WINDOWS
--    if( !m_btfhead) return -1;
-+    if( !m_btfhead ){
-+      errno = ENOMEM;
-+      return -1;
-+    }
- #endif
-     m_btfhead->bf_length = m_total_files_length = t;
-     if( saveas ){
-       m_btfhead->bf_filename = new char[strlen(saveas) + 1];
- #ifndef WINDOWS
--      if(!m_btfhead->bf_filename ) return -1;
-+      if( !m_btfhead->bf_filename ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       strcpy(m_btfhead->bf_filename, saveas);
-     }else if( arg_flg_convert_filenames ){
-       char *tmpfn = new char[strlen(path)*2+5];
- #ifndef WINDOWS
--      if( !tmpfn ) return -1;
-+      if( !tmpfn ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       ConvertFilename(tmpfn, path, strlen(path)*2+5);
-       m_btfhead->bf_filename = new char[strlen(tmpfn) + 1];
- #ifndef WINDOWS
-       if( !m_btfhead->bf_filename ){
-         delete []tmpfn;
-+        errno = ENOMEM;
-         return -1;
-       }
- #endif
-@@ -596,7 +661,10 @@
-     }else{
-       m_btfhead->bf_filename = new char[strlen(path) + 1];
- #ifndef WINDOWS
--      if(!m_btfhead->bf_filename ) return -1;
-+      if( !m_btfhead->bf_filename ){
-+        errno = ENOMEM;
-+        return -1;
-+      }
- #endif
-       strcpy(m_btfhead->bf_filename, path);
-     }
-@@ -694,6 +762,32 @@
- size_t btFiles::FillMetaInfo(FILE* fp)
- {
-   BTFILE *p;
-+  const char *refname, *s;
-+  char path[MAXPATHLEN];
-+
-+  refname = m_directory ? m_directory : m_btfhead->bf_filename;
-+  while( (s = strchr(refname, PATH_SP)) && *(s + 1) ){
-+    refname = s + 1;
-+  }
-+  if( m_directory && '.' == *refname ){
-+    char dir[MAXPATHLEN];
-+    if( getcwd(dir, sizeof(dir)) && 0==chdir(m_directory) ){
-+      if( getcwd(path, sizeof(path)) ){
-+        refname = path;
-+        while( (s = strchr(refname, PATH_SP)) && *(s + 1) ){
-+          refname = s + 1;
-+        }
-+      }
-+      chdir(dir);
-+    }
-+  }
-+  if( '/' == *refname || '\0' == *refname || '.' == *refname ){
-+    CONSOLE.Warning(1, "error, inappropriate file or directory name \"%s\"",
-+      m_directory ? m_directory : m_btfhead->bf_filename);
-+    errno = EINVAL;
-+    return 0;
-+  }
-+
-   if( m_directory ){
-     // multi files
-     if( bencode_str("files", fp) != 1 ) return 0;
-@@ -715,16 +809,15 @@
-     if(bencode_end_dict_list(fp) != 1 ) return 0;
-     
-     if(bencode_str("name", fp) != 1) return 0;
--    return bencode_str(m_directory, fp);
--    
-+    return bencode_str(refname, fp);
-   }else{
-     if( bencode_str("length", fp) != 1 ) return 0;
-     if( bencode_int(m_btfhead->bf_length, fp) != 1) return 0;
-     
-     if( bencode_str("name", fp) != 1 ) return 0;
--    return bencode_str(m_btfhead->bf_filename, fp);
-+    return bencode_str(refname, fp);
-   }
--  return 1;
-+  return 0;
- }
- 
- 
-Index: a/btcontent.cpp
-===================================================================
---- a/btcontent.cpp	(revision 300)
-+++ b/btcontent.cpp	(revision 302)
-@@ -357,7 +357,11 @@
- 
-   cfg_req_queue_length = (m_piece_length / cfg_req_slice_size) * 2 - 1;
- 
--  if( m_btfiles.BuildFromMI(b, flen, saveas) < 0 ) ERR_RETURN();
-+  if( m_btfiles.BuildFromMI(b, flen, saveas, arg_flg_exam_only) < 0 ){
-+    if( EINVAL == errno )
-+      CONSOLE.Warning(1, "Torrent metainfo file data is invalid or unusable.");
-+    ERR_RETURN();
-+  }
- 
-   delete []b;
-   b = (char *)0;
-Index: a/btfiles.h
-===================================================================
---- a/btfiles.h	(revision 300)
-+++ b/btfiles.h	(revision 302)
-@@ -61,7 +61,7 @@
-   
-   int BuildFromFS(const char *pathname);
-   int BuildFromMI(const char *metabuf, const size_t metabuf_len,
--                  const char *saveas);
-+                  const char *saveas, unsigned char exam_only);
- 
-   char *GetDataName() const;
-   uint64_t GetTotalLength() const { return m_total_files_length; }
diff --git a/trunk/package/feeds/packages/ctorrent/patches/100-negative-ints.patch b/trunk/package/feeds/packages/ctorrent/patches/100-negative-ints.patch
deleted file mode 100644
index 864ce1b6..00000000
--- a/trunk/package/feeds/packages/ctorrent/patches/100-negative-ints.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/bencode.cpp
-+++ b/bencode.cpp
-@@ -44,6 +44,10 @@ size_t buf_long(const char *b,size_t len
-     p++; len--;
-   }
- 
-+  if( *p == '-'){
-+    p++; len--;
-+  }
-+
-   for(psave = p; len && isdigit(*p); p++,len--) ;
- 
-   if(!len || MAX_INT_SIZ < (p - psave) || *p != endchar) return 0;
diff --git a/trunk/package/feeds/packages/cyrus-sasl/Makefile b/trunk/package/feeds/packages/cyrus-sasl/Makefile
deleted file mode 100644
index dfc21d2e..00000000
--- a/trunk/package/feeds/packages/cyrus-sasl/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cyrus-sasl
-PKG_VERSION:=2.1.26
-PKG_RELEASE:=3
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.cyrusimap.org/cyrus-sasl/
-PKG_MD5SUM:=a7f4e5e559a0e37b3ffc438c9456e425
-
-PKG_LICENSE:=BSD-4c BSD
-PKG_LICENSE_FILES:=COPYING cmulocal/COPYING saslauthd/COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_MACRO_PATHS:=cmulocal config ../cmulocal ../config
-PKG_AUTOMAKE_PATHS:=. saslauthd sasldb
-PKG_REMOVE_FILES:=aclocal.m4 saslauthd/aclocal.m4 config/libtool.m4
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsasl2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A general purpose authentication library
-  URL:=http://asg.web.cmu.edu/sasl/
-  DEPENDS:=+libopenssl
-endef
-
-TARGET_CFLAGS += $(FPIC)
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-sample \
-	--enable-staticdlopen \
-	--disable-java \
-	--disable-alwaystrue \
-	--disable-checkapop \
-	--enable-cram \
-	--enable-digest \
-	--without-auth-sasldb \
-	--disable-otp \
-	--disable-srp \
-	--disable-srp-setpass \
-	--disable-krb4 \
-	--disable-gssapi \
-	--disable-gss_mutexes \
-	--enable-plain \
-	--enable-anon \
-	--disable-login \
-	--disable-ntlm \
-	--disable-sql \
-	--disable-ldapdb \
-	--without-dblib \
-	--without-gdbm \
-	--with-devrandom="/dev/urandom" \
-	--without-pam \
-	--without-saslauthd \
-	--without-authdaemond \
-	--without-pwcheck \
-	--with-ipctype=unix \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--without-des \
-	--without-opie \
-	--without-ldap \
-	--without-mysql \
-	--without-pgsql \
-	--without-sqlite \
-	--without-rc4 \
-	--without-dmalloc \
-	--without-sfio \
-	--disable-sample
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/include \
-		CC="$(HOSTCC)" \
-		LINK="$(HOSTCC) -o makemd5 -lc" \
-		CFLAGS="" \
-		CPPFLAGS="" \
-		makemd5
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(1)/usr/lib/
-	ln -sf libsasl2.a $(1)/usr/lib/libsasl.a
-	ln -sf libsasl2.so $(1)/usr/lib/libsasl.so
-	$(INSTALL_DIR) $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(1)/usr/lib/sasl2/
-endef
-
-define Package/libsasl2/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so* $(1)/usr/lib/sasl2/
-endef
-
-$(eval $(call BuildPackage,libsasl2))
diff --git a/trunk/package/feeds/packages/dansguardian/Makefile b/trunk/package/feeds/packages/dansguardian/Makefile
deleted file mode 100644
index eefefaa3..00000000
--- a/trunk/package/feeds/packages/dansguardian/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dansguardian
-PKG_VERSION:=2.12.0.3
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/dansguardian
-PKG_MD5SUM:=2a88d0392cd28eaec02b7ee727b2e253
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dansguardian
-  SECTION:=net
-  DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=DansGuardian
-  URL:=http://dansguardian.org
-endef
-
-define Package/dansguardian/conffiles
-/etc/dansguardian/dansguardianf1.conf
-/etc/config/dansguardian
-endef
-
-CONFIGURE_VARS += \
-	INCLUDES="" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \
-	LIBS="-lpthread" \
-
-define Build/Configure
-	$(call Build/Configure/Default,\
-		--disable-clamav \
-		--with-sysconfsubdir=dansguardian \
-		--with-proxyuser=root \
-		--with-proxygroup=root \
-		--disable-pcre \
-	)
-endef
-
-define Package/dansguardian/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/dansguardian $(1)/etc/
-	$(INSTALL_CONF) ./files/dansguardianf1.conf $(1)/etc/dansguardian/dansguardianf1.conf
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/dansguardian.config $(1)/etc/config/dansguardian
-
-	$(INSTALL_DIR) $(1)/usr/share/dansguardian
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(1)/usr/share/dansguardian/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/blockedflash.swf $(1)/usr/share/dansguardian/
-
-	$(INSTALL_DIR) $(1)/usr/share/dansguardian/languages/ukenglish
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/dansguardian/languages/ukenglish/* $(1)/usr/share/dansguardian/languages/ukenglish/
-
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/dansguardian.init $(1)/etc/init.d/dansguardian
-endef
-
-$(eval $(call BuildPackage,dansguardian))
diff --git a/trunk/package/feeds/packages/dansguardian/files/dansguardian.config b/trunk/package/feeds/packages/dansguardian/files/dansguardian.config
deleted file mode 100644
index 86640aff..00000000
--- a/trunk/package/feeds/packages/dansguardian/files/dansguardian.config
+++ /dev/null
@@ -1,71 +0,0 @@
-config dansguardian 'dansguardian'
-	option config_file '/etc/dansguardian/dansguardianf1.conf'
-	option accessdeniedaddress 'http://YOURSERVER.YOURDOMAIN/cgi-bin/dansguardian.pl'
-	option bannediplist '/etc/dansguardian/lists/bannediplist'
-	option contentscanexceptions 'off'
-	option contentscannertimeout '60'
-	option createlistcachefiles 'on'
-	option custombannedflashfile '/usr/share/dansguardian/blockedflash.swf'
-	option custombannedimagefile '/usr/share/dansguardian/transparent1x1.gif'
-	option deletedownloadedtempfiles 'on'
-	option downloadmanager '/etc/dansguardian/downloadmanagers/default.conf'
-	option exceptioniplist '/etc/dansguardian/lists/exceptioniplist'
-	option filecachedir '/tmp'
-	option filtergroups '1'
-	option filtergroupslist '/etc/dansguardian/lists/filtergroupslist'
-	option filterip ''
-	option filterports '8080'
-	option forcequicksearch 'off'
-	option forwardedfor 'off'
-	option hexdecodecontent 'off'
-	option initialtrickledelay '20'
-	option ipcfilename '/tmp/.dguardianipc'
-	option ipipcfilename '/tmp/.dguardianipipc'
-	option languagedir '/usr/share/dansguardian/languages'
-	option language 'ukenglish'
-	option logadblocks 'off'
-	option logchildprocesshandling 'off'
-	option logclienthostnames 'off'
-	option logconnectionhandlingerrors 'on'
-	option logexceptionhits '2'
-	option logfileformat '1'
-	option loglevel '2'
-	option loglocation '/dev/null'
-	option logsyslog 'on'
-	option loguseragent 'off'
-	option maxagechildren '500'
-	option maxchildren '120'
-	option maxcontentfilecachescansize '20000'
-	option maxcontentfiltersize '256'
-	option maxcontentramcachescansize '2000'
-	option maxips '0'
-	option maxsparechildren '32'
-	option maxuploadsize '-1'
-	option minchildren '8'
-	option minsparechildren '4'
-	option nodaemon 'off'
-	option nologger 'off'
-	option nonstandarddelimiter 'on'
-	option perroomblockingdirectory '/etc/dansguardian/lists/bannedrooms/'
-	option phrasefiltermode '2'
-	option prefercachedlists 'off'
-	option preforkchildren '6'
-	option preservecase '0'
-	option proxyip '127.0.0.1'
-	option proxyport '3128'
-	option proxytimeout '20'
-	option recheckreplacedurls 'off'
-	option reportinglevel '3'
-	option reverseaddresslookups 'off'
-	option reverseclientiplookups 'off'
-	option scancleancache 'on'
-	option showweightedfound 'on'
-	option softrestart 'off'
-	option trickledelay '10'
-	option urlcacheage '900'
-	option urlcachenumber '1000'
-	option urlipcfilename '/tmp/.dguardianurlipc'
-	option usecustombannedflash 'on'
-	option usecustombannedimage 'on'
-	option usexforwardedfor 'off'
-	option weightedphrasemode '2'
diff --git a/trunk/package/feeds/packages/dansguardian/files/dansguardian.init b/trunk/package/feeds/packages/dansguardian/files/dansguardian.init
deleted file mode 100644
index 67ec6bd5..00000000
--- a/trunk/package/feeds/packages/dansguardian/files/dansguardian.init
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/dansguardian
-CONFIGFILE="/tmp/dansguardian/dansguardian.conf"
-
-validate_dansguardian_section() {
-	uci_validate_section dansguardian dansguardian "${1}" \
-		'config_file:string' \
-		'accessdeniedaddress:string' \
-		'bannediplist:string' \
-		'contentscanexceptions:string' \
-		'contentscannertimeout:uinteger' \
-		'createlistcachefiles:string' \
-		'custombannedflashfile:string' \
-		'custombannedimagefile:string' \
-		'deletedownloadedtempfiles:string' \
-		'downloadmanager:string' \
-		'exceptioniplist:string' \
-		'filecachedir:string' \
-		'filtergroups:uinteger' \
-		'filtergroupslist:string' \
-		'filterip:ipaddr' \
-		'filterports:port:8080' \
-		'forcequicksearch:string' \
-		'forwardedfor:string' \
-		'hexdecodecontent:string' \
-		'initialtrickledelay:uinteger' \
-		'ipcfilename:string' \
-		'ipipcfilename:string' \
-		'languagedir:string' \
-		'language:string' \
-		'logadblocks:string' \
-		'logchildprocesshandling:string' \
-		'logclienthostnames:string' \
-		'logconnectionhandlingerrors:string' \
-		'logexceptionhits:range(0,2)' \
-		'logfileformat:range(1,4)' \
-		'loglevel:range(0,3)' \
-		'loglocation:string' \
-		'loguseragent:string' \
-		'maxagechildren:uinteger' \
-		'maxchildren:uinteger' \
-		'maxcontentfilecachescansize:uinteger' \
-		'maxcontentfiltersize:uinteger' \
-		'maxcontentramcachescansize:uinteger' \
-		'maxips:uinteger' \
-		'maxsparechildren:uinteger' \
-		'maxuploadsize:integer' \
-		'minchildren:uinteger' \
-		'minsparechildren:uinteger' \
-		'nodaemon:string' \
-		'nologger:string' \
-		'nonstandarddelimiter:string' \
-		'perroomblockingdirectory:string' \
-		'phrasefiltermode:range(0,3)' \
-		'prefercachedlists:string' \
-		'preforkchildren:uinteger' \
-		'preservecase:range(0,2)' \
-		'proxyip:ipaddr' \
-		'proxyport:port:3128' \
-		'proxytimeout:range(20,30)' \
-		'recheckreplacedurls:string' \
-		'reportinglevel:range(-1,3)' \
-		'reverseaddresslookups:string' \
-		'reverseclientiplookups:string' \
-		'scancleancache:string' \
-		'showweightedfound:string' \
-		'softrestart:string' \
-		'trickledelay:uinteger' \
-		'urlcacheage:uinteger' \
-		'urlcachenumber:uinteger' \
-		'urlipcfilename:string' \
-		'usecustombannedflash:string' \
-		'usecustombannedimage:string' \
-		'usexforwardedfor:string' \
-		'weightedphrasemode:range(0,2)'
-}
-
-start_service() {
-	local config_file accessdeniedaddress bannediplist contentscanexceptions contentscannertimeout \
-		createlistcachefiles custombannedflashfile custombannedimagefile deletedownloadedtempfiles \
-		downloadmanager exceptioniplist filecachedir filtergroups filtergroupslist filterip filterports \
-		forcequicksearch forwardedfor hexdecodecontent initialtrickledelay ipcfilename ipipcfilename \
-		language languagedir logadblocks logchildprocesshandling logclienthostnames logconnectionhandlingerrors \
-		logexceptionhits logfileformat loglevel loguseragent maxagechildren maxchildren maxcontentfilecachescansize \
-		maxcontentfiltersize maxcontentramcachescansize maxips maxsparechildren maxuploadsize minchildren minsparechildren \
-		nodaemon nologger nonstandarddelimiter perroomblockingdirectory phrasefiltermode prefercachedlists preforkchildren \
-		preservecase proxyip proxyport proxytimeout recheckreplacedurls reportinglevel reverseaddresslookups \
-		reverseclientiplookups scancleancache showweightedfound softrestart trickledelay urlcacheage urlcachenumber \
-		urlipcfilename usecustombannedflash usecustombannedimage usexforwardedfor weightedphrasemode
-
-	validate_dansguardian_section dansguardian || {
-		echo "validation failed"
-		return 1
-	}
-
-	mkdir -p $(dirname $CONFIGFILE)
-	ln -sf $config_file $(dirname $CONFIGFILE)
-
-	echo "accessdeniedaddress = " $accessdeniedaddress > $CONFIGFILE
-	echo "bannediplist = " $bannediplist >> $CONFIGFILE
-	echo "contentscanexceptions = " $contentscanexceptions >> $CONFIGFILE
-	echo "contentscannertimeout = " $contentscannertimeout >> $CONFIGFILE
-	echo "createlistcachefiles = " $createlistcachefiles >> $CONFIGFILE
-	echo "custombannedflashfile = " $custombannedflashfile >> $CONFIGFILE
-	echo "custombannedimagefile = " $custombannedimagefile >> $CONFIGFILE
-	echo "deletedownloadedtempfiles = " $deletedownloadedtempfiles >> $CONFIGFILE
-	echo "downloadmanager = " $downloadmanager >> $CONFIGFILE
-	echo "exceptioniplist = " $exceptioniplist >> $CONFIGFILE
-	echo "filecachedir = " $filecachedir >> $CONFIGFILE
-	echo "filtergroups = " $filtergroups >> $CONFIGFILE
-	echo "filtergroupslist = " $filtergroupslist >> $CONFIGFILE
-	echo "filterip = " $filterip >> $CONFIGFILE
-	echo "filterports = " $filterports >> $CONFIGFILE
-	echo "forcequicksearch = " $forcequicksearch >> $CONFIGFILE
-	echo "forwardedfor = " $forwardedfor >> $CONFIGFILE
-	echo "hexdecodecontent = " $hexdecodecontent >> $CONFIGFILE
-	echo "initialtrickledelay = " $initialtrickledelay >> $CONFIGFILE
-	echo "ipcfilename = " $ipcfilename >> $CONFIGFILE
-	echo "ipipcfilename = " $ipipcfilename >> $CONFIGFILE
-	echo "language = " $language >> $CONFIGFILE
-	echo "languagedir = " $languagedir >> $CONFIGFILE
-	echo "logadblocks = " $logadblocks >> $CONFIGFILE
-	echo "logchildprocesshandling = " $logchildprocesshandling >> $CONFIGFILE
-	echo "logclienthostnames = " $logclienthostnames >> $CONFIGFILE
-	echo "logconnectionhandlingerrors = " $logconnectionhandlingerrors >> $CONFIGFILE
-	echo "logexceptionhits = " $logexceptionhits >> $CONFIGFILE
-	echo "logfileformat = " $logfileformat >> $CONFIGFILE
-	echo "loglevel = " $loglevel >> $CONFIGFILE
-	echo "loglocation = " $loglocation >> $CONFIGFILE
-	echo "loguseragent = " $loguseragent >> $CONFIGFILE
-	echo "maxagechildren = " $maxagechildren >> $CONFIGFILE
-	echo "maxchildren = " $maxchildren >> $CONFIGFILE
-	echo "maxcontentfilecachescansize = " $maxcontentfilecachescansize >> $CONFIGFILE
-	echo "maxcontentfiltersize = " $maxcontentfiltersize >> $CONFIGFILE
-	echo "maxcontentramcachescansize = " $maxcontentramcachescansize >> $CONFIGFILE
-	echo "maxips = " $maxips >> $CONFIGFILE
-	echo "maxsparechildren = " $maxsparechildren >> $CONFIGFILE
-	echo "maxuploadsize = " $maxuploadsize >> $CONFIGFILE
-	echo "minchildren = " $minchildren >> $CONFIGFILE
-	echo "minsparechildren = " $minsparechildren >> $CONFIGFILE
-	echo "nodaemon = " $nodaemon >> $CONFIGFILE
-	echo "nologger = " $nologger >> $CONFIGFILE
-	echo "nonstandarddelimiter = " $nonstandarddelimiter >> $CONFIGFILE
-	echo "perroomblockingdirectory = " $perroomblockingdirectory >> $CONFIGFILE
-	echo "phrasefiltermode = " $phrasefiltermode >> $CONFIGFILE
-	echo "prefercachedlists = " $prefercachedlists >> $CONFIGFILE
-	echo "preforkchildren = " $preforkchildren >> $CONFIGFILE
-	echo "preservecase = " $preservecase >> $CONFIGFILE
-	echo "proxyip = " $proxyip >> $CONFIGFILE
-	echo "proxyport = " $proxyport >> $CONFIGFILE
-	echo "proxytimeout = " $proxytimeout >> $CONFIGFILE
-	echo "recheckreplacedurls = " $recheckreplacedurls >> $CONFIGFILE
-	echo "reportinglevel = " $reportinglevel >> $CONFIGFILE
-	echo "reverseaddresslookups = " $reverseaddresslookups >> $CONFIGFILE
-	echo "reverseclientiplookups = " $reverseclientiplookups >> $CONFIGFILE
-	echo "scancleancache = " $scancleancache >> $CONFIGFILE
-	echo "showweightedfound = " $showweightedfound >> $CONFIGFILE
-	echo "softrestart = " $softrestart >> $CONFIGFILE
-	echo "trickledelay = " $trickledelay >> $CONFIGFILE
-	echo "urlcacheage = " $urlcacheage >> $CONFIGFILE
-	echo "urlcachenumber = " $urlcachenumber >> $CONFIGFILE
-	echo "urlipcfilename = " $urlipcfilename >> $CONFIGFILE
-	echo "usecustombannedflash = " $usecustombannedflash >> $CONFIGFILE
-	echo "usecustombannedimage = " $usecustombannedimage >> $CONFIGFILE
-	echo "usexforwardedfor = " $usexforwardedfor >> $CONFIGFILE
-	echo "weightedphrasemode = " $weightedphrasemode >> $CONFIGFILE
-
-	procd_open_instance
-	procd_set_param command $PROG -N -c "$CONFIGFILE"
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-	dansguardian -s | awk -F':' '{ print $2}' | xargs kill -9
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "dansguardian"
-	procd_add_validation validate_dansguardian_section
-}
diff --git a/trunk/package/feeds/packages/dansguardian/files/dansguardianf1.conf b/trunk/package/feeds/packages/dansguardian/files/dansguardianf1.conf
deleted file mode 100644
index 01e09aec..00000000
--- a/trunk/package/feeds/packages/dansguardian/files/dansguardianf1.conf
+++ /dev/null
@@ -1,348 +0,0 @@
-# DansGuardian filter group config file for version 2.12.0.0
-
-
-# Filter group mode
-# This option determines whether members of this group have their web access
-# unfiltered, filtered, or banned. This mechanism replaces the "banneduserlist"
-# and "exceptionuserlist" files from previous versions.
-#
-# 0 = banned
-# 1 = filtered
-# 2 = unfiltered (exception)
-#
-# Only filter groups with a mode of 1 need to define phrase, URL, site, extension,
-# mimetype and PICS lists; in other modes, these options are ignored to conserve
-# memory.
-#
-# Defaults to 0 if unspecified.
-# Unauthenticated users are treated as being in the first filter group.
-groupmode = 1
-
-# Filter group name
-# Used to fill in the -FILTERGROUP- placeholder in the HTML template file, and to
-# name the group in the access logs
-# Defaults to empty string
-#groupname = ''
-
-# Content filtering files location
-bannedphraselist = '/etc/dansguardian/lists/bannedphraselist'
-weightedphraselist = '/etc/dansguardian/lists/weightedphraselist'
-exceptionphraselist = '/etc/dansguardian/lists/exceptionphraselist'
-bannedsitelist = '/etc/dansguardian/lists/bannedsitelist'
-greysitelist = '/etc/dansguardian/lists/greysitelist'
-exceptionsitelist = '/etc/dansguardian/lists/exceptionsitelist'
-bannedurllist = '/etc/dansguardian/lists/bannedurllist'
-greyurllist = '/etc/dansguardian/lists/greyurllist'
-exceptionurllist = '/etc/dansguardian/lists/exceptionurllist'
-exceptionregexpurllist = '/etc/dansguardian/lists/exceptionregexpurllist'
-bannedregexpurllist = '/etc/dansguardian/lists/bannedregexpurllist'
-picsfile = '/etc/dansguardian/lists/pics'
-contentregexplist = '/etc/dansguardian/lists/contentregexplist'
-urlregexplist = '/etc/dansguardian/lists/urlregexplist'
-
-# Filetype filtering
-#
-# Blanket download blocking
-# If enabled, all files will be blocked, unless they match the
-# exceptionextensionlist or exceptionmimetypelist.
-# These lists do not override virus scanning.
-# Exception lists defined above override all types of filtering, including
-# the blanket download block.
-# Defaults to disabled.
-# (on | off)
-#
-blockdownloads = off
-exceptionextensionlist = '/etc/dansguardian/lists/exceptionextensionlist'
-exceptionmimetypelist = '/etc/dansguardian/lists/exceptionmimetypelist'
-#
-# Use the following lists to block specific kinds of file downloads.
-# The two exception lists above can be used to override these.
-#
-bannedextensionlist = '/etc/dansguardian/lists/bannedextensionlist'
-bannedmimetypelist = '/etc/dansguardian/lists/bannedmimetypelist'
-#
-# In either file filtering mode, the following list can be used to override
-# MIME type & extension blocks for particular domains & URLs (trusted download sites).
-#
-exceptionfilesitelist = '/etc/dansguardian/lists/exceptionfilesitelist'
-exceptionfileurllist = '/etc/dansguardian/lists/exceptionfileurllist'
-
-# Categorise without blocking:
-# Supply categorised lists here and the category string shall be logged against
-# matching requests, but matching these lists does not perform any filtering
-# action.
-#logsitelist = '/etc/dansguardian/lists/logsitelist'
-#logurllist = '/etc/dansguardian/lists/logurllist'
-#logregexpurllist = '/etc/dansguardian/lists/logregexpurllist'
-
-# Outgoing HTTP header rules:
-# Optional lists for blocking based on, and modification of, outgoing HTTP
-# request headers.  Format for headerregexplist is one modification rule per
-# line, similar to content/URL modifications.  Format for
-# bannedregexpheaderlist is one regular expression per line, with matching
-# headers causing a request to be blocked.
-# Headers are matched/replaced on a line-by-line basis, not as a contiguous
-# block.
-# Use for example, to remove cookies or prevent certain user-agents.
-headerregexplist = '/etc/dansguardian/lists/headerregexplist'
-bannedregexpheaderlist = '/etc/dansguardian/lists/bannedregexpheaderlist'
-
-# Weighted phrase mode
-# Optional; overrides the weightedphrasemode option in dansguardian.conf
-# for this particular group.  See documentation for supported values in
-# that file.
-#weightedphrasemode = 0
-
-# Naughtiness limit
-# This the limit over which the page will be blocked.  Each weighted phrase is given
-# a value either positive or negative and the values added up.  Phrases to do with
-# good subjects will have negative values, and bad subjects will have positive
-# values.  See the weightedphraselist file for examples.
-# As a guide:
-# 50 is for young children,  100 for old children,  160 for young adults.
-naughtynesslimit = 50
-
-# Search term blocking
-# Search terms can be extracted from search URLs and filtered using the
-# bannedphraselist, weightedphraselist and exceptionphraselist, with a separate
-# threshold for blocking than that used for normal page content.
-# To do this, the first two options below must be enabled.
-#
-# Search engine regular expression list
-# List of regular expressions for matching search engine URLs.  It is assumed
-# that the search terms themselves will be contained within the first submatch
-# of each expression.
-#searchengineregexplist = '/etc/dansguardian/lists/searchengineregexplist'
-#
-# Search term limit
-# The limit over which requests will be blocked for containing search terms
-# which match the weightedphraselist.  This should usually be lower than the
-# 'naughtynesslimit' value above, because the amount of text being filtered
-# is only a few words, rather than a whole page.
-# This option must be uncommented if searchengineregexplist is uncommented.
-# A value of 0 here indicates that search terms should be extracted,
-# for logging/reporting purposes, but no filtering should be performed
-# on the resulting text.
-#searchtermlimit = 30
-#
-# Search term lists
-# If the three lines below are uncommented, search term blocking will use
-# the banned, weighted & exception phrases from these lists, instead of using
-# the same phrase lists as for page content.  This is optional but recommended,
-# as weights for individual phrases in the "normal" lists may not be
-# appropriate for blocking when those phrases appear in a much smaller block
-# of text.
-# Please note that all or none of the below should be uncommented, not a
-# mixture.
-#bannedsearchtermlist = '/etc/dansguardian/lists/bannedsearchtermlist'
-#weightedsearchtermlist = '/etc/dansguardian/lists/weightedsearchtermlist'
-#exceptionsearchtermlist = '/etc/dansguardian/lists/exceptionsearchtermlist'
-
-# Category display threshold
-# This option only applies to pages blocked by weighted phrase filtering.
-# Defines the minimum score that must be accumulated within a particular
-# category in order for it to show up on the block pages' category list.
-# All categories under which the page scores positively will be logged; those
-# that were not displayed to the user appear in brackets.
-#
-# -1 = display only the highest scoring category
-# 0 = display all categories (default)
-# > 0 = minimum score for a category to be displayed
-categorydisplaythreshold = 0
-
-# Embedded URL weighting
-# When set to something greater than zero, this option causes URLs embedded within a
-# page's HTML (from links, image tags, etc.) to be extracted and checked against the
-# bannedsitelist and bannedurllist. Each link to a banned page causes the amount set
-# here to be added to the page's weighting.
-# The behaviour of this option with regards to multiple occurrences of a site/URL is
-# affected by the weightedphrasemode setting.
-#
-# NB: Currently, this feature uses regular expressions that require the PCRE library.
-# As such, it is only available if you compiled DansGuardian with '--enable-pcre=yes'.
-# You can check compile-time options by running 'dansguardian -v'.
-#
-# Set to 0 to disable.
-# Defaults to 0.
-# WARNING: This option is highly CPU intensive!
-embeddedurlweight = 0
-
-# Enable PICS rating support
-#
-# Defaults to disabled
-# (on | off)
-enablepics = off
-
-# Temporary Denied Page Bypass
-# This provides a link on the denied page to bypass the ban for a few minutes.  To be
-# secure it uses a random hashed secret generated at daemon startup.  You define the
-# number of seconds the bypass will function for before the deny will appear again.
-# To allow the link on the denied page to appear you will need to edit the template.html
-# or dansguardian.pl file for your language.
-# 300 = enable for 5 minutes
-# 0 = disable ( defaults to 0 )
-# -1 = enable but you require a separate program/CGI to generate a valid link
-bypass = 0
-
-# Temporary Denied Page Bypass Secret Key
-# Rather than generating a random key you can specify one.  It must be more than 8 chars.
-# '' = generate a random one (recommended and default)
-# 'Mary had a little lamb.' = an example
-# '76b42abc1cd0fdcaf6e943dcbc93b826' = an example
-bypasskey = ''
-
-# Infection/Scan Error Bypass
-# Similar to the 'bypass' setting, but specifically for bypassing files scanned and found
-# to be infected, or files that trigger scanner errors - for example, archive types with
-# recognised but unsupported compression schemes, or corrupt archives.
-# The option specifies the number of seconds for which the bypass link will be valid.
-# 300 = enable for 5 minutes
-# 0 = disable (default)
-# -1 = enable, but require a separate program/CGI to generate a valid link
-infectionbypass = 0
-
-# Infection/Scan Error Bypass Secret Key
-# Same as the 'bypasskey' option, but used for infection bypass mode.
-infectionbypasskey = ''
-
-# Infection/Scan Error Bypass on Scan Errors Only
-# Enable this option to allow infectionbypass links only when virus scanning fails,
-# not when a file is found to contain a virus.
-# on = enable (default and highly recommended)
-# off = disable
-infectionbypasserrorsonly = on
-
-# Disable content scanning
-# If you enable this option you will disable content scanning for this group.
-# Content scanning primarily is AV scanning (if enabled) but could include
-# other types.
-# (on|off) default = off.
-disablecontentscan = off
-
-# Enable Deep URL Analysis
-# When enabled, DG looks for URLs within URLs, checking against the bannedsitelist and
-# bannedurllist. This can be used, for example, to block images originating from banned
-# sites from appearing in Google Images search results, as the original URLs are
-# embedded in the thumbnail GET requests.
-# (on|off) default = off
-deepurlanalysis = off
-
-# reportinglevel
-#
-# -1 = log, but do not block - Stealth mode
-#  0 = just say 'Access Denied'
-#  1 = report why but not what denied phrase
-#  2 = report fully
-#  3 = use HTML template file (accessdeniedaddress ignored) - recommended
-#
-# If defined, this overrides the global setting in dansguardian.conf for
-# members of this filter group.
-#
-#reportinglevel = 3
-
-# accessdeniedaddress is the address of your web server to which the cgi
-# dansguardian reporting script was copied. Only used in reporting levels
-# 1 and 2.
-#
-# This webserver must be either:
-#  1. Non-proxied. Either a machine on the local network, or listed as an
-#     exception in your browser's proxy configuration.
-#  2. Added to the exceptionsitelist. Option 1 is preferable; this option is
-#     only for users using both transparent proxying and a non-local server
-#     to host this script.
-#
-# If defined, this overrides the global setting in dansguardian.conf for
-# members of this filter group.
-#
-#accessdeniedaddress = 'http://YOURSERVER.YOURDOMAIN/cgi-bin/dansguardian.pl'
-
-# HTML Template override
-# If defined, this specifies a custom HTML template file for members of this
-# filter group, overriding the global setting in dansguardian.conf. This is
-# only used in reporting level 3.
-#
-# The default template file path is <languagedir>/<language>/template.html
-# e.g. /usr/share/dansguardian/languages/ukenglish/template.html when using 'ukenglish'
-# language.
-#
-# This option generates a file path of the form:
-# <languagedir>/<language>/<htmltemplate>
-# e.g. /usr/share/dansguardian/languages/ukenglish/custom.html
-#
-#htmltemplate = 'custom.html'
-
-# Email reporting - original patch by J. Gauthier
-
-# Use SMTP
-# If on, will enable system wide events to be reported by email.
-# need to configure mail program (see 'mailer' in global config)
-# and email recipients
-# default usesmtp = off
-#!! Not compiled !!usesmtp = off
-
-# mailfrom
-# who the email would come from
-# example: mailfrom = 'dansguardian@mycompany.com'
-#!! Not compiled !!mailfrom = ''
-
-# avadmin
-# who the virus emails go to (if notify av is on)
-# example: avadmin = 'admin@mycompany.com'
-#!! Not compiled !!avadmin = ''
-
-# contentdmin
-# who the content emails go to (when thresholds are exceeded)
-# and contentnotify is on
-# example: contentadmin = 'admin@mycompany.com'
-#!! Not compiled !!contentadmin = ''
-
-# avsubject
-# Subject of the email sent when a virus is caught.
-# only applicable if notifyav is on
-# default avsubject = 'dansguardian virus block'
-#!! Not compiled !!avsubject = 'dansguardian virus block'
-
-# content
-# Subject of the email sent when violation thresholds are exceeded
-# default contentsubject = 'dansguardian violation'
-#!! Not compiled !!contentsubject = 'dansguardian violation'
-
-# notifyAV
-# This will send a notification, if usesmtp/notifyav is on, any time an
-# infection is found.
-# Important: If this option is off, viruses will still be recorded like a
-# content infraction.
-#!! Not compiled !!notifyav = off
-
-# notifycontent
-# This will send a notification, if usesmtp is on, based on thresholds
-# below
-#!! Not compiled !!notifycontent = off
-
-# thresholdbyuser
-# results are only predictable with user authenticated configs
-# if enabled the violation/threshold count is kept track of by the user
-#!! Not compiled !!thresholdbyuser = off
-
-#violations
-# number of violations before notification
-# setting to 0 will never trigger a notification
-#!! Not compiled !!violations = 0
-
-#threshold
-# this is in seconds. If 'violations' occur in 'threshold' seconds, then
-# a notification is made.
-# if this is set to 0, then whenever the set number of violations are made a
-# notifaction will be sent.
-#!! Not compiled !!threshold = 0
-
-#SSL certificate checking
-# Check that ssl certificates for servers on https connections are valid
-# and signed by a ca in the configured path
-sslcertcheck = off
-
-#SSL man in the middle
-# Forge ssl certificates for all sites, decrypt the data then re encrypt it
-# using a different private key. Used to filter ssl sites
-sslmitm = off
-
diff --git a/trunk/package/feeds/packages/dansguardian/patches/001-compile.patch b/trunk/package/feeds/packages/dansguardian/patches/001-compile.patch
deleted file mode 100644
index db8efa43..00000000
--- a/trunk/package/feeds/packages/dansguardian/patches/001-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -827,7 +827,7 @@ sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
- includedir='${prefix}/include'
--oldincludedir='/usr/include'
-+oldincludedir='${prefix}/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
- infodir='${datarootdir}/info'
- htmldir='${docdir}'
-@@ -5265,7 +5265,7 @@ $as_echo_n "checking for zlib... " >&6;
- # Check whether --with-zlib was given.
- if test "${with_zlib+set}" = set; then :
-   withval=$with_zlib;  # check for header & func (in library) in given prefix
--	CPPFLAGS="${CPPFLAGS} -I${withval}/include"
-+	CPPFLAGS="${CPPFLAGS}"
- 	if test "x$staticzlib" = "xtrue"; then
- 		LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}"
- 	else
-@@ -7095,7 +7095,7 @@ $as_echo "#define ENABLE_NTLM /**/" >>co
- if test "${with_libiconv+set}" = set; then :
-   withval=$with_libiconv;  # check for header & func (in library) in given prefix
- 			if test "x$withval" != "x"; then
--				CPPFLAGS="${CPPFLAGS} -I${withval}/include"
-+				CPPFLAGS="${CPPFLAGS}"
- 				LIBS="-L${withval}/lib -liconv ${LIBS}"
- 			else
- 				LIBS="-liconv ${LIBS}"
diff --git a/trunk/package/feeds/packages/davfs2/Makefile b/trunk/package/feeds/packages/davfs2/Makefile
deleted file mode 100644
index 96de63c2..00000000
--- a/trunk/package/feeds/packages/davfs2/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=davfs2
-PKG_VERSION:=1.5.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/davfs2/
-PKG_MD5SUM:=376bc9346454135cba78afacbcb23f86
-
-PKG_FIXUP:=gettext-version autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/davfs2
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  DEPENDS=+libopenssl +libneon +libiconv +libintl +libexpat +kmod-fuse +libfuse
-  TITLE:=Mount a WebDAV resource as a regular file system.
-  URL:=http://savannah.nongnu.org/projects/davfs2/
-  MAINTAINER:=Federico Di Marco <fededim@gmail.com>
-endef
-
-define Package/davfs2/description
- Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol,
- allows authoring of resources on a remote web server.davfs2 provides the ability to
- access such resources like a typical filesystem, allowing for use by standard
- applications with no built-in support for WebDAV.
-
- davfs2 is designed to fully integrate into the filesystem semantics of Unix-like
- systems (mount, umount, etc.). davfs2 makes mounting by unprivileged users as easy
- and secure as possible.
-
- davfs2 does extensive caching to make the file system responsive, to avoid
- unnecessary network traffic and to prevent data loss, and to cope for slow or
- unreliable connections.
-
- davfs2 will work with most WebDAV servers needing little or no configuration.
-endef
-
-define Package/davfs2/conffiles
-/etc/davfs2/davfs2.conf
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-
-CONFIGURE_VARS += \
-       LDFLAGS="$(TARGET_LDFLAGS) -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib"
-
-CONFIGURE_ARGS += --with-neon="$(STAGING_DIR)/usr"
-
-define Package/davfs2/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mount.davfs $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umount.davfs $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/etc/davfs2
-	$(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/davfs2
-endef
-
-$(eval $(call BuildPackage,davfs2))
diff --git a/trunk/package/feeds/packages/davfs2/files/davfs2.conf b/trunk/package/feeds/packages/davfs2/files/davfs2.conf
deleted file mode 100644
index 4cf501be..00000000
--- a/trunk/package/feeds/packages/davfs2/files/davfs2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# davfs2 configuration file
-# please see http://linux.die.net/man/5/davfs2.conf for details
-#
-
-dav_user nobody
-dav_group nogroup
-cache_dir /tmp/davfs2
-cache_size 4
diff --git a/trunk/package/feeds/packages/davfs2/patches/010-main_code_fix.patch b/trunk/package/feeds/packages/davfs2/patches/010-main_code_fix.patch
deleted file mode 100644
index aa36fdfa..00000000
--- a/trunk/package/feeds/packages/davfs2/patches/010-main_code_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,8 +32,8 @@ mount_davfs_SOURCES = cache.c dav_coda.c
-         kernel_interface.h mount_davfs.h webdav.h
- umount_davfs_SOURCES = umount_davfs.c defaults.h
- 
--AM_CFLAGS = -Wall -Werror=format-security \
--        -fstack-protector --param=ssp-buffer-size=4
-+AM_CFLAGS = -Wall -Werror=format-security 
-+#        -fstack-protector --param=ssp-buffer-size=4  -- removed ssp not supported in openwrt
- DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
-        -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \
-        -DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -58,7 +58,7 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#include <sys/xattr.h>
-+#include <linux/xattr.h>
- 
- #include <ne_alloc.h>
- #include <ne_string.h>
---- a/src/webdav.c
-+++ b/src/webdav.c
-@@ -2033,7 +2033,7 @@ ssl_verify(void *userdata, int failures,
-             len = getline(&s, &n, stdin);
-             if (len < 0)
-                 abort();
--            if (rpmatch(s) > 0)
-+            if ((s[0]=='y' || s[0]=='Y') > 0)
-                 ret = 0;
-             free(s);
-     } 
diff --git a/trunk/package/feeds/packages/db47/Makefile b/trunk/package/feeds/packages/db47/Makefile
deleted file mode 100644
index 563d47c8..00000000
--- a/trunk/package/feeds/packages/db47/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
-
-BASE_VERSION:=4.7.25
-
-PKG_NAME:=db47
-PKG_VERSION:=$(BASE_VERSION).4.NC
-PKG_RELEASE:=3
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(BASE_VERSION).NC
-PKG_SOURCE:=db-$(BASE_VERSION).NC.tar.gz
-PKG_SOURCE_URL:=http://download.oracle.com/berkeley-db/
-PKG_MD5SUM:=073ab7f20d24b3872a51ca762f5090e7
-
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-PKG_LICENSE:=Sleepycat
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_FIXUP:=autoreconf
-PKG_LIBTOOL_PATHS:=. build_unix
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdb47
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxml2
-  TITLE:=Berkeley DB library (4.7)
-  URL:=http://www.oracle.com/us/products/database/berkeley-db
-  PROVIDES:=libdb47-full
-endef
-
-define Package/libdb47/description
-  Berkeley DB library (4.7).
-endef
-
-define Package/libdb47xx
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libdb47 $(CXX_DEPENDS)
-  TITLE:=Berkeley DB library (4.7) for C++
-  URL:=http://www.oracle.com/us/products/database/berkeley-db
-  PROVIDES:=libdb47xx-full
-endef
-
-define Package/libdb47xx/description
-  Berkeley DB library (4.7).  C++ wrapper.
-endef
-
-CONFIGURE_PATH = build_unix
-CONFIGURE_CMD = ../dist/configure
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-java \
-	--with-mutex=UNIX/fcntl \
-	--disable-tcl \
-	--disable-rpc \
-	--enable-compat185 \
-	--disable-debug \
-	$(if $(CONFIG_PACKAGE_libdb47xx),--enable-cxx,--disable-cxx)
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-	$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
-		DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
-define Package/libdb47/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb-*.so $(1)/usr/lib/
-endef
-
-define Package/libdb47xx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb_cxx-*.so $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/db_cxx.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libdb47))
-$(eval $(call BuildPackage,libdb47xx))
diff --git a/trunk/package/feeds/packages/db47/patches/010-patch.4.7.25.1.patch b/trunk/package/feeds/packages/db47/patches/010-patch.4.7.25.1.patch
deleted file mode 100644
index f1fd4727..00000000
--- a/trunk/package/feeds/packages/db47/patches/010-patch.4.7.25.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/sequence/sequence.c
-+++ b/sequence/sequence.c
-@@ -187,7 +187,11 @@ __seq_open_pp(seq, txn, keyp, flags)
- 	if ((ret = __db_get_flags(dbp, &tflags)) != 0)
- 		goto err;
- 
--	if (DB_IS_READONLY(dbp)) {
-+	/*
-+	 * We can let replication clients open sequences, but must
-+	 * check later that they do not update them.
-+	 */
-+	if (F_ISSET(dbp, DB_AM_RDONLY)) {
- 		ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
- 		goto err;
- 	}
-@@ -244,6 +248,11 @@ retry:	if ((ret = __db_get(dbp, ip,
- 		if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
- 		    !LF_ISSET(DB_CREATE))
- 			goto err;
-+		if (IS_REP_CLIENT(env) &&
-+		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
-+			ret = __db_rdonly(env, "DB_SEQUENCE->open");
-+			goto err;
-+		}
- 		ret = 0;
- 
- 		rp = &seq->seq_record;
-@@ -296,7 +305,12 @@ retry:	if ((ret = __db_get(dbp, ip,
- 	 */
- 	rp = seq->seq_data.data;
- 	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
--oldver:		rp->seq_version = DB_SEQUENCE_VERSION;
-+oldver:		if (IS_REP_CLIENT(env) &&
-+		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
-+			ret = __db_rdonly(env, "DB_SEQUENCE->open");
-+			goto err;
-+		}
-+		rp->seq_version = DB_SEQUENCE_VERSION;
- 		if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
- 			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
- 				if ((ret =
-@@ -707,6 +721,13 @@ __seq_get(seq, txn, delta, retp, flags)
- 
- 	MUTEX_LOCK(env, seq->mtx_seq);
- 
-+	if (handle_check && IS_REP_CLIENT(env) &&
-+	    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
-+		ret = __db_rdonly(env, "DB_SEQUENCE->get");
-+		goto err;
-+	}
-+
-+
- 	if (rp->seq_min + delta > rp->seq_max) {
- 		__db_errx(env, "Sequence overflow");
- 		ret = EINVAL;
diff --git a/trunk/package/feeds/packages/db47/patches/020-patch.4.7.25.2.patch b/trunk/package/feeds/packages/db47/patches/020-patch.4.7.25.2.patch
deleted file mode 100644
index ddf830a3..00000000
--- a/trunk/package/feeds/packages/db47/patches/020-patch.4.7.25.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lock/lock.c
-+++ b/lock/lock.c
-@@ -1274,10 +1274,12 @@ __lock_put_internal(lt, lockp, obj_ndx,
- 		SH_TAILQ_REMOVE(
- 		    &lt->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
- 		if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
--			LOCK_REGION_LOCK(env);
-+			if (region->part_t_size != 1)
-+				LOCK_REGION_LOCK(env);
- 			__env_alloc_free(&lt->reginfo,
- 			    SH_DBT_PTR(&sh_obj->lockobj));
--			LOCK_REGION_UNLOCK(env);
-+			if (region->part_t_size != 1)
-+				LOCK_REGION_UNLOCK(env);
- 		}
- 		SH_TAILQ_INSERT_HEAD(
- 		    &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
-@@ -1467,15 +1469,21 @@ retry:	SH_TAILQ_FOREACH(sh_obj, &lt->obj
- 		if (obj->size <= sizeof(sh_obj->objdata))
- 			p = sh_obj->objdata;
- 		else {
--			LOCK_REGION_LOCK(env);
-+			/*
-+			 * If we have only one partition, the region is locked.
-+			 */
-+			if (region->part_t_size != 1)
-+				LOCK_REGION_LOCK(env);
- 			if ((ret =
- 			    __env_alloc(&lt->reginfo, obj->size, &p)) != 0) {
- 				__db_errx(env,
- 				    "No space for lock object storage");
--				LOCK_REGION_UNLOCK(env);
-+				if (region->part_t_size != 1)
-+					LOCK_REGION_UNLOCK(env);
- 				goto err;
- 			}
--			LOCK_REGION_UNLOCK(env);
-+			if (region->part_t_size != 1)
-+				LOCK_REGION_UNLOCK(env);
- 		}
- 
- 		memcpy(p, obj->data, obj->size);
diff --git a/trunk/package/feeds/packages/db47/patches/030-patch.4.7.25.3.patch b/trunk/package/feeds/packages/db47/patches/030-patch.4.7.25.3.patch
deleted file mode 100644
index 59b00e65..00000000
--- a/trunk/package/feeds/packages/db47/patches/030-patch.4.7.25.3.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- a/lock/lock_deadlock.c
-+++ b/lock/lock_deadlock.c
-@@ -121,7 +121,7 @@ __lock_detect(env, atype, rejectp)
- 	DB_LOCKTAB *lt;
- 	db_timespec now;
- 	locker_info *idmap;
--	u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap;
-+	u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap;
- 	u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
- 	u_int32_t lock_max, txn_max;
- 	int ret, status;
-@@ -133,7 +133,8 @@ __lock_detect(env, atype, rejectp)
- 	if (IS_REP_CLIENT(env))
- 		atype = DB_LOCK_MINWRITE;
- 
--	free_me = NULL;
-+	copymap = tmpmap = NULL;
-+	deadlist = NULL;
- 
- 	lt = env->lk_handle;
- 	if (rejectp != NULL)
-@@ -179,11 +180,11 @@ __lock_detect(env, atype, rejectp)
- 	memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
- 
- 	if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
--		goto err1;
-+		goto err;
- 
- 	/* Find a deadlock. */
- 	if ((ret =
--	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0)
-+	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0)
- 		return (ret);
- 
- 	/*
-@@ -204,8 +205,7 @@ __lock_detect(env, atype, rejectp)
- 		txn_max = TXN_MAXIMUM;
- 
- 	killid = BAD_KILLID;
--	free_me = deadp;
--	for (; *deadp != NULL; deadp++) {
-+	for (deadp = deadlist; *deadp != NULL; deadp++) {
- 		if (rejectp != NULL)
- 			++*rejectp;
- 		killid = (u_int32_t)(*deadp - bitmap) / nalloc;
-@@ -342,11 +342,12 @@ dokill:		if (killid == BAD_KILLID) {
- 			__db_msg(env,
- 			    "Aborting locker %lx", (u_long)idmap[killid].id);
- 	}
--	__os_free(env, tmpmap);
--err1:	__os_free(env, copymap);
--
--err:	if (free_me != NULL)
--		__os_free(env, free_me);
-+err:	if(copymap != NULL)
-+		__os_free(env, copymap);
-+	if (deadlist != NULL)
-+		__os_free(env, deadlist);
-+	if(tmpmap != NULL)
-+		__os_free(env, tmpmap);
- 	__os_free(env, bitmap);
- 	__os_free(env, idmap);
- 
-@@ -360,6 +361,17 @@ err:	if (free_me != NULL)
- 
- #define	DD_INVALID_ID	((u_int32_t) -1)
- 
-+/*
-+ * __dd_build --
-+ *	Build the lock dependency bit maps.
-+ * Notes on syncronization:  
-+ *	LOCK_SYSTEM_LOCK is used to hold objects locked when we have
-+ *		a single partition.
-+ *	LOCK_LOCKERS is held while we are walking the lockers list and
-+ *		to single thread the use of lockerp->dd_id.
-+ *	LOCK_DD protects the DD list of objects.
-+ */
-+
- static int
- __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp)
- 	ENV *env;
-@@ -393,6 +405,7 @@ __dd_build(env, atype, bmp, nlockers, al
- 	 * In particular we do not build the conflict array and our caller
- 	 * needs to expect this.
- 	 */
-+	LOCK_SYSTEM_LOCK(lt, region);
- 	if (atype == DB_LOCK_EXPIRE) {
- skip:		LOCK_DD(env, region);
- 		op = SH_TAILQ_FIRST(&region->dd_objs, __db_lockobj);
-@@ -430,17 +443,18 @@ skip:		LOCK_DD(env, region);
- 			OBJECT_UNLOCK(lt, region, indx);
- 		}
- 		UNLOCK_DD(env, region);
-+		LOCK_SYSTEM_UNLOCK(lt, region);
- 		goto done;
- 	}
- 
- 	/*
--	 * We'll check how many lockers there are, add a few more in for
--	 * good measure and then allocate all the structures.  Then we'll
--	 * verify that we have enough room when we go back in and get the
--	 * mutex the second time.
-+	 * Allocate after locking the region
-+	 * to make sure the structures are large enough.
- 	 */
--retry:	count = region->stat.st_nlockers;
-+	LOCK_LOCKERS(env, region);
-+	count = region->stat.st_nlockers;
- 	if (count == 0) {
-+		UNLOCK_LOCKERS(env, region);
- 		*nlockers = 0;
- 		return (0);
- 	}
-@@ -448,50 +462,37 @@ retry:	count = region->stat.st_nlockers;
- 	if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
- 		__db_msg(env, "%lu lockers", (u_long)count);
- 
--	count += 20;
- 	nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
- 
--	/*
--	 * Allocate enough space for a count by count bitmap matrix.
--	 *
--	 * XXX
--	 * We can probably save the malloc's between iterations just
--	 * reallocing if necessary because count grew by too much.
--	 */
-+	/* Allocate enough space for a count by count bitmap matrix. */
- 	if ((ret = __os_calloc(env, (size_t)count,
--	    sizeof(u_int32_t) * nentries, &bitmap)) != 0)
-+	    sizeof(u_int32_t) * nentries, &bitmap)) != 0) {
-+		UNLOCK_LOCKERS(env, region);
- 		return (ret);
-+	}
- 
- 	if ((ret = __os_calloc(env,
- 	    sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
-+		UNLOCK_LOCKERS(env, region);
- 		__os_free(env, bitmap);
- 		return (ret);
- 	}
- 
- 	if ((ret = __os_calloc(env,
- 	    (size_t)count, sizeof(locker_info), &id_array)) != 0) {
-+		UNLOCK_LOCKERS(env, region);
- 		__os_free(env, bitmap);
- 		__os_free(env, tmpmap);
- 		return (ret);
- 	}
- 
- 	/*
--	 * Now go back in and actually fill in the matrix.
--	 */
--	if (region->stat.st_nlockers > count) {
--		__os_free(env, bitmap);
--		__os_free(env, tmpmap);
--		__os_free(env, id_array);
--		goto retry;
--	}
--
--	/*
- 	 * First we go through and assign each locker a deadlock detector id.
- 	 */
- 	id = 0;
--	LOCK_LOCKERS(env, region);
- 	SH_TAILQ_FOREACH(lip, &region->lockers, ulinks, __db_locker) {
- 		if (lip->master_locker == INVALID_ROFF) {
-+			DB_ASSERT(env, id < count);
- 			lip->dd_id = id++;
- 			id_array[lip->dd_id].id = lip->id;
- 			switch (atype) {
-@@ -510,7 +511,6 @@ retry:	count = region->stat.st_nlockers;
- 			lip->dd_id = DD_INVALID_ID;
- 
- 	}
--	UNLOCK_LOCKERS(env, region);
- 
- 	/*
- 	 * We only need consider objects that have waiters, so we use
-@@ -669,7 +669,6 @@ again:		memset(bitmap, 0, count * sizeof
- 	 * status after building the bit maps so that we will not detect
- 	 * a blocked transaction without noting that it is already aborting.
- 	 */
--	LOCK_LOCKERS(env, region);
- 	for (id = 0; id < count; id++) {
- 		if (!id_array[id].valid)
- 			continue;
-@@ -738,6 +737,7 @@ get_lock:		id_array[id].last_lock = R_OF
- 			id_array[id].in_abort = 1;
- 	}
- 	UNLOCK_LOCKERS(env, region);
-+	LOCK_SYSTEM_UNLOCK(lt, region);
- 
- 	/*
- 	 * Now we can release everything except the bitmap matrix that we
-@@ -839,6 +839,7 @@ __dd_abort(env, info, statusp)
- 	ret = 0;
- 
- 	/* We must lock so this locker cannot go away while we abort it. */
-+	LOCK_SYSTEM_LOCK(lt, region);
- 	LOCK_LOCKERS(env, region);
- 
- 	/*
-@@ -895,6 +896,7 @@ __dd_abort(env, info, statusp)
- done:	OBJECT_UNLOCK(lt, region, info->last_ndx);
- err:
- out:	UNLOCK_LOCKERS(env, region);
-+	LOCK_SYSTEM_UNLOCK(lt, region);
- 	return (ret);
- }
- 
diff --git a/trunk/package/feeds/packages/db47/patches/040-patch.4.7.25.4.patch b/trunk/package/feeds/packages/db47/patches/040-patch.4.7.25.4.patch
deleted file mode 100644
index 7db40612..00000000
--- a/trunk/package/feeds/packages/db47/patches/040-patch.4.7.25.4.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- a/dbinc/repmgr.h
-+++ b/dbinc/repmgr.h
-@@ -374,6 +374,7 @@ typedef struct {
- #define	SITE_FROM_EID(eid)	(&db_rep->sites[eid])
- #define	EID_FROM_SITE(s)	((int)((s) - (&db_rep->sites[0])))
- #define	IS_VALID_EID(e)		((e) >= 0)
-+#define	IS_KNOWN_REMOTE_SITE(e)	((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
- #define	SELF_EID		INT_MAX
- 
- #define	IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||		\
---- a/rep/rep_elect.c
-+++ b/rep/rep_elect.c
-@@ -33,7 +33,7 @@ static int __rep_elect_init
- static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
- static void __rep_elect_master __P((ENV *, REP *));
- static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
--static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
-+static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
- 
- /*
-  * __rep_elect --
-@@ -55,7 +55,7 @@ __rep_elect(dbenv, given_nsites, nvotes,
- 	ENV *env;
- 	LOG *lp;
- 	REP *rep;
--	int done, eid, elected, full_elect, locked, in_progress, need_req;
-+	int done, elected, full_elect, locked, in_progress, need_req;
- 	int ret, send_vote, t_ret;
- 	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
- 	u_int32_t tiebreaker;
-@@ -181,8 +181,7 @@ __rep_elect(dbenv, given_nsites, nvotes,
- 			REP_SYSTEM_UNLOCK(env);
- 			(void)__rep_send_message(env, DB_EID_BROADCAST,
- 			    REP_MASTER_REQ, NULL, NULL, 0, 0);
--			ret = __rep_wait(env, &to, &eid,
--			    0, REP_F_EPHASE0);
-+			ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
- 			REP_SYSTEM_LOCK(env);
- 			F_CLR(rep, REP_F_EPHASE0);
- 			switch (ret) {
-@@ -286,11 +285,11 @@ restart:
- 		REP_SYSTEM_LOCK(env);
- 		goto vote;
- 	}
--	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
-+	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
- 	switch (ret) {
- 		case 0:
- 			/* Check if election complete or phase complete. */
--			if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
-+			if (!IN_ELECTION(rep)) {
- 				RPRINT(env, DB_VERB_REP_ELECT,
- 				    (env, "Ended election phase 1"));
- 				goto edone;
-@@ -398,15 +397,12 @@ phase2:
- 		REP_SYSTEM_LOCK(env);
- 		goto i_won;
- 	}
--	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
-+	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
- 	RPRINT(env, DB_VERB_REP_ELECT,
- 	    (env, "Ended election phase 2 %d", ret));
- 	switch (ret) {
- 		case 0:
--			if (eid != DB_EID_INVALID)
--				goto edone;
--			ret = DB_REP_UNAVAIL;
--			break;
-+			goto edone;
- 		case DB_REP_EGENCHG:
- 			if (to > timeout)
- 				to = timeout;
-@@ -1050,13 +1046,6 @@ __rep_elect_master(env, rep)
- 	ENV *env;
- 	REP *rep;
- {
--	/*
--	 * We often come through here twice, sometimes even more.  We mustn't
--	 * let the redundant calls affect stats counting.  But rep_elect relies
--	 * on this first part for setting eidp.
--	 */
--	rep->master_id = rep->eid;
--
- 	if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
- 		/* We've been through here already; avoid double counting. */
- 		return;
-@@ -1093,10 +1082,10 @@ __rep_fire_elected(env, rep, egen)
- 	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
- 
- static int
--__rep_wait(env, timeoutp, eidp, full_elect, flags)
-+__rep_wait(env, timeoutp, full_elect, flags)
- 	ENV *env;
- 	db_timeout_t *timeoutp;
--	int *eidp, full_elect;
-+	int full_elect;
- 	u_int32_t flags;
- {
- 	DB_REP *db_rep;
-@@ -1174,7 +1163,6 @@ __rep_wait(env, timeoutp, eidp, full_ele
- 			F_CLR(rep, REP_F_EGENUPDATE);
- 			ret = DB_REP_EGENCHG;
- 		} else if (phase_over) {
--			*eidp = rep->master_id;
- 			done = 1;
- 			ret = 0;
- 		}
---- a/repmgr/repmgr_net.c
-+++ b/repmgr/repmgr_net.c
-@@ -100,6 +100,8 @@ __repmgr_send(dbenv, control, rec, lsnp,
- 		    control, rec, &nsites_sent, &npeers_sent)) != 0)
- 			goto out;
- 	} else {
-+		DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
-+
- 		/*
- 		 * If this is a request that can be sent anywhere, then see if
- 		 * we can send it to our peer (to save load on the master), but
diff --git a/trunk/package/feeds/packages/dbus/Makefile b/trunk/package/feeds/packages/dbus/Makefile
deleted file mode 100644
index c8bd4155..00000000
--- a/trunk/package/feeds/packages/dbus/Makefile
+++ /dev/null
@@ -1,213 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-# Make sure to also update the dbus-x package
-PKG_NAME:=dbus
-PKG_VERSION:=1.9.14
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/
-PKG_MD5SUM:=32cd0d16067422bfd691e2f647b432b0
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=AFL-2.1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-define Package/dbus/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Simple interprocess messaging system
-  URL:=http://dbus.freedesktop.org/
-endef
-
-define Package/dbus/Default/description
- D-Bus is a message bus system, a simple way for applications to talk to one
- another. In addition to interprocess communication, D-Bus helps coordinate
- process lifecycle; it makes it simple and reliable to code a "single instance"
- application or daemon, and to launch applications and daemons on demand when
- their services are needed.
-endef
-
-define Package/libdbus
-$(call Package/dbus/Default)
-  CATEGORY:=Libraries
-  TITLE+= (library)
-  DEPENDS:= +libpthread
-endef
-
-define Package/libdbus/Description
-$(call Package/dbus/Default/description)
- This package contains the D-Bus shared library.
-endef
-
-define Package/dbus
-$(call Package/dbus/Default)
- TITLE+= (daemon)
- DEPENDS:= +libexpat +libdbus
-endef
-
-define Package/dbus/Description
-$(call Package/dbus/Default/description)
- This package contains the D-Bus daemon.
-endef
-
-define Package/dbus-utils
-$(call Package/dbus/Default)
- TITLE+= (utilities)
- DEPENDS:= dbus
-endef
-
-define Package/dbus-utils/Description
-$(call Package/dbus/Default/description)
- This package contains D-Bus utilities.
-endef
-
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	$(SED) 's/-Wl,--gc-sections/--gc-sections/' $(PKG_BUILD_DIR)/configure
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-abstract-sockets \
-	--disable-ansi \
-	--disable-asserts \
-	--disable-console-owner-file \
-	--disable-doxygen-docs \
-	--disable-compiler_coverage \
-	--disable-selinux \
-	--disable-tests \
-	--disable-verbose-mode \
-	--disable-xml-docs \
-	--with-xml="expat" \
-	--with-dbus-user=root \
-	--with-dbus-daemondir="/usr/sbin" \
-	--with-system-socket="/var/run/dbus/system_bus_socket" \
-	--with-system-pid-file="/var/run/dbus.pid" \
-	--without-x \
-	--libexecdir=/usr/lib/dbus-1
-
-CONFIGURE_VARS+= \
-	ac_cv_have_abstract_sockets="yes" \
-	ac_cv_lib_expat_XML_ParserCreate_MM="yes" \
-
-HOST_CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-abstract-sockets \
-	--disable-ansi \
-	--disable-asserts \
-	--disable-console-owner-file \
-	--disable-docygen-docs \
-	--disable-compiler_coverage \
-	--disable-selinux \
-	--disable-tests \
-	--disable-verbose-mode \
-	--disable-xml-docs \
-	--with-dbus-user=root \
-	--with-dbus-daemondir="$(STAGIND_DIR_HOST)/bin" \
-	--with-system-socket="$(STAGING_DIR_HOST)/var/run/dbus/system_bus_socket" \
-	--with-system-pid-file="$(STAGING_DIR_HOST)/var/run/dbus.pid" \
-	--without-x \
-	--libexecdir="$(STAGING_DIR_HOST)/lib/dbus-1"
-
-HOST_CONFIGURE_VARS+= \
-	ac_cv_have_abstract_sockets="yes" \
-	ac_cv_lib_expat_XML_ParserCreate_MM="yes" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/dbus-1.0 \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/dbus-1.0/include/dbus/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \
-		$(1)/usr/lib/dbus-1.0/include/dbus/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{so*,la,a} \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/dbus/conffiles
-/etc/dbus-1/session.conf
-/etc/dbus-1/system.conf
-endef
-
-define Package/libdbus/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so.* \
-		$(1)/usr/lib/
-endef
-
-define Package/dbus/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/dbus-1 \
-		$(1)/etc/
-
-	$(INSTALL_DIR) $(1)/usr/lib/dbus-1
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/lib/dbus-1/dbus-daemon-launch-helper \
-		$(1)/usr/lib/dbus-1/
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/dbus-daemon \
-		$(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen \
-		$(1)/usr/bin/
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/dbus-launch \
-		$(1)/usr/bin/dbus-launch.real
-	$(INSTALL_BIN) \
-		./files/dbus-launch \
-		$(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) \
-		./files/dbus.init \
-		$(1)/etc/init.d/dbus
-endef
-
-define Package/dbus-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/dbus-{send,monitor,cleanup-sockets} \
-		$(1)/usr/bin/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libdbus))
-$(eval $(call BuildPackage,dbus))
-$(eval $(call BuildPackage,dbus-utils))
diff --git a/trunk/package/feeds/packages/dbus/files/dbus-launch b/trunk/package/feeds/packages/dbus/files/dbus-launch
deleted file mode 100644
index 7c3f9228..00000000
--- a/trunk/package/feeds/packages/dbus/files/dbus-launch
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Simple wrapper script which allows us to build dbus without general x support
-# If an application needs x support in dbus-launch it has to depend on the
-# dbus-launch-x package. The script is used to prefer dbus-launch with x over
-# the dbus-lauch without x.
-
-if [ -f /usr/bin/dbus-launch-x ]; then
-	exec /usr/bin/dbus-launch-x $@
-else
-	exec /usr/bin/dbus-launch.real $@
-fi
diff --git a/trunk/package/feeds/packages/dbus/files/dbus.init b/trunk/package/feeds/packages/dbus/files/dbus.init
deleted file mode 100644
index 42940837..00000000
--- a/trunk/package/feeds/packages/dbus/files/dbus.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2011 OpenWrt.org
-
-START=60
-
-SERVICE_PID_FILE=/var/run/dbus.pid
-
-start() {
-	mkdir -m 0755 -p /var/lib/dbus
-	mkdir -m 0755 -p /var/run/dbus
-	[ -x /usr/bin/dbus-uuidgen ] && /usr/bin/dbus-uuidgen --ensure
-	service_start /usr/sbin/dbus-daemon --system
-}
-
-stop() {
-	service_stop /usr/sbin/dbus-daemon && rm $SERVICE_PID_FILE
-}
diff --git a/trunk/package/feeds/packages/dbus/patches/100-fix-poll-select.patch b/trunk/package/feeds/packages/dbus/patches/100-fix-poll-select.patch
deleted file mode 100644
index 64f65251..00000000
--- a/trunk/package/feeds/packages/dbus/patches/100-fix-poll-select.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-1.9.4/tools/tool-common.c
-===================================================================
---- dbus-1.9.4.orig/tools/tool-common.c
-+++ dbus-1.9.4/tools/tool-common.c
-@@ -29,6 +29,8 @@
- #include <string.h>
- #include <time.h>
- 
-+#include <sys/select.h>
-+
- #ifdef DBUS_WIN
- #include <windows.h>
- #endif
diff --git a/trunk/package/feeds/packages/ddns-scripts/Makefile b/trunk/package/feeds/packages/ddns-scripts/Makefile
deleted file mode 100644
index f739cb72..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/Makefile
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ddns-scripts
-# Version == major.minor.patch
-# increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.4.1
-# Release == build
-# increase on changes of services files or tld_names.dat
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-# no default dependencies
-PKG_DEFAULT_DEPENDS=
-
-define Package/$(PKG_NAME)/Default
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=IP Addresses and Names
-    PKGARCH:=all
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)
-    $(call Package/$(PKG_NAME)/Default)
-    TITLE:=Dynamic DNS Client scripts (with IPv6 support)
-endef
-# shown in LuCI package description
-define Package/$(PKG_NAME)/description
-    Dynamic DNS Client scripts (with IPv6 support) - Info: http://wiki.openwrt.org/doc/howto/ddns.client
-endef
-# shown in menuconfig <Help>
-define Package/$(PKG_NAME)/config
-	help
-		A highly configurable set of scripts for doing dynamic dns updates.
-		  - IPv6 support
-		  - force communication to IPv4 or IPv6 only
-		  - DNS server support
-		  - using BIND host if installed
-		  - DNS requests via TCP
-		  - Proxy server support
-		  - log file support
-		  - support to run once
-		.
-		Version: $(PKG_VERSION)-$(PKG_RELEASE)
-		Info   : http://wiki.openwrt.org/doc/howto/ddns.client
-		.
-		$(PKG_MAINTAINER)
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_cloudflare
-    $(call Package/$(PKG_NAME)/Default)
-    TITLE:=DDNS extension for CloudFlare
-    DEPENDS:=$(PKG_NAME)
-endef
-define Package/$(PKG_NAME)_cloudflare/description
-    Dynamic DNS Client scripts extension for CloudFlare
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_no-ip_com
-    $(call Package/$(PKG_NAME)/Default)
-    TITLE:=DDNS extension for No-IP.com
-    DEPENDS:=$(PKG_NAME)
-endef
-define Package/$(PKG_NAME)_no-ip_com/description
-    Dynamic DNS Client scripts extension for No-IP.com
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_nsupdate
-    $(call Package/$(PKG_NAME)/Default)
-    TITLE:=DDNS extension using Bind nsupdate
-    DEPENDS:=$(PKG_NAME) +bind-client
-endef
-define Package/$(PKG_NAME)_nsupdate/description
-    Dynamic DNS Client scripts extension for direct updates using Bind nsupdate
-endef
-define Package/$(PKG_NAME)_nsupdate/config
-    help
-	The script directly updates a PowerDNS (or maybe bind server) via nsupdate 
-	from bind-client package. It requires 
-	"option dns_server" to be set to the server to be used by nsupdate.
-	"option username" should be set to the key name and 
-	"option password" to the base64 encoded shared secret.
-
-endef
-
-##### **********************************
-define Build/Configure
-endef
-define Build/Compile
-	$(CP) ./files $(PKG_BUILD_DIR)
-	for FILE in `find $(PKG_BUILD_DIR)/files -type f`; do \
-		$(SED) 's/^\s*#/#/' \
-		-e '/^#\s\|^#$$$$/d' \
-		-e 's/\s#\s.*$$$$//' \
-		-e 's/\s*$$$$//' \
-		-e '/^\/\/\s/d'	\
-		-e '/^\s*$$$$/d'	$$$$FILE; \
-	done
-	gzip -9 $(PKG_BUILD_DIR)/files/tld_names.dat
-endef
-
-define Package/$(PKG_NAME)/conffiles
-/etc/config/ddns
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.hotplug $(1)/etc/hotplug.d/iface/95-ddns
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.init $(1)/etc/init.d/ddns
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/files/ddns.config $(1)/etc/config/ddns
-
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/services* $(1)/usr/lib/ddns
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/dynamic_*.sh $(1)/usr/lib/ddns
-endef
-define Package/$(PKG_NAME)/postinst
-	#!/bin/sh
-	# if run within buildroot exit
-	[ -n "$${IPKG_INSTROOT}" ] && exit 0
-
-	# add new section "ddns" "global" if not exists
-	uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
-	uci -q get ddns.global.date_format > /dev/null || uci -q set ddns.global.date_format='%F %R'
-	uci -q get ddns.global.log_lines > /dev/null || uci -q set ddns.global.log_lines='250'
-	uci -q get ddns.global.allow_local_ip > /dev/null || uci -q set ddns.global.allow_local_ip='0'
-	uci -q commit ddns
-
-	# clear LuCI indexcache
-	rm -f /tmp/luci-indexcache >/dev/null 2>&1
-
-	exit 0
-endef
-define Package/$(PKG_NAME)/prerm
-	#!/bin/sh
-	# if run within buildroot exit
-	[ -n "$${IPKG_INSTROOT}" ] && exit 0
-
-	# stop running scripts
-	/etc/init.d/ddns disable
-	/etc/init.d/ddns stop
-
-	# clear LuCI indexcache
-	rm -f /tmp/luci-indexcache >/dev/null 2>&1
-
-	exit 0
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_cloudflare/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_CloudFlare.sh $(1)/usr/lib/ddns
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/tld_names.dat.gz $(1)/usr/lib/ddns
-endef
-define Package/$(PKG_NAME)_cloudflare/postinst
-	#!/bin/sh
-	echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-	echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
-endef
-define Package/$(PKG_NAME)_cloudflare/prerm
-	#!/bin/sh
-	/bin/sed -i '/update_CloudFlare\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
-	/bin/sed -i '/update_CloudFlare\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_no-ip_com/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_No-IP.com.sh $(1)/usr/lib/ddns
-endef
-define Package/$(PKG_NAME)_no-ip_com/postinst
-	#!/bin/sh
-	echo -e '"No-IP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-	echo -e '"NoIP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-endef
-define Package/$(PKG_NAME)_no-ip_com/prerm
-	#!/bin/sh
-	/bin/sed -i '/update_No-IP\.com\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
-endef
-
-##### **********************************
-define Package/$(PKG_NAME)_nsupdate/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_nsupdate.sh $(1)/usr/lib/ddns
-endef
-define Package/$(PKG_NAME)_nsupdate/postinst
-	#!/bin/sh
-	echo -e '"Bind-nsupdate"\t"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-	echo -e '"Bind-nsupdate"\t"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
-endef
-define Package/$(PKG_NAME)_nsupdate/prerm
-	#!/bin/sh
-	/bin/sed -i '/update_nsupdate\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
-	/bin/sed -i '/update_nsupdate\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
-endef
-
-##### **********************************
-$(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)_cloudflare))
-$(eval $(call BuildPackage,$(PKG_NAME)_no-ip_com))
-$(eval $(call BuildPackage,$(PKG_NAME)_nsupdate))
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/ddns.config b/trunk/package/feeds/packages/ddns-scripts/files/ddns.config
deleted file mode 100644
index 5d69bb17..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/ddns.config
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Please read ddns.sample
-# or http://wiki.openwrt.org/doc/uci/ddns
-#
-config ddns "global"
-	option date_format "%F %R"
-#	option run_dir "/var/run/ddns"
-#	option log_dir "/var/log/ddns"
-	option log_lines "250"
-	option allow_local_ip "0"
-
-
-config service "myddns_ipv4"
-	option service_name	"dyndns.com"
-	option domain		"yourhost.example.com"
-	option username		"your_username"
-	option password		"your_password"
-	option interface	"wan"
-	option ip_source	"network"
-	option ip_network	"wan"
-
-config service "myddns_ipv6"
-	option update_url	"http://[USERNAME]:[PASSWORD]@your.provider.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
-	option domain		"yourhost.example.com"
-	option username		"your_username"
-	option password		"your_password"
-	option use_ipv6		"1"
-	option interface	"wan6"
-	option ip_source	"network"
-	option ip_network	"wan6"
-
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/ddns.hotplug b/trunk/package/feeds/packages/ddns-scripts/files/ddns.hotplug
deleted file mode 100644
index dfb35f6d..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/ddns.hotplug
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# there are other ACTIONs like ifupdate we don't need
-# so parse dynamic_dns_functions.sh only when needed
-case "$ACTION" in
-	ifup)
-		. /usr/lib/ddns/dynamic_dns_functions.sh
-		/etc/init.d/ddns enabled && start_daemon_for_all_ddns_sections "$INTERFACE"
-		;;
-	ifdown)
-		. /usr/lib/ddns/dynamic_dns_functions.sh
-		stop_daemon_for_all_ddns_sections "$INTERFACE"
-		;;
-esac
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/ddns.init b/trunk/package/feeds/packages/ddns-scripts/files/ddns.init
deleted file mode 100644
index 2cc9b90f..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/ddns.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=95
-STOP=10
-
-boot() {
-	return 0
-}
-
-reload() {
-	killall -1 dynamic_dns_updater.sh 2>/dev/null	# send SIGHUP
-	return 0
-}
-
-restart() {
-	stop
-	sleep 1	# give time to shutdown
-	start
-}
-
-start() {
-	. /usr/lib/ddns/dynamic_dns_functions.sh
-	start_daemon_for_all_ddns_sections
-}
-
-stop() {
-	killall dynamic_dns_updater.sh 2>/dev/null
-	return 0 # if killall fails, ignore
-}
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_functions.sh b/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_functions.sh
deleted file mode 100755
index 0023f88f..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_functions.sh
+++ /dev/null
@@ -1,1124 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/dynamic_dns_functions.sh
-#
-# Original written by Eric Paul Bishop, January 2008
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-# (Loosely) based on the script on the one posted by exobyte in the forums here:
-# http://forum.openwrt.org/viewtopic.php?id=14040
-#
-# extended and partial rewritten in August 2014 by
-#.Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# to support:
-# - IPv6 DDNS services
-# - setting DNS Server to retrieve current IP including TCP transport
-# - Proxy Server to send out updates or retrieving WEB based IP detection
-# - force_interval=0 to run once (useful for cron jobs etc.)
-# - the usage of BIND's host instead of BusyBox's nslookup if installed (DNS via TCP)
-# - extended Verbose Mode and log file support for better error detection
-#
-# function timeout
-# copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
-# @author Anthony Thyssen  6 April 2011
-#
-# variables in small chars are read from /etc/config/ddns
-# variables in big chars are defined inside these scripts as global vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-
-# GLOBAL VARIABLES #
-SECTION_ID=""		# hold config's section name
-VERBOSE_MODE=1		# default mode is log to console, but easily changed with parameter
-
-LOGFILE=""		# logfile - all files are set in dynamic_dns_updater.sh
-PIDFILE=""		# pid file
-UPDFILE=""		# store UPTIME of last update
-DATFILE=""		# save stdout data of WGet and other external programs called
-ERRFILE=""		# save stderr output of WGet and other external programs called
-TLDFILE=/usr/lib/ddns/tld_names.dat.gz	# TLD file used by split_FQDN
-
-CHECK_SECONDS=0		# calculated seconds out of given
-FORCE_SECONDS=0		# interval and unit
-RETRY_SECONDS=0		# in configuration
-
-LAST_TIME=0		# holds the uptime of last successful update
-CURR_TIME=0		# holds the current uptime
-NEXT_TIME=0		# calculated time for next FORCED update
-EPOCH_TIME=0		# seconds since 1.1.1970 00:00:00
-
-REGISTERED_IP=""	# holds the IP read from DNS
-LOCAL_IP=""		# holds the local IP read from the box
-
-URL_USER=""		# url encoded $username from config file
-URL_PASS=""		# url encoded $password from config file
-
-ERR_LAST=0		# used to save $? return code of program and function calls
-ERR_UPDATE=0		# error counter on different local and registered ip
-
-PID_SLEEP=0		# ProcessID of current background "sleep"
-
-# allow NON-public IP's
-ALLOW_LOCAL_IP=$(uci -q get ddns.global.allow_local_ip) || ALLOW_LOCAL_IP=0
-
-# directory to store run information to.
-RUNDIR=$(uci -q get ddns.global.run_dir) || RUNDIR="/var/run/ddns"
-[ -d $RUNDIR ] || mkdir -p -m755 $RUNDIR
-
-# directory to store log files
-LOGDIR=$(uci -q get ddns.global.log_dir) || LOGDIR="/var/log/ddns"
-[ -d $LOGDIR ] || mkdir -p -m755 $LOGDIR
-
-# number of lines to before rotate logfile
-LOGLINES=$(uci -q get ddns.global.log_lines) || LOGLINES=250
-LOGLINES=$((LOGLINES + 1))	# correct sed handling
-
-# format to show date information in log and luci-app-ddns default ISO 8601 format
-DATE_FORMAT=$(uci -q get ddns.global.date_format) || DATE_FORMAT="%F %R"
-DATE_PROG="date +'$DATE_FORMAT'"
-
-# regular expression to detect IPv4 / IPv6
-# IPv4       0-9   1-3x "." 0-9  1-3x "." 0-9  1-3x "." 0-9  1-3x
-IPV4_REGEX="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}"
-# IPv6       ( ( 0-9a-f  1-4char ":") min 1x) ( ( 0-9a-f  1-4char   )optional) ( (":" 0-9a-f 1-4char  ) min 1x)
-IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)"
-
-# detect if called by dynamic_dns_lucihelper.sh script, disable retrys (empty variable == false)
-[ "$(basename $0)" = "dynamic_dns_lucihelper.sh" ] && LUCI_HELPER="TRUE" || LUCI_HELPER=""
-
-# USE_CURL if GNU Wget and cURL installed normally Wget is used by do_transfer()
-# to change this use global option use_curl '1'
-USE_CURL=$(uci -q get ddns.global.use_curl) || USE_CURL=0	# read config
-[ -x /usr/bin/curl ] || USE_CURL=0				# check for cURL
-
-# loads all options for a given package and section
-# also, sets all_option_variables to a list of the variable names
-# $1 = ddns, $2 = SECTION_ID
-load_all_config_options()
-{
-	local __PKGNAME="$1"
-	local __SECTIONID="$2"
-	local __VAR
-	local __ALL_OPTION_VARIABLES=""
-
-	# this callback loads all the variables in the __SECTIONID section when we do
-	# config_load. We need to redefine the option_cb for different sections
-	# so that the active one isn't still active after we're done with it.  For reference
-	# the $1 variable is the name of the option and $2 is the name of the section
-	config_cb()
-	{
-		if [ ."$2" = ."$__SECTIONID" ]; then
-			option_cb()
-			{
-				__ALL_OPTION_VARIABLES="$__ALL_OPTION_VARIABLES $1"
-			}
-		else
-			option_cb() { return 0; }
-		fi
-	}
-
-	config_load "$__PKGNAME"
-
-	# Given SECTION_ID not found so no data, so return 1
-	[ -z "$__ALL_OPTION_VARIABLES" ] && return 1
-
-	for __VAR in $__ALL_OPTION_VARIABLES
-	do
-		config_get "$__VAR" "$__SECTIONID" "$__VAR"
-	done
-	return 0
-}
-
-# read's all service sections from ddns config
-# $1 = Name of variable to store
-load_all_service_sections() {
-	local __DATA=""
-	config_cb()
-	{
-		# only look for section type "service", ignore everything else
-		[ "$1" = "service" ] && __DATA="$__DATA $2"
-	}
-	config_load "ddns"
-
-	eval "$1=\"$__DATA\""
-	return
-}
-
-# starts updater script for all given sections or only for the one given
-# $1 = interface (Optional: when given only scripts are started
-# configured for that interface)
-# used by /etc/hotplug.d/iface/25-ddns on IFUP
-# and by /etc/init.d/ddns start
-start_daemon_for_all_ddns_sections()
-{
-	local __EVENTIF="$1"
-	local __SECTIONS=""
-	local __SECTIONID=""
-	local __IFACE=""
-
-	load_all_service_sections __SECTIONS
-	for __SECTIONID in $__SECTIONS; do
-		config_get __IFACE "$__SECTIONID" interface "wan"
-		[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
-		/usr/lib/ddns/dynamic_dns_updater.sh $__SECTIONID 0 >/dev/null 2>&1 &
-	done
-}
-
-# stop sections process incl. childs (sleeps)
-# $1 = section
-stop_section_processes() {
-	local __PID=0
-	local __PIDFILE="$RUNDIR/$1.pid"
-	[ $# -ne 1 ] && write_log 12 "Error calling 'stop_section_processes()' - wrong number of parameters"
-
-	[ -e "$__PIDFILE" ] && {
-		__PID=$(cat $__PIDFILE)
-		ps | grep "^[\t ]*$__PID" >/dev/null 2>&1 && kill $__PID || __PID=0	# terminate it
-	}
-	[ $__PID -eq 0 ] # report if process was running
-}
-
-# stop updater script for all defines sections or only for one given
-# $1 = interface (optional)
-# used by /etc/hotplug.d/iface/25-ddns on 'ifdown'
-# and by /etc/init.d/ddns stop
-# needed because we also need to kill "sleep" child processes
-stop_daemon_for_all_ddns_sections() {
-	local __EVENTIF="$1"
-	local __SECTIONS=""
-	local __SECTIONID=""
-	local __IFACE=""
-
-	load_all_service_sections __SECTIONS
-	for __SECTIONID in $__SECTIONS;	do
-		config_get __IFACE "$__SECTIONID" interface "wan"
-		[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
-		stop_section_processes "$__SECTIONID"
-	done
-}
-
-# reports to console, logfile, syslog
-# $1	loglevel 7 == Debug to 0 == EMERG
-#	value +10 will exit the scripts
-# $2..n	text to report
-write_log() {
-	local __LEVEL __EXIT __CMD __MSG
-	local __TIME=$(date +%H%M%S)
-	[ $1 -ge 10 ] && {
-		__LEVEL=$(($1-10))
-		__EXIT=1
-	} || {
-		__LEVEL=$1
-		__EXIT=0
-	}
-	shift	# remove loglevel
-	[ $__EXIT -eq 0 ] && __MSG="$*" || __MSG="$* - TERMINATE"
-	case $__LEVEL in		# create log message and command depending on loglevel
-		0)	__CMD="logger -p user.emerg -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME EMERG : $__MSG" ;;
-		1)	__CMD="logger -p user.alert -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME ALERT : $__MSG" ;;
-		2)	__CMD="logger -p user.crit -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  CRIT : $__MSG" ;;
-		3)	__CMD="logger -p user.err -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME ERROR : $__MSG" ;;
-		4)	__CMD="logger -p user.warn -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  WARN : $__MSG" ;;
-		5)	__CMD="logger -p user.notice -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  note : $__MSG" ;;
-		6)	__CMD="logger -p user.info -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  info : $__MSG" ;;
-		7)	__MSG=" $__TIME       : $__MSG";;
-		*) 	return;;
-	esac
-
-	# verbose echo
-	[ $VERBOSE_MODE -gt 0 -o $__EXIT -gt 0 ] && echo -e "$__MSG"
-	# write to logfile
-	if [ ${use_logfile:-1} -eq 1 -o $VERBOSE_MODE -gt 1 ]; then
-		echo -e "$__MSG" >> $LOGFILE
-		# VERBOSE_MODE > 1 then NO loop so NO truncate log to $LOGLINES lines
-		[ $VERBOSE_MODE -gt 1 ] || sed -i -e :a -e '$q;N;'$LOGLINES',$D;ba' $LOGFILE
-	fi
-	[ $LUCI_HELPER ]   && return	# nothing else todo when running LuCI helper script
-	[ $__LEVEL -eq 7 ] && return	# no syslog for debug messages
-	__CMD=$(echo -e "$__CMD" | tr -d '\n' | tr '\t' '     ')        # remove \n \t chars
-	[ $__EXIT  -eq 1 ] && {
-		$__CMD		# force syslog before exit
-		exit 1
-	}
-	[ $use_syslog -eq 0 ] && return
-	[ $((use_syslog + __LEVEL)) -le 7 ] && $__CMD
-	return
-}
-
-# replace all special chars to their %hex value
-# used for USERNAME and PASSWORD in update_url
-# unchanged: "-"(minus) "_"(underscore) "."(dot) "~"(tilde)
-# to verify: "'"(single quote) '"'(double quote)	# because shell delimiter
-#            "$"(Dollar)				# because used as variable output
-# tested with the following string stored via Luci Application as password / username
-# A B!"#AA$1BB%&'()*+,-./:;<=>?@[\]^_`{|}~	without problems at Dollar or quotes
-urlencode() {
-	# $1	Name of Variable to store encoded string to
-	# $2	string to encode
-	local __STR __LEN __CHAR __OUT
-	local __ENC=""
-	local __POS=1
-
-	[ $# -ne 2 ] && write_log 12 "Error calling 'urlencode()' - wrong number of parameters"
-
-	__STR="$2"		# read string to encode
-	__LEN=${#__STR}		# get string length
-
-	while [ $__POS -le $__LEN ]; do
-		# read one chat of the string
-		__CHAR=$(expr substr "$__STR" $__POS 1)
-
-		case "$__CHAR" in
-		        [-_.~a-zA-Z0-9] )
-				# standard char
-				__OUT="${__CHAR}"
-				;;
-		        * )
-				# special char get %hex code
-		               __OUT=$(printf '%%%02x' "'$__CHAR" )
-				;;
-		esac
-		__ENC="${__ENC}${__OUT}"	# append to encoded string
-		__POS=$(( $__POS + 1 ))		# increment position
-	done
-
-	eval "$1=\"$__ENC\""	# transfer back to variable
-	return 0
-}
-
-# extract url or script for given DDNS Provider from
-# file /usr/lib/ddns/services for IPv4 or from
-# file /usr/lib/ddns/services_ipv6 for IPv6
-# $1	Name of Variable to store url to
-# $2	Name of Variable to store script to
-get_service_data() {
-	local __LINE __FILE __NAME __URL __SERVICES __DATA
-	local __SCRIPT=""
-	local __OLD_IFS=$IFS
-	local __NEWLINE_IFS='
-' # __NEWLINE_IFS
-	[ $# -ne 2 ] && write_log 12 "Error calling 'get_service_data()' - wrong number of parameters"
-
-	__FILE="/usr/lib/ddns/services"					# IPv4
-	[ $use_ipv6 -ne 0 ] && __FILE="/usr/lib/ddns/services_ipv6"	# IPv6
-
-	# remove any lines not containing data, and then make sure fields are enclosed in double quotes
-	__SERVICES=$(cat $__FILE | grep "^[\t ]*[^#]" | \
-		awk ' gsub("\x27", "\"") { if ($1~/^[^\"]*$/) $1="\""$1"\"" }; { if ( $NF~/^[^\"]*$/) $NF="\""$NF"\""  }; { print $0 }')
-
-	IFS=$__NEWLINE_IFS
-	for __LINE in $__SERVICES; do
-		# grep out proper parts of data and use echo to remove quotes
-		__NAME=$(echo $__LINE | grep -o "^[\t ]*\"[^\"]*\"" | xargs -r -n1 echo)
-		__DATA=$(echo $__LINE | grep -o "\"[^\"]*\"[\t ]*$" | xargs -r -n1 echo)
-
-		if [ "$__NAME" = "$service_name" ]; then
-			break			# found so leave for loop
-		fi
-	done
-	IFS=$__OLD_IFS
-
-	# check if URL or SCRIPT is given
-	__URL=$(echo "$__DATA" | grep "^http")
-	[ -z "$__URL" ] && __SCRIPT="/usr/lib/ddns/$__DATA"
-
-	eval "$1=\"$__URL\""
-	eval "$2=\"$__SCRIPT\""
-	return 0
-}
-
-# Calculate seconds from interval and unit
-# $1	Name of Variable to store result in
-# $2	Number and
-# $3	Unit of time interval
-get_seconds() {
-	[ $# -ne 3 ] && write_log 12 "Error calling 'get_seconds()' - wrong number of parameters"
-	case "$3" in
-		"days" )	eval "$1=$(( $2 * 86400 ))";;
-		"hours" )	eval "$1=$(( $2 * 3600 ))";;
-		"minutes" )	eval "$1=$(( $2 * 60 ))";;
-		* )		eval "$1=$2";;
-	esac
-	return 0
-}
-
-timeout() {
-	#.copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
-	# only did the following changes
-	#	- commented out "#!/bin/bash" and usage section
-	#	- replace exit by return for usage as function
-	#	- some reformatting
-	#
-	# timeout [-SIG] time [--] command args...
-	#
-	# Run the given command until completion, but kill it if it runs too long.
-	# Specifically designed to exit immediately (no sleep interval) and clean up
-	# nicely without messages or leaving any extra processes when finished.
-	#
-	# Example use
-	#    timeout 5 countdown
-	#
-	# Based on notes in my "Shell Script Hints", section "Command Timeout"
-	#   http://www.ict.griffith.edu.au/~anthony/info/shell/script.hints
-	#
-	# This script uses a lot of tricks to terminate both the background command,
-	# the timeout script, and even the sleep process.  It also includes trap
-	# commands to prevent sub-shells reporting expected "Termination Errors".
-	#
-	# It took years of occasional trials, errors and testing to get a pure bash
-	# timeout command working as well as this does.
-	#
-	#.Anthony Thyssen     6 April 2011
-	#
-#	PROGNAME=$(type $0 | awk '{print $3}')	# search for executable on path
-#	PROGDIR=$(dirname $PROGNAME)		# extract directory of program
-#	PROGNAME=$(basename $PROGNAME)		# base name of program
-
-	# output the script comments as docs
-#	Usage() {
-#		echo >&2 "$PROGNAME:" "$@"
-#		sed >&2 -n '/^###/q; /^#/!q; s/^#//; s/^ //; 3s/^/Usage: /; 2,$ p' "$PROGDIR/$PROGNAME"
-#		exit 10;
-#	}
-
-	SIG=-TERM
-
-	while [ $# -gt 0 ]; do
-		case "$1" in
-			--)
-				# forced end of user options
-				shift;
-				break ;;
-#			-\?|--help|--doc*)
-#				Usage ;;
-			[0-9]*)
-				TIMEOUT="$1" ;;
-			-*)
-				SIG="$1" ;;
-			*)
-				# unforced  end of user options
-				break ;;
-		esac
-		shift	# next option
-	done
-
-	# run main command in backgrounds and get its pid
-	"$@" &
-	command_pid=$!
-
-	# timeout sub-process abort countdown after ABORT seconds! also backgrounded
-	sleep_pid=0
-	(
-		# cleanup sleep process
-		trap 'kill -TERM $sleep_pid; return 1' 1 2 3 15
-		# sleep timeout period in background
-		sleep $TIMEOUT &
-		sleep_pid=$!
-		wait $sleep_pid
-		# Abort the command
-		kill $SIG $command_pid >/dev/null 2>&1
-		return 1
-	) &
-	timeout_pid=$!
-
-	# Wait for main command to finished or be timed out
-	wait $command_pid
-	status=$?
-
-	# Clean up timeout sub-shell - if it is still running!
-	kill $timeout_pid 2>/dev/null
-	wait $timeout_pid 2>/dev/null
-
-	# Uncomment to check if a LONG sleep still running (no sleep should be)
-	# sleep 1
-	# echo "-----------"
-	# /bin/ps j  # uncomment to show if abort "sleep" is still sleeping
-
-	return $status
-}
-
-# verify given host and port is connectable
-# $1	Host/IP to verify
-# $2	Port to verify
-verify_host_port() {
-	local __HOST=$1
-	local __PORT=$2
-	local __IP __IPV4 __IPV6 __RUNPROG __PROG __ERR
-	# return codes
-	# 1	system specific error
-	# 2	nslookup/host error
-	# 3	nc (netcat) error
-	# 4	unmatched IP version
-
-	[ $# -ne 2 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
-
-	# check if ip or FQDN was given
-	__IPV4=$(echo $__HOST | grep -m 1 -o "$IPV4_REGEX$")	# do not detect ip in 0.0.0.0.example.com
-	__IPV6=$(echo $__HOST | grep -m 1 -o "$IPV6_REGEX")
-	# if FQDN given get IP address
-	[ -z "$__IPV4" -a -z "$__IPV6" ] && {
-		if [ -x /usr/bin/host ]; then	# use BIND host if installed
-			__PROG="BIND host"
-			__RUNPROG="/usr/bin/host -t ANY $__HOST >$DATFILE 2>$ERRFILE"
-		else	# use BusyBox nslookup
-			__PROG="BusyBox nslookup"
-			__RUNPROG="/usr/bin/nslookup $__HOST >$DATFILE 2>$ERRFILE"
-		fi
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		# command error
-		[ $__ERR -gt 0 ] && {
-			write_log 3 "DNS Resolver Error - $__PROG Error '$__ERR'"
-			write_log 7 "$(cat $ERRFILE)"
-			return 2
-		}
-		# extract IP address
-		if [ -x /usr/bin/host ]; then	# use BIND host if installed
-			__IPV4=$(cat $DATFILE | awk -F "address " '/has address/ {print $2; exit}' )
-			__IPV6=$(cat $DATFILE | awk -F "address " '/has IPv6/ {print $2; exit}' )
-		else	# use BusyBox nslookup
-			__IPV4=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($IPV4_REGEX\).*$/\\1/p }")
-			__IPV6=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($IPV6_REGEX\).*$/\\1/p }")
-		fi
-	}
-
-	# check IP version if forced
-	if [ $force_ipversion -ne 0 ]; then
-		__ERR=0
-		[ $use_ipv6 -eq 0 -a -z "$__IPV4" ] && __ERR=4
-		[ $use_ipv6 -eq 1 -a -z "$__IPV6" ] && __ERR=6
-		[ $__ERR -gt 0 ] && {
-			[ $LUCI_HELPER ] && return 4
-			write_log 14 "Verify host Error '4' - Forced IP Version IPv$__ERR don't match"
-		}
-	fi
-
-	# verify nc command
-	# busybox nc compiled without -l option "NO OPT l!" -> critical error
-	/usr/bin/nc --help 2>&1 | grep -i "NO OPT l!" >/dev/null 2>&1 && \
-		write_log 12 "Busybox nc (netcat) compiled without '-l' option, error 'NO OPT l!'"
-	# busybox nc compiled with extensions
-	/usr/bin/nc --help 2>&1 | grep "\-w" >/dev/null 2>&1 && __NCEXT="TRUE"
-
-	# connectivity test
-	# run busybox nc to HOST PORT
-	# busybox might be compiled with "FEATURE_PREFER_IPV4_ADDRESS=n"
-	# then nc will try to connect via IPv6 if there is any IPv6 available on any host interface
-	# not worrying, if there is an IPv6 wan address
-	# so if not "force_ipversion" to use_ipv6 then connect test via ipv4, if available
-	[ $force_ipversion -ne 0 -a $use_ipv6 -ne 0 -o -z "$__IPV4" ] && __IP=$__IPV6 || __IP=$__IPV4
-
-	if [ -n "$__NCEXT" ]; then	# BusyBox nc compiled with extensions (timeout support)
-		__RUNPROG="/usr/bin/nc -w 1 $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		[ $__ERR -eq 0 ] && return 0
-		write_log 3 "Connect error - BusyBox nc (netcat) Error '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"
-		return 3
-	else		# nc compiled without extensions (no timeout support)
-		__RUNPROG="timeout 2 -- /usr/bin/nc $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		[ $__ERR -eq 0 ] && return 0
-		write_log 3 "Connect error - BusyBox nc (netcat) timeout Error '$__ERR'"
-		return 3
-	fi
-}
-
-# verify given DNS server if connectable
-# $1	DNS server to verify
-verify_dns() {
-	local __ERR=255	# last error buffer
-	local __CNT=0	# error counter
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_dns()' - wrong number of parameters"
-	write_log 7 "Verify DNS server '$1'"
-
-	while [ $__ERR -ne 0 ]; do
-		# DNS uses port 53
-		verify_host_port "$1" "53"
-		__ERR=$?
-		if [ $LUCI_HELPER ]; then	# no retry if called by LuCI helper script
-			return $__ERR
-		elif [ $__ERR -ne 0 -a $VERBOSE_MODE -gt 1 ]; then	# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Verify DNS server '$1' failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			return $__ERR
-		elif [ $__ERR -ne 0 ]; then
-			__CNT=$(( $__CNT + 1 ))	# increment error counter
-			# if error count > retry_count leave here
-			[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-				write_log 14 "Verify DNS server '$1' failed after $retry_count retries"
-
-			write_log 4 "Verify DNS server '$1' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-			sleep $RETRY_SECONDS &
-			PID_SLEEP=$!
-			wait $PID_SLEEP	# enable trap-handler
-			PID_SLEEP=0
-		fi
-	done
-	return 0
-}
-
-# analyze and verify given proxy string
-# $1	Proxy-String to verify
-verify_proxy() {
-	#	complete entry		user:password@host:port
-	# 				inside user and password NO '@' of ":" allowed
-	#	host and port only	host:port
-	#	host only		host		ERROR unsupported
-	#	IPv4 address instead of host	123.234.234.123
-	#	IPv6 address instead of host	[xxxx:....:xxxx]	in square bracket
-	local __TMP __HOST __PORT
-	local __ERR=255	# last error buffer
-	local __CNT=0	# error counter
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_proxy()' - wrong number of parameters"
-	write_log 7 "Verify Proxy server 'http://$1'"
-
-	# try to split user:password "@" host:port
-	__TMP=$(echo $1 | awk -F "@" '{print $2}')
-	# no "@" found - only host:port is given
-	[ -z "$__TMP" ] && __TMP="$1"
-	# now lets check for IPv6 address
-	__HOST=$(echo $__TMP | grep -m 1 -o "$IPV6_REGEX")
-	# IPv6 host address found read port
-	if [ -n "$__HOST" ]; then
-		# IPv6 split at "]:"
-		__PORT=$(echo $__TMP | awk -F "]:" '{print $2}')
-	else
-		__HOST=$(echo $__TMP | awk -F ":" '{print $1}')
-		__PORT=$(echo $__TMP | awk -F ":" '{print $2}')
-	fi
-	# No Port detected - EXITING
-	[ -z "$__PORT" ] && {
-		[ $LUCI_HELPER ] && return 5
-		write_log 14 "Invalid Proxy server Error '5' - proxy port missing"
-	}
-
-	while [ $__ERR -gt 0 ]; do
-		verify_host_port "$__HOST" "$__PORT"
-		__ERR=$?
-		if [ $LUCI_HELPER ]; then	# no retry if called by LuCI helper script
-			return $__ERR
-		elif [ $__ERR -gt 0 -a $VERBOSE_MODE -gt 1 ]; then	# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Verify Proxy server '$1' failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			return $__ERR
-		elif [ $__ERR -gt 0 ]; then
-			__CNT=$(( $__CNT + 1 ))	# increment error counter
-			# if error count > retry_count leave here
-			[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-				write_log 14 "Verify Proxy server '$1' failed after $retry_count retries"
-
-			write_log 4 "Verify Proxy server '$1' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-			sleep $RETRY_SECONDS &
-			PID_SLEEP=$!
-			wait $PID_SLEEP	# enable trap-handler
-			PID_SLEEP=0
-		fi
-	done
-	return 0
-}
-
-do_transfer() {
-	# $1	# URL to use
-	local __URL="$1"
-	local __ERR=0
-	local __CNT=0	# error counter
-	local __PROG  __RUNPROG
-
-	[ $# -ne 1 ] && write_log 12 "Error in 'do_transfer()' - wrong number of parameters"
-
-	# lets prefer GNU Wget because it does all for us - IPv4/IPv6/HTTPS/PROXY/force IP version
-	grep -i "\+ssl" /usr/bin/wget >/dev/null 2>&1	# check for Wget with SSL support
-	if [ $? -eq 0 -a $USE_CURL -eq 0 ]; then 	# except global option use_curl is set to "1"
-		__PROG="/usr/bin/wget -nv -t 1 -O $DATFILE -o $ERRFILE"	# non_verbose no_retry outfile errfile
-		# force network/ip to use for communication
-		if [ -n "$bind_network" ]; then
-			local __BINDIP
-			# set correct program to detect IP
-			[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" || __RUNPROG="network_get_ipaddr6"
-			eval "$__RUNPROG __BINDIP $bind_network" || \
-				write_log 13 "Can not detect local IP using '$__RUNPROG $bind_network' - Error: '$?'"
-			write_log 7 "Force communication via IP '$__BINDIP'"
-			__PROG="$__PROG --bind-address=$__BINDIP"
-		fi
-		# force ip version to use
-		if [ $force_ipversion -eq 1 ]; then
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
-		fi
-		# set certificate parameters
-		if [ $use_https -eq 1 ]; then
-			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-				__PROG="$__PROG --no-check-certificate"
-			elif [ -f "$cacert" ]; then
-				__PROG="$__PROG --ca-certificate=${cacert}"
-			elif [ -d "$cacert" ]; then
-				__PROG="$__PROG --ca-directory=${cacert}"
-			else	# exit here because it makes no sense to start loop
-				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-			fi
-		fi
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		[ -z "$proxy" ] && __PROG="$__PROG --no-proxy"
-
-		__RUNPROG="$__PROG '$__URL'"	# build final command
-		__PROG="GNU Wget"		# reuse for error logging
-
-	# 2nd choice is cURL IPv4/IPv6/HTTPS
-	# libcurl might be compiled without Proxy Support (default in trunk)
-	elif [ -x /usr/bin/curl ]; then
-		__PROG="/usr/bin/curl -RsS -o $DATFILE --stderr $ERRFILE"
-		# force network/interface-device to use for communication
-		if [ -n "$bind_network" ]; then
-			local __DEVICE
-			network_get_physdev __DEVICE $bind_network || \
-				write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
-			write_log 7 "Force communication via device '$__DEVICE'"
-			__PROG="$__PROG --interface $__DEVICE"
-		fi
-		# force ip version to use
-		if [ $force_ipversion -eq 1 ]; then
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
-		fi
-		# set certificate parameters
-		if [ $use_https -eq 1 ]; then
-			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-				__PROG="$__PROG --insecure"	# but not empty better to use "IGNORE"
-			elif [ -f "$cacert" ]; then
-				__PROG="$__PROG --cacert $cacert"
-			elif [ -d "$cacert" ]; then
-				__PROG="$__PROG --capath $cacert"
-			else	# exit here because it makes no sense to start loop
-				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-			fi
-		fi
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		# or check if libcurl compiled with proxy support
-		if [ -z "$proxy" ]; then
-			__PROG="$__PROG --noproxy '*'"
-		else
-			# if libcurl has no proxy support and proxy should be used then force ERROR
-			# libcurl currently no proxy support by default
-			grep -i "all_proxy" /usr/lib/libcurl.so* >/dev/null 2>&1 || \
-				write_log 13 "cURL: libcurl compiled without Proxy support"
-		fi
-
-		__RUNPROG="$__PROG '$__URL'"	# build final command
-		__PROG="cURL"			# reuse for error logging
-
-	# busybox Wget (did not support neither IPv6 nor HTTPS)
-	elif [ -x /usr/bin/wget ]; then
-		__PROG="/usr/bin/wget -q -O $DATFILE"
-		# force network/ip not supported
-		[ -n "$__BINDIP" ] && \
-			write_log 14 "BusyBox Wget: FORCE binding to specific address not supported"
-		# force ip version not supported
-		[ $force_ipversion -eq 1 ] && \
-			write_log 14 "BusyBox Wget: Force connecting to IPv4 or IPv6 addresses not supported"
-		# https not supported
-		[ $use_https -eq 1 ] && \
-			write_log 14 "BusyBox Wget: no HTTPS support"
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		[ -z "$proxy" ] && __PROG="$__PROG -Y off"
-
-		__RUNPROG="$__PROG '$__URL' 2>$ERRFILE"		# build final command
-		__PROG="Busybox Wget"				# reuse for error logging
-
-	else
-		write_log 13 "Neither 'Wget' nor 'cURL' installed or executable"
-	fi
-
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG			# DO transfer
-		__ERR=$?			# save error code
-		[ $__ERR -eq 0 ] && return 0	# no error leave
-		[ $LUCI_HELPER ] && return 1	# no retry if called by LuCI helper script
-
-		write_log 3 "$__PROG Error: '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"		# report error
-
-		[ $VERBOSE_MODE -gt 1 ] && {
-			# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			return 1
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Transfer failed after $retry_count retries"
-
-		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'do_transfer()' - program coding error"
-}
-
-send_update() {
-	# $1	# IP to set at DDNS service provider
-	local __IP
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'send_update()' - wrong number of parameters"
-
-	if [ $ALLOW_LOCAL_IP -eq 0 ]; then
-		# verify given IP / no private IPv4's / no IPv6 addr starting with fxxx of with ":"
-		[ $use_ipv6 -eq 0 ] && __IP=$(echo $1 | grep -v -E "(^0|^10\.|^100\.6[4-9]\.|^100\.[7-9][0-9]\.|^100\.1[0-1][0-9]\.|^100\.12[0-7]\.|^127|^169\.254|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-1]\.|^192\.168)")
-		[ $use_ipv6 -eq 1 ] && __IP=$(echo $1 | grep "^[0-9a-eA-E]")
-		[ -z "$__IP" ] && write_log 14 "Private or invalid or no IP '$1' given! Please check your configuration"
-	else
-		__IP="$1"
-	fi
-
-	if [ -n "$update_script" ]; then
-		write_log 7 "parsing script '$update_script'"
-		. $update_script
-	else
-		local __URL __ERR
-
-		# do replaces in URL
-		__URL=$(echo $update_url | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-					       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
-		[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-		do_transfer "$__URL" || return 1
-
-		write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
-
-		return 0
-		# TODO analyze providers answer
-		# "good" or "nochg"		= dyndns.com compatible API
-		# grep -i -E "good|nochg" $DATFILE >/dev/null 2>&1
-		# return $?	# "0" if found
-	fi
-}
-
-get_local_ip () {
-	# $1	Name of Variable to store local IP (LOCAL_IP)
-	local __CNT=0	# error counter
-	local __RUNPROG __DATA __URL __ERR
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'get_local_ip()' - wrong number of parameters"
-	write_log 7 "Detect local IP on '$ip_source'"
-
-	while : ; do
-		case $ip_source in
-			network)
-				# set correct program
-				[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" \
-						    || __RUNPROG="network_get_ipaddr6"
-				eval "$__RUNPROG __DATA $ip_network" || \
-					write_log 13 "Can not detect local IP using $__RUNPROG '$ip_network' - Error: '$?'"
-				[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on network '$ip_network'"
-				;;
-			interface)
-				write_log 7 "#> ifconfig $ip_interface >$DATFILE 2>$ERRFILE"
-				ifconfig $ip_interface >$DATFILE 2>$ERRFILE
-				__ERR=$?
-				if [ $__ERR -eq 0 ]; then
-					if [ $use_ipv6 -eq 0 ]; then
-						__DATA=$(awk '
-							/inet addr:/ {	# Filter IPv4
-							#   inet addr:192.168.1.1  Bcast:192.168.1.255  Mask:255.255.255.0
-							$1="";		# remove inet
-							$3="";		# remove Bcast: ...
-							$4="";		# remove Mask: ...
-							FS=":";		# separator ":"
-							$0=$0;		# reread to activate separator
-							$1="";		# remove addr
-							FS=" ";		# set back separator to default " "
-							$0=$0;		# reread to activate separator (remove whitespaces)
-							print $1;	# print IPv4 addr
-							}' $DATFILE
-						)
-					else
-						__DATA=$(awk '
-							/inet6/ && /: [0-9a-eA-E]/ && !/\/128/ {	# Filter IPv6 exclude fxxx and /128 prefix
-							#   inet6 addr: 2001:db8::xxxx:xxxx/32 Scope:Global
-							FS="/";		# separator "/"
-							$0=$0;		# reread to activate separator
-							$2="";		# remove everything behind "/"
-							FS=" ";		# set back separator to default " "
-							$0=$0;		# reread to activate separator
-							print $3;	# print IPv6 addr
-							}' $DATFILE
-						)
-					fi
-					[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on interface '$ip_interface'"
-				else
-					write_log 3 "ifconfig Error: '$__ERR'"
-					write_log 7 "$(cat $ERRFILE)"		# report error
-				fi
-				;;
-			script)
-				write_log 7 "#> $ip_script >$DATFILE 2>$ERRFILE"
-				eval $ip_script >$DATFILE 2>$ERRFILE
-				__ERR=$?
-				if [ $__ERR -eq 0 ]; then
-					__DATA=$(cat $DATFILE)
-					[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected via script '$ip_script'"
-				else
-					write_log 3 "$ip_script Error: '$__ERR'"
-					write_log 7 "$(cat $ERRFILE)"		# report error
-				fi
-				;;
-			web)
-				do_transfer "$ip_url"
-				# use correct regular expression
-				[ $use_ipv6 -eq 0 ] \
-					&& __DATA=$(grep -m 1 -o "$IPV4_REGEX" $DATFILE) \
-					|| __DATA=$(grep -m 1 -o "$IPV6_REGEX" $DATFILE)
-				[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on web at '$ip_url'"
-				;;
-			*)
-				write_log 12 "Error in 'get_local_ip()' - unhandled ip_source '$ip_source'"
-				;;
-		esac
-		# valid data found return here
-		[ -n "$__DATA" ] && {
-			eval "$1=\"$__DATA\""
-			return 0
-		}
-
-		[ $LUCI_HELPER ] && return 1	# no retry if called by LuCI helper script
-
-		write_log 7 "Data detected:\n$(cat $DATFILE)"
-
-		[ $VERBOSE_MODE -gt 1 ] && {
-			# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Get local IP via '$ip_source' failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			return 1
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Get local IP via '$ip_source' failed after $retry_count retries"
-		write_log 4 "Get local IP via '$ip_source' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'get_local_ip()' - program coding error"
-}
-
-get_registered_ip() {
-	# $1	Name of Variable to store public IP (REGISTERED_IP)
-	# $2	(optional) if set, do not retry on error
-	local __CNT=0	# error counter
-	local __ERR=255
-	local __REGEX  __PROG  __RUNPROG  __DATA
-	# return codes
-	# 1	no IP detected
-
-	[ $# -lt 1 -o $# -gt 2 ] && write_log 12 "Error calling 'get_registered_ip()' - wrong number of parameters"
-	write_log 7 "Detect registered/public IP"
-
-	# set correct regular expression
-	[ $use_ipv6 -eq 0 ] && __REGEX="$IPV4_REGEX" || __REGEX="$IPV6_REGEX"
-
-	if [ -x /usr/bin/host ]; then
-		__PROG="/usr/bin/host"
-		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -t A"  || __PROG="$__PROG -t AAAA"
-		if [ $force_ipversion -eq 1 ]; then			# force IP version
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
-		fi
-		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"	# force TCP
-
-		__RUNPROG="$__PROG $domain $dns_server >$DATFILE 2>$ERRFILE"
-		__PROG="BIND host"
-	elif [ -x /usr/bin/nslookup ]; then	# last use BusyBox nslookup
-		[ $force_ipversion -ne 0 -o $force_dnstcp -ne 0 ] && \
-			write_log 14 "Busybox nslookup - no support to 'force IP Version' or 'DNS over TCP'"
-
-		__RUNPROG="/usr/bin/nslookup $domain $dns_server >$DATFILE 2>$ERRFILE"
-		__PROG="BusyBox nslookup"
-	else	# there must be an error
-		write_log 12 "Error in 'get_registered_ip()' - no supported Name Server lookup software accessible"
-	fi
-
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		if [ $__ERR -ne 0 ]; then
-			write_log 3 "$__PROG error: '$__ERR'"
-			write_log 7 "$(cat $ERRFILE)"
-		else
-			if [ "$__PROG" = "BIND host" ]; then
-				__DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
-			else
-				__DATA=$(cat $DATFILE | sed -ne "3,\$ { s/^Address[0-9 ]\{0,\}: \($__REGEX\).*$/\\1/p }" )
-			fi
-			[ -n "$__DATA" ] && {
-				write_log 7 "Registered IP '$__DATA' detected"
-				eval "$1=\"$__DATA\""	# valid data found
-				return 0		# leave here
-			}
-			write_log 4 "NO valid IP found"
-			__ERR=127
-		fi
-
-		[ $LUCI_HELPER ] && return $__ERR	# no retry if called by LuCI helper script
-		[ -n "$2" ] && return $__ERR		# $2 is given -> no retry
-		[ $VERBOSE_MODE -gt 1 ] && {
-			# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Get registered/public IP for '$domain' failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			return $__ERR
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Get registered/public IP for '$domain' failed after $retry_count retries"
-
-		write_log 4 "Get registered/public IP for '$domain' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'get_registered_ip()' - program coding error"
-}
-
-get_uptime() {
-	# $1	Variable to store result in
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
-	local __UPTIME=$(cat /proc/uptime)
-	eval "$1=\"${__UPTIME%%.*}\""
-}
-
-trap_handler() {
-	# $1	trap signal
-	# $2	optional (exit status)
-	local __PIDS __PID
-	local __ERR=${2:-0}
-	local __OLD_IFS=$IFS
-	local __NEWLINE_IFS='
-' # __NEWLINE_IFS
-
-	[ $PID_SLEEP -ne 0 ] && kill -$1 $PID_SLEEP 2>/dev/null	# kill pending sleep if exist
-
-	case $1 in
-		 0)	if [ $__ERR -eq 0 ]; then
-				write_log 5 "PID '$$' exit normal at $(eval $DATE_PROG)\n"
-			else
-				write_log 4 "PID '$$' exit WITH ERROR '$__ERR' at $(eval $DATE_PROG)\n"
-			fi ;;
-		 1)	write_log 6 "PID '$$' received 'SIGHUP' at $(eval $DATE_PROG)"
-			# reload config via starting the script again
-			eval "/usr/lib/ddns/dynamic_dns_updater.sh $SECTION_ID $VERBOSE_MODE &"
-			exit 0 ;;	# and leave this one
-		 2)	write_log 5 "PID '$$' terminated by 'SIGINT' at $(eval $DATE_PROG)\n";;
-		 3)	write_log 5 "PID '$$' terminated by 'SIGQUIT' at $(eval $DATE_PROG)\n";;
-		15)	write_log 5 "PID '$$' terminated by 'SIGTERM' at $(eval $DATE_PROG)\n";;
-		 *)	write_log 13 "Unhandled signal '$1' in 'trap_handler()'";;
-	esac
-
-	__PIDS=$(pgrep -P $$)	# get my childs (pgrep prints with "newline")
-	IFS=$__NEWLINE_IFS
-	for __PID in $__PIDS; do
-		kill -$1 $__PID	# terminate it
-	done
-	IFS=$__OLD_IFS
-
-	# remove out and err file
-	[ -f $DATFILE ] && rm -f $DATFILE
-	[ -f $ERRFILE ] && rm -f $ERRFILE
-
-	# exit with correct handling:
-	# remove trap handling settings and send kill to myself
-	trap - 0 1 2 3 15
-	[ $1 -gt 0 ] && kill -$1 $$
-}
-
-split_FQDN() {
-	# $1	FQDN to split
-	# $2	name of variable to store TLD
-	# $3	name of variable to store (reg)Domain
-	# $4	name of variable to store Host/Subdomain
-
-	[ $# -ne 4 ] && write_log 12 "Error calling 'split_FQDN()' - wrong number of parameters"
-	[ -z "$1"  ] && write_log 12 "Error calling 'split_FQDN()' - missing FQDN to split"
-	[ -f $TLDFILE ] || write_log 12 "Error calling 'split_FQDN()' - missing file '$TLDFILE'"
-
-	local _HOST _FDOM _CTLD _FTLD
-	local _SET="$@"					# save given function parameters
-
-	local _PAR=$(echo "$1" | tr [A-Z] [a-z] | tr "." " ")	# to lower and replace DOT with SPACE
-	set -- $_PAR					# set new as function parameters
-	_PAR=""						# clear variable for later reuse
-	while [ -n "$1" ] ; do				# as long we have parameters
-		_PAR="$1 $_PAR"				# invert order of parameters
-		shift
-	done
-	set -- $_PAR					# use new as function parameters
-	_PAR=""						# clear variable
-
-	while [ -n "$1" ] ; do				# as long we have parameters
-		if [ -z "$_CTLD" ]; then 		# first loop
-			_CTLD="$1"			# CURRENT TLD to look at
-			shift
-		else
-			_CTLD="$1.$_CTLD"		# Next TLD to look at
-			shift
-		fi
-		# check if TLD exact match in tld_names.dat, save TLD
-		zcat $TLDFILE | grep -E "^$_CTLD$" >/dev/null 2>&1 && {
-			_FTLD="$_CTLD"		# save found
-			_FDOM="$1"		# save domain next step might be invalid
-			continue
-		}
-		# check if match any "*" in tld_names.dat,
-		zcat $TLDFILE | grep -E "^\*.$_CTLD$" >/dev/null 2>&1 && {
-			[ -z "$1" ] && break	# no more data break
-			# check if next level TLD match excludes "!" in tld_names.dat
-			if zcat $TLDFILE | grep -E "^!$1.$_CTLD$" >/dev/null 2>&1 ; then
-				_FTLD="$_CTLD"	# Yes
-			else
-				_FTLD="$1.$_CTLD"
-				shift
-			fi
-			_FDOM="$1"; shift
-		}
-		[ -n "$_FTLD" ] && break	# we have something valid, break
-	done
-
-	# the leftover parameters are the HOST/SUBDOMAIN
-	while [ -n "$1" ]; do
-		_HOST="$1 $HOST"		# remember we need to invert
-		shift
-	done
-	_HOST=$(echo $_HOST | tr " " ".")	# insert DOT
-
-	set -- $_SET				# set back parameters from function call
-	[ -n "$_FTLD" ] && {
-		eval "$2=$_FTLD"		# set TLD
-		eval "$3=$_FDOM"		# set registrable domain
-		eval "$4=$_HOST"		# set HOST/SUBDOMAIN
-		return 0
-	}
-	eval "$2=''"		# clear TLD
-	eval "$3=''"		# clear registrable domain
-	eval "$4=''"		# clear HOST/SUBDOMAIN
-	return 1
-}
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_lucihelper.sh b/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_lucihelper.sh
deleted file mode 100755
index 0f8bb5aa..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_lucihelper.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/luci_dns_helper.sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# Written in August 2014 by
-#.Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# This script is used by luci-app-ddns
-# - getting registered IP
-# - check if possible to get local IP
-# - verifing given DNS- or Proxy-Server
-#
-# variables in small chars are read from /etc/config/ddns as parameter given here
-# variables in big chars are defined inside these scripts as gloval vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-[ $# -lt 2 ] && exit 1
-
-. /usr/lib/ddns/dynamic_dns_functions.sh	# global vars are also defined here
-
-# preset some variables, wrong or not set in dynamic_dns_functions.sh
-SECTION_ID="lucihelper"
-LOGFILE="$LOGDIR/$SECTION_ID.log"
-DATFILE="$RUNDIR/$SECTION_ID.$$.dat"	# save stdout data of WGet and other extern programs called
-ERRFILE="$RUNDIR/$SECTION_ID.$$.err"	# save stderr output of WGet and other extern programs called
-VERBOSE_MODE=0		# no console logging
-# global variables normally set by reading DDNS UCI configuration
-use_syslog=0		# no syslog
-use_logfile=0		# by default no logfile, can be changed here
-
-__RET=0
-case "$1" in
-	get_registered_ip)
-		local IP
-		domain=$2			# Hostname/Domain
-		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
-		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
-		force_dnstcp=${5:-"0"}		# Force TCP on DNS - default 0 - No
-		dns_server=${6:-""}		# DNS server - default No DNS
-		write_log 7 "-----> get_registered_ip IP"
-		get_registered_ip IP
-		__RET=$?
-		[ $__RET -ne 0 ] && IP=""
-		echo -n "$IP"			# suppress LF
-		;;
-	verify_dns)
-		# $2 : dns-server to verify	# no need for force_dnstcp because
-						# verify with nc (netcat) uses tcp anyway
-		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
-		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
-		write_log 7 "-----> verify_dns '$2'"
-		verify_dns "$2"
-		__RET=$?
-		;;
-	verify_proxy)
-		# $2 : proxy string to verify
-		use_ipv6=${3:-"0"}		# Use IPv6 - default IPv4
-		force_ipversion=${4:-"0"}	# Force IP Version - default 0 - No
-		write_log 7 "-----> verify_proxy '$2'"
-		verify_proxy "$2"
-		__RET=$?
-		;;
-	get_local_ip)
-		local IP
-		use_ipv6="$2"			# Use IPv6
-		ip_source="$3"			# IP source
-		ip_network="$4"			# set if source = "network" otherwise "-"
-		ip_url="$5"			# set if source = "web" otherwise "-"
-		ip_interface="$6"		# set if source = "interface" itherwiase "-"
-		ip_script="$7"			# set if source = "script" otherwise "-"
-		proxy="$8"			# proxy if set
-		force_ipversion="0"		# not needed but must be set
-		use_https="0"			# not needed but must be set
-		[ -n "$proxy" -a "$ip_source" = "web" ] && {
-			# proxy defined, used for ip_source=web
-			export HTTP_PROXY="http://$proxy"
-			export HTTPS_PROXY="http://$proxy"
-			export http_proxy="http://$proxy"
-			export https_proxy="http://$proxy"
-		}
-		# don't need IP only the return code
-		[ "$ip_source" = "web" -o  "$ip_source" = "script" ] && {
-			# we wait only 3 seconds for an
-			# answer from "web" or "script"
-			write_log 7 "-----> timeout 3 -- get_local_ip IP"
-			timeout 3 -- get_local_ip IP
-		} || {
-			write_log 7 "-----> get_local_ip IP"
-			get_local_ip IP
-		}
-		__RET=$?
-		;;
-	*)
-		__RET=255
-		;;
-esac
-
-# remove out and err file
-[ -f $DATFILE ] && rm -f $DATFILE
-[ -f $ERRFILE ] && rm -f $ERRFILE
-return $__RET
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_updater.sh b/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_updater.sh
deleted file mode 100644
index a0143a73..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/dynamic_dns_updater.sh
+++ /dev/null
@@ -1,334 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/dynamic_dns_updater.sh
-#
-# Original written by Eric Paul Bishop, January 2008
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-# (Loosely) based on the script on the one posted by exobyte in the forums here:
-# http://forum.openwrt.org/viewtopic.php?id=14040
-#
-# extended and partial rewritten in August 2014 by
-#.Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# to support:
-# - IPv6 DDNS services
-# - DNS Server to retrieve registered IP including TCP transport (Ticket 7820)
-# - Proxy Server to send out updates
-# - force_interval=0 to run once (Luci Ticket 538)
-# - the usage of BIND's host command instead of BusyBox's nslookup if installed
-# - extended Verbose Mode and log file support for better error detection
-# - wait for interface to fully come up, before the first update is done
-#
-# variables in small chars are read from /etc/config/ddns
-# variables in big chars are defined inside these scripts as global vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-[ $# -lt 1 -o -n "${2//[0-3]/}" -o ${#2} -gt 1 ] && {
-	echo -e "\n  USAGE:"
-	echo -e "  $0 [SECTION] [VERBOSE_MODE]\n"
-	echo    "  [SECTION]      - service section as defined in /etc/config/ddns"
-	echo    "  [VERBOSE_MODE] - '0' NO output to console"
-	echo    "                   '1' output to console"
-	echo    "                   '2' output to console AND logfile"
-	echo    "                       + run once WITHOUT retry on error"
-	echo    "                   '3' output to console AND logfile"
-	echo    "                       + run once WITHOUT retry on error"
-	echo -e "                       + NOT sending update to DDNS service\n"
-	exit 1
-}
-
-. /usr/lib/ddns/dynamic_dns_functions.sh	# global vars are also defined here
-
-SECTION_ID="$1"
-VERBOSE_MODE=${2:-1}	# default mode is log to console
-
-# set file names
-PIDFILE="$RUNDIR/$SECTION_ID.pid"	# Process ID file
-UPDFILE="$RUNDIR/$SECTION_ID.update"	# last update successful send (system uptime)
-DATFILE="$RUNDIR/$SECTION_ID.dat"	# save stdout data of WGet and other extern programs called
-ERRFILE="$RUNDIR/$SECTION_ID.err"	# save stderr output of WGet and other extern programs called
-LOGFILE="$LOGDIR/$SECTION_ID.log"	# log file
-
-# VERBOSE_MODE > 1 delete logfile if exist to create an empty one
-# only with this data of this run for easier diagnostic
-# new one created by write_log function
-[ $VERBOSE_MODE -gt 1 -a -f $LOGFILE ] && rm -f $LOGFILE
-
-# TRAP handler
-trap "trap_handler 0 \$?" 0	# handle script exit with exit status
-trap "trap_handler 1"  1	# SIGHUP	Hangup / reload config
-trap "trap_handler 2"  2	# SIGINT	Terminal interrupt
-trap "trap_handler 3"  3	# SIGQUIT	Terminal quit
-# trap "trap_handler 9"  9	# SIGKILL	no chance to trap
-trap "trap_handler 15" 15	# SIGTERM	Termination
-
-################################################################################
-# Leave this comment here, to clearly document variable names that are expected/possible
-# Use load_all_config_options to load config options, which is a much more flexible solution.
-#
-# config_load "ddns"
-# config_get <variable> $SECTION_ID <option>
-#
-# defined options (also used as variable):
-#
-# enable	self-explanatory
-# interface 	network interface used by hotplug.d i.e. 'wan' or 'wan6'
-#
-# service_name	Which DDNS service do you use or "custom"
-# update_url	URL to use to update your "custom" DDNS service
-# update_script SCRIPT to use to update your "custom" DDNS service
-#
-# domain 	Your DNS name / replace [DOMAIN] in update_url
-# username 	Username of your DDNS service account / replace [USERNAME] in update_url
-# password 	Password of your DDNS service account / replace [PASSWORD] in update_url
-#
-# use_https	use HTTPS to update DDNS service
-# cacert	file or directory where HTTPS can find certificates to verify server; 'IGNORE' ignore check of server certificate
-#
-# use_syslog	log activity to syslog
-#
-# ip_source	source to detect current local IP ('network' or 'web' or 'script' or 'interface')
-# ip_network	local defined network to read IP from i.e. 'wan' or 'wan6'
-# ip_url	URL to read local address from i.e. http://checkip.dyndns.com/ or http://checkipv6.dyndns.com/
-# ip_script	full path and name of your script to detect local IP
-# ip_interface	physical interface to use for detecting
-#
-# check_interval	check for changes every  !!! checks below 10 minutes make no sense because the Internet
-# check_unit		'days' 'hours' 'minutes' !!! needs about 5-10 minutes to sync an IP-change for an DNS entry
-#
-# force_interval	force to send an update to your service if no change was detected
-# force_unit		'days' 'hours' 'minutes' !!! force_interval="0" runs this script once for use i.e. with cron
-#
-# retry_interval	if error was detected retry in
-# retry_unit		'days' 'hours' 'minutes' 'seconds'
-# retry_count 		number of retries before scripts stops
-#
-# use_ipv6		detecting/sending IPv6 address
-# force_ipversion	force usage of IPv4 or IPv6 for the whole detection and update communication
-# dns_server		using a non default dns server to get Registered IP from Internet
-# force_dnstcp		force communication with DNS server via TCP instead of default UDP
-# proxy			using a proxy for communication !!! ALSO used to detect local IP via web => return proxy's IP !!!
-# use_logfile		self-explanatory "/var/log/ddns/$SECTION_ID.log"
-#
-# some functionality needs
-# - GNU Wget or cURL installed for sending updates to DDNS service
-# - BIND host installed to detect Registered IP
-#
-################################################################################
-
-load_all_config_options "ddns" "$SECTION_ID"
-ERR_LAST=$?	# save return code - equal 0 if SECTION_ID found
-
-# set defaults if not defined
-[ -z "$enabled" ]	  && enabled=0
-[ -z "$retry_count" ]	  && retry_count=5
-[ -z "$use_syslog" ]      && use_syslog=2	# syslog "Notice"
-[ -z "$use_https" ]       && use_https=0	# not use https
-[ -z "$use_logfile" ]     && use_logfile=1	# use logfile by default
-[ -z "$use_ipv6" ]	  && use_ipv6=0		# use IPv4 by default
-[ -z "$force_ipversion" ] && force_ipversion=0	# default let system decide
-[ -z "$force_dnstcp" ]	  && force_dnstcp=0	# default UDP
-[ -z "$ip_source" ]	  && ip_source="network"
-[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 0 ] && ip_network="wan"  # IPv4: default wan
-[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 1 ] && ip_network="wan6" # IPv6: default wan6
-[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 0 ] && ip_url="http://checkip.dyndns.com"
-[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 1 ] && ip_url="http://checkipv6.dyndns.com"
-[ "$ip_source" = "interface" -a -z "$ip_interface" ] && ip_interface="eth1"
-
-# SECTION_ID does not exists
-[ $ERR_LAST -ne 0 ] && {
-	[ $VERBOSE_MODE -le 1 ] && VERBOSE_MODE=2	# force console out and logfile output
-	[ -f $LOGFILE ] && rm -f $LOGFILE		# clear logfile before first entry
-	write_log  7 "************ ************** ************** **************"
-	write_log  5 "PID '$$' started at $(eval $DATE_PROG)"
-	write_log  7 "uci configuration:\n$(uci -q show ddns | grep '=service' | sort)"
-	write_log 14 "Service section '$SECTION_ID' not defined"
-}
-
-write_log 7 "************ ************** ************** **************"
-write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
-write_log 7 "uci configuration:\n$(uci -q show ddns.$SECTION_ID | sort)"
-write_log 7 "ddns version  : $(opkg list-installed ddns-scripts | cut -d ' ' -f 3)"
-case $VERBOSE_MODE in
-	0) write_log  7 "verbose mode  : 0 - run normal, NO console output";;
-	1) write_log  7 "verbose mode  : 1 - run normal, console mode";;
-	2) write_log  7 "verbose mode  : 2 - run once, NO retry on error";;
-	3) write_log  7 "verbose mode  : 3 - run once, NO retry on error, NOT sending update";;
-	*) write_log 14 "error detecting VERBOSE_MODE '$VERBOSE_MODE'";;
-esac
-
-# check enabled state otherwise we don't need to continue
-[ $enabled -eq 0 ] && write_log 14 "Service section disabled!"
-
-# determine what update url we're using if a service_name is supplied
-# otherwise update_url is set inside configuration (custom update url)
-# or update_script is set inside configuration (custom update script)
-[ -n "$service_name" ] && get_service_data update_url update_script
-[ -z "$update_url" -a -z "$update_script" ] && write_log 14 "No update_url found/defined or no update_script found/defined!"
-[ -n "$update_script" -a ! -f "$update_script" ] && write_log 14 "Custom update_script not found!"
-
-# without domain and possibly username and password we can do nothing for you
-[ -z "$domain" ] && write_log 14 "Service section not configured correctly! Missing 'domain'"
-[ -n "$update_url" ] && {
-	# only check if update_url is given, update_scripts have to check themselves
-	[ -z "$username" ] && $(echo "$update_url" | grep "\[USERNAME\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'username'"
-	[ -z "$password" ] && $(echo "$update_url" | grep "\[PASSWORD\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'password'"
-}
-
-# url encode username (might be email or something like this)
-# and password (might have special chars for security reason)
-[ -n "$username" ] && urlencode URL_USER "$username"
-[ -n "$password" ] && urlencode URL_PASS "$password"
-
-# verify ip_source 'script' if script is configured and executable
-if [ "$ip_source" = "script" ]; then
-	set -- $ip_script	#handling script with parameters, we need a trick
-	[ -z "$1" ] && write_log 14 "No script defined to detect local IP!"
-	[ -x "$1" ] || write_log 14 "Script to detect local IP not executable!"
-fi
-
-# compute update interval in seconds
-get_seconds CHECK_SECONDS ${check_interval:-10} ${check_unit:-"minutes"} # default 10 min
-get_seconds FORCE_SECONDS ${force_interval:-72} ${force_unit:-"hours"}	 # default 3 days
-get_seconds RETRY_SECONDS ${retry_interval:-60} ${retry_unit:-"seconds"} # default 60 sec
-[ $CHECK_SECONDS -lt 300 ] && CHECK_SECONDS=300		# minimum 5 minutes
-[ $FORCE_SECONDS -gt 0 -a $FORCE_SECONDS -lt $CHECK_SECONDS ] && FORCE_SECONDS=$CHECK_SECONDS	# FORCE_SECONDS >= CHECK_SECONDS or 0
-write_log 7 "check interval: $CHECK_SECONDS seconds"
-write_log 7 "force interval: $FORCE_SECONDS seconds"
-write_log 7 "retry interval: $RETRY_SECONDS seconds"
-write_log 7 "retry counter : $retry_count times"
-
-# kill old process if it exists & set new pid file
-stop_section_processes "$SECTION_ID"
-[ $? -gt 0 ] && write_log 7 "'SIGTERM' was send to old process" || write_log 7 "No old process"
-echo $$ > $PIDFILE
-
-# determine when the last update was
-# the following lines should prevent multiple updates if hotplug fires multiple startups
-# as described in Ticket #7820, but did not function if never an update take place
-# i.e. after a reboot (/var is linked to /tmp)
-# using uptime as reference because date might not be updated via NTP client
-get_uptime CURR_TIME
-[ -e "$UPDFILE" ] && {
-	LAST_TIME=$(cat $UPDFILE)
-	# check also LAST > CURR because link of /var/run to /tmp might be removed
-	# i.e. boxes with larger filesystems
-	[ -z "$LAST_TIME" ] && LAST_TIME=0
-	[ $LAST_TIME -gt $CURR_TIME ] && LAST_TIME=0
-}
-if [ $LAST_TIME -eq 0 ]; then
-	write_log 7 "last update: never"
-else
-	EPOCH_TIME=$(( $(date +%s) - CURR_TIME + LAST_TIME ))
-	EPOCH_TIME="date -d @$EPOCH_TIME +'$DATE_FORMAT'"
-	write_log 7 "last update: $(eval $EPOCH_TIME)"
-fi
-
-# verify DNS server
-[ -n "$dns_server" ] && verify_dns "$dns_server"
-
-# verify Proxy server and set environment
-[ -n "$proxy" ] && {
-	verify_proxy "$proxy" && {
-		# everything ok set proxy
-		export HTTP_PROXY="http://$proxy"
-		export HTTPS_PROXY="http://$proxy"
-		export http_proxy="http://$proxy"
-		export https_proxy="http://$proxy"
-	}
-}
-
-# let's check if there is already an IP registered on the web
-get_registered_ip REGISTERED_IP "NO_RETRY"
-ERR_LAST=$?
-#     No error    or     No IP set	 otherwise retry
-[ $ERR_LAST -eq 0 -o $ERR_LAST -eq 127 ] || get_registered_ip REGISTERED_IP
-
-# loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
-write_log 6 "Starting main loop at $(eval $DATE_PROG)"
-while : ; do
-
-	get_local_ip LOCAL_IP		# read local IP
-
-	# prepare update
-	# never updated or forced immediate then NEXT_TIME = 0
-	[ $FORCE_SECONDS -eq 0 -o $LAST_TIME -eq 0 ] \
-		&& NEXT_TIME=0 \
-		|| NEXT_TIME=$(( $LAST_TIME + $FORCE_SECONDS ))
-
-	get_uptime CURR_TIME		# get current uptime
-
-	# send update when current time > next time or local ip different from registered ip
-	if [ $CURR_TIME -ge $NEXT_TIME -o "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-		if [ $VERBOSE_MODE -gt 2 ]; then
-			write_log 7 "Verbose Mode: $VERBOSE_MODE - NO UPDATE send"
-		elif [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-			write_log 7 "Update needed - L: '$LOCAL_IP' <> R: '$REGISTERED_IP'"
-		else
-			write_log 7 "Forced Update - L: '$LOCAL_IP' == R: '$REGISTERED_IP'"
-		fi
-
-		ERR_LAST=0
-		[ $VERBOSE_MODE -lt 3 ] && {
-			# only send if VERBOSE_MODE < 3
-			send_update "$LOCAL_IP"
-			ERR_LAST=$?	# save return value
-		}
-
-		# error sending local IP to provider
-		# we have no communication error (handled inside send_update/do_transfer)
-		# but update was not recognized
-		# do NOT retry after RETRY_SECONDS, do retry after CHECK_SECONDS
-		# to early retrys will block most DDNS provider
-		# providers answer is checked inside send_update() function
-		if [ $ERR_LAST -eq 0 ]; then
-			get_uptime LAST_TIME		# we send update, so
-			echo $LAST_TIME > $UPDFILE	# save LASTTIME to file
-			[ "$LOCAL_IP" != "$REGISTERED_IP" ] \
-				&& write_log 6 "Update successful - IP '$LOCAL_IP' send" \
-				|| write_log 6 "Forced update successful - IP: '$LOCAL_IP' send"
-		else
-			write_log 3 "Can not update IP at DDNS Provider"
-		fi
-	fi
-
-	# now we wait for check interval before testing if update was recognized
-	# only sleep if VERBOSE_MODE <= 2 because otherwise nothing was send
-	[ $VERBOSE_MODE -le 2 ] && {
-		write_log 7 "Waiting $CHECK_SECONDS seconds (Check Interval)"
-		sleep $CHECK_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	} || write_log 7 "Verbose Mode: $VERBOSE_MODE - NO Check Interval waiting"
-
-	REGISTERED_IP=""		# clear variable
-	get_registered_ip REGISTERED_IP	# get registered/public IP
-
-	# IP's are still different
-	if [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-		if [ $VERBOSE_MODE -le 1 ]; then	# VERBOSE_MODE <=1 then retry
-			ERR_UPDATE=$(( $ERR_UPDATE + 1 ))
-			[ $retry_count -gt 0 -a $ERR_UPDATE -gt $retry_count ] && \
-				write_log 14 "Updating IP at DDNS provider failed after $retry_count retries"
-			write_log 4 "Updating IP at DDNS provider failed - starting retry $ERR_UPDATE/$retry_count"
-			continue # loop to beginning
-		else
-			write_log 4 "Updating IP at DDNS provider failed"
-			write_log 7 "Verbose Mode: $VERBOSE_MODE - NO retry"; exit 1
-		fi
-	else
-		# we checked successful the last update
-		ERR_UPDATE=0			# reset error counter
-	fi
-
-	# force_update=0 or VERBOSE_MODE > 1 - leave here
-	[ $VERBOSE_MODE -gt 1 ]  && write_log 7 "Verbose Mode: $VERBOSE_MODE - NO reloop"
-	[ $FORCE_SECONDS -eq 0 ] && write_log 6 "Configured to run once"
-	[ $VERBOSE_MODE -gt 1 -o $FORCE_SECONDS -eq 0 ] && exit 0
-
-	write_log 6 "Rerun IP check at $(eval $DATE_PROG)"
-done
-# we should never come here there must be a programming error
-write_log 12 "Error in 'dynamic_dns_updater.sh - program coding error"
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/services b/trunk/package/feeds/packages/ddns-scripts/files/services
deleted file mode 100644
index b3ac4056..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/services
+++ /dev/null
@@ -1,93 +0,0 @@
-# 44444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444
-#
-# This file contains the update urls for various dynamic dns services.
-# Column one contains the service name, column two contains the update url.
-# within the update url there are 4 variables you can use: [USERNAME],
-# [PASSWORD], [DOMAIN] and [IP].  These are substituted for the username,
-# password, and domain name specified in the /etc/config/ddns file when an
-# update is performed.  The IP is substituted for the current ip address of the
-# router.  These variables are case sensitive, while urls generally are not, so
-# if you need to enter the same text in the url (which seems very unlikely) put
-# that text in lowercase, while the variables should remain in uppercase
-#
-# There are TONS of dynamic dns services out there. There's a huge list of them at:
-# http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/
-# If anyone has time they could update this file to be compatible with a bunch of them
-#
-# !!! Since ddns-scripts Version 2.x the update of IPv6 addresses is also supported
-# !!! This file is used for update of IPv4 adresses only. For IPv6 use services_ipv6
-#
-# !!! Since ddns-scripts Version 2.x the update via provider specific update scripts is supported.
-# !!! This scripts must be located at /usr/lib/ddns directory if defined inside this file.
-# !!! Use only the script name (without path). Sample:
-# !!! "example.com"	"update_sample.sh"
-#
-# 44444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444
-
-"dyndns.org"		"http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-"changeip.com"		"http://[USERNAME]:[PASSWORD]@nic.changeip.com/nic/update?u=[USERNAME]&p=[PASSWORD]&cmd=update&hostname=[DOMAIN]&ip=[IP]"
-"zoneedit.com"		"http://[USERNAME]:[PASSWORD]@dynamic.zoneedit.com/auth/dynamic.html?host=[DOMAIN]&dnsto=[IP]"
-"free.editdns.net"	"http://dyndns-free.editdns.net/api/dynLinux.php?p=[PASSWORD]&r=[DOMAIN]"
-
-# freedns.afraid.org is weird, you just need an update code, for which we use the password variable
-"freedns.afraid.org"	"http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
-
-# DNS Max and resellers' update urls
-"dnsmax.com"	"http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=1&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
-"thatip.com"	"http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=2&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
-
-# Hurricane Electric Dynamic DNS
-"he.net"	"http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# DNSdynamic.org
-"dnsdynamic.org"	"http://[USERNAME]:[PASSWORD]@www.dnsdynamic.org/api/?hostname=[DOMAIN]&myip=[IP]"
-
-# dnsExit.com free dynamic DNS update url
-"dnsexit.com"	"http://www.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]"
-
-# OVH
-"ovh.com" "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
-
-# dns-o-matic is a free service by opendns.com for updating multiple hosts and
-# dynamic dns services in one api call. To update all your configured services
-# at once, use "all.dnsomatic.com as the hostname.
-"dnsomatic.com" "http://[USERNAME]:[PASSWORD]@updates.dnsomatic.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# 3322.org
-"3322.org"  "http://[USERNAME]:[PASSWORD]@members.3322.org/dyndns/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
-
-# namecheap.com
-"namecheap.com" "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]"
-
-# easydns.com dynamic DNS
-"easydns.com"	"http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/tomato.php?hostname=[DOMAIN]&myip=[IP]"
-
-# Winco DDNS
-"ddns.com.br"	"http://[DOMAIN]:[PASSWORD]@members.ddns.com.br/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# Mythic Beasts (https://www.mythic-beasts.com) Dynamic DNS
-"mythic-beasts.com"	"http://dnsapi4.mythic-beasts.com/?domain=[USERNAME]&password=[PASSWORD]&command=REPLACE%20[DOMAIN]%2060%20A%20DYNAMIC_IP"
-
-# Securepoint Dynamic-DNS-Service	(http://www.spdns.de)
-"spdns.de"	"http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# duiadns.net - free dynamic DNS
-"duiadns.net"   "http://ipv4.duia.ro/dynamic.duia?host=[DOMAIN]&password=[PASSWORD]&ip4=[IP]"
-
-# Two-DNS - Simply. Connected. Everywhere.
-"twodns.de" "http://[USERNAME]:[PASSWORD]@update.twodns.de/update?hostname=[DOMAIN]&ip=[IP]"
-
-# MyDNS.JP
-"mydns.jp"	"http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
-
-# LoopiaDNS
-"loopia.se" "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]"
-
-# SelfHost.de
-"selfhost.de"	"http://carol.selfhost.de/update?username=[USERNAME]&password=[PASSWORD]&myip=[IP]&hostname=1"
-
-# no-ip.pl nothing to do with no-ip.com (domain registered to www.domeny.tv) (IP autodetected by provider)
-"no-ip.pl"	"http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
-
-# domains.google.com	non free service - require HTTPS communication
-"domains.google.com"	"https://[USERNAME]:[PASSWORD]@domains.google.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/services_ipv6 b/trunk/package/feeds/packages/ddns-scripts/files/services_ipv6
deleted file mode 100644
index a0781a24..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/services_ipv6
+++ /dev/null
@@ -1,43 +0,0 @@
-# 66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666
-#
-# This file contains the update urls for various dynamic dns services.
-# Column one contains the service name, column two contains the update url.
-# within the update url there are 4 variables you can use: [USERNAME],
-# [PASSWORD], [DOMAIN] and [IP].  These are substituted for the username,
-# password, and domain name specified in the /etc/config/ddns file when an
-# update is performed.  The IP is substituted for the current ip address of the
-# router.  These variables are case sensitive, while urls generally are not, so
-# if you need to enter the same text in the url (which seems very unlikely) put
-# that text in lowercase, while the variables should remain in uppercase
-#
-# There are TONS of dynamic dns services out there. There's a huge list of them at:
-# http://www.dmoz.org/Computers/Software/Internet/Servers/Address_Management/Dynamic_DNS_Services/
-# If anyone has time they could update this file to be compatible with a bunch of them
-#
-# !!! Since ddns-scripts Version 2.x the update of IPv6 addresses is also supported
-# !!! This file is used for update of IPv6 adresses only. For IPv4 use services
-#
-# !!! Since ddns-scripts Version 2.x the update via provider specific update scripts is supported.
-# !!! This scripts must be located at /usr/lib/ddns directory if defined inside this file.
-# !!! Use only the script name (without path). Sample:
-# !!! "example.com"	"update_sample.sh"
-#
-# 66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666
-
-# IPv6 @ Securepoint Dynamic-DNS-Service
-"spdns.de"	"http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# IPv6 @ Hurricane Electric Dynamic DNS
-"he.net"	"http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-# IPv6 @ MyDNS.JP
-"mydns.jp"	"http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
-
-# IPv6 @ no-ip.pl nothing to do with no-ip.com (domain registered to www.domeny.tv) (IP autodetected by provider)
-"no-ip.pl"	"http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
-
-# IPv6 @ freedns.afraid.org
-"freedns.afraid.org"	"http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
-
-# IPv6 @ LoopiaDNS
-"loopia.se" "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]"
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/tld_names.dat b/trunk/package/feeds/packages/ddns-scripts/files/tld_names.dat
deleted file mode 100644
index 474b780b..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/tld_names.dat
+++ /dev/null
@@ -1,10460 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// ===BEGIN ICANN DOMAINS===
-
-// ac : http://en.wikipedia.org/wiki/.ac
-ac
-com.ac
-edu.ac
-gov.ac
-net.ac
-mil.ac
-org.ac
-
-// ad : http://en.wikipedia.org/wiki/.ad
-ad
-nom.ad
-
-// ae : http://en.wikipedia.org/wiki/.ae
-// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php
-ae
-co.ae
-net.ae
-org.ae
-sch.ae
-ac.ae
-gov.ae
-mil.ae
-
-// aero : see http://www.information.aero/index.php?id=66
-aero
-accident-investigation.aero
-accident-prevention.aero
-aerobatic.aero
-aeroclub.aero
-aerodrome.aero
-agents.aero
-aircraft.aero
-airline.aero
-airport.aero
-air-surveillance.aero
-airtraffic.aero
-air-traffic-control.aero
-ambulance.aero
-amusement.aero
-association.aero
-author.aero
-ballooning.aero
-broker.aero
-caa.aero
-cargo.aero
-catering.aero
-certification.aero
-championship.aero
-charter.aero
-civilaviation.aero
-club.aero
-conference.aero
-consultant.aero
-consulting.aero
-control.aero
-council.aero
-crew.aero
-design.aero
-dgca.aero
-educator.aero
-emergency.aero
-engine.aero
-engineer.aero
-entertainment.aero
-equipment.aero
-exchange.aero
-express.aero
-federation.aero
-flight.aero
-freight.aero
-fuel.aero
-gliding.aero
-government.aero
-groundhandling.aero
-group.aero
-hanggliding.aero
-homebuilt.aero
-insurance.aero
-journal.aero
-journalist.aero
-leasing.aero
-logistics.aero
-magazine.aero
-maintenance.aero
-marketplace.aero
-media.aero
-microlight.aero
-modelling.aero
-navigation.aero
-parachuting.aero
-paragliding.aero
-passenger-association.aero
-pilot.aero
-press.aero
-production.aero
-recreation.aero
-repbody.aero
-res.aero
-research.aero
-rotorcraft.aero
-safety.aero
-scientist.aero
-services.aero
-show.aero
-skydiving.aero
-software.aero
-student.aero
-taxi.aero
-trader.aero
-trading.aero
-trainer.aero
-union.aero
-workinggroup.aero
-works.aero
-
-// af : http://www.nic.af/help.jsp
-af
-gov.af
-com.af
-org.af
-net.af
-edu.af
-
-// ag : http://www.nic.ag/prices.htm
-ag
-com.ag
-org.ag
-net.ag
-co.ag
-nom.ag
-
-// ai : http://nic.com.ai/
-ai
-off.ai
-com.ai
-net.ai
-org.ai
-
-// al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
-al
-com.al
-edu.al
-gov.al
-mil.al
-net.al
-org.al
-
-// am : http://en.wikipedia.org/wiki/.am
-am
-
-// an : http://www.una.an/an_domreg/default.asp
-an
-com.an
-net.an
-org.an
-edu.an
-
-// ao : http://en.wikipedia.org/wiki/.ao
-// http://www.dns.ao/REGISTR.DOC
-ao
-ed.ao
-gv.ao
-og.ao
-co.ao
-pb.ao
-it.ao
-
-// aq : http://en.wikipedia.org/wiki/.aq
-aq
-
-// ar : https://nic.ar/normativa-vigente.xhtml
-ar
-com.ar
-edu.ar
-gob.ar
-gov.ar
-int.ar
-mil.ar
-net.ar
-org.ar
-tur.ar
-
-// arpa : http://en.wikipedia.org/wiki/.arpa
-// Confirmed by registry <iana-questions@icann.org> 2008-06-18
-arpa
-e164.arpa
-in-addr.arpa
-ip6.arpa
-iris.arpa
-uri.arpa
-urn.arpa
-
-// as : http://en.wikipedia.org/wiki/.as
-as
-gov.as
-
-// asia : http://en.wikipedia.org/wiki/.asia
-asia
-
-// at : http://en.wikipedia.org/wiki/.at
-// Confirmed by registry <it@nic.at> 2008-06-17
-at
-ac.at
-co.at
-gv.at
-or.at
-
-// au : http://en.wikipedia.org/wiki/.au
-// http://www.auda.org.au/
-au
-// 2LDs
-com.au
-net.au
-org.au
-edu.au
-gov.au
-asn.au
-id.au
-// Historic 2LDs (closed to new registration, but sites still exist)
-info.au
-conf.au
-oz.au
-// CGDNs - http://www.cgdn.org.au/
-act.au
-nsw.au
-nt.au
-qld.au
-sa.au
-tas.au
-vic.au
-wa.au
-// 3LDs
-act.edu.au
-nsw.edu.au
-nt.edu.au
-qld.edu.au
-sa.edu.au
-tas.edu.au
-vic.edu.au
-wa.edu.au
-// act.gov.au Bug 984824 - Removed at request of Greg Tankard
-// nsw.gov.au Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
-// nt.gov.au Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
-qld.gov.au
-sa.gov.au
-tas.gov.au
-vic.gov.au
-wa.gov.au
-
-// aw : http://en.wikipedia.org/wiki/.aw
-aw
-com.aw
-
-// ax : http://en.wikipedia.org/wiki/.ax
-ax
-
-// az : http://en.wikipedia.org/wiki/.az
-az
-com.az
-net.az
-int.az
-gov.az
-org.az
-edu.az
-info.az
-pp.az
-mil.az
-name.az
-pro.az
-biz.az
-
-// ba : http://en.wikipedia.org/wiki/.ba
-ba
-org.ba
-net.ba
-edu.ba
-gov.ba
-mil.ba
-unsa.ba
-unbi.ba
-co.ba
-com.ba
-rs.ba
-
-// bb : http://en.wikipedia.org/wiki/.bb
-bb
-biz.bb
-co.bb
-com.bb
-edu.bb
-gov.bb
-info.bb
-net.bb
-org.bb
-store.bb
-tv.bb
-
-// bd : http://en.wikipedia.org/wiki/.bd
-*.bd
-
-// be : http://en.wikipedia.org/wiki/.be
-// Confirmed by registry <tech@dns.be> 2008-06-08
-be
-ac.be
-
-// bf : http://en.wikipedia.org/wiki/.bf
-bf
-gov.bf
-
-// bg : http://en.wikipedia.org/wiki/.bg
-// https://www.register.bg/user/static/rules/en/index.html
-bg
-a.bg
-b.bg
-c.bg
-d.bg
-e.bg
-f.bg
-g.bg
-h.bg
-i.bg
-j.bg
-k.bg
-l.bg
-m.bg
-n.bg
-o.bg
-p.bg
-q.bg
-r.bg
-s.bg
-t.bg
-u.bg
-v.bg
-w.bg
-x.bg
-y.bg
-z.bg
-0.bg
-1.bg
-2.bg
-3.bg
-4.bg
-5.bg
-6.bg
-7.bg
-8.bg
-9.bg
-
-// bh : http://en.wikipedia.org/wiki/.bh
-bh
-com.bh
-edu.bh
-net.bh
-org.bh
-gov.bh
-
-// bi : http://en.wikipedia.org/wiki/.bi
-// http://whois.nic.bi/
-bi
-co.bi
-com.bi
-edu.bi
-or.bi
-org.bi
-
-// biz : http://en.wikipedia.org/wiki/.biz
-biz
-
-// bj : http://en.wikipedia.org/wiki/.bj
-bj
-asso.bj
-barreau.bj
-gouv.bj
-
-// bm : http://www.bermudanic.bm/dnr-text.txt
-bm
-com.bm
-edu.bm
-gov.bm
-net.bm
-org.bm
-
-// bn : http://en.wikipedia.org/wiki/.bn
-*.bn
-
-// bo : http://www.nic.bo/
-bo
-com.bo
-edu.bo
-gov.bo
-gob.bo
-int.bo
-org.bo
-net.bo
-mil.bo
-tv.bo
-
-// br : http://registro.br/dominio/categoria.html
-// Submitted by registry <fneves@registro.br> 2014-08-11
-br
-adm.br
-adv.br
-agr.br
-am.br
-arq.br
-art.br
-ato.br
-b.br
-bio.br
-blog.br
-bmd.br
-cim.br
-cng.br
-cnt.br
-com.br
-coop.br
-ecn.br
-eco.br
-edu.br
-emp.br
-eng.br
-esp.br
-etc.br
-eti.br
-far.br
-flog.br
-fm.br
-fnd.br
-fot.br
-fst.br
-g12.br
-ggf.br
-gov.br
-imb.br
-ind.br
-inf.br
-jor.br
-jus.br
-leg.br
-lel.br
-mat.br
-med.br
-mil.br
-mp.br
-mus.br
-net.br
-*.nom.br
-not.br
-ntr.br
-odo.br
-org.br
-ppg.br
-pro.br
-psc.br
-psi.br
-qsl.br
-radio.br
-rec.br
-slg.br
-srv.br
-taxi.br
-teo.br
-tmp.br
-trd.br
-tur.br
-tv.br
-vet.br
-vlog.br
-wiki.br
-zlg.br
-
-// bs : http://www.nic.bs/rules.html
-bs
-com.bs
-net.bs
-org.bs
-edu.bs
-gov.bs
-
-// bt : http://en.wikipedia.org/wiki/.bt
-bt
-com.bt
-edu.bt
-gov.bt
-net.bt
-org.bt
-
-// bv : No registrations at this time.
-// Submitted by registry <jarle@uninett.no> 2006-06-16
-bv
-
-// bw : http://en.wikipedia.org/wiki/.bw
-// http://www.gobin.info/domainname/bw.doc
-// list of other 2nd level tlds ?
-bw
-co.bw
-org.bw
-
-// by : http://en.wikipedia.org/wiki/.by
-// http://tld.by/rules_2006_en.html
-// list of other 2nd level tlds ?
-by
-gov.by
-mil.by
-// Official information does not indicate that com.by is a reserved
-// second-level domain, but it's being used as one (see www.google.com.by and
-// www.yahoo.com.by, for example), so we list it here for safety's sake.
-com.by
-
-// http://hoster.by/
-of.by
-
-// bz : http://en.wikipedia.org/wiki/.bz
-// http://www.belizenic.bz/
-bz
-com.bz
-net.bz
-org.bz
-edu.bz
-gov.bz
-
-// ca : http://en.wikipedia.org/wiki/.ca
-ca
-// ca geographical names
-ab.ca
-bc.ca
-mb.ca
-nb.ca
-nf.ca
-nl.ca
-ns.ca
-nt.ca
-nu.ca
-on.ca
-pe.ca
-qc.ca
-sk.ca
-yk.ca
-// gc.ca: http://en.wikipedia.org/wiki/.gc.ca
-// see also: http://registry.gc.ca/en/SubdomainFAQ
-gc.ca
-
-// cat : http://en.wikipedia.org/wiki/.cat
-cat
-
-// cc : http://en.wikipedia.org/wiki/.cc
-cc
-
-// cd : http://en.wikipedia.org/wiki/.cd
-// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
-cd
-gov.cd
-
-// cf : http://en.wikipedia.org/wiki/.cf
-cf
-
-// cg : http://en.wikipedia.org/wiki/.cg
-cg
-
-// ch : http://en.wikipedia.org/wiki/.ch
-ch
-
-// ci : http://en.wikipedia.org/wiki/.ci
-// http://www.nic.ci/index.php?page=charte
-ci
-org.ci
-or.ci
-com.ci
-co.ci
-edu.ci
-ed.ci
-ac.ci
-net.ci
-go.ci
-asso.ci
-aéroport.ci
-xn--aroport-bya.ci
-int.ci
-presse.ci
-md.ci
-gouv.ci
-
-// ck : http://en.wikipedia.org/wiki/.ck
-*.ck
-!www.ck
-
-// cl : http://en.wikipedia.org/wiki/.cl
-cl
-gov.cl
-gob.cl
-co.cl
-mil.cl
-
-// cm : http://en.wikipedia.org/wiki/.cm plus bug 981927
-cm
-co.cm
-com.cm
-gov.cm
-net.cm
-
-// cn : http://en.wikipedia.org/wiki/.cn
-// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
-cn
-ac.cn
-com.cn
-edu.cn
-gov.cn
-net.cn
-org.cn
-mil.cn
-公司.cn
-xn--55qx5d.cn
-网络.cn
-xn--io0a7i.cn
-網絡.cn
-xn--od0alg.cn
-// cn geographic names
-ah.cn
-bj.cn
-cq.cn
-fj.cn
-gd.cn
-gs.cn
-gz.cn
-gx.cn
-ha.cn
-hb.cn
-he.cn
-hi.cn
-hl.cn
-hn.cn
-jl.cn
-js.cn
-jx.cn
-ln.cn
-nm.cn
-nx.cn
-qh.cn
-sc.cn
-sd.cn
-sh.cn
-sn.cn
-sx.cn
-tj.cn
-xj.cn
-xz.cn
-yn.cn
-zj.cn
-hk.cn
-mo.cn
-tw.cn
-
-// co : http://en.wikipedia.org/wiki/.co
-// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11
-co
-arts.co
-com.co
-edu.co
-firm.co
-gov.co
-info.co
-int.co
-mil.co
-net.co
-nom.co
-org.co
-rec.co
-web.co
-
-// com : http://en.wikipedia.org/wiki/.com
-com
-
-// coop : http://en.wikipedia.org/wiki/.coop
-coop
-
-// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
-cr
-ac.cr
-co.cr
-ed.cr
-fi.cr
-go.cr
-or.cr
-sa.cr
-
-// cu : http://en.wikipedia.org/wiki/.cu
-cu
-com.cu
-edu.cu
-org.cu
-net.cu
-gov.cu
-inf.cu
-
-// cv : http://en.wikipedia.org/wiki/.cv
-cv
-
-// cw : http://www.una.cw/cw_registry/
-// Confirmed by registry <registry@una.net> 2013-03-26
-cw
-com.cw
-edu.cw
-net.cw
-org.cw
-
-// cx : http://en.wikipedia.org/wiki/.cx
-// list of other 2nd level tlds ?
-cx
-gov.cx
-
-// cy : http://en.wikipedia.org/wiki/.cy
-*.cy
-
-// cz : http://en.wikipedia.org/wiki/.cz
-cz
-
-// de : http://en.wikipedia.org/wiki/.de
-// Confirmed by registry <ops@denic.de> (with technical
-// reservations) 2008-07-01
-de
-
-// dj : http://en.wikipedia.org/wiki/.dj
-dj
-
-// dk : http://en.wikipedia.org/wiki/.dk
-// Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
-dk
-
-// dm : http://en.wikipedia.org/wiki/.dm
-dm
-com.dm
-net.dm
-org.dm
-edu.dm
-gov.dm
-
-// do : http://en.wikipedia.org/wiki/.do
-do
-art.do
-com.do
-edu.do
-gob.do
-gov.do
-mil.do
-net.do
-org.do
-sld.do
-web.do
-
-// dz : http://en.wikipedia.org/wiki/.dz
-dz
-com.dz
-org.dz
-net.dz
-gov.dz
-edu.dz
-asso.dz
-pol.dz
-art.dz
-
-// ec : http://www.nic.ec/reg/paso1.asp
-// Submitted by registry <vabboud@nic.ec> 2008-07-04
-ec
-com.ec
-info.ec
-net.ec
-fin.ec
-k12.ec
-med.ec
-pro.ec
-org.ec
-edu.ec
-gov.ec
-gob.ec
-mil.ec
-
-// edu : http://en.wikipedia.org/wiki/.edu
-edu
-
-// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
-ee
-edu.ee
-gov.ee
-riik.ee
-lib.ee
-med.ee
-com.ee
-pri.ee
-aip.ee
-org.ee
-fie.ee
-
-// eg : http://en.wikipedia.org/wiki/.eg
-eg
-com.eg
-edu.eg
-eun.eg
-gov.eg
-mil.eg
-name.eg
-net.eg
-org.eg
-sci.eg
-
-// er : http://en.wikipedia.org/wiki/.er
-*.er
-
-// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
-es
-com.es
-nom.es
-org.es
-gob.es
-edu.es
-
-// et : http://en.wikipedia.org/wiki/.et
-et
-com.et
-gov.et
-org.et
-edu.et
-biz.et
-name.et
-info.et
-
-// eu : http://en.wikipedia.org/wiki/.eu
-eu
-
-// fi : http://en.wikipedia.org/wiki/.fi
-fi
-// aland.fi : http://en.wikipedia.org/wiki/.ax
-// This domain is being phased out in favor of .ax. As there are still many
-// domains under aland.fi, we still keep it on the list until aland.fi is
-// completely removed.
-// TODO: Check for updates (expected to be phased out around Q1/2009)
-aland.fi
-
-// fj : http://en.wikipedia.org/wiki/.fj
-*.fj
-
-// fk : http://en.wikipedia.org/wiki/.fk
-*.fk
-
-// fm : http://en.wikipedia.org/wiki/.fm
-fm
-
-// fo : http://en.wikipedia.org/wiki/.fo
-fo
-
-// fr : http://www.afnic.fr/
-// domaines descriptifs : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-descriptifs
-fr
-com.fr
-asso.fr
-nom.fr
-prd.fr
-presse.fr
-tm.fr
-// domaines sectoriels : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-sectoriels
-aeroport.fr
-assedic.fr
-avocat.fr
-avoues.fr
-cci.fr
-chambagri.fr
-chirurgiens-dentistes.fr
-experts-comptables.fr
-geometre-expert.fr
-gouv.fr
-greta.fr
-huissier-justice.fr
-medecin.fr
-notaires.fr
-pharmacien.fr
-port.fr
-veterinaire.fr
-
-// ga : http://en.wikipedia.org/wiki/.ga
-ga
-
-// gb : This registry is effectively dormant
-// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12
-gb
-
-// gd : http://en.wikipedia.org/wiki/.gd
-gd
-
-// ge : http://www.nic.net.ge/policy_en.pdf
-ge
-com.ge
-edu.ge
-gov.ge
-org.ge
-mil.ge
-net.ge
-pvt.ge
-
-// gf : http://en.wikipedia.org/wiki/.gf
-gf
-
-// gg : http://www.channelisles.net/register-domains/
-// Confirmed by registry <nigel@channelisles.net> 2013-11-28
-gg
-co.gg
-net.gg
-org.gg
-
-// gh : http://en.wikipedia.org/wiki/.gh
-// see also: http://www.nic.gh/reg_now.php
-// Although domains directly at second level are not possible at the moment,
-// they have been possible for some time and may come back.
-gh
-com.gh
-edu.gh
-gov.gh
-org.gh
-mil.gh
-
-// gi : http://www.nic.gi/rules.html
-gi
-com.gi
-ltd.gi
-gov.gi
-mod.gi
-edu.gi
-org.gi
-
-// gl : http://en.wikipedia.org/wiki/.gl
-// http://nic.gl
-gl
-
-// gm : http://www.nic.gm/htmlpages%5Cgm-policy.htm
-gm
-
-// gn : http://psg.com/dns/gn/gn.txt
-// Submitted by registry <randy@psg.com> 2008-06-17
-gn
-ac.gn
-com.gn
-edu.gn
-gov.gn
-org.gn
-net.gn
-
-// gov : http://en.wikipedia.org/wiki/.gov
-gov
-
-// gp : http://www.nic.gp/index.php?lang=en
-gp
-com.gp
-net.gp
-mobi.gp
-edu.gp
-org.gp
-asso.gp
-
-// gq : http://en.wikipedia.org/wiki/.gq
-gq
-
-// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
-// Submitted by registry <segred@ics.forth.gr> 2008-06-09
-gr
-com.gr
-edu.gr
-net.gr
-org.gr
-gov.gr
-
-// gs : http://en.wikipedia.org/wiki/.gs
-gs
-
-// gt : http://www.gt/politicas_de_registro.html
-gt
-com.gt
-edu.gt
-gob.gt
-ind.gt
-mil.gt
-net.gt
-org.gt
-
-// gu : http://gadao.gov.gu/registration.txt
-*.gu
-
-// gw : http://en.wikipedia.org/wiki/.gw
-gw
-
-// gy : http://en.wikipedia.org/wiki/.gy
-// http://registry.gy/
-gy
-co.gy
-com.gy
-net.gy
-
-// hk : https://www.hkdnr.hk
-// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
-hk
-com.hk
-edu.hk
-gov.hk
-idv.hk
-net.hk
-org.hk
-公司.hk
-xn--55qx5d.hk
-教育.hk
-xn--wcvs22d.hk
-敎育.hk
-xn--lcvr32d.hk
-政府.hk
-xn--mxtq1m.hk
-個人.hk
-xn--gmqw5a.hk
-个人.hk
-xn--ciqpn.hk
-箇人.hk
-xn--gmq050i.hk
-網络.hk
-xn--zf0avx.hk
-网络.hk
-xn--io0a7i.hk
-组織.hk
-xn--mk0axi.hk
-網絡.hk
-xn--od0alg.hk
-网絡.hk
-xn--od0aq3b.hk
-组织.hk
-xn--tn0ag.hk
-組織.hk
-xn--uc0atv.hk
-組织.hk
-xn--uc0ay4a.hk
-
-// hm : http://en.wikipedia.org/wiki/.hm
-hm
-
-// hn : http://www.nic.hn/politicas/ps02,,05.html
-hn
-com.hn
-edu.hn
-org.hn
-net.hn
-mil.hn
-gob.hn
-
-// hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
-hr
-iz.hr
-from.hr
-name.hr
-com.hr
-
-// ht : http://www.nic.ht/info/charte.cfm
-ht
-com.ht
-shop.ht
-firm.ht
-info.ht
-adult.ht
-net.ht
-pro.ht
-org.ht
-med.ht
-art.ht
-coop.ht
-pol.ht
-asso.ht
-edu.ht
-rel.ht
-gouv.ht
-perso.ht
-
-// hu : http://www.domain.hu/domain/English/sld.html
-// Confirmed by registry <pasztor@iszt.hu> 2008-06-12
-hu
-co.hu
-info.hu
-org.hu
-priv.hu
-sport.hu
-tm.hu
-2000.hu
-agrar.hu
-bolt.hu
-casino.hu
-city.hu
-erotica.hu
-erotika.hu
-film.hu
-forum.hu
-games.hu
-hotel.hu
-ingatlan.hu
-jogasz.hu
-konyvelo.hu
-lakas.hu
-media.hu
-news.hu
-reklam.hu
-sex.hu
-shop.hu
-suli.hu
-szex.hu
-tozsde.hu
-utazas.hu
-video.hu
-
-// id : https://register.pandi.or.id/
-id
-ac.id
-biz.id
-co.id
-desa.id
-go.id
-mil.id
-my.id
-net.id
-or.id
-sch.id
-web.id
-
-// ie : http://en.wikipedia.org/wiki/.ie
-ie
-gov.ie
-
-// il : http://en.wikipedia.org/wiki/.il
-*.il
-
-// im : https://www.nic.im/
-// Submitted by registry <info@nic.im> 2013-11-15
-im
-ac.im
-co.im
-com.im
-ltd.co.im
-net.im
-org.im
-plc.co.im
-tt.im
-tv.im
-
-// in : http://en.wikipedia.org/wiki/.in
-// see also: https://registry.in/Policies
-// Please note, that nic.in is not an offical eTLD, but used by most
-// government institutions.
-in
-co.in
-firm.in
-net.in
-org.in
-gen.in
-ind.in
-nic.in
-ac.in
-edu.in
-res.in
-gov.in
-mil.in
-
-// info : http://en.wikipedia.org/wiki/.info
-info
-
-// int : http://en.wikipedia.org/wiki/.int
-// Confirmed by registry <iana-questions@icann.org> 2008-06-18
-int
-eu.int
-
-// io : http://www.nic.io/rules.html
-// list of other 2nd level tlds ?
-io
-com.io
-
-// iq : http://www.cmc.iq/english/iq/iqregister1.htm
-iq
-gov.iq
-edu.iq
-mil.iq
-com.iq
-org.iq
-net.iq
-
-// ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
-// Also see http://www.nic.ir/Internationalized_Domain_Names
-// Two <iran>.ir entries added at request of <tech-team@nic.ir>, 2010-04-16
-ir
-ac.ir
-co.ir
-gov.ir
-id.ir
-net.ir
-org.ir
-sch.ir
-// xn--mgba3a4f16a.ir (<iran>.ir, Persian YEH)
-ایران.ir
-xn--mgba3a4f16a.ir
-// xn--mgba3a4fra.ir (<iran>.ir, Arabic YEH)
-ايران.ir
-xn--mgba3a4fra.ir
-
-// is : http://www.isnic.is/domain/rules.php
-// Confirmed by registry <marius@isgate.is> 2008-12-06
-is
-net.is
-com.is
-edu.is
-gov.is
-org.is
-int.is
-
-// it : http://en.wikipedia.org/wiki/.it
-it
-gov.it
-edu.it
-// Reserved geo-names:
-// http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
-// There is also a list of reserved geo-names corresponding to Italian municipalities
-// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here.
-// Regions
-abr.it
-abruzzo.it
-aosta-valley.it
-aostavalley.it
-bas.it
-basilicata.it
-cal.it
-calabria.it
-cam.it
-campania.it
-emilia-romagna.it
-emiliaromagna.it
-emr.it
-friuli-v-giulia.it
-friuli-ve-giulia.it
-friuli-vegiulia.it
-friuli-venezia-giulia.it
-friuli-veneziagiulia.it
-friuli-vgiulia.it
-friuliv-giulia.it
-friulive-giulia.it
-friulivegiulia.it
-friulivenezia-giulia.it
-friuliveneziagiulia.it
-friulivgiulia.it
-fvg.it
-laz.it
-lazio.it
-lig.it
-liguria.it
-lom.it
-lombardia.it
-lombardy.it
-lucania.it
-mar.it
-marche.it
-mol.it
-molise.it
-piedmont.it
-piemonte.it
-pmn.it
-pug.it
-puglia.it
-sar.it
-sardegna.it
-sardinia.it
-sic.it
-sicilia.it
-sicily.it
-taa.it
-tos.it
-toscana.it
-trentino-a-adige.it
-trentino-aadige.it
-trentino-alto-adige.it
-trentino-altoadige.it
-trentino-s-tirol.it
-trentino-stirol.it
-trentino-sud-tirol.it
-trentino-sudtirol.it
-trentino-sued-tirol.it
-trentino-suedtirol.it
-trentinoa-adige.it
-trentinoaadige.it
-trentinoalto-adige.it
-trentinoaltoadige.it
-trentinos-tirol.it
-trentinostirol.it
-trentinosud-tirol.it
-trentinosudtirol.it
-trentinosued-tirol.it
-trentinosuedtirol.it
-tuscany.it
-umb.it
-umbria.it
-val-d-aosta.it
-val-daosta.it
-vald-aosta.it
-valdaosta.it
-valle-aosta.it
-valle-d-aosta.it
-valle-daosta.it
-valleaosta.it
-valled-aosta.it
-valledaosta.it
-vallee-aoste.it
-valleeaoste.it
-vao.it
-vda.it
-ven.it
-veneto.it
-// Provinces
-ag.it
-agrigento.it
-al.it
-alessandria.it
-alto-adige.it
-altoadige.it
-an.it
-ancona.it
-andria-barletta-trani.it
-andria-trani-barletta.it
-andriabarlettatrani.it
-andriatranibarletta.it
-ao.it
-aosta.it
-aoste.it
-ap.it
-aq.it
-aquila.it
-ar.it
-arezzo.it
-ascoli-piceno.it
-ascolipiceno.it
-asti.it
-at.it
-av.it
-avellino.it
-ba.it
-balsan.it
-bari.it
-barletta-trani-andria.it
-barlettatraniandria.it
-belluno.it
-benevento.it
-bergamo.it
-bg.it
-bi.it
-biella.it
-bl.it
-bn.it
-bo.it
-bologna.it
-bolzano.it
-bozen.it
-br.it
-brescia.it
-brindisi.it
-bs.it
-bt.it
-bz.it
-ca.it
-cagliari.it
-caltanissetta.it
-campidano-medio.it
-campidanomedio.it
-campobasso.it
-carbonia-iglesias.it
-carboniaiglesias.it
-carrara-massa.it
-carraramassa.it
-caserta.it
-catania.it
-catanzaro.it
-cb.it
-ce.it
-cesena-forli.it
-cesenaforli.it
-ch.it
-chieti.it
-ci.it
-cl.it
-cn.it
-co.it
-como.it
-cosenza.it
-cr.it
-cremona.it
-crotone.it
-cs.it
-ct.it
-cuneo.it
-cz.it
-dell-ogliastra.it
-dellogliastra.it
-en.it
-enna.it
-fc.it
-fe.it
-fermo.it
-ferrara.it
-fg.it
-fi.it
-firenze.it
-florence.it
-fm.it
-foggia.it
-forli-cesena.it
-forlicesena.it
-fr.it
-frosinone.it
-ge.it
-genoa.it
-genova.it
-go.it
-gorizia.it
-gr.it
-grosseto.it
-iglesias-carbonia.it
-iglesiascarbonia.it
-im.it
-imperia.it
-is.it
-isernia.it
-kr.it
-la-spezia.it
-laquila.it
-laspezia.it
-latina.it
-lc.it
-le.it
-lecce.it
-lecco.it
-li.it
-livorno.it
-lo.it
-lodi.it
-lt.it
-lu.it
-lucca.it
-macerata.it
-mantova.it
-massa-carrara.it
-massacarrara.it
-matera.it
-mb.it
-mc.it
-me.it
-medio-campidano.it
-mediocampidano.it
-messina.it
-mi.it
-milan.it
-milano.it
-mn.it
-mo.it
-modena.it
-monza-brianza.it
-monza-e-della-brianza.it
-monza.it
-monzabrianza.it
-monzaebrianza.it
-monzaedellabrianza.it
-ms.it
-mt.it
-na.it
-naples.it
-napoli.it
-no.it
-novara.it
-nu.it
-nuoro.it
-og.it
-ogliastra.it
-olbia-tempio.it
-olbiatempio.it
-or.it
-oristano.it
-ot.it
-pa.it
-padova.it
-padua.it
-palermo.it
-parma.it
-pavia.it
-pc.it
-pd.it
-pe.it
-perugia.it
-pesaro-urbino.it
-pesarourbino.it
-pescara.it
-pg.it
-pi.it
-piacenza.it
-pisa.it
-pistoia.it
-pn.it
-po.it
-pordenone.it
-potenza.it
-pr.it
-prato.it
-pt.it
-pu.it
-pv.it
-pz.it
-ra.it
-ragusa.it
-ravenna.it
-rc.it
-re.it
-reggio-calabria.it
-reggio-emilia.it
-reggiocalabria.it
-reggioemilia.it
-rg.it
-ri.it
-rieti.it
-rimini.it
-rm.it
-rn.it
-ro.it
-roma.it
-rome.it
-rovigo.it
-sa.it
-salerno.it
-sassari.it
-savona.it
-si.it
-siena.it
-siracusa.it
-so.it
-sondrio.it
-sp.it
-sr.it
-ss.it
-suedtirol.it
-sv.it
-ta.it
-taranto.it
-te.it
-tempio-olbia.it
-tempioolbia.it
-teramo.it
-terni.it
-tn.it
-to.it
-torino.it
-tp.it
-tr.it
-trani-andria-barletta.it
-trani-barletta-andria.it
-traniandriabarletta.it
-tranibarlettaandria.it
-trapani.it
-trentino.it
-trento.it
-treviso.it
-trieste.it
-ts.it
-turin.it
-tv.it
-ud.it
-udine.it
-urbino-pesaro.it
-urbinopesaro.it
-va.it
-varese.it
-vb.it
-vc.it
-ve.it
-venezia.it
-venice.it
-verbania.it
-vercelli.it
-verona.it
-vi.it
-vibo-valentia.it
-vibovalentia.it
-vicenza.it
-viterbo.it
-vr.it
-vs.it
-vt.it
-vv.it
-
-// je : http://www.channelisles.net/register-domains/
-// Confirmed by registry <nigel@channelisles.net> 2013-11-28
-je
-co.je
-net.je
-org.je
-
-// jm : http://www.com.jm/register.html
-*.jm
-
-// jo : http://www.dns.jo/Registration_policy.aspx
-jo
-com.jo
-org.jo
-net.jo
-edu.jo
-sch.jo
-gov.jo
-mil.jo
-name.jo
-
-// jobs : http://en.wikipedia.org/wiki/.jobs
-jobs
-
-// jp : http://en.wikipedia.org/wiki/.jp
-// http://jprs.co.jp/en/jpdomain.html
-// Submitted by registry <info@jprs.jp> 2014-10-30
-jp
-// jp organizational type names
-ac.jp
-ad.jp
-co.jp
-ed.jp
-go.jp
-gr.jp
-lg.jp
-ne.jp
-or.jp
-// jp prefecture type names
-aichi.jp
-akita.jp
-aomori.jp
-chiba.jp
-ehime.jp
-fukui.jp
-fukuoka.jp
-fukushima.jp
-gifu.jp
-gunma.jp
-hiroshima.jp
-hokkaido.jp
-hyogo.jp
-ibaraki.jp
-ishikawa.jp
-iwate.jp
-kagawa.jp
-kagoshima.jp
-kanagawa.jp
-kochi.jp
-kumamoto.jp
-kyoto.jp
-mie.jp
-miyagi.jp
-miyazaki.jp
-nagano.jp
-nagasaki.jp
-nara.jp
-niigata.jp
-oita.jp
-okayama.jp
-okinawa.jp
-osaka.jp
-saga.jp
-saitama.jp
-shiga.jp
-shimane.jp
-shizuoka.jp
-tochigi.jp
-tokushima.jp
-tokyo.jp
-tottori.jp
-toyama.jp
-wakayama.jp
-yamagata.jp
-yamaguchi.jp
-yamanashi.jp
-栃木.jp
-xn--4pvxs.jp
-愛知.jp
-xn--vgu402c.jp
-愛媛.jp
-xn--c3s14m.jp
-兵庫.jp
-xn--f6qx53a.jp
-熊本.jp
-xn--8pvr4u.jp
-茨城.jp
-xn--uist22h.jp
-北海道.jp
-xn--djrs72d6uy.jp
-千葉.jp
-xn--mkru45i.jp
-和歌山.jp
-xn--0trq7p7nn.jp
-長崎.jp
-xn--8ltr62k.jp
-長野.jp
-xn--2m4a15e.jp
-新潟.jp
-xn--efvn9s.jp
-青森.jp
-xn--32vp30h.jp
-静岡.jp
-xn--4it797k.jp
-東京.jp
-xn--1lqs71d.jp
-石川.jp
-xn--5rtp49c.jp
-埼玉.jp
-xn--5js045d.jp
-三重.jp
-xn--ehqz56n.jp
-京都.jp
-xn--1lqs03n.jp
-佐賀.jp
-xn--qqqt11m.jp
-大分.jp
-xn--kbrq7o.jp
-大阪.jp
-xn--pssu33l.jp
-奈良.jp
-xn--ntsq17g.jp
-宮城.jp
-xn--uisz3g.jp
-宮崎.jp
-xn--6btw5a.jp
-富山.jp
-xn--1ctwo.jp
-山口.jp
-xn--6orx2r.jp
-山形.jp
-xn--rht61e.jp
-山梨.jp
-xn--rht27z.jp
-岩手.jp
-xn--djty4k.jp
-岐阜.jp
-xn--nit225k.jp
-岡山.jp
-xn--rht3d.jp
-島根.jp
-xn--klty5x.jp
-広島.jp
-xn--kltx9a.jp
-徳島.jp
-xn--kltp7d.jp
-沖縄.jp
-xn--uuwu58a.jp
-滋賀.jp
-xn--zbx025d.jp
-神奈川.jp
-xn--ntso0iqx3a.jp
-福井.jp
-xn--elqq16h.jp
-福岡.jp
-xn--4it168d.jp
-福島.jp
-xn--klt787d.jp
-秋田.jp
-xn--rny31h.jp
-群馬.jp
-xn--7t0a264c.jp
-香川.jp
-xn--5rtq34k.jp
-高知.jp
-xn--k7yn95e.jp
-鳥取.jp
-xn--tor131o.jp
-鹿児島.jp
-xn--d5qv7z876c.jp
-// jp geographic type names
-// http://jprs.jp/doc/rule/saisoku-1.html
-*.kawasaki.jp
-*.kitakyushu.jp
-*.kobe.jp
-*.nagoya.jp
-*.sapporo.jp
-*.sendai.jp
-*.yokohama.jp
-!city.kawasaki.jp
-!city.kitakyushu.jp
-!city.kobe.jp
-!city.nagoya.jp
-!city.sapporo.jp
-!city.sendai.jp
-!city.yokohama.jp
-// 4th level registration
-aisai.aichi.jp
-ama.aichi.jp
-anjo.aichi.jp
-asuke.aichi.jp
-chiryu.aichi.jp
-chita.aichi.jp
-fuso.aichi.jp
-gamagori.aichi.jp
-handa.aichi.jp
-hazu.aichi.jp
-hekinan.aichi.jp
-higashiura.aichi.jp
-ichinomiya.aichi.jp
-inazawa.aichi.jp
-inuyama.aichi.jp
-isshiki.aichi.jp
-iwakura.aichi.jp
-kanie.aichi.jp
-kariya.aichi.jp
-kasugai.aichi.jp
-kira.aichi.jp
-kiyosu.aichi.jp
-komaki.aichi.jp
-konan.aichi.jp
-kota.aichi.jp
-mihama.aichi.jp
-miyoshi.aichi.jp
-nishio.aichi.jp
-nisshin.aichi.jp
-obu.aichi.jp
-oguchi.aichi.jp
-oharu.aichi.jp
-okazaki.aichi.jp
-owariasahi.aichi.jp
-seto.aichi.jp
-shikatsu.aichi.jp
-shinshiro.aichi.jp
-shitara.aichi.jp
-tahara.aichi.jp
-takahama.aichi.jp
-tobishima.aichi.jp
-toei.aichi.jp
-togo.aichi.jp
-tokai.aichi.jp
-tokoname.aichi.jp
-toyoake.aichi.jp
-toyohashi.aichi.jp
-toyokawa.aichi.jp
-toyone.aichi.jp
-toyota.aichi.jp
-tsushima.aichi.jp
-yatomi.aichi.jp
-akita.akita.jp
-daisen.akita.jp
-fujisato.akita.jp
-gojome.akita.jp
-hachirogata.akita.jp
-happou.akita.jp
-higashinaruse.akita.jp
-honjo.akita.jp
-honjyo.akita.jp
-ikawa.akita.jp
-kamikoani.akita.jp
-kamioka.akita.jp
-katagami.akita.jp
-kazuno.akita.jp
-kitaakita.akita.jp
-kosaka.akita.jp
-kyowa.akita.jp
-misato.akita.jp
-mitane.akita.jp
-moriyoshi.akita.jp
-nikaho.akita.jp
-noshiro.akita.jp
-odate.akita.jp
-oga.akita.jp
-ogata.akita.jp
-semboku.akita.jp
-yokote.akita.jp
-yurihonjo.akita.jp
-aomori.aomori.jp
-gonohe.aomori.jp
-hachinohe.aomori.jp
-hashikami.aomori.jp
-hiranai.aomori.jp
-hirosaki.aomori.jp
-itayanagi.aomori.jp
-kuroishi.aomori.jp
-misawa.aomori.jp
-mutsu.aomori.jp
-nakadomari.aomori.jp
-noheji.aomori.jp
-oirase.aomori.jp
-owani.aomori.jp
-rokunohe.aomori.jp
-sannohe.aomori.jp
-shichinohe.aomori.jp
-shingo.aomori.jp
-takko.aomori.jp
-towada.aomori.jp
-tsugaru.aomori.jp
-tsuruta.aomori.jp
-abiko.chiba.jp
-asahi.chiba.jp
-chonan.chiba.jp
-chosei.chiba.jp
-choshi.chiba.jp
-chuo.chiba.jp
-funabashi.chiba.jp
-futtsu.chiba.jp
-hanamigawa.chiba.jp
-ichihara.chiba.jp
-ichikawa.chiba.jp
-ichinomiya.chiba.jp
-inzai.chiba.jp
-isumi.chiba.jp
-kamagaya.chiba.jp
-kamogawa.chiba.jp
-kashiwa.chiba.jp
-katori.chiba.jp
-katsuura.chiba.jp
-kimitsu.chiba.jp
-kisarazu.chiba.jp
-kozaki.chiba.jp
-kujukuri.chiba.jp
-kyonan.chiba.jp
-matsudo.chiba.jp
-midori.chiba.jp
-mihama.chiba.jp
-minamiboso.chiba.jp
-mobara.chiba.jp
-mutsuzawa.chiba.jp
-nagara.chiba.jp
-nagareyama.chiba.jp
-narashino.chiba.jp
-narita.chiba.jp
-noda.chiba.jp
-oamishirasato.chiba.jp
-omigawa.chiba.jp
-onjuku.chiba.jp
-otaki.chiba.jp
-sakae.chiba.jp
-sakura.chiba.jp
-shimofusa.chiba.jp
-shirako.chiba.jp
-shiroi.chiba.jp
-shisui.chiba.jp
-sodegaura.chiba.jp
-sosa.chiba.jp
-tako.chiba.jp
-tateyama.chiba.jp
-togane.chiba.jp
-tohnosho.chiba.jp
-tomisato.chiba.jp
-urayasu.chiba.jp
-yachimata.chiba.jp
-yachiyo.chiba.jp
-yokaichiba.chiba.jp
-yokoshibahikari.chiba.jp
-yotsukaido.chiba.jp
-ainan.ehime.jp
-honai.ehime.jp
-ikata.ehime.jp
-imabari.ehime.jp
-iyo.ehime.jp
-kamijima.ehime.jp
-kihoku.ehime.jp
-kumakogen.ehime.jp
-masaki.ehime.jp
-matsuno.ehime.jp
-matsuyama.ehime.jp
-namikata.ehime.jp
-niihama.ehime.jp
-ozu.ehime.jp
-saijo.ehime.jp
-seiyo.ehime.jp
-shikokuchuo.ehime.jp
-tobe.ehime.jp
-toon.ehime.jp
-uchiko.ehime.jp
-uwajima.ehime.jp
-yawatahama.ehime.jp
-echizen.fukui.jp
-eiheiji.fukui.jp
-fukui.fukui.jp
-ikeda.fukui.jp
-katsuyama.fukui.jp
-mihama.fukui.jp
-minamiechizen.fukui.jp
-obama.fukui.jp
-ohi.fukui.jp
-ono.fukui.jp
-sabae.fukui.jp
-sakai.fukui.jp
-takahama.fukui.jp
-tsuruga.fukui.jp
-wakasa.fukui.jp
-ashiya.fukuoka.jp
-buzen.fukuoka.jp
-chikugo.fukuoka.jp
-chikuho.fukuoka.jp
-chikujo.fukuoka.jp
-chikushino.fukuoka.jp
-chikuzen.fukuoka.jp
-chuo.fukuoka.jp
-dazaifu.fukuoka.jp
-fukuchi.fukuoka.jp
-hakata.fukuoka.jp
-higashi.fukuoka.jp
-hirokawa.fukuoka.jp
-hisayama.fukuoka.jp
-iizuka.fukuoka.jp
-inatsuki.fukuoka.jp
-kaho.fukuoka.jp
-kasuga.fukuoka.jp
-kasuya.fukuoka.jp
-kawara.fukuoka.jp
-keisen.fukuoka.jp
-koga.fukuoka.jp
-kurate.fukuoka.jp
-kurogi.fukuoka.jp
-kurume.fukuoka.jp
-minami.fukuoka.jp
-miyako.fukuoka.jp
-miyama.fukuoka.jp
-miyawaka.fukuoka.jp
-mizumaki.fukuoka.jp
-munakata.fukuoka.jp
-nakagawa.fukuoka.jp
-nakama.fukuoka.jp
-nishi.fukuoka.jp
-nogata.fukuoka.jp
-ogori.fukuoka.jp
-okagaki.fukuoka.jp
-okawa.fukuoka.jp
-oki.fukuoka.jp
-omuta.fukuoka.jp
-onga.fukuoka.jp
-onojo.fukuoka.jp
-oto.fukuoka.jp
-saigawa.fukuoka.jp
-sasaguri.fukuoka.jp
-shingu.fukuoka.jp
-shinyoshitomi.fukuoka.jp
-shonai.fukuoka.jp
-soeda.fukuoka.jp
-sue.fukuoka.jp
-tachiarai.fukuoka.jp
-tagawa.fukuoka.jp
-takata.fukuoka.jp
-toho.fukuoka.jp
-toyotsu.fukuoka.jp
-tsuiki.fukuoka.jp
-ukiha.fukuoka.jp
-umi.fukuoka.jp
-usui.fukuoka.jp
-yamada.fukuoka.jp
-yame.fukuoka.jp
-yanagawa.fukuoka.jp
-yukuhashi.fukuoka.jp
-aizubange.fukushima.jp
-aizumisato.fukushima.jp
-aizuwakamatsu.fukushima.jp
-asakawa.fukushima.jp
-bandai.fukushima.jp
-date.fukushima.jp
-fukushima.fukushima.jp
-furudono.fukushima.jp
-futaba.fukushima.jp
-hanawa.fukushima.jp
-higashi.fukushima.jp
-hirata.fukushima.jp
-hirono.fukushima.jp
-iitate.fukushima.jp
-inawashiro.fukushima.jp
-ishikawa.fukushima.jp
-iwaki.fukushima.jp
-izumizaki.fukushima.jp
-kagamiishi.fukushima.jp
-kaneyama.fukushima.jp
-kawamata.fukushima.jp
-kitakata.fukushima.jp
-kitashiobara.fukushima.jp
-koori.fukushima.jp
-koriyama.fukushima.jp
-kunimi.fukushima.jp
-miharu.fukushima.jp
-mishima.fukushima.jp
-namie.fukushima.jp
-nango.fukushima.jp
-nishiaizu.fukushima.jp
-nishigo.fukushima.jp
-okuma.fukushima.jp
-omotego.fukushima.jp
-ono.fukushima.jp
-otama.fukushima.jp
-samegawa.fukushima.jp
-shimogo.fukushima.jp
-shirakawa.fukushima.jp
-showa.fukushima.jp
-soma.fukushima.jp
-sukagawa.fukushima.jp
-taishin.fukushima.jp
-tamakawa.fukushima.jp
-tanagura.fukushima.jp
-tenei.fukushima.jp
-yabuki.fukushima.jp
-yamato.fukushima.jp
-yamatsuri.fukushima.jp
-yanaizu.fukushima.jp
-yugawa.fukushima.jp
-anpachi.gifu.jp
-ena.gifu.jp
-gifu.gifu.jp
-ginan.gifu.jp
-godo.gifu.jp
-gujo.gifu.jp
-hashima.gifu.jp
-hichiso.gifu.jp
-hida.gifu.jp
-higashishirakawa.gifu.jp
-ibigawa.gifu.jp
-ikeda.gifu.jp
-kakamigahara.gifu.jp
-kani.gifu.jp
-kasahara.gifu.jp
-kasamatsu.gifu.jp
-kawaue.gifu.jp
-kitagata.gifu.jp
-mino.gifu.jp
-minokamo.gifu.jp
-mitake.gifu.jp
-mizunami.gifu.jp
-motosu.gifu.jp
-nakatsugawa.gifu.jp
-ogaki.gifu.jp
-sakahogi.gifu.jp
-seki.gifu.jp
-sekigahara.gifu.jp
-shirakawa.gifu.jp
-tajimi.gifu.jp
-takayama.gifu.jp
-tarui.gifu.jp
-toki.gifu.jp
-tomika.gifu.jp
-wanouchi.gifu.jp
-yamagata.gifu.jp
-yaotsu.gifu.jp
-yoro.gifu.jp
-annaka.gunma.jp
-chiyoda.gunma.jp
-fujioka.gunma.jp
-higashiagatsuma.gunma.jp
-isesaki.gunma.jp
-itakura.gunma.jp
-kanna.gunma.jp
-kanra.gunma.jp
-katashina.gunma.jp
-kawaba.gunma.jp
-kiryu.gunma.jp
-kusatsu.gunma.jp
-maebashi.gunma.jp
-meiwa.gunma.jp
-midori.gunma.jp
-minakami.gunma.jp
-naganohara.gunma.jp
-nakanojo.gunma.jp
-nanmoku.gunma.jp
-numata.gunma.jp
-oizumi.gunma.jp
-ora.gunma.jp
-ota.gunma.jp
-shibukawa.gunma.jp
-shimonita.gunma.jp
-shinto.gunma.jp
-showa.gunma.jp
-takasaki.gunma.jp
-takayama.gunma.jp
-tamamura.gunma.jp
-tatebayashi.gunma.jp
-tomioka.gunma.jp
-tsukiyono.gunma.jp
-tsumagoi.gunma.jp
-ueno.gunma.jp
-yoshioka.gunma.jp
-asaminami.hiroshima.jp
-daiwa.hiroshima.jp
-etajima.hiroshima.jp
-fuchu.hiroshima.jp
-fukuyama.hiroshima.jp
-hatsukaichi.hiroshima.jp
-higashihiroshima.hiroshima.jp
-hongo.hiroshima.jp
-jinsekikogen.hiroshima.jp
-kaita.hiroshima.jp
-kui.hiroshima.jp
-kumano.hiroshima.jp
-kure.hiroshima.jp
-mihara.hiroshima.jp
-miyoshi.hiroshima.jp
-naka.hiroshima.jp
-onomichi.hiroshima.jp
-osakikamijima.hiroshima.jp
-otake.hiroshima.jp
-saka.hiroshima.jp
-sera.hiroshima.jp
-seranishi.hiroshima.jp
-shinichi.hiroshima.jp
-shobara.hiroshima.jp
-takehara.hiroshima.jp
-abashiri.hokkaido.jp
-abira.hokkaido.jp
-aibetsu.hokkaido.jp
-akabira.hokkaido.jp
-akkeshi.hokkaido.jp
-asahikawa.hokkaido.jp
-ashibetsu.hokkaido.jp
-ashoro.hokkaido.jp
-assabu.hokkaido.jp
-atsuma.hokkaido.jp
-bibai.hokkaido.jp
-biei.hokkaido.jp
-bifuka.hokkaido.jp
-bihoro.hokkaido.jp
-biratori.hokkaido.jp
-chippubetsu.hokkaido.jp
-chitose.hokkaido.jp
-date.hokkaido.jp
-ebetsu.hokkaido.jp
-embetsu.hokkaido.jp
-eniwa.hokkaido.jp
-erimo.hokkaido.jp
-esan.hokkaido.jp
-esashi.hokkaido.jp
-fukagawa.hokkaido.jp
-fukushima.hokkaido.jp
-furano.hokkaido.jp
-furubira.hokkaido.jp
-haboro.hokkaido.jp
-hakodate.hokkaido.jp
-hamatonbetsu.hokkaido.jp
-hidaka.hokkaido.jp
-higashikagura.hokkaido.jp
-higashikawa.hokkaido.jp
-hiroo.hokkaido.jp
-hokuryu.hokkaido.jp
-hokuto.hokkaido.jp
-honbetsu.hokkaido.jp
-horokanai.hokkaido.jp
-horonobe.hokkaido.jp
-ikeda.hokkaido.jp
-imakane.hokkaido.jp
-ishikari.hokkaido.jp
-iwamizawa.hokkaido.jp
-iwanai.hokkaido.jp
-kamifurano.hokkaido.jp
-kamikawa.hokkaido.jp
-kamishihoro.hokkaido.jp
-kamisunagawa.hokkaido.jp
-kamoenai.hokkaido.jp
-kayabe.hokkaido.jp
-kembuchi.hokkaido.jp
-kikonai.hokkaido.jp
-kimobetsu.hokkaido.jp
-kitahiroshima.hokkaido.jp
-kitami.hokkaido.jp
-kiyosato.hokkaido.jp
-koshimizu.hokkaido.jp
-kunneppu.hokkaido.jp
-kuriyama.hokkaido.jp
-kuromatsunai.hokkaido.jp
-kushiro.hokkaido.jp
-kutchan.hokkaido.jp
-kyowa.hokkaido.jp
-mashike.hokkaido.jp
-matsumae.hokkaido.jp
-mikasa.hokkaido.jp
-minamifurano.hokkaido.jp
-mombetsu.hokkaido.jp
-moseushi.hokkaido.jp
-mukawa.hokkaido.jp
-muroran.hokkaido.jp
-naie.hokkaido.jp
-nakagawa.hokkaido.jp
-nakasatsunai.hokkaido.jp
-nakatombetsu.hokkaido.jp
-nanae.hokkaido.jp
-nanporo.hokkaido.jp
-nayoro.hokkaido.jp
-nemuro.hokkaido.jp
-niikappu.hokkaido.jp
-niki.hokkaido.jp
-nishiokoppe.hokkaido.jp
-noboribetsu.hokkaido.jp
-numata.hokkaido.jp
-obihiro.hokkaido.jp
-obira.hokkaido.jp
-oketo.hokkaido.jp
-okoppe.hokkaido.jp
-otaru.hokkaido.jp
-otobe.hokkaido.jp
-otofuke.hokkaido.jp
-otoineppu.hokkaido.jp
-oumu.hokkaido.jp
-ozora.hokkaido.jp
-pippu.hokkaido.jp
-rankoshi.hokkaido.jp
-rebun.hokkaido.jp
-rikubetsu.hokkaido.jp
-rishiri.hokkaido.jp
-rishirifuji.hokkaido.jp
-saroma.hokkaido.jp
-sarufutsu.hokkaido.jp
-shakotan.hokkaido.jp
-shari.hokkaido.jp
-shibecha.hokkaido.jp
-shibetsu.hokkaido.jp
-shikabe.hokkaido.jp
-shikaoi.hokkaido.jp
-shimamaki.hokkaido.jp
-shimizu.hokkaido.jp
-shimokawa.hokkaido.jp
-shinshinotsu.hokkaido.jp
-shintoku.hokkaido.jp
-shiranuka.hokkaido.jp
-shiraoi.hokkaido.jp
-shiriuchi.hokkaido.jp
-sobetsu.hokkaido.jp
-sunagawa.hokkaido.jp
-taiki.hokkaido.jp
-takasu.hokkaido.jp
-takikawa.hokkaido.jp
-takinoue.hokkaido.jp
-teshikaga.hokkaido.jp
-tobetsu.hokkaido.jp
-tohma.hokkaido.jp
-tomakomai.hokkaido.jp
-tomari.hokkaido.jp
-toya.hokkaido.jp
-toyako.hokkaido.jp
-toyotomi.hokkaido.jp
-toyoura.hokkaido.jp
-tsubetsu.hokkaido.jp
-tsukigata.hokkaido.jp
-urakawa.hokkaido.jp
-urausu.hokkaido.jp
-uryu.hokkaido.jp
-utashinai.hokkaido.jp
-wakkanai.hokkaido.jp
-wassamu.hokkaido.jp
-yakumo.hokkaido.jp
-yoichi.hokkaido.jp
-aioi.hyogo.jp
-akashi.hyogo.jp
-ako.hyogo.jp
-amagasaki.hyogo.jp
-aogaki.hyogo.jp
-asago.hyogo.jp
-ashiya.hyogo.jp
-awaji.hyogo.jp
-fukusaki.hyogo.jp
-goshiki.hyogo.jp
-harima.hyogo.jp
-himeji.hyogo.jp
-ichikawa.hyogo.jp
-inagawa.hyogo.jp
-itami.hyogo.jp
-kakogawa.hyogo.jp
-kamigori.hyogo.jp
-kamikawa.hyogo.jp
-kasai.hyogo.jp
-kasuga.hyogo.jp
-kawanishi.hyogo.jp
-miki.hyogo.jp
-minamiawaji.hyogo.jp
-nishinomiya.hyogo.jp
-nishiwaki.hyogo.jp
-ono.hyogo.jp
-sanda.hyogo.jp
-sannan.hyogo.jp
-sasayama.hyogo.jp
-sayo.hyogo.jp
-shingu.hyogo.jp
-shinonsen.hyogo.jp
-shiso.hyogo.jp
-sumoto.hyogo.jp
-taishi.hyogo.jp
-taka.hyogo.jp
-takarazuka.hyogo.jp
-takasago.hyogo.jp
-takino.hyogo.jp
-tamba.hyogo.jp
-tatsuno.hyogo.jp
-toyooka.hyogo.jp
-yabu.hyogo.jp
-yashiro.hyogo.jp
-yoka.hyogo.jp
-yokawa.hyogo.jp
-ami.ibaraki.jp
-asahi.ibaraki.jp
-bando.ibaraki.jp
-chikusei.ibaraki.jp
-daigo.ibaraki.jp
-fujishiro.ibaraki.jp
-hitachi.ibaraki.jp
-hitachinaka.ibaraki.jp
-hitachiomiya.ibaraki.jp
-hitachiota.ibaraki.jp
-ibaraki.ibaraki.jp
-ina.ibaraki.jp
-inashiki.ibaraki.jp
-itako.ibaraki.jp
-iwama.ibaraki.jp
-joso.ibaraki.jp
-kamisu.ibaraki.jp
-kasama.ibaraki.jp
-kashima.ibaraki.jp
-kasumigaura.ibaraki.jp
-koga.ibaraki.jp
-miho.ibaraki.jp
-mito.ibaraki.jp
-moriya.ibaraki.jp
-naka.ibaraki.jp
-namegata.ibaraki.jp
-oarai.ibaraki.jp
-ogawa.ibaraki.jp
-omitama.ibaraki.jp
-ryugasaki.ibaraki.jp
-sakai.ibaraki.jp
-sakuragawa.ibaraki.jp
-shimodate.ibaraki.jp
-shimotsuma.ibaraki.jp
-shirosato.ibaraki.jp
-sowa.ibaraki.jp
-suifu.ibaraki.jp
-takahagi.ibaraki.jp
-tamatsukuri.ibaraki.jp
-tokai.ibaraki.jp
-tomobe.ibaraki.jp
-tone.ibaraki.jp
-toride.ibaraki.jp
-tsuchiura.ibaraki.jp
-tsukuba.ibaraki.jp
-uchihara.ibaraki.jp
-ushiku.ibaraki.jp
-yachiyo.ibaraki.jp
-yamagata.ibaraki.jp
-yawara.ibaraki.jp
-yuki.ibaraki.jp
-anamizu.ishikawa.jp
-hakui.ishikawa.jp
-hakusan.ishikawa.jp
-kaga.ishikawa.jp
-kahoku.ishikawa.jp
-kanazawa.ishikawa.jp
-kawakita.ishikawa.jp
-komatsu.ishikawa.jp
-nakanoto.ishikawa.jp
-nanao.ishikawa.jp
-nomi.ishikawa.jp
-nonoichi.ishikawa.jp
-noto.ishikawa.jp
-shika.ishikawa.jp
-suzu.ishikawa.jp
-tsubata.ishikawa.jp
-tsurugi.ishikawa.jp
-uchinada.ishikawa.jp
-wajima.ishikawa.jp
-fudai.iwate.jp
-fujisawa.iwate.jp
-hanamaki.iwate.jp
-hiraizumi.iwate.jp
-hirono.iwate.jp
-ichinohe.iwate.jp
-ichinoseki.iwate.jp
-iwaizumi.iwate.jp
-iwate.iwate.jp
-joboji.iwate.jp
-kamaishi.iwate.jp
-kanegasaki.iwate.jp
-karumai.iwate.jp
-kawai.iwate.jp
-kitakami.iwate.jp
-kuji.iwate.jp
-kunohe.iwate.jp
-kuzumaki.iwate.jp
-miyako.iwate.jp
-mizusawa.iwate.jp
-morioka.iwate.jp
-ninohe.iwate.jp
-noda.iwate.jp
-ofunato.iwate.jp
-oshu.iwate.jp
-otsuchi.iwate.jp
-rikuzentakata.iwate.jp
-shiwa.iwate.jp
-shizukuishi.iwate.jp
-sumita.iwate.jp
-tanohata.iwate.jp
-tono.iwate.jp
-yahaba.iwate.jp
-yamada.iwate.jp
-ayagawa.kagawa.jp
-higashikagawa.kagawa.jp
-kanonji.kagawa.jp
-kotohira.kagawa.jp
-manno.kagawa.jp
-marugame.kagawa.jp
-mitoyo.kagawa.jp
-naoshima.kagawa.jp
-sanuki.kagawa.jp
-tadotsu.kagawa.jp
-takamatsu.kagawa.jp
-tonosho.kagawa.jp
-uchinomi.kagawa.jp
-utazu.kagawa.jp
-zentsuji.kagawa.jp
-akune.kagoshima.jp
-amami.kagoshima.jp
-hioki.kagoshima.jp
-isa.kagoshima.jp
-isen.kagoshima.jp
-izumi.kagoshima.jp
-kagoshima.kagoshima.jp
-kanoya.kagoshima.jp
-kawanabe.kagoshima.jp
-kinko.kagoshima.jp
-kouyama.kagoshima.jp
-makurazaki.kagoshima.jp
-matsumoto.kagoshima.jp
-minamitane.kagoshima.jp
-nakatane.kagoshima.jp
-nishinoomote.kagoshima.jp
-satsumasendai.kagoshima.jp
-soo.kagoshima.jp
-tarumizu.kagoshima.jp
-yusui.kagoshima.jp
-aikawa.kanagawa.jp
-atsugi.kanagawa.jp
-ayase.kanagawa.jp
-chigasaki.kanagawa.jp
-ebina.kanagawa.jp
-fujisawa.kanagawa.jp
-hadano.kanagawa.jp
-hakone.kanagawa.jp
-hiratsuka.kanagawa.jp
-isehara.kanagawa.jp
-kaisei.kanagawa.jp
-kamakura.kanagawa.jp
-kiyokawa.kanagawa.jp
-matsuda.kanagawa.jp
-minamiashigara.kanagawa.jp
-miura.kanagawa.jp
-nakai.kanagawa.jp
-ninomiya.kanagawa.jp
-odawara.kanagawa.jp
-oi.kanagawa.jp
-oiso.kanagawa.jp
-sagamihara.kanagawa.jp
-samukawa.kanagawa.jp
-tsukui.kanagawa.jp
-yamakita.kanagawa.jp
-yamato.kanagawa.jp
-yokosuka.kanagawa.jp
-yugawara.kanagawa.jp
-zama.kanagawa.jp
-zushi.kanagawa.jp
-aki.kochi.jp
-geisei.kochi.jp
-hidaka.kochi.jp
-higashitsuno.kochi.jp
-ino.kochi.jp
-kagami.kochi.jp
-kami.kochi.jp
-kitagawa.kochi.jp
-kochi.kochi.jp
-mihara.kochi.jp
-motoyama.kochi.jp
-muroto.kochi.jp
-nahari.kochi.jp
-nakamura.kochi.jp
-nankoku.kochi.jp
-nishitosa.kochi.jp
-niyodogawa.kochi.jp
-ochi.kochi.jp
-okawa.kochi.jp
-otoyo.kochi.jp
-otsuki.kochi.jp
-sakawa.kochi.jp
-sukumo.kochi.jp
-susaki.kochi.jp
-tosa.kochi.jp
-tosashimizu.kochi.jp
-toyo.kochi.jp
-tsuno.kochi.jp
-umaji.kochi.jp
-yasuda.kochi.jp
-yusuhara.kochi.jp
-amakusa.kumamoto.jp
-arao.kumamoto.jp
-aso.kumamoto.jp
-choyo.kumamoto.jp
-gyokuto.kumamoto.jp
-hitoyoshi.kumamoto.jp
-kamiamakusa.kumamoto.jp
-kashima.kumamoto.jp
-kikuchi.kumamoto.jp
-kosa.kumamoto.jp
-kumamoto.kumamoto.jp
-mashiki.kumamoto.jp
-mifune.kumamoto.jp
-minamata.kumamoto.jp
-minamioguni.kumamoto.jp
-nagasu.kumamoto.jp
-nishihara.kumamoto.jp
-oguni.kumamoto.jp
-ozu.kumamoto.jp
-sumoto.kumamoto.jp
-takamori.kumamoto.jp
-uki.kumamoto.jp
-uto.kumamoto.jp
-yamaga.kumamoto.jp
-yamato.kumamoto.jp
-yatsushiro.kumamoto.jp
-ayabe.kyoto.jp
-fukuchiyama.kyoto.jp
-higashiyama.kyoto.jp
-ide.kyoto.jp
-ine.kyoto.jp
-joyo.kyoto.jp
-kameoka.kyoto.jp
-kamo.kyoto.jp
-kita.kyoto.jp
-kizu.kyoto.jp
-kumiyama.kyoto.jp
-kyotamba.kyoto.jp
-kyotanabe.kyoto.jp
-kyotango.kyoto.jp
-maizuru.kyoto.jp
-minami.kyoto.jp
-minamiyamashiro.kyoto.jp
-miyazu.kyoto.jp
-muko.kyoto.jp
-nagaokakyo.kyoto.jp
-nakagyo.kyoto.jp
-nantan.kyoto.jp
-oyamazaki.kyoto.jp
-sakyo.kyoto.jp
-seika.kyoto.jp
-tanabe.kyoto.jp
-uji.kyoto.jp
-ujitawara.kyoto.jp
-wazuka.kyoto.jp
-yamashina.kyoto.jp
-yawata.kyoto.jp
-asahi.mie.jp
-inabe.mie.jp
-ise.mie.jp
-kameyama.mie.jp
-kawagoe.mie.jp
-kiho.mie.jp
-kisosaki.mie.jp
-kiwa.mie.jp
-komono.mie.jp
-kumano.mie.jp
-kuwana.mie.jp
-matsusaka.mie.jp
-meiwa.mie.jp
-mihama.mie.jp
-minamiise.mie.jp
-misugi.mie.jp
-miyama.mie.jp
-nabari.mie.jp
-shima.mie.jp
-suzuka.mie.jp
-tado.mie.jp
-taiki.mie.jp
-taki.mie.jp
-tamaki.mie.jp
-toba.mie.jp
-tsu.mie.jp
-udono.mie.jp
-ureshino.mie.jp
-watarai.mie.jp
-yokkaichi.mie.jp
-furukawa.miyagi.jp
-higashimatsushima.miyagi.jp
-ishinomaki.miyagi.jp
-iwanuma.miyagi.jp
-kakuda.miyagi.jp
-kami.miyagi.jp
-kawasaki.miyagi.jp
-kesennuma.miyagi.jp
-marumori.miyagi.jp
-matsushima.miyagi.jp
-minamisanriku.miyagi.jp
-misato.miyagi.jp
-murata.miyagi.jp
-natori.miyagi.jp
-ogawara.miyagi.jp
-ohira.miyagi.jp
-onagawa.miyagi.jp
-osaki.miyagi.jp
-rifu.miyagi.jp
-semine.miyagi.jp
-shibata.miyagi.jp
-shichikashuku.miyagi.jp
-shikama.miyagi.jp
-shiogama.miyagi.jp
-shiroishi.miyagi.jp
-tagajo.miyagi.jp
-taiwa.miyagi.jp
-tome.miyagi.jp
-tomiya.miyagi.jp
-wakuya.miyagi.jp
-watari.miyagi.jp
-yamamoto.miyagi.jp
-zao.miyagi.jp
-aya.miyazaki.jp
-ebino.miyazaki.jp
-gokase.miyazaki.jp
-hyuga.miyazaki.jp
-kadogawa.miyazaki.jp
-kawaminami.miyazaki.jp
-kijo.miyazaki.jp
-kitagawa.miyazaki.jp
-kitakata.miyazaki.jp
-kitaura.miyazaki.jp
-kobayashi.miyazaki.jp
-kunitomi.miyazaki.jp
-kushima.miyazaki.jp
-mimata.miyazaki.jp
-miyakonojo.miyazaki.jp
-miyazaki.miyazaki.jp
-morotsuka.miyazaki.jp
-nichinan.miyazaki.jp
-nishimera.miyazaki.jp
-nobeoka.miyazaki.jp
-saito.miyazaki.jp
-shiiba.miyazaki.jp
-shintomi.miyazaki.jp
-takaharu.miyazaki.jp
-takanabe.miyazaki.jp
-takazaki.miyazaki.jp
-tsuno.miyazaki.jp
-achi.nagano.jp
-agematsu.nagano.jp
-anan.nagano.jp
-aoki.nagano.jp
-asahi.nagano.jp
-azumino.nagano.jp
-chikuhoku.nagano.jp
-chikuma.nagano.jp
-chino.nagano.jp
-fujimi.nagano.jp
-hakuba.nagano.jp
-hara.nagano.jp
-hiraya.nagano.jp
-iida.nagano.jp
-iijima.nagano.jp
-iiyama.nagano.jp
-iizuna.nagano.jp
-ikeda.nagano.jp
-ikusaka.nagano.jp
-ina.nagano.jp
-karuizawa.nagano.jp
-kawakami.nagano.jp
-kiso.nagano.jp
-kisofukushima.nagano.jp
-kitaaiki.nagano.jp
-komagane.nagano.jp
-komoro.nagano.jp
-matsukawa.nagano.jp
-matsumoto.nagano.jp
-miasa.nagano.jp
-minamiaiki.nagano.jp
-minamimaki.nagano.jp
-minamiminowa.nagano.jp
-minowa.nagano.jp
-miyada.nagano.jp
-miyota.nagano.jp
-mochizuki.nagano.jp
-nagano.nagano.jp
-nagawa.nagano.jp
-nagiso.nagano.jp
-nakagawa.nagano.jp
-nakano.nagano.jp
-nozawaonsen.nagano.jp
-obuse.nagano.jp
-ogawa.nagano.jp
-okaya.nagano.jp
-omachi.nagano.jp
-omi.nagano.jp
-ookuwa.nagano.jp
-ooshika.nagano.jp
-otaki.nagano.jp
-otari.nagano.jp
-sakae.nagano.jp
-sakaki.nagano.jp
-saku.nagano.jp
-sakuho.nagano.jp
-shimosuwa.nagano.jp
-shinanomachi.nagano.jp
-shiojiri.nagano.jp
-suwa.nagano.jp
-suzaka.nagano.jp
-takagi.nagano.jp
-takamori.nagano.jp
-takayama.nagano.jp
-tateshina.nagano.jp
-tatsuno.nagano.jp
-togakushi.nagano.jp
-togura.nagano.jp
-tomi.nagano.jp
-ueda.nagano.jp
-wada.nagano.jp
-yamagata.nagano.jp
-yamanouchi.nagano.jp
-yasaka.nagano.jp
-yasuoka.nagano.jp
-chijiwa.nagasaki.jp
-futsu.nagasaki.jp
-goto.nagasaki.jp
-hasami.nagasaki.jp
-hirado.nagasaki.jp
-iki.nagasaki.jp
-isahaya.nagasaki.jp
-kawatana.nagasaki.jp
-kuchinotsu.nagasaki.jp
-matsuura.nagasaki.jp
-nagasaki.nagasaki.jp
-obama.nagasaki.jp
-omura.nagasaki.jp
-oseto.nagasaki.jp
-saikai.nagasaki.jp
-sasebo.nagasaki.jp
-seihi.nagasaki.jp
-shimabara.nagasaki.jp
-shinkamigoto.nagasaki.jp
-togitsu.nagasaki.jp
-tsushima.nagasaki.jp
-unzen.nagasaki.jp
-ando.nara.jp
-gose.nara.jp
-heguri.nara.jp
-higashiyoshino.nara.jp
-ikaruga.nara.jp
-ikoma.nara.jp
-kamikitayama.nara.jp
-kanmaki.nara.jp
-kashiba.nara.jp
-kashihara.nara.jp
-katsuragi.nara.jp
-kawai.nara.jp
-kawakami.nara.jp
-kawanishi.nara.jp
-koryo.nara.jp
-kurotaki.nara.jp
-mitsue.nara.jp
-miyake.nara.jp
-nara.nara.jp
-nosegawa.nara.jp
-oji.nara.jp
-ouda.nara.jp
-oyodo.nara.jp
-sakurai.nara.jp
-sango.nara.jp
-shimoichi.nara.jp
-shimokitayama.nara.jp
-shinjo.nara.jp
-soni.nara.jp
-takatori.nara.jp
-tawaramoto.nara.jp
-tenkawa.nara.jp
-tenri.nara.jp
-uda.nara.jp
-yamatokoriyama.nara.jp
-yamatotakada.nara.jp
-yamazoe.nara.jp
-yoshino.nara.jp
-aga.niigata.jp
-agano.niigata.jp
-gosen.niigata.jp
-itoigawa.niigata.jp
-izumozaki.niigata.jp
-joetsu.niigata.jp
-kamo.niigata.jp
-kariwa.niigata.jp
-kashiwazaki.niigata.jp
-minamiuonuma.niigata.jp
-mitsuke.niigata.jp
-muika.niigata.jp
-murakami.niigata.jp
-myoko.niigata.jp
-nagaoka.niigata.jp
-niigata.niigata.jp
-ojiya.niigata.jp
-omi.niigata.jp
-sado.niigata.jp
-sanjo.niigata.jp
-seiro.niigata.jp
-seirou.niigata.jp
-sekikawa.niigata.jp
-shibata.niigata.jp
-tagami.niigata.jp
-tainai.niigata.jp
-tochio.niigata.jp
-tokamachi.niigata.jp
-tsubame.niigata.jp
-tsunan.niigata.jp
-uonuma.niigata.jp
-yahiko.niigata.jp
-yoita.niigata.jp
-yuzawa.niigata.jp
-beppu.oita.jp
-bungoono.oita.jp
-bungotakada.oita.jp
-hasama.oita.jp
-hiji.oita.jp
-himeshima.oita.jp
-hita.oita.jp
-kamitsue.oita.jp
-kokonoe.oita.jp
-kuju.oita.jp
-kunisaki.oita.jp
-kusu.oita.jp
-oita.oita.jp
-saiki.oita.jp
-taketa.oita.jp
-tsukumi.oita.jp
-usa.oita.jp
-usuki.oita.jp
-yufu.oita.jp
-akaiwa.okayama.jp
-asakuchi.okayama.jp
-bizen.okayama.jp
-hayashima.okayama.jp
-ibara.okayama.jp
-kagamino.okayama.jp
-kasaoka.okayama.jp
-kibichuo.okayama.jp
-kumenan.okayama.jp
-kurashiki.okayama.jp
-maniwa.okayama.jp
-misaki.okayama.jp
-nagi.okayama.jp
-niimi.okayama.jp
-nishiawakura.okayama.jp
-okayama.okayama.jp
-satosho.okayama.jp
-setouchi.okayama.jp
-shinjo.okayama.jp
-shoo.okayama.jp
-soja.okayama.jp
-takahashi.okayama.jp
-tamano.okayama.jp
-tsuyama.okayama.jp
-wake.okayama.jp
-yakage.okayama.jp
-aguni.okinawa.jp
-ginowan.okinawa.jp
-ginoza.okinawa.jp
-gushikami.okinawa.jp
-haebaru.okinawa.jp
-higashi.okinawa.jp
-hirara.okinawa.jp
-iheya.okinawa.jp
-ishigaki.okinawa.jp
-ishikawa.okinawa.jp
-itoman.okinawa.jp
-izena.okinawa.jp
-kadena.okinawa.jp
-kin.okinawa.jp
-kitadaito.okinawa.jp
-kitanakagusuku.okinawa.jp
-kumejima.okinawa.jp
-kunigami.okinawa.jp
-minamidaito.okinawa.jp
-motobu.okinawa.jp
-nago.okinawa.jp
-naha.okinawa.jp
-nakagusuku.okinawa.jp
-nakijin.okinawa.jp
-nanjo.okinawa.jp
-nishihara.okinawa.jp
-ogimi.okinawa.jp
-okinawa.okinawa.jp
-onna.okinawa.jp
-shimoji.okinawa.jp
-taketomi.okinawa.jp
-tarama.okinawa.jp
-tokashiki.okinawa.jp
-tomigusuku.okinawa.jp
-tonaki.okinawa.jp
-urasoe.okinawa.jp
-uruma.okinawa.jp
-yaese.okinawa.jp
-yomitan.okinawa.jp
-yonabaru.okinawa.jp
-yonaguni.okinawa.jp
-zamami.okinawa.jp
-abeno.osaka.jp
-chihayaakasaka.osaka.jp
-chuo.osaka.jp
-daito.osaka.jp
-fujiidera.osaka.jp
-habikino.osaka.jp
-hannan.osaka.jp
-higashiosaka.osaka.jp
-higashisumiyoshi.osaka.jp
-higashiyodogawa.osaka.jp
-hirakata.osaka.jp
-ibaraki.osaka.jp
-ikeda.osaka.jp
-izumi.osaka.jp
-izumiotsu.osaka.jp
-izumisano.osaka.jp
-kadoma.osaka.jp
-kaizuka.osaka.jp
-kanan.osaka.jp
-kashiwara.osaka.jp
-katano.osaka.jp
-kawachinagano.osaka.jp
-kishiwada.osaka.jp
-kita.osaka.jp
-kumatori.osaka.jp
-matsubara.osaka.jp
-minato.osaka.jp
-minoh.osaka.jp
-misaki.osaka.jp
-moriguchi.osaka.jp
-neyagawa.osaka.jp
-nishi.osaka.jp
-nose.osaka.jp
-osakasayama.osaka.jp
-sakai.osaka.jp
-sayama.osaka.jp
-sennan.osaka.jp
-settsu.osaka.jp
-shijonawate.osaka.jp
-shimamoto.osaka.jp
-suita.osaka.jp
-tadaoka.osaka.jp
-taishi.osaka.jp
-tajiri.osaka.jp
-takaishi.osaka.jp
-takatsuki.osaka.jp
-tondabayashi.osaka.jp
-toyonaka.osaka.jp
-toyono.osaka.jp
-yao.osaka.jp
-ariake.saga.jp
-arita.saga.jp
-fukudomi.saga.jp
-genkai.saga.jp
-hamatama.saga.jp
-hizen.saga.jp
-imari.saga.jp
-kamimine.saga.jp
-kanzaki.saga.jp
-karatsu.saga.jp
-kashima.saga.jp
-kitagata.saga.jp
-kitahata.saga.jp
-kiyama.saga.jp
-kouhoku.saga.jp
-kyuragi.saga.jp
-nishiarita.saga.jp
-ogi.saga.jp
-omachi.saga.jp
-ouchi.saga.jp
-saga.saga.jp
-shiroishi.saga.jp
-taku.saga.jp
-tara.saga.jp
-tosu.saga.jp
-yoshinogari.saga.jp
-arakawa.saitama.jp
-asaka.saitama.jp
-chichibu.saitama.jp
-fujimi.saitama.jp
-fujimino.saitama.jp
-fukaya.saitama.jp
-hanno.saitama.jp
-hanyu.saitama.jp
-hasuda.saitama.jp
-hatogaya.saitama.jp
-hatoyama.saitama.jp
-hidaka.saitama.jp
-higashichichibu.saitama.jp
-higashimatsuyama.saitama.jp
-honjo.saitama.jp
-ina.saitama.jp
-iruma.saitama.jp
-iwatsuki.saitama.jp
-kamiizumi.saitama.jp
-kamikawa.saitama.jp
-kamisato.saitama.jp
-kasukabe.saitama.jp
-kawagoe.saitama.jp
-kawaguchi.saitama.jp
-kawajima.saitama.jp
-kazo.saitama.jp
-kitamoto.saitama.jp
-koshigaya.saitama.jp
-kounosu.saitama.jp
-kuki.saitama.jp
-kumagaya.saitama.jp
-matsubushi.saitama.jp
-minano.saitama.jp
-misato.saitama.jp
-miyashiro.saitama.jp
-miyoshi.saitama.jp
-moroyama.saitama.jp
-nagatoro.saitama.jp
-namegawa.saitama.jp
-niiza.saitama.jp
-ogano.saitama.jp
-ogawa.saitama.jp
-ogose.saitama.jp
-okegawa.saitama.jp
-omiya.saitama.jp
-otaki.saitama.jp
-ranzan.saitama.jp
-ryokami.saitama.jp
-saitama.saitama.jp
-sakado.saitama.jp
-satte.saitama.jp
-sayama.saitama.jp
-shiki.saitama.jp
-shiraoka.saitama.jp
-soka.saitama.jp
-sugito.saitama.jp
-toda.saitama.jp
-tokigawa.saitama.jp
-tokorozawa.saitama.jp
-tsurugashima.saitama.jp
-urawa.saitama.jp
-warabi.saitama.jp
-yashio.saitama.jp
-yokoze.saitama.jp
-yono.saitama.jp
-yorii.saitama.jp
-yoshida.saitama.jp
-yoshikawa.saitama.jp
-yoshimi.saitama.jp
-aisho.shiga.jp
-gamo.shiga.jp
-higashiomi.shiga.jp
-hikone.shiga.jp
-koka.shiga.jp
-konan.shiga.jp
-kosei.shiga.jp
-koto.shiga.jp
-kusatsu.shiga.jp
-maibara.shiga.jp
-moriyama.shiga.jp
-nagahama.shiga.jp
-nishiazai.shiga.jp
-notogawa.shiga.jp
-omihachiman.shiga.jp
-otsu.shiga.jp
-ritto.shiga.jp
-ryuoh.shiga.jp
-takashima.shiga.jp
-takatsuki.shiga.jp
-torahime.shiga.jp
-toyosato.shiga.jp
-yasu.shiga.jp
-akagi.shimane.jp
-ama.shimane.jp
-gotsu.shimane.jp
-hamada.shimane.jp
-higashiizumo.shimane.jp
-hikawa.shimane.jp
-hikimi.shimane.jp
-izumo.shimane.jp
-kakinoki.shimane.jp
-masuda.shimane.jp
-matsue.shimane.jp
-misato.shimane.jp
-nishinoshima.shimane.jp
-ohda.shimane.jp
-okinoshima.shimane.jp
-okuizumo.shimane.jp
-shimane.shimane.jp
-tamayu.shimane.jp
-tsuwano.shimane.jp
-unnan.shimane.jp
-yakumo.shimane.jp
-yasugi.shimane.jp
-yatsuka.shimane.jp
-arai.shizuoka.jp
-atami.shizuoka.jp
-fuji.shizuoka.jp
-fujieda.shizuoka.jp
-fujikawa.shizuoka.jp
-fujinomiya.shizuoka.jp
-fukuroi.shizuoka.jp
-gotemba.shizuoka.jp
-haibara.shizuoka.jp
-hamamatsu.shizuoka.jp
-higashiizu.shizuoka.jp
-ito.shizuoka.jp
-iwata.shizuoka.jp
-izu.shizuoka.jp
-izunokuni.shizuoka.jp
-kakegawa.shizuoka.jp
-kannami.shizuoka.jp
-kawanehon.shizuoka.jp
-kawazu.shizuoka.jp
-kikugawa.shizuoka.jp
-kosai.shizuoka.jp
-makinohara.shizuoka.jp
-matsuzaki.shizuoka.jp
-minamiizu.shizuoka.jp
-mishima.shizuoka.jp
-morimachi.shizuoka.jp
-nishiizu.shizuoka.jp
-numazu.shizuoka.jp
-omaezaki.shizuoka.jp
-shimada.shizuoka.jp
-shimizu.shizuoka.jp
-shimoda.shizuoka.jp
-shizuoka.shizuoka.jp
-susono.shizuoka.jp
-yaizu.shizuoka.jp
-yoshida.shizuoka.jp
-ashikaga.tochigi.jp
-bato.tochigi.jp
-haga.tochigi.jp
-ichikai.tochigi.jp
-iwafune.tochigi.jp
-kaminokawa.tochigi.jp
-kanuma.tochigi.jp
-karasuyama.tochigi.jp
-kuroiso.tochigi.jp
-mashiko.tochigi.jp
-mibu.tochigi.jp
-moka.tochigi.jp
-motegi.tochigi.jp
-nasu.tochigi.jp
-nasushiobara.tochigi.jp
-nikko.tochigi.jp
-nishikata.tochigi.jp
-nogi.tochigi.jp
-ohira.tochigi.jp
-ohtawara.tochigi.jp
-oyama.tochigi.jp
-sakura.tochigi.jp
-sano.tochigi.jp
-shimotsuke.tochigi.jp
-shioya.tochigi.jp
-takanezawa.tochigi.jp
-tochigi.tochigi.jp
-tsuga.tochigi.jp
-ujiie.tochigi.jp
-utsunomiya.tochigi.jp
-yaita.tochigi.jp
-aizumi.tokushima.jp
-anan.tokushima.jp
-ichiba.tokushima.jp
-itano.tokushima.jp
-kainan.tokushima.jp
-komatsushima.tokushima.jp
-matsushige.tokushima.jp
-mima.tokushima.jp
-minami.tokushima.jp
-miyoshi.tokushima.jp
-mugi.tokushima.jp
-nakagawa.tokushima.jp
-naruto.tokushima.jp
-sanagochi.tokushima.jp
-shishikui.tokushima.jp
-tokushima.tokushima.jp
-wajiki.tokushima.jp
-adachi.tokyo.jp
-akiruno.tokyo.jp
-akishima.tokyo.jp
-aogashima.tokyo.jp
-arakawa.tokyo.jp
-bunkyo.tokyo.jp
-chiyoda.tokyo.jp
-chofu.tokyo.jp
-chuo.tokyo.jp
-edogawa.tokyo.jp
-fuchu.tokyo.jp
-fussa.tokyo.jp
-hachijo.tokyo.jp
-hachioji.tokyo.jp
-hamura.tokyo.jp
-higashikurume.tokyo.jp
-higashimurayama.tokyo.jp
-higashiyamato.tokyo.jp
-hino.tokyo.jp
-hinode.tokyo.jp
-hinohara.tokyo.jp
-inagi.tokyo.jp
-itabashi.tokyo.jp
-katsushika.tokyo.jp
-kita.tokyo.jp
-kiyose.tokyo.jp
-kodaira.tokyo.jp
-koganei.tokyo.jp
-kokubunji.tokyo.jp
-komae.tokyo.jp
-koto.tokyo.jp
-kouzushima.tokyo.jp
-kunitachi.tokyo.jp
-machida.tokyo.jp
-meguro.tokyo.jp
-minato.tokyo.jp
-mitaka.tokyo.jp
-mizuho.tokyo.jp
-musashimurayama.tokyo.jp
-musashino.tokyo.jp
-nakano.tokyo.jp
-nerima.tokyo.jp
-ogasawara.tokyo.jp
-okutama.tokyo.jp
-ome.tokyo.jp
-oshima.tokyo.jp
-ota.tokyo.jp
-setagaya.tokyo.jp
-shibuya.tokyo.jp
-shinagawa.tokyo.jp
-shinjuku.tokyo.jp
-suginami.tokyo.jp
-sumida.tokyo.jp
-tachikawa.tokyo.jp
-taito.tokyo.jp
-tama.tokyo.jp
-toshima.tokyo.jp
-chizu.tottori.jp
-hino.tottori.jp
-kawahara.tottori.jp
-koge.tottori.jp
-kotoura.tottori.jp
-misasa.tottori.jp
-nanbu.tottori.jp
-nichinan.tottori.jp
-sakaiminato.tottori.jp
-tottori.tottori.jp
-wakasa.tottori.jp
-yazu.tottori.jp
-yonago.tottori.jp
-asahi.toyama.jp
-fuchu.toyama.jp
-fukumitsu.toyama.jp
-funahashi.toyama.jp
-himi.toyama.jp
-imizu.toyama.jp
-inami.toyama.jp
-johana.toyama.jp
-kamiichi.toyama.jp
-kurobe.toyama.jp
-nakaniikawa.toyama.jp
-namerikawa.toyama.jp
-nanto.toyama.jp
-nyuzen.toyama.jp
-oyabe.toyama.jp
-taira.toyama.jp
-takaoka.toyama.jp
-tateyama.toyama.jp
-toga.toyama.jp
-tonami.toyama.jp
-toyama.toyama.jp
-unazuki.toyama.jp
-uozu.toyama.jp
-yamada.toyama.jp
-arida.wakayama.jp
-aridagawa.wakayama.jp
-gobo.wakayama.jp
-hashimoto.wakayama.jp
-hidaka.wakayama.jp
-hirogawa.wakayama.jp
-inami.wakayama.jp
-iwade.wakayama.jp
-kainan.wakayama.jp
-kamitonda.wakayama.jp
-katsuragi.wakayama.jp
-kimino.wakayama.jp
-kinokawa.wakayama.jp
-kitayama.wakayama.jp
-koya.wakayama.jp
-koza.wakayama.jp
-kozagawa.wakayama.jp
-kudoyama.wakayama.jp
-kushimoto.wakayama.jp
-mihama.wakayama.jp
-misato.wakayama.jp
-nachikatsuura.wakayama.jp
-shingu.wakayama.jp
-shirahama.wakayama.jp
-taiji.wakayama.jp
-tanabe.wakayama.jp
-wakayama.wakayama.jp
-yuasa.wakayama.jp
-yura.wakayama.jp
-asahi.yamagata.jp
-funagata.yamagata.jp
-higashine.yamagata.jp
-iide.yamagata.jp
-kahoku.yamagata.jp
-kaminoyama.yamagata.jp
-kaneyama.yamagata.jp
-kawanishi.yamagata.jp
-mamurogawa.yamagata.jp
-mikawa.yamagata.jp
-murayama.yamagata.jp
-nagai.yamagata.jp
-nakayama.yamagata.jp
-nanyo.yamagata.jp
-nishikawa.yamagata.jp
-obanazawa.yamagata.jp
-oe.yamagata.jp
-oguni.yamagata.jp
-ohkura.yamagata.jp
-oishida.yamagata.jp
-sagae.yamagata.jp
-sakata.yamagata.jp
-sakegawa.yamagata.jp
-shinjo.yamagata.jp
-shirataka.yamagata.jp
-shonai.yamagata.jp
-takahata.yamagata.jp
-tendo.yamagata.jp
-tozawa.yamagata.jp
-tsuruoka.yamagata.jp
-yamagata.yamagata.jp
-yamanobe.yamagata.jp
-yonezawa.yamagata.jp
-yuza.yamagata.jp
-abu.yamaguchi.jp
-hagi.yamaguchi.jp
-hikari.yamaguchi.jp
-hofu.yamaguchi.jp
-iwakuni.yamaguchi.jp
-kudamatsu.yamaguchi.jp
-mitou.yamaguchi.jp
-nagato.yamaguchi.jp
-oshima.yamaguchi.jp
-shimonoseki.yamaguchi.jp
-shunan.yamaguchi.jp
-tabuse.yamaguchi.jp
-tokuyama.yamaguchi.jp
-toyota.yamaguchi.jp
-ube.yamaguchi.jp
-yuu.yamaguchi.jp
-chuo.yamanashi.jp
-doshi.yamanashi.jp
-fuefuki.yamanashi.jp
-fujikawa.yamanashi.jp
-fujikawaguchiko.yamanashi.jp
-fujiyoshida.yamanashi.jp
-hayakawa.yamanashi.jp
-hokuto.yamanashi.jp
-ichikawamisato.yamanashi.jp
-kai.yamanashi.jp
-kofu.yamanashi.jp
-koshu.yamanashi.jp
-kosuge.yamanashi.jp
-minami-alps.yamanashi.jp
-minobu.yamanashi.jp
-nakamichi.yamanashi.jp
-nanbu.yamanashi.jp
-narusawa.yamanashi.jp
-nirasaki.yamanashi.jp
-nishikatsura.yamanashi.jp
-oshino.yamanashi.jp
-otsuki.yamanashi.jp
-showa.yamanashi.jp
-tabayama.yamanashi.jp
-tsuru.yamanashi.jp
-uenohara.yamanashi.jp
-yamanakako.yamanashi.jp
-yamanashi.yamanashi.jp
-
-// ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145
-*.ke
-
-// kg : http://www.domain.kg/dmn_n.html
-kg
-org.kg
-net.kg
-com.kg
-edu.kg
-gov.kg
-mil.kg
-
-// kh : http://www.mptc.gov.kh/dns_registration.htm
-*.kh
-
-// ki : http://www.ki/dns/index.html
-ki
-edu.ki
-biz.ki
-net.ki
-org.ki
-gov.ki
-info.ki
-com.ki
-
-// km : http://en.wikipedia.org/wiki/.km
-// http://www.domaine.km/documents/charte.doc
-km
-org.km
-nom.km
-gov.km
-prd.km
-tm.km
-edu.km
-mil.km
-ass.km
-com.km
-// These are only mentioned as proposed suggestions at domaine.km, but
-// http://en.wikipedia.org/wiki/.km says they're available for registration:
-coop.km
-asso.km
-presse.km
-medecin.km
-notaires.km
-pharmaciens.km
-veterinaire.km
-gouv.km
-
-// kn : http://en.wikipedia.org/wiki/.kn
-// http://www.dot.kn/domainRules.html
-kn
-net.kn
-org.kn
-edu.kn
-gov.kn
-
-// kp : http://www.kcce.kp/en_index.php
-kp
-com.kp
-edu.kp
-gov.kp
-org.kp
-rep.kp
-tra.kp
-
-// kr : http://en.wikipedia.org/wiki/.kr
-// see also: http://domain.nida.or.kr/eng/registration.jsp
-kr
-ac.kr
-co.kr
-es.kr
-go.kr
-hs.kr
-kg.kr
-mil.kr
-ms.kr
-ne.kr
-or.kr
-pe.kr
-re.kr
-sc.kr
-// kr geographical names
-busan.kr
-chungbuk.kr
-chungnam.kr
-daegu.kr
-daejeon.kr
-gangwon.kr
-gwangju.kr
-gyeongbuk.kr
-gyeonggi.kr
-gyeongnam.kr
-incheon.kr
-jeju.kr
-jeonbuk.kr
-jeonnam.kr
-seoul.kr
-ulsan.kr
-
-// kw : http://en.wikipedia.org/wiki/.kw
-*.kw
-
-// ky : http://www.icta.ky/da_ky_reg_dom.php
-// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
-ky
-edu.ky
-gov.ky
-com.ky
-org.ky
-net.ky
-
-// kz : http://en.wikipedia.org/wiki/.kz
-// see also: http://www.nic.kz/rules/index.jsp
-kz
-org.kz
-edu.kz
-net.kz
-gov.kz
-mil.kz
-com.kz
-
-// la : http://en.wikipedia.org/wiki/.la
-// Submitted by registry <gavin.brown@nic.la> 2008-06-10
-la
-int.la
-net.la
-info.la
-edu.la
-gov.la
-per.la
-com.la
-org.la
-
-// lb : http://en.wikipedia.org/wiki/.lb
-// Submitted by registry <randy@psg.com> 2008-06-17
-lb
-com.lb
-edu.lb
-gov.lb
-net.lb
-org.lb
-
-// lc : http://en.wikipedia.org/wiki/.lc
-// see also: http://www.nic.lc/rules.htm
-lc
-com.lc
-net.lc
-co.lc
-org.lc
-edu.lc
-gov.lc
-
-// li : http://en.wikipedia.org/wiki/.li
-li
-
-// lk : http://www.nic.lk/seclevpr.html
-lk
-gov.lk
-sch.lk
-net.lk
-int.lk
-com.lk
-org.lk
-edu.lk
-ngo.lk
-soc.lk
-web.lk
-ltd.lk
-assn.lk
-grp.lk
-hotel.lk
-
-// lr : http://psg.com/dns/lr/lr.txt
-// Submitted by registry <randy@psg.com> 2008-06-17
-lr
-com.lr
-edu.lr
-gov.lr
-org.lr
-net.lr
-
-// ls : http://en.wikipedia.org/wiki/.ls
-ls
-co.ls
-org.ls
-
-// lt : http://en.wikipedia.org/wiki/.lt
-lt
-// gov.lt : http://www.gov.lt/index_en.php
-gov.lt
-
-// lu : http://www.dns.lu/en/
-lu
-
-// lv : http://www.nic.lv/DNS/En/generic.php
-lv
-com.lv
-edu.lv
-gov.lv
-org.lv
-mil.lv
-id.lv
-net.lv
-asn.lv
-conf.lv
-
-// ly : http://www.nic.ly/regulations.php
-ly
-com.ly
-net.ly
-gov.ly
-plc.ly
-edu.ly
-sch.ly
-med.ly
-org.ly
-id.ly
-
-// ma : http://en.wikipedia.org/wiki/.ma
-// http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
-ma
-co.ma
-net.ma
-gov.ma
-org.ma
-ac.ma
-press.ma
-
-// mc : http://www.nic.mc/
-mc
-tm.mc
-asso.mc
-
-// md : http://en.wikipedia.org/wiki/.md
-md
-
-// me : http://en.wikipedia.org/wiki/.me
-me
-co.me
-net.me
-org.me
-edu.me
-ac.me
-gov.me
-its.me
-priv.me
-
-// mg : http://www.nic.mg/tarif.htm
-mg
-org.mg
-nom.mg
-gov.mg
-prd.mg
-tm.mg
-edu.mg
-mil.mg
-com.mg
-
-// mh : http://en.wikipedia.org/wiki/.mh
-mh
-
-// mil : http://en.wikipedia.org/wiki/.mil
-mil
-
-// mk : http://en.wikipedia.org/wiki/.mk
-// see also: http://dns.marnet.net.mk/postapka.php
-mk
-com.mk
-org.mk
-net.mk
-edu.mk
-gov.mk
-inf.mk
-name.mk
-
-// ml : http://www.gobin.info/domainname/ml-template.doc
-// see also: http://en.wikipedia.org/wiki/.ml
-ml
-com.ml
-edu.ml
-gouv.ml
-gov.ml
-net.ml
-org.ml
-presse.ml
-
-// mm : http://en.wikipedia.org/wiki/.mm
-*.mm
-
-// mn : http://en.wikipedia.org/wiki/.mn
-mn
-gov.mn
-edu.mn
-org.mn
-
-// mo : http://www.monic.net.mo/
-mo
-com.mo
-net.mo
-org.mo
-edu.mo
-gov.mo
-
-// mobi : http://en.wikipedia.org/wiki/.mobi
-mobi
-
-// mp : http://www.dot.mp/
-// Confirmed by registry <dcamacho@saipan.com> 2008-06-17
-mp
-
-// mq : http://en.wikipedia.org/wiki/.mq
-mq
-
-// mr : http://en.wikipedia.org/wiki/.mr
-mr
-gov.mr
-
-// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf
-ms
-com.ms
-edu.ms
-gov.ms
-net.ms
-org.ms
-
-// mt : https://www.nic.org.mt/go/policy
-// Submitted by registry <help@nic.org.mt> 2013-11-19
-mt
-com.mt
-edu.mt
-net.mt
-org.mt
-
-// mu : http://en.wikipedia.org/wiki/.mu
-mu
-com.mu
-net.mu
-org.mu
-gov.mu
-ac.mu
-co.mu
-or.mu
-
-// museum : http://about.museum/naming/
-// http://index.museum/
-museum
-academy.museum
-agriculture.museum
-air.museum
-airguard.museum
-alabama.museum
-alaska.museum
-amber.museum
-ambulance.museum
-american.museum
-americana.museum
-americanantiques.museum
-americanart.museum
-amsterdam.museum
-and.museum
-annefrank.museum
-anthro.museum
-anthropology.museum
-antiques.museum
-aquarium.museum
-arboretum.museum
-archaeological.museum
-archaeology.museum
-architecture.museum
-art.museum
-artanddesign.museum
-artcenter.museum
-artdeco.museum
-arteducation.museum
-artgallery.museum
-arts.museum
-artsandcrafts.museum
-asmatart.museum
-assassination.museum
-assisi.museum
-association.museum
-astronomy.museum
-atlanta.museum
-austin.museum
-australia.museum
-automotive.museum
-aviation.museum
-axis.museum
-badajoz.museum
-baghdad.museum
-bahn.museum
-bale.museum
-baltimore.museum
-barcelona.museum
-baseball.museum
-basel.museum
-baths.museum
-bauern.museum
-beauxarts.museum
-beeldengeluid.museum
-bellevue.museum
-bergbau.museum
-berkeley.museum
-berlin.museum
-bern.museum
-bible.museum
-bilbao.museum
-bill.museum
-birdart.museum
-birthplace.museum
-bonn.museum
-boston.museum
-botanical.museum
-botanicalgarden.museum
-botanicgarden.museum
-botany.museum
-brandywinevalley.museum
-brasil.museum
-bristol.museum
-british.museum
-britishcolumbia.museum
-broadcast.museum
-brunel.museum
-brussel.museum
-brussels.museum
-bruxelles.museum
-building.museum
-burghof.museum
-bus.museum
-bushey.museum
-cadaques.museum
-california.museum
-cambridge.museum
-can.museum
-canada.museum
-capebreton.museum
-carrier.museum
-cartoonart.museum
-casadelamoneda.museum
-castle.museum
-castres.museum
-celtic.museum
-center.museum
-chattanooga.museum
-cheltenham.museum
-chesapeakebay.museum
-chicago.museum
-children.museum
-childrens.museum
-childrensgarden.museum
-chiropractic.museum
-chocolate.museum
-christiansburg.museum
-cincinnati.museum
-cinema.museum
-circus.museum
-civilisation.museum
-civilization.museum
-civilwar.museum
-clinton.museum
-clock.museum
-coal.museum
-coastaldefence.museum
-cody.museum
-coldwar.museum
-collection.museum
-colonialwilliamsburg.museum
-coloradoplateau.museum
-columbia.museum
-columbus.museum
-communication.museum
-communications.museum
-community.museum
-computer.museum
-computerhistory.museum
-comunicações.museum
-xn--comunicaes-v6a2o.museum
-contemporary.museum
-contemporaryart.museum
-convent.museum
-copenhagen.museum
-corporation.museum
-correios-e-telecomunicações.museum
-xn--correios-e-telecomunicaes-ghc29a.museum
-corvette.museum
-costume.museum
-countryestate.museum
-county.museum
-crafts.museum
-cranbrook.museum
-creation.museum
-cultural.museum
-culturalcenter.museum
-culture.museum
-cyber.museum
-cymru.museum
-dali.museum
-dallas.museum
-database.museum
-ddr.museum
-decorativearts.museum
-delaware.museum
-delmenhorst.museum
-denmark.museum
-depot.museum
-design.museum
-detroit.museum
-dinosaur.museum
-discovery.museum
-dolls.museum
-donostia.museum
-durham.museum
-eastafrica.museum
-eastcoast.museum
-education.museum
-educational.museum
-egyptian.museum
-eisenbahn.museum
-elburg.museum
-elvendrell.museum
-embroidery.museum
-encyclopedic.museum
-england.museum
-entomology.museum
-environment.museum
-environmentalconservation.museum
-epilepsy.museum
-essex.museum
-estate.museum
-ethnology.museum
-exeter.museum
-exhibition.museum
-family.museum
-farm.museum
-farmequipment.museum
-farmers.museum
-farmstead.museum
-field.museum
-figueres.museum
-filatelia.museum
-film.museum
-fineart.museum
-finearts.museum
-finland.museum
-flanders.museum
-florida.museum
-force.museum
-fortmissoula.museum
-fortworth.museum
-foundation.museum
-francaise.museum
-frankfurt.museum
-franziskaner.museum
-freemasonry.museum
-freiburg.museum
-fribourg.museum
-frog.museum
-fundacio.museum
-furniture.museum
-gallery.museum
-garden.museum
-gateway.museum
-geelvinck.museum
-gemological.museum
-geology.museum
-georgia.museum
-giessen.museum
-glas.museum
-glass.museum
-gorge.museum
-grandrapids.museum
-graz.museum
-guernsey.museum
-halloffame.museum
-hamburg.museum
-handson.museum
-harvestcelebration.museum
-hawaii.museum
-health.museum
-heimatunduhren.museum
-hellas.museum
-helsinki.museum
-hembygdsforbund.museum
-heritage.museum
-histoire.museum
-historical.museum
-historicalsociety.museum
-historichouses.museum
-historisch.museum
-historisches.museum
-history.museum
-historyofscience.museum
-horology.museum
-house.museum
-humanities.museum
-illustration.museum
-imageandsound.museum
-indian.museum
-indiana.museum
-indianapolis.museum
-indianmarket.museum
-intelligence.museum
-interactive.museum
-iraq.museum
-iron.museum
-isleofman.museum
-jamison.museum
-jefferson.museum
-jerusalem.museum
-jewelry.museum
-jewish.museum
-jewishart.museum
-jfk.museum
-journalism.museum
-judaica.museum
-judygarland.museum
-juedisches.museum
-juif.museum
-karate.museum
-karikatur.museum
-kids.museum
-koebenhavn.museum
-koeln.museum
-kunst.museum
-kunstsammlung.museum
-kunstunddesign.museum
-labor.museum
-labour.museum
-lajolla.museum
-lancashire.museum
-landes.museum
-lans.museum
-läns.museum
-xn--lns-qla.museum
-larsson.museum
-lewismiller.museum
-lincoln.museum
-linz.museum
-living.museum
-livinghistory.museum
-localhistory.museum
-london.museum
-losangeles.museum
-louvre.museum
-loyalist.museum
-lucerne.museum
-luxembourg.museum
-luzern.museum
-mad.museum
-madrid.museum
-mallorca.museum
-manchester.museum
-mansion.museum
-mansions.museum
-manx.museum
-marburg.museum
-maritime.museum
-maritimo.museum
-maryland.museum
-marylhurst.museum
-media.museum
-medical.museum
-medizinhistorisches.museum
-meeres.museum
-memorial.museum
-mesaverde.museum
-michigan.museum
-midatlantic.museum
-military.museum
-mill.museum
-miners.museum
-mining.museum
-minnesota.museum
-missile.museum
-missoula.museum
-modern.museum
-moma.museum
-money.museum
-monmouth.museum
-monticello.museum
-montreal.museum
-moscow.museum
-motorcycle.museum
-muenchen.museum
-muenster.museum
-mulhouse.museum
-muncie.museum
-museet.museum
-museumcenter.museum
-museumvereniging.museum
-music.museum
-national.museum
-nationalfirearms.museum
-nationalheritage.museum
-nativeamerican.museum
-naturalhistory.museum
-naturalhistorymuseum.museum
-naturalsciences.museum
-nature.museum
-naturhistorisches.museum
-natuurwetenschappen.museum
-naumburg.museum
-naval.museum
-nebraska.museum
-neues.museum
-newhampshire.museum
-newjersey.museum
-newmexico.museum
-newport.museum
-newspaper.museum
-newyork.museum
-niepce.museum
-norfolk.museum
-north.museum
-nrw.museum
-nuernberg.museum
-nuremberg.museum
-nyc.museum
-nyny.museum
-oceanographic.museum
-oceanographique.museum
-omaha.museum
-online.museum
-ontario.museum
-openair.museum
-oregon.museum
-oregontrail.museum
-otago.museum
-oxford.museum
-pacific.museum
-paderborn.museum
-palace.museum
-paleo.museum
-palmsprings.museum
-panama.museum
-paris.museum
-pasadena.museum
-pharmacy.museum
-philadelphia.museum
-philadelphiaarea.museum
-philately.museum
-phoenix.museum
-photography.museum
-pilots.museum
-pittsburgh.museum
-planetarium.museum
-plantation.museum
-plants.museum
-plaza.museum
-portal.museum
-portland.museum
-portlligat.museum
-posts-and-telecommunications.museum
-preservation.museum
-presidio.museum
-press.museum
-project.museum
-public.museum
-pubol.museum
-quebec.museum
-railroad.museum
-railway.museum
-research.museum
-resistance.museum
-riodejaneiro.museum
-rochester.museum
-rockart.museum
-roma.museum
-russia.museum
-saintlouis.museum
-salem.museum
-salvadordali.museum
-salzburg.museum
-sandiego.museum
-sanfrancisco.museum
-santabarbara.museum
-santacruz.museum
-santafe.museum
-saskatchewan.museum
-satx.museum
-savannahga.museum
-schlesisches.museum
-schoenbrunn.museum
-schokoladen.museum
-school.museum
-schweiz.museum
-science.museum
-scienceandhistory.museum
-scienceandindustry.museum
-sciencecenter.museum
-sciencecenters.museum
-science-fiction.museum
-sciencehistory.museum
-sciences.museum
-sciencesnaturelles.museum
-scotland.museum
-seaport.museum
-settlement.museum
-settlers.museum
-shell.museum
-sherbrooke.museum
-sibenik.museum
-silk.museum
-ski.museum
-skole.museum
-society.museum
-sologne.museum
-soundandvision.museum
-southcarolina.museum
-southwest.museum
-space.museum
-spy.museum
-square.museum
-stadt.museum
-stalbans.museum
-starnberg.museum
-state.museum
-stateofdelaware.museum
-station.museum
-steam.museum
-steiermark.museum
-stjohn.museum
-stockholm.museum
-stpetersburg.museum
-stuttgart.museum
-suisse.museum
-surgeonshall.museum
-surrey.museum
-svizzera.museum
-sweden.museum
-sydney.museum
-tank.museum
-tcm.museum
-technology.museum
-telekommunikation.museum
-television.museum
-texas.museum
-textile.museum
-theater.museum
-time.museum
-timekeeping.museum
-topology.museum
-torino.museum
-touch.museum
-town.museum
-transport.museum
-tree.museum
-trolley.museum
-trust.museum
-trustee.museum
-uhren.museum
-ulm.museum
-undersea.museum
-university.museum
-usa.museum
-usantiques.museum
-usarts.museum
-uscountryestate.museum
-usculture.museum
-usdecorativearts.museum
-usgarden.museum
-ushistory.museum
-ushuaia.museum
-uslivinghistory.museum
-utah.museum
-uvic.museum
-valley.museum
-vantaa.museum
-versailles.museum
-viking.museum
-village.museum
-virginia.museum
-virtual.museum
-virtuel.museum
-vlaanderen.museum
-volkenkunde.museum
-wales.museum
-wallonie.museum
-war.museum
-washingtondc.museum
-watchandclock.museum
-watch-and-clock.museum
-western.museum
-westfalen.museum
-whaling.museum
-wildlife.museum
-williamsburg.museum
-windmill.museum
-workshop.museum
-york.museum
-yorkshire.museum
-yosemite.museum
-youth.museum
-zoological.museum
-zoology.museum
-ירושלים.museum
-xn--9dbhblg6di.museum
-иком.museum
-xn--h1aegh.museum
-
-// mv : http://en.wikipedia.org/wiki/.mv
-// "mv" included because, contra Wikipedia, google.mv exists.
-mv
-aero.mv
-biz.mv
-com.mv
-coop.mv
-edu.mv
-gov.mv
-info.mv
-int.mv
-mil.mv
-museum.mv
-name.mv
-net.mv
-org.mv
-pro.mv
-
-// mw : http://www.registrar.mw/
-mw
-ac.mw
-biz.mw
-co.mw
-com.mw
-coop.mw
-edu.mw
-gov.mw
-int.mw
-museum.mw
-net.mw
-org.mw
-
-// mx : http://www.nic.mx/
-// Submitted by registry <farias@nic.mx> 2008-06-19
-mx
-com.mx
-org.mx
-gob.mx
-edu.mx
-net.mx
-
-// my : http://www.mynic.net.my/
-my
-com.my
-net.my
-org.my
-gov.my
-edu.my
-mil.my
-name.my
-
-// mz : http://www.gobin.info/domainname/mz-template.doc
-*.mz
-!teledata.mz
-
-// na : http://www.na-nic.com.na/
-// http://www.info.na/domain/
-na
-info.na
-pro.na
-name.na
-school.na
-or.na
-dr.na
-us.na
-mx.na
-ca.na
-in.na
-cc.na
-tv.na
-ws.na
-mobi.na
-co.na
-com.na
-org.na
-
-// name : has 2nd-level tlds, but there's no list of them
-name
-
-// nc : http://www.cctld.nc/
-nc
-asso.nc
-
-// ne : http://en.wikipedia.org/wiki/.ne
-ne
-
-// net : http://en.wikipedia.org/wiki/.net
-net
-
-// nf : http://en.wikipedia.org/wiki/.nf
-nf
-com.nf
-net.nf
-per.nf
-rec.nf
-web.nf
-arts.nf
-firm.nf
-info.nf
-other.nf
-store.nf
-
-// ng : http://psg.com/dns/ng/
-ng
-com.ng
-edu.ng
-name.ng
-net.ng
-org.ng
-sch.ng
-gov.ng
-mil.ng
-mobi.ng
-
-// ni : http://www.nic.ni/dominios.htm
-*.ni
-
-// nl : http://www.domain-registry.nl/ace.php/c,728,122,,,,Home.html
-// Confirmed by registry <Antoin.Verschuren@sidn.nl> (with technical
-// reservations) 2008-06-08
-nl
-
-// BV.nl will be a registry for dutch BV's (besloten vennootschap)
-bv.nl
-
-// no : http://www.norid.no/regelverk/index.en.html
-// The Norwegian registry has declined to notify us of updates. The web pages
-// referenced below are the official source of the data. There is also an
-// announce mailing list:
-// https://postlister.uninett.no/sympa/info/norid-diskusjon
-no
-// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
-fhs.no
-vgs.no
-fylkesbibl.no
-folkebibl.no
-museum.no
-idrett.no
-priv.no
-// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
-mil.no
-stat.no
-dep.no
-kommune.no
-herad.no
-// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
-// counties
-aa.no
-ah.no
-bu.no
-fm.no
-hl.no
-hm.no
-jan-mayen.no
-mr.no
-nl.no
-nt.no
-of.no
-ol.no
-oslo.no
-rl.no
-sf.no
-st.no
-svalbard.no
-tm.no
-tr.no
-va.no
-vf.no
-// primary and lower secondary schools per county
-gs.aa.no
-gs.ah.no
-gs.bu.no
-gs.fm.no
-gs.hl.no
-gs.hm.no
-gs.jan-mayen.no
-gs.mr.no
-gs.nl.no
-gs.nt.no
-gs.of.no
-gs.ol.no
-gs.oslo.no
-gs.rl.no
-gs.sf.no
-gs.st.no
-gs.svalbard.no
-gs.tm.no
-gs.tr.no
-gs.va.no
-gs.vf.no
-// cities
-akrehamn.no
-Ã¥krehamn.no
-xn--krehamn-dxa.no
-algard.no
-ålgård.no
-xn--lgrd-poac.no
-arna.no
-brumunddal.no
-bryne.no
-bronnoysund.no
-brønnøysund.no
-xn--brnnysund-m8ac.no
-drobak.no
-drøbak.no
-xn--drbak-wua.no
-egersund.no
-fetsund.no
-floro.no
-florø.no
-xn--flor-jra.no
-fredrikstad.no
-hokksund.no
-honefoss.no
-hønefoss.no
-xn--hnefoss-q1a.no
-jessheim.no
-jorpeland.no
-jørpeland.no
-xn--jrpeland-54a.no
-kirkenes.no
-kopervik.no
-krokstadelva.no
-langevag.no
-langevåg.no
-xn--langevg-jxa.no
-leirvik.no
-mjondalen.no
-mjøndalen.no
-xn--mjndalen-64a.no
-mo-i-rana.no
-mosjoen.no
-mosjøen.no
-xn--mosjen-eya.no
-nesoddtangen.no
-orkanger.no
-osoyro.no
-osøyro.no
-xn--osyro-wua.no
-raholt.no
-råholt.no
-xn--rholt-mra.no
-sandnessjoen.no
-sandnessjøen.no
-xn--sandnessjen-ogb.no
-skedsmokorset.no
-slattum.no
-spjelkavik.no
-stathelle.no
-stavern.no
-stjordalshalsen.no
-stjørdalshalsen.no
-xn--stjrdalshalsen-sqb.no
-tananger.no
-tranby.no
-vossevangen.no
-// communities
-afjord.no
-Ã¥fjord.no
-xn--fjord-lra.no
-agdenes.no
-al.no
-Ã¥l.no
-xn--l-1fa.no
-alesund.no
-Ã¥lesund.no
-xn--lesund-hua.no
-alstahaug.no
-alta.no
-áltá.no
-xn--lt-liac.no
-alaheadju.no
-álaheadju.no
-xn--laheadju-7ya.no
-alvdal.no
-amli.no
-Ã¥mli.no
-xn--mli-tla.no
-amot.no
-Ã¥mot.no
-xn--mot-tla.no
-andebu.no
-andoy.no
-andøy.no
-xn--andy-ira.no
-andasuolo.no
-ardal.no
-Ã¥rdal.no
-xn--rdal-poa.no
-aremark.no
-arendal.no
-Ã¥s.no
-xn--s-1fa.no
-aseral.no
-Ã¥seral.no
-xn--seral-lra.no
-asker.no
-askim.no
-askvoll.no
-askoy.no
-askøy.no
-xn--asky-ira.no
-asnes.no
-Ã¥snes.no
-xn--snes-poa.no
-audnedaln.no
-aukra.no
-aure.no
-aurland.no
-aurskog-holand.no
-aurskog-høland.no
-xn--aurskog-hland-jnb.no
-austevoll.no
-austrheim.no
-averoy.no
-averøy.no
-xn--avery-yua.no
-balestrand.no
-ballangen.no
-balat.no
-bálát.no
-xn--blt-elab.no
-balsfjord.no
-bahccavuotna.no
-báhccavuotna.no
-xn--bhccavuotna-k7a.no
-bamble.no
-bardu.no
-beardu.no
-beiarn.no
-bajddar.no
-bájddar.no
-xn--bjddar-pta.no
-baidar.no
-báidár.no
-xn--bidr-5nac.no
-berg.no
-bergen.no
-berlevag.no
-berlevåg.no
-xn--berlevg-jxa.no
-bearalvahki.no
-bearalváhki.no
-xn--bearalvhki-y4a.no
-bindal.no
-birkenes.no
-bjarkoy.no
-bjarkøy.no
-xn--bjarky-fya.no
-bjerkreim.no
-bjugn.no
-bodo.no
-bodø.no
-xn--bod-2na.no
-badaddja.no
-bådåddjå.no
-xn--bdddj-mrabd.no
-budejju.no
-bokn.no
-bremanger.no
-bronnoy.no
-brønnøy.no
-xn--brnny-wuac.no
-bygland.no
-bykle.no
-barum.no
-bærum.no
-xn--brum-voa.no
-bo.telemark.no
-bø.telemark.no
-xn--b-5ga.telemark.no
-bo.nordland.no
-bø.nordland.no
-xn--b-5ga.nordland.no
-bievat.no
-bievát.no
-xn--bievt-0qa.no
-bomlo.no
-bømlo.no
-xn--bmlo-gra.no
-batsfjord.no
-båtsfjord.no
-xn--btsfjord-9za.no
-bahcavuotna.no
-báhcavuotna.no
-xn--bhcavuotna-s4a.no
-dovre.no
-drammen.no
-drangedal.no
-dyroy.no
-dyrøy.no
-xn--dyry-ira.no
-donna.no
-dønna.no
-xn--dnna-gra.no
-eid.no
-eidfjord.no
-eidsberg.no
-eidskog.no
-eidsvoll.no
-eigersund.no
-elverum.no
-enebakk.no
-engerdal.no
-etne.no
-etnedal.no
-evenes.no
-evenassi.no
-evenášši.no
-xn--eveni-0qa01ga.no
-evje-og-hornnes.no
-farsund.no
-fauske.no
-fuossko.no
-fuoisku.no
-fedje.no
-fet.no
-finnoy.no
-finnøy.no
-xn--finny-yua.no
-fitjar.no
-fjaler.no
-fjell.no
-flakstad.no
-flatanger.no
-flekkefjord.no
-flesberg.no
-flora.no
-fla.no
-flå.no
-xn--fl-zia.no
-folldal.no
-forsand.no
-fosnes.no
-frei.no
-frogn.no
-froland.no
-frosta.no
-frana.no
-fræna.no
-xn--frna-woa.no
-froya.no
-frøya.no
-xn--frya-hra.no
-fusa.no
-fyresdal.no
-forde.no
-førde.no
-xn--frde-gra.no
-gamvik.no
-gangaviika.no
-gáŋgaviika.no
-xn--ggaviika-8ya47h.no
-gaular.no
-gausdal.no
-gildeskal.no
-gildeskål.no
-xn--gildeskl-g0a.no
-giske.no
-gjemnes.no
-gjerdrum.no
-gjerstad.no
-gjesdal.no
-gjovik.no
-gjøvik.no
-xn--gjvik-wua.no
-gloppen.no
-gol.no
-gran.no
-grane.no
-granvin.no
-gratangen.no
-grimstad.no
-grong.no
-kraanghke.no
-kråanghke.no
-xn--kranghke-b0a.no
-grue.no
-gulen.no
-hadsel.no
-halden.no
-halsa.no
-hamar.no
-hamaroy.no
-habmer.no
-hábmer.no
-xn--hbmer-xqa.no
-hapmir.no
-hápmir.no
-xn--hpmir-xqa.no
-hammerfest.no
-hammarfeasta.no
-hámmárfeasta.no
-xn--hmmrfeasta-s4ac.no
-haram.no
-hareid.no
-harstad.no
-hasvik.no
-aknoluokta.no
-ákŋoluokta.no
-xn--koluokta-7ya57h.no
-hattfjelldal.no
-aarborte.no
-haugesund.no
-hemne.no
-hemnes.no
-hemsedal.no
-heroy.more-og-romsdal.no
-herøy.møre-og-romsdal.no
-xn--hery-ira.xn--mre-og-romsdal-qqb.no
-heroy.nordland.no
-herøy.nordland.no
-xn--hery-ira.nordland.no
-hitra.no
-hjartdal.no
-hjelmeland.no
-hobol.no
-hobøl.no
-xn--hobl-ira.no
-hof.no
-hol.no
-hole.no
-holmestrand.no
-holtalen.no
-holtålen.no
-xn--holtlen-hxa.no
-hornindal.no
-horten.no
-hurdal.no
-hurum.no
-hvaler.no
-hyllestad.no
-hagebostad.no
-hægebostad.no
-xn--hgebostad-g3a.no
-hoyanger.no
-høyanger.no
-xn--hyanger-q1a.no
-hoylandet.no
-høylandet.no
-xn--hylandet-54a.no
-ha.no
-hå.no
-xn--h-2fa.no
-ibestad.no
-inderoy.no
-inderøy.no
-xn--indery-fya.no
-iveland.no
-jevnaker.no
-jondal.no
-jolster.no
-jølster.no
-xn--jlster-bya.no
-karasjok.no
-karasjohka.no
-kárášjohka.no
-xn--krjohka-hwab49j.no
-karlsoy.no
-galsa.no
-gálsá.no
-xn--gls-elac.no
-karmoy.no
-karmøy.no
-xn--karmy-yua.no
-kautokeino.no
-guovdageaidnu.no
-klepp.no
-klabu.no
-klæbu.no
-xn--klbu-woa.no
-kongsberg.no
-kongsvinger.no
-kragero.no
-kragerø.no
-xn--krager-gya.no
-kristiansand.no
-kristiansund.no
-krodsherad.no
-krødsherad.no
-xn--krdsherad-m8a.no
-kvalsund.no
-rahkkeravju.no
-ráhkkerávju.no
-xn--rhkkervju-01af.no
-kvam.no
-kvinesdal.no
-kvinnherad.no
-kviteseid.no
-kvitsoy.no
-kvitsøy.no
-xn--kvitsy-fya.no
-kvafjord.no
-kvæfjord.no
-xn--kvfjord-nxa.no
-giehtavuoatna.no
-kvanangen.no
-kvænangen.no
-xn--kvnangen-k0a.no
-navuotna.no
-návuotna.no
-xn--nvuotna-hwa.no
-kafjord.no
-kåfjord.no
-xn--kfjord-iua.no
-gaivuotna.no
-gáivuotna.no
-xn--givuotna-8ya.no
-larvik.no
-lavangen.no
-lavagis.no
-loabat.no
-loabát.no
-xn--loabt-0qa.no
-lebesby.no
-davvesiida.no
-leikanger.no
-leirfjord.no
-leka.no
-leksvik.no
-lenvik.no
-leangaviika.no
-leaŋgaviika.no
-xn--leagaviika-52b.no
-lesja.no
-levanger.no
-lier.no
-lierne.no
-lillehammer.no
-lillesand.no
-lindesnes.no
-lindas.no
-lindås.no
-xn--linds-pra.no
-lom.no
-loppa.no
-lahppi.no
-láhppi.no
-xn--lhppi-xqa.no
-lund.no
-lunner.no
-luroy.no
-lurøy.no
-xn--lury-ira.no
-luster.no
-lyngdal.no
-lyngen.no
-ivgu.no
-lardal.no
-lerdal.no
-lærdal.no
-xn--lrdal-sra.no
-lodingen.no
-lødingen.no
-xn--ldingen-q1a.no
-lorenskog.no
-lørenskog.no
-xn--lrenskog-54a.no
-loten.no
-løten.no
-xn--lten-gra.no
-malvik.no
-masoy.no
-måsøy.no
-xn--msy-ula0h.no
-muosat.no
-muosát.no
-xn--muost-0qa.no
-mandal.no
-marker.no
-marnardal.no
-masfjorden.no
-meland.no
-meldal.no
-melhus.no
-meloy.no
-meløy.no
-xn--mely-ira.no
-meraker.no
-meråker.no
-xn--merker-kua.no
-moareke.no
-moåreke.no
-xn--moreke-jua.no
-midsund.no
-midtre-gauldal.no
-modalen.no
-modum.no
-molde.no
-moskenes.no
-moss.no
-mosvik.no
-malselv.no
-målselv.no
-xn--mlselv-iua.no
-malatvuopmi.no
-málatvuopmi.no
-xn--mlatvuopmi-s4a.no
-namdalseid.no
-aejrie.no
-namsos.no
-namsskogan.no
-naamesjevuemie.no
-nååmesjevuemie.no
-xn--nmesjevuemie-tcba.no
-laakesvuemie.no
-nannestad.no
-narvik.no
-narviika.no
-naustdal.no
-nedre-eiker.no
-nes.akershus.no
-nes.buskerud.no
-nesna.no
-nesodden.no
-nesseby.no
-unjarga.no
-unjárga.no
-xn--unjrga-rta.no
-nesset.no
-nissedal.no
-nittedal.no
-nord-aurdal.no
-nord-fron.no
-nord-odal.no
-norddal.no
-nordkapp.no
-davvenjarga.no
-davvenjárga.no
-xn--davvenjrga-y4a.no
-nordre-land.no
-nordreisa.no
-raisa.no
-ráisa.no
-xn--risa-5na.no
-nore-og-uvdal.no
-notodden.no
-naroy.no
-nærøy.no
-xn--nry-yla5g.no
-notteroy.no
-nøtterøy.no
-xn--nttery-byae.no
-odda.no
-oksnes.no
-øksnes.no
-xn--ksnes-uua.no
-oppdal.no
-oppegard.no
-oppegård.no
-xn--oppegrd-ixa.no
-orkdal.no
-orland.no
-ørland.no
-xn--rland-uua.no
-orskog.no
-ørskog.no
-xn--rskog-uua.no
-orsta.no
-ørsta.no
-xn--rsta-fra.no
-os.hedmark.no
-os.hordaland.no
-osen.no
-osteroy.no
-osterøy.no
-xn--ostery-fya.no
-ostre-toten.no
-østre-toten.no
-xn--stre-toten-zcb.no
-overhalla.no
-ovre-eiker.no
-øvre-eiker.no
-xn--vre-eiker-k8a.no
-oyer.no
-øyer.no
-xn--yer-zna.no
-oygarden.no
-øygarden.no
-xn--ygarden-p1a.no
-oystre-slidre.no
-øystre-slidre.no
-xn--ystre-slidre-ujb.no
-porsanger.no
-porsangu.no
-porsáŋgu.no
-xn--porsgu-sta26f.no
-porsgrunn.no
-radoy.no
-radøy.no
-xn--rady-ira.no
-rakkestad.no
-rana.no
-ruovat.no
-randaberg.no
-rauma.no
-rendalen.no
-rennebu.no
-rennesoy.no
-rennesøy.no
-xn--rennesy-v1a.no
-rindal.no
-ringebu.no
-ringerike.no
-ringsaker.no
-rissa.no
-risor.no
-risør.no
-xn--risr-ira.no
-roan.no
-rollag.no
-rygge.no
-ralingen.no
-rælingen.no
-xn--rlingen-mxa.no
-rodoy.no
-rødøy.no
-xn--rdy-0nab.no
-romskog.no
-rømskog.no
-xn--rmskog-bya.no
-roros.no
-røros.no
-xn--rros-gra.no
-rost.no
-røst.no
-xn--rst-0na.no
-royken.no
-røyken.no
-xn--ryken-vua.no
-royrvik.no
-røyrvik.no
-xn--ryrvik-bya.no
-rade.no
-råde.no
-xn--rde-ula.no
-salangen.no
-siellak.no
-saltdal.no
-salat.no
-sálát.no
-xn--slt-elab.no
-sálat.no
-xn--slat-5na.no
-samnanger.no
-sande.more-og-romsdal.no
-sande.møre-og-romsdal.no
-sande.xn--mre-og-romsdal-qqb.no
-sande.vestfold.no
-sandefjord.no
-sandnes.no
-sandoy.no
-sandøy.no
-xn--sandy-yua.no
-sarpsborg.no
-sauda.no
-sauherad.no
-sel.no
-selbu.no
-selje.no
-seljord.no
-sigdal.no
-siljan.no
-sirdal.no
-skaun.no
-skedsmo.no
-ski.no
-skien.no
-skiptvet.no
-skjervoy.no
-skjervøy.no
-xn--skjervy-v1a.no
-skierva.no
-skiervá.no
-xn--skierv-uta.no
-skjak.no
-skjåk.no
-xn--skjk-soa.no
-skodje.no
-skanland.no
-skånland.no
-xn--sknland-fxa.no
-skanit.no
-skánit.no
-xn--sknit-yqa.no
-smola.no
-smøla.no
-xn--smla-hra.no
-snillfjord.no
-snasa.no
-snåsa.no
-xn--snsa-roa.no
-snoasa.no
-snaase.no
-snåase.no
-xn--snase-nra.no
-sogndal.no
-sokndal.no
-sola.no
-solund.no
-songdalen.no
-sortland.no
-spydeberg.no
-stange.no
-stavanger.no
-steigen.no
-steinkjer.no
-stjordal.no
-stjørdal.no
-xn--stjrdal-s1a.no
-stokke.no
-stor-elvdal.no
-stord.no
-stordal.no
-storfjord.no
-omasvuotna.no
-strand.no
-stranda.no
-stryn.no
-sula.no
-suldal.no
-sund.no
-sunndal.no
-surnadal.no
-sveio.no
-svelvik.no
-sykkylven.no
-sogne.no
-søgne.no
-xn--sgne-gra.no
-somna.no
-sømna.no
-xn--smna-gra.no
-sondre-land.no
-søndre-land.no
-xn--sndre-land-0cb.no
-sor-aurdal.no
-sør-aurdal.no
-xn--sr-aurdal-l8a.no
-sor-fron.no
-sør-fron.no
-xn--sr-fron-q1a.no
-sor-odal.no
-sør-odal.no
-xn--sr-odal-q1a.no
-sor-varanger.no
-sør-varanger.no
-xn--sr-varanger-ggb.no
-matta-varjjat.no
-mátta-várjjat.no
-xn--mtta-vrjjat-k7af.no
-sorfold.no
-sørfold.no
-xn--srfold-bya.no
-sorreisa.no
-sørreisa.no
-xn--srreisa-q1a.no
-sorum.no
-sørum.no
-xn--srum-gra.no
-tana.no
-deatnu.no
-time.no
-tingvoll.no
-tinn.no
-tjeldsund.no
-dielddanuorri.no
-tjome.no
-tjøme.no
-xn--tjme-hra.no
-tokke.no
-tolga.no
-torsken.no
-tranoy.no
-tranøy.no
-xn--trany-yua.no
-tromso.no
-tromsø.no
-xn--troms-zua.no
-tromsa.no
-romsa.no
-trondheim.no
-troandin.no
-trysil.no
-trana.no
-træna.no
-xn--trna-woa.no
-trogstad.no
-trøgstad.no
-xn--trgstad-r1a.no
-tvedestrand.no
-tydal.no
-tynset.no
-tysfjord.no
-divtasvuodna.no
-divttasvuotna.no
-tysnes.no
-tysvar.no
-tysvær.no
-xn--tysvr-vra.no
-tonsberg.no
-tønsberg.no
-xn--tnsberg-q1a.no
-ullensaker.no
-ullensvang.no
-ulvik.no
-utsira.no
-vadso.no
-vadsø.no
-xn--vads-jra.no
-cahcesuolo.no
-čáhcesuolo.no
-xn--hcesuolo-7ya35b.no
-vaksdal.no
-valle.no
-vang.no
-vanylven.no
-vardo.no
-vardø.no
-xn--vard-jra.no
-varggat.no
-várggát.no
-xn--vrggt-xqad.no
-vefsn.no
-vaapste.no
-vega.no
-vegarshei.no
-vegårshei.no
-xn--vegrshei-c0a.no
-vennesla.no
-verdal.no
-verran.no
-vestby.no
-vestnes.no
-vestre-slidre.no
-vestre-toten.no
-vestvagoy.no
-vestvågøy.no
-xn--vestvgy-ixa6o.no
-vevelstad.no
-vik.no
-vikna.no
-vindafjord.no
-volda.no
-voss.no
-varoy.no
-værøy.no
-xn--vry-yla5g.no
-vagan.no
-vågan.no
-xn--vgan-qoa.no
-voagat.no
-vagsoy.no
-vågsøy.no
-xn--vgsy-qoa0j.no
-vaga.no
-vågå.no
-xn--vg-yiab.no
-valer.ostfold.no
-våler.østfold.no
-xn--vler-qoa.xn--stfold-9xa.no
-valer.hedmark.no
-våler.hedmark.no
-xn--vler-qoa.hedmark.no
-
-// np : http://www.mos.com.np/register.html
-*.np
-
-// nr : http://cenpac.net.nr/dns/index.html
-// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17
-nr
-biz.nr
-info.nr
-gov.nr
-edu.nr
-org.nr
-net.nr
-com.nr
-
-// nu : http://en.wikipedia.org/wiki/.nu
-nu
-
-// nz : http://en.wikipedia.org/wiki/.nz
-// Confirmed by registry <jay@nzrs.net.nz> 2014-05-19
-nz
-ac.nz
-co.nz
-cri.nz
-geek.nz
-gen.nz
-govt.nz
-health.nz
-iwi.nz
-kiwi.nz
-maori.nz
-mil.nz
-māori.nz
-xn--mori-qsa.nz
-net.nz
-org.nz
-parliament.nz
-school.nz
-
-// om : http://en.wikipedia.org/wiki/.om
-om
-co.om
-com.om
-edu.om
-gov.om
-med.om
-museum.om
-net.om
-org.om
-pro.om
-
-// org : http://en.wikipedia.org/wiki/.org
-org
-
-// pa : http://www.nic.pa/
-// Some additional second level "domains" resolve directly as hostnames, such as
-// pannet.pa, so we add a rule for "pa".
-pa
-ac.pa
-gob.pa
-com.pa
-org.pa
-sld.pa
-edu.pa
-net.pa
-ing.pa
-abo.pa
-med.pa
-nom.pa
-
-// pe : https://www.nic.pe/InformeFinalComision.pdf
-pe
-edu.pe
-gob.pe
-nom.pe
-mil.pe
-org.pe
-com.pe
-net.pe
-
-// pf : http://www.gobin.info/domainname/formulaire-pf.pdf
-pf
-com.pf
-org.pf
-edu.pf
-
-// pg : http://en.wikipedia.org/wiki/.pg
-*.pg
-
-// ph : http://www.domains.ph/FAQ2.asp
-// Submitted by registry <jed@email.com.ph> 2008-06-13
-ph
-com.ph
-net.ph
-org.ph
-gov.ph
-edu.ph
-ngo.ph
-mil.ph
-i.ph
-
-// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
-pk
-com.pk
-net.pk
-edu.pk
-org.pk
-fam.pk
-biz.pk
-web.pk
-gov.pk
-gob.pk
-gok.pk
-gon.pk
-gop.pk
-gos.pk
-info.pk
-
-// pl http://www.dns.pl/english/index.html
-// confirmed on 26.09.2014 from Bogna Tchórzewska <partner@dns.pl>
-pl
-com.pl
-net.pl
-org.pl
-info.pl
-waw.pl
-gov.pl
-// pl functional domains (http://www.dns.pl/english/index.html)
-aid.pl
-agro.pl
-atm.pl
-auto.pl
-biz.pl
-edu.pl
-gmina.pl
-gsm.pl
-mail.pl
-miasta.pl
-media.pl
-mil.pl
-nieruchomosci.pl
-nom.pl
-pc.pl
-powiat.pl
-priv.pl
-realestate.pl
-rel.pl
-sex.pl
-shop.pl
-sklep.pl
-sos.pl
-szkola.pl
-targi.pl
-tm.pl
-tourism.pl
-travel.pl
-turystyka.pl
-// Government domains (administred by ippt.gov.pl)
-uw.gov.pl
-um.gov.pl
-ug.gov.pl
-upow.gov.pl
-starostwo.gov.pl
-so.gov.pl
-sr.gov.pl
-po.gov.pl
-pa.gov.pl
-// pl regional domains (http://www.dns.pl/english/index.html)
-augustow.pl
-babia-gora.pl
-bedzin.pl
-beskidy.pl
-bialowieza.pl
-bialystok.pl
-bielawa.pl
-bieszczady.pl
-boleslawiec.pl
-bydgoszcz.pl
-bytom.pl
-cieszyn.pl
-czeladz.pl
-czest.pl
-dlugoleka.pl
-elblag.pl
-elk.pl
-glogow.pl
-gniezno.pl
-gorlice.pl
-grajewo.pl
-ilawa.pl
-jaworzno.pl
-jelenia-gora.pl
-jgora.pl
-kalisz.pl
-kazimierz-dolny.pl
-karpacz.pl
-kartuzy.pl
-kaszuby.pl
-katowice.pl
-kepno.pl
-ketrzyn.pl
-klodzko.pl
-kobierzyce.pl
-kolobrzeg.pl
-konin.pl
-konskowola.pl
-kutno.pl
-lapy.pl
-lebork.pl
-legnica.pl
-lezajsk.pl
-limanowa.pl
-lomza.pl
-lowicz.pl
-lubin.pl
-lukow.pl
-malbork.pl
-malopolska.pl
-mazowsze.pl
-mazury.pl
-mielec.pl
-mielno.pl
-mragowo.pl
-naklo.pl
-nowaruda.pl
-nysa.pl
-olawa.pl
-olecko.pl
-olkusz.pl
-olsztyn.pl
-opoczno.pl
-opole.pl
-ostroda.pl
-ostroleka.pl
-ostrowiec.pl
-ostrowwlkp.pl
-pila.pl
-pisz.pl
-podhale.pl
-podlasie.pl
-polkowice.pl
-pomorze.pl
-pomorskie.pl
-prochowice.pl
-pruszkow.pl
-przeworsk.pl
-pulawy.pl
-radom.pl
-rawa-maz.pl
-rybnik.pl
-rzeszow.pl
-sanok.pl
-sejny.pl
-slask.pl
-slupsk.pl
-sosnowiec.pl
-stalowa-wola.pl
-skoczow.pl
-starachowice.pl
-stargard.pl
-suwalki.pl
-swidnica.pl
-swiebodzin.pl
-swinoujscie.pl
-szczecin.pl
-szczytno.pl
-tarnobrzeg.pl
-tgory.pl
-turek.pl
-tychy.pl
-ustka.pl
-walbrzych.pl
-warmia.pl
-warszawa.pl
-wegrow.pl
-wielun.pl
-wlocl.pl
-wloclawek.pl
-wodzislaw.pl
-wolomin.pl
-wroclaw.pl
-zachpomor.pl
-zagan.pl
-zarow.pl
-zgora.pl
-zgorzelec.pl
-
-// pm : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-pm
-
-// pn : http://www.government.pn/PnRegistry/policies.htm
-pn
-gov.pn
-co.pn
-org.pn
-edu.pn
-net.pn
-
-// post : http://en.wikipedia.org/wiki/.post
-post
-
-// pr : http://www.nic.pr/index.asp?f=1
-pr
-com.pr
-net.pr
-org.pr
-gov.pr
-edu.pr
-isla.pr
-pro.pr
-biz.pr
-info.pr
-name.pr
-// these aren't mentioned on nic.pr, but on http://en.wikipedia.org/wiki/.pr
-est.pr
-prof.pr
-ac.pr
-
-// pro : http://www.nic.pro/support_faq.htm
-pro
-aca.pro
-bar.pro
-cpa.pro
-jur.pro
-law.pro
-med.pro
-eng.pro
-
-// ps : http://en.wikipedia.org/wiki/.ps
-// http://www.nic.ps/registration/policy.html#reg
-ps
-edu.ps
-gov.ps
-sec.ps
-plo.ps
-com.ps
-org.ps
-net.ps
-
-// pt : http://online.dns.pt/dns/start_dns
-pt
-net.pt
-gov.pt
-org.pt
-edu.pt
-int.pt
-publ.pt
-com.pt
-nome.pt
-
-// pw : http://en.wikipedia.org/wiki/.pw
-pw
-co.pw
-ne.pw
-or.pw
-ed.pw
-go.pw
-belau.pw
-
-// py : http://www.nic.py/pautas.html#seccion_9
-// Confirmed by registry 2012-10-03
-py
-com.py
-coop.py
-edu.py
-gov.py
-mil.py
-net.py
-org.py
-
-// qa : http://domains.qa/en/
-qa
-com.qa
-edu.qa
-gov.qa
-mil.qa
-name.qa
-net.qa
-org.qa
-sch.qa
-
-// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
-re
-com.re
-asso.re
-nom.re
-
-// ro : http://www.rotld.ro/
-ro
-com.ro
-org.ro
-tm.ro
-nt.ro
-nom.ro
-info.ro
-rec.ro
-arts.ro
-firm.ro
-store.ro
-www.ro
-
-// rs : http://en.wikipedia.org/wiki/.rs
-rs
-co.rs
-org.rs
-edu.rs
-ac.rs
-gov.rs
-in.rs
-
-// ru : http://www.cctld.ru/ru/docs/aktiv_8.php
-// Industry domains
-ru
-ac.ru
-com.ru
-edu.ru
-int.ru
-net.ru
-org.ru
-pp.ru
-// Geographical domains
-adygeya.ru
-altai.ru
-amur.ru
-arkhangelsk.ru
-astrakhan.ru
-bashkiria.ru
-belgorod.ru
-bir.ru
-bryansk.ru
-buryatia.ru
-cbg.ru
-chel.ru
-chelyabinsk.ru
-chita.ru
-chukotka.ru
-chuvashia.ru
-dagestan.ru
-dudinka.ru
-e-burg.ru
-grozny.ru
-irkutsk.ru
-ivanovo.ru
-izhevsk.ru
-jar.ru
-joshkar-ola.ru
-kalmykia.ru
-kaluga.ru
-kamchatka.ru
-karelia.ru
-kazan.ru
-kchr.ru
-kemerovo.ru
-khabarovsk.ru
-khakassia.ru
-khv.ru
-kirov.ru
-koenig.ru
-komi.ru
-kostroma.ru
-krasnoyarsk.ru
-kuban.ru
-kurgan.ru
-kursk.ru
-lipetsk.ru
-magadan.ru
-mari.ru
-mari-el.ru
-marine.ru
-mordovia.ru
-// mosreg.ru Bug 1090800 - removed at request of Aleksey Konstantinov <konstantinovav@mosreg.ru>
-msk.ru
-murmansk.ru
-nalchik.ru
-nnov.ru
-nov.ru
-novosibirsk.ru
-nsk.ru
-omsk.ru
-orenburg.ru
-oryol.ru
-palana.ru
-penza.ru
-perm.ru
-ptz.ru
-rnd.ru
-ryazan.ru
-sakhalin.ru
-samara.ru
-saratov.ru
-simbirsk.ru
-smolensk.ru
-spb.ru
-stavropol.ru
-stv.ru
-surgut.ru
-tambov.ru
-tatarstan.ru
-tom.ru
-tomsk.ru
-tsaritsyn.ru
-tsk.ru
-tula.ru
-tuva.ru
-tver.ru
-tyumen.ru
-udm.ru
-udmurtia.ru
-ulan-ude.ru
-vladikavkaz.ru
-vladimir.ru
-vladivostok.ru
-volgograd.ru
-vologda.ru
-voronezh.ru
-vrn.ru
-vyatka.ru
-yakutia.ru
-yamal.ru
-yaroslavl.ru
-yekaterinburg.ru
-yuzhno-sakhalinsk.ru
-// More geographical domains
-amursk.ru
-baikal.ru
-cmw.ru
-fareast.ru
-jamal.ru
-kms.ru
-k-uralsk.ru
-kustanai.ru
-kuzbass.ru
-magnitka.ru
-mytis.ru
-nakhodka.ru
-nkz.ru
-norilsk.ru
-oskol.ru
-pyatigorsk.ru
-rubtsovsk.ru
-snz.ru
-syzran.ru
-vdonsk.ru
-zgrad.ru
-// State domains
-gov.ru
-mil.ru
-// Technical domains
-test.ru
-
-// rw : http://www.nic.rw/cgi-bin/policy.pl
-rw
-gov.rw
-net.rw
-edu.rw
-ac.rw
-com.rw
-co.rw
-int.rw
-mil.rw
-gouv.rw
-
-// sa : http://www.nic.net.sa/
-sa
-com.sa
-net.sa
-org.sa
-gov.sa
-med.sa
-pub.sa
-edu.sa
-sch.sa
-
-// sb : http://www.sbnic.net.sb/
-// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
-sb
-com.sb
-edu.sb
-gov.sb
-net.sb
-org.sb
-
-// sc : http://www.nic.sc/
-sc
-com.sc
-gov.sc
-net.sc
-org.sc
-edu.sc
-
-// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
-// Submitted by registry <admin@isoc.sd> 2008-06-17
-sd
-com.sd
-net.sd
-org.sd
-edu.sd
-med.sd
-tv.sd
-gov.sd
-info.sd
-
-// se : http://en.wikipedia.org/wiki/.se
-// Submitted by registry <patrik.wallstrom@iis.se> 2014-03-18
-se
-a.se
-ac.se
-b.se
-bd.se
-brand.se
-c.se
-d.se
-e.se
-f.se
-fh.se
-fhsk.se
-fhv.se
-g.se
-h.se
-i.se
-k.se
-komforb.se
-kommunalforbund.se
-komvux.se
-l.se
-lanbib.se
-m.se
-n.se
-naturbruksgymn.se
-o.se
-org.se
-p.se
-parti.se
-pp.se
-press.se
-r.se
-s.se
-t.se
-tm.se
-u.se
-w.se
-x.se
-y.se
-z.se
-
-// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines
-sg
-com.sg
-net.sg
-org.sg
-gov.sg
-edu.sg
-per.sg
-
-// sh : http://www.nic.sh/registrar.html
-sh
-com.sh
-net.sh
-gov.sh
-org.sh
-mil.sh
-
-// si : http://en.wikipedia.org/wiki/.si
-si
-
-// sj : No registrations at this time.
-// Submitted by registry <jarle@uninett.no> 2008-06-16
-sj
-
-// sk : http://en.wikipedia.org/wiki/.sk
-// list of 2nd level domains ?
-sk
-
-// sl : http://www.nic.sl
-// Submitted by registry <adam@neoip.com> 2008-06-12
-sl
-com.sl
-net.sl
-edu.sl
-gov.sl
-org.sl
-
-// sm : http://en.wikipedia.org/wiki/.sm
-sm
-
-// sn : http://en.wikipedia.org/wiki/.sn
-sn
-art.sn
-com.sn
-edu.sn
-gouv.sn
-org.sn
-perso.sn
-univ.sn
-
-// so : http://www.soregistry.com/
-so
-com.so
-net.so
-org.so
-
-// sr : http://en.wikipedia.org/wiki/.sr
-sr
-
-// st : http://www.nic.st/html/policyrules/
-st
-co.st
-com.st
-consulado.st
-edu.st
-embaixada.st
-gov.st
-mil.st
-net.st
-org.st
-principe.st
-saotome.st
-store.st
-
-// su : http://en.wikipedia.org/wiki/.su
-su
-adygeya.su
-arkhangelsk.su
-balashov.su
-bashkiria.su
-bryansk.su
-dagestan.su
-grozny.su
-ivanovo.su
-kalmykia.su
-kaluga.su
-karelia.su
-khakassia.su
-krasnodar.su
-kurgan.su
-lenug.su
-mordovia.su
-msk.su
-murmansk.su
-nalchik.su
-nov.su
-obninsk.su
-penza.su
-pokrovsk.su
-sochi.su
-spb.su
-togliatti.su
-troitsk.su
-tula.su
-tuva.su
-vladikavkaz.su
-vladimir.su
-vologda.su
-
-// sv : http://www.svnet.org.sv/niveldos.pdf
-sv
-com.sv
-edu.sv
-gob.sv
-org.sv
-red.sv
-
-// sx : http://en.wikipedia.org/wiki/.sx
-// Confirmed by registry <jcvignes@openregistry.com> 2012-05-31
-sx
-gov.sx
-
-// sy : http://en.wikipedia.org/wiki/.sy
-// see also: http://www.gobin.info/domainname/sy.doc
-sy
-edu.sy
-gov.sy
-net.sy
-mil.sy
-com.sy
-org.sy
-
-// sz : http://en.wikipedia.org/wiki/.sz
-// http://www.sispa.org.sz/
-sz
-co.sz
-ac.sz
-org.sz
-
-// tc : http://en.wikipedia.org/wiki/.tc
-tc
-
-// td : http://en.wikipedia.org/wiki/.td
-td
-
-// tel: http://en.wikipedia.org/wiki/.tel
-// http://www.telnic.org/
-tel
-
-// tf : http://en.wikipedia.org/wiki/.tf
-tf
-
-// tg : http://en.wikipedia.org/wiki/.tg
-// http://www.nic.tg/
-tg
-
-// th : http://en.wikipedia.org/wiki/.th
-// Submitted by registry <krit@thains.co.th> 2008-06-17
-th
-ac.th
-co.th
-go.th
-in.th
-mi.th
-net.th
-or.th
-
-// tj : http://www.nic.tj/policy.html
-tj
-ac.tj
-biz.tj
-co.tj
-com.tj
-edu.tj
-go.tj
-gov.tj
-int.tj
-mil.tj
-name.tj
-net.tj
-nic.tj
-org.tj
-test.tj
-web.tj
-
-// tk : http://en.wikipedia.org/wiki/.tk
-tk
-
-// tl : http://en.wikipedia.org/wiki/.tl
-tl
-gov.tl
-
-// tm : http://www.nic.tm/local.html
-tm
-com.tm
-co.tm
-org.tm
-net.tm
-nom.tm
-gov.tm
-mil.tm
-edu.tm
-
-// tn : http://en.wikipedia.org/wiki/.tn
-// http://whois.ati.tn/
-tn
-com.tn
-ens.tn
-fin.tn
-gov.tn
-ind.tn
-intl.tn
-nat.tn
-net.tn
-org.tn
-info.tn
-perso.tn
-tourism.tn
-edunet.tn
-rnrt.tn
-rns.tn
-rnu.tn
-mincom.tn
-agrinet.tn
-defense.tn
-turen.tn
-
-// to : http://en.wikipedia.org/wiki/.to
-// Submitted by registry <egullich@colo.to> 2008-06-17
-to
-com.to
-gov.to
-net.to
-org.to
-edu.to
-mil.to
-
-// tp : No registrations at this time.
-// Submitted by Ryan Sleevi <ryan.sleevi@gmail.com> 2014-01-03
-tp
-
-// subTLDs: https://www.nic.tr/forms/eng/policies.pdf
-// and: https://www.nic.tr/forms/politikalar.pdf
-// Submitted by <mehmetgurevin@gmail.com> 2014-07-19
-tr
-com.tr
-info.tr
-biz.tr
-net.tr
-org.tr
-web.tr
-gen.tr
-tv.tr
-av.tr
-dr.tr
-bbs.tr
-name.tr
-tel.tr
-gov.tr
-bel.tr
-pol.tr
-mil.tr
-k12.tr
-edu.tr
-kep.tr
-
-// Used by Northern Cyprus
-nc.tr
-
-// Used by government agencies of Northern Cyprus
-gov.nc.tr
-
-// travel : http://en.wikipedia.org/wiki/.travel
-travel
-
-// tt : http://www.nic.tt/
-tt
-co.tt
-com.tt
-org.tt
-net.tt
-biz.tt
-info.tt
-pro.tt
-int.tt
-coop.tt
-jobs.tt
-mobi.tt
-travel.tt
-museum.tt
-aero.tt
-name.tt
-gov.tt
-edu.tt
-
-// tv : http://en.wikipedia.org/wiki/.tv
-// Not listing any 2LDs as reserved since none seem to exist in practice,
-// Wikipedia notwithstanding.
-tv
-
-// tw : http://en.wikipedia.org/wiki/.tw
-tw
-edu.tw
-gov.tw
-mil.tw
-com.tw
-net.tw
-org.tw
-idv.tw
-game.tw
-ebiz.tw
-club.tw
-網路.tw
-xn--zf0ao64a.tw
-組織.tw
-xn--uc0atv.tw
-商業.tw
-xn--czrw28b.tw
-
-// tz : http://www.tznic.or.tz/index.php/domains
-// Confirmed by registry <manager@tznic.or.tz> 2013-01-22
-tz
-ac.tz
-co.tz
-go.tz
-hotel.tz
-info.tz
-me.tz
-mil.tz
-mobi.tz
-ne.tz
-or.tz
-sc.tz
-tv.tz
-
-// ua : https://hostmaster.ua/policy/?ua
-// Submitted by registry <dk@cctld.ua> 2012-04-27
-ua
-// ua 2LD
-com.ua
-edu.ua
-gov.ua
-in.ua
-net.ua
-org.ua
-// ua geographic names
-// https://hostmaster.ua/2ld/
-cherkassy.ua
-cherkasy.ua
-chernigov.ua
-chernihiv.ua
-chernivtsi.ua
-chernovtsy.ua
-ck.ua
-cn.ua
-cr.ua
-crimea.ua
-cv.ua
-dn.ua
-dnepropetrovsk.ua
-dnipropetrovsk.ua
-dominic.ua
-donetsk.ua
-dp.ua
-if.ua
-ivano-frankivsk.ua
-kh.ua
-kharkiv.ua
-kharkov.ua
-kherson.ua
-khmelnitskiy.ua
-khmelnytskyi.ua
-kiev.ua
-kirovograd.ua
-km.ua
-kr.ua
-krym.ua
-ks.ua
-kv.ua
-kyiv.ua
-lg.ua
-lt.ua
-lugansk.ua
-lutsk.ua
-lv.ua
-lviv.ua
-mk.ua
-mykolaiv.ua
-nikolaev.ua
-od.ua
-odesa.ua
-odessa.ua
-pl.ua
-poltava.ua
-rivne.ua
-rovno.ua
-rv.ua
-sb.ua
-sebastopol.ua
-sevastopol.ua
-sm.ua
-sumy.ua
-te.ua
-ternopil.ua
-uz.ua
-uzhgorod.ua
-vinnica.ua
-vinnytsia.ua
-vn.ua
-volyn.ua
-yalta.ua
-zaporizhzhe.ua
-zaporizhzhia.ua
-zhitomir.ua
-zhytomyr.ua
-zp.ua
-zt.ua
-
-// Private registries in .ua
-co.ua
-pp.ua
-
-// ug : https://www.registry.co.ug/
-ug
-co.ug
-or.ug
-ac.ug
-sc.ug
-go.ug
-ne.ug
-com.ug
-org.ug
-
-// uk : http://en.wikipedia.org/wiki/.uk
-// Submitted by registry <Michael.Daly@nominet.org.uk>
-uk
-ac.uk
-co.uk
-gov.uk
-ltd.uk
-me.uk
-net.uk
-nhs.uk
-org.uk
-plc.uk
-police.uk
-*.sch.uk
-
-// us : http://en.wikipedia.org/wiki/.us
-us
-dni.us
-fed.us
-isa.us
-kids.us
-nsn.us
-// us geographic names
-ak.us
-al.us
-ar.us
-as.us
-az.us
-ca.us
-co.us
-ct.us
-dc.us
-de.us
-fl.us
-ga.us
-gu.us
-hi.us
-ia.us
-id.us
-il.us
-in.us
-ks.us
-ky.us
-la.us
-ma.us
-md.us
-me.us
-mi.us
-mn.us
-mo.us
-ms.us
-mt.us
-nc.us
-nd.us
-ne.us
-nh.us
-nj.us
-nm.us
-nv.us
-ny.us
-oh.us
-ok.us
-or.us
-pa.us
-pr.us
-ri.us
-sc.us
-sd.us
-tn.us
-tx.us
-ut.us
-vi.us
-vt.us
-va.us
-wa.us
-wi.us
-wv.us
-wy.us
-// The registrar notes several more specific domains available in each state,
-// such as state.*.us, dst.*.us, etc., but resolution of these is somewhat
-// haphazard; in some states these domains resolve as addresses, while in others
-// only subdomains are available, or even nothing at all. We include the
-// most common ones where it's clear that different sites are different
-// entities.
-k12.ak.us
-k12.al.us
-k12.ar.us
-k12.as.us
-k12.az.us
-k12.ca.us
-k12.co.us
-k12.ct.us
-k12.dc.us
-k12.de.us
-k12.fl.us
-k12.ga.us
-k12.gu.us
-// k12.hi.us Bug 614565 - Hawaii has a state-wide DOE login
-k12.ia.us
-k12.id.us
-k12.il.us
-k12.in.us
-k12.ks.us
-k12.ky.us
-k12.la.us
-k12.ma.us
-k12.md.us
-k12.me.us
-k12.mi.us
-k12.mn.us
-k12.mo.us
-k12.ms.us
-k12.mt.us
-k12.nc.us
-// k12.nd.us Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
-k12.ne.us
-k12.nh.us
-k12.nj.us
-k12.nm.us
-k12.nv.us
-k12.ny.us
-k12.oh.us
-k12.ok.us
-k12.or.us
-k12.pa.us
-k12.pr.us
-k12.ri.us
-k12.sc.us
-// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
-k12.tn.us
-k12.tx.us
-k12.ut.us
-k12.vi.us
-k12.vt.us
-k12.va.us
-k12.wa.us
-k12.wi.us
-// k12.wv.us Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
-k12.wy.us
-cc.ak.us
-cc.al.us
-cc.ar.us
-cc.as.us
-cc.az.us
-cc.ca.us
-cc.co.us
-cc.ct.us
-cc.dc.us
-cc.de.us
-cc.fl.us
-cc.ga.us
-cc.gu.us
-cc.hi.us
-cc.ia.us
-cc.id.us
-cc.il.us
-cc.in.us
-cc.ks.us
-cc.ky.us
-cc.la.us
-cc.ma.us
-cc.md.us
-cc.me.us
-cc.mi.us
-cc.mn.us
-cc.mo.us
-cc.ms.us
-cc.mt.us
-cc.nc.us
-cc.nd.us
-cc.ne.us
-cc.nh.us
-cc.nj.us
-cc.nm.us
-cc.nv.us
-cc.ny.us
-cc.oh.us
-cc.ok.us
-cc.or.us
-cc.pa.us
-cc.pr.us
-cc.ri.us
-cc.sc.us
-cc.sd.us
-cc.tn.us
-cc.tx.us
-cc.ut.us
-cc.vi.us
-cc.vt.us
-cc.va.us
-cc.wa.us
-cc.wi.us
-cc.wv.us
-cc.wy.us
-lib.ak.us
-lib.al.us
-lib.ar.us
-lib.as.us
-lib.az.us
-lib.ca.us
-lib.co.us
-lib.ct.us
-lib.dc.us
-lib.de.us
-lib.fl.us
-lib.ga.us
-lib.gu.us
-lib.hi.us
-lib.ia.us
-lib.id.us
-lib.il.us
-lib.in.us
-lib.ks.us
-lib.ky.us
-lib.la.us
-lib.ma.us
-lib.md.us
-lib.me.us
-lib.mi.us
-lib.mn.us
-lib.mo.us
-lib.ms.us
-lib.mt.us
-lib.nc.us
-lib.nd.us
-lib.ne.us
-lib.nh.us
-lib.nj.us
-lib.nm.us
-lib.nv.us
-lib.ny.us
-lib.oh.us
-lib.ok.us
-lib.or.us
-lib.pa.us
-lib.pr.us
-lib.ri.us
-lib.sc.us
-lib.sd.us
-lib.tn.us
-lib.tx.us
-lib.ut.us
-lib.vi.us
-lib.vt.us
-lib.va.us
-lib.wa.us
-lib.wi.us
-// lib.wv.us Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
-lib.wy.us
-// k12.ma.us contains school districts in Massachusetts. The 4LDs are
-// managed indepedently except for private (PVT), charter (CHTR) and
-// parochial (PAROCH) schools. Those are delegated dorectly to the
-// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net>
-pvt.k12.ma.us
-chtr.k12.ma.us
-paroch.k12.ma.us
-
-// uy : http://www.nic.org.uy/
-uy
-com.uy
-edu.uy
-gub.uy
-mil.uy
-net.uy
-org.uy
-
-// uz : http://www.reg.uz/
-uz
-co.uz
-com.uz
-net.uz
-org.uz
-
-// va : http://en.wikipedia.org/wiki/.va
-va
-
-// vc : http://en.wikipedia.org/wiki/.vc
-// Submitted by registry <kshah@ca.afilias.info> 2008-06-13
-vc
-com.vc
-net.vc
-org.vc
-gov.vc
-mil.vc
-edu.vc
-
-// ve : https://registro.nic.ve/
-// Confirmed by registry 2012-10-04
-// Updated 2014-05-20 - Bug 940478
-ve
-arts.ve
-co.ve
-com.ve
-e12.ve
-edu.ve
-firm.ve
-gob.ve
-gov.ve
-info.ve
-int.ve
-mil.ve
-net.ve
-org.ve
-rec.ve
-store.ve
-tec.ve
-web.ve
-
-// vg : http://en.wikipedia.org/wiki/.vg
-vg
-
-// vi : http://www.nic.vi/newdomainform.htm
-// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
-// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
-// are available for registration (which they do not seem to be).
-vi
-co.vi
-com.vi
-k12.vi
-net.vi
-org.vi
-
-// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
-vn
-com.vn
-net.vn
-org.vn
-edu.vn
-gov.vn
-int.vn
-ac.vn
-biz.vn
-info.vn
-name.vn
-pro.vn
-health.vn
-
-// vu : http://en.wikipedia.org/wiki/.vu
-// http://www.vunic.vu/
-vu
-com.vu
-edu.vu
-net.vu
-org.vu
-
-// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-wf
-
-// ws : http://en.wikipedia.org/wiki/.ws
-// http://samoanic.ws/index.dhtml
-ws
-com.ws
-net.ws
-org.ws
-gov.ws
-edu.ws
-
-// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-yt
-
-// IDN ccTLDs
-// Please sort by ISO 3166 ccTLD, then punicode string
-// when submitting patches and follow this format:
-// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD>
-// [optional sponsoring org]
-// <URL>
-
-// xn--mgbaam7a8h ("Emerat" Arabic) : AE
-// http://nic.ae/english/arabicdomain/rules.jsp
-امارات
-xn--mgbaam7a8h
-
-// xn--54b7fta0cc ("Bangla" Bangla) : BD
-বাংলা
-xn--54b7fta0cc
-
-// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhongguo>) : CN
-// CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
-中国
-xn--fiqs8s
-
-// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhongguo>) : CN
-// CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
-中國
-xn--fiqz9s
-
-// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ
-الجزائر
-xn--lgbbat1ad8j
-
-// xn--wgbh1c ("Egypt" Arabic .masr) : EG
-// http://www.dotmasr.eg/
-مصر
-xn--wgbh1c
-
-// xn--node ("ge" Georgian (Mkhedruli)) : GE
-გე
-xn--node
-
-// xn--j6w193g ("Hong Kong" Chinese-Han) : HK
-// https://www2.hkirc.hk/register/rules.jsp
-香港
-xn--j6w193g
-
-// xn--h2brj9c ("Bharat" Devanagari) : IN
-// India
-भारत
-xn--h2brj9c
-
-// xn--mgbbh1a71e ("Bharat" Arabic) : IN
-// India
-بھارت
-xn--mgbbh1a71e
-
-// xn--fpcrj9c3d ("Bharat" Telugu) : IN
-// India
-భారత్
-xn--fpcrj9c3d
-
-// xn--gecrj9c ("Bharat" Gujarati) : IN
-// India
-ભારત
-xn--gecrj9c
-
-// xn--s9brj9c ("Bharat" Gurmukhi) : IN
-// India
-ਭਾਰਤ
-xn--s9brj9c
-
-// xn--45brj9c ("Bharat" Bengali) : IN
-// India
-ভারত
-xn--45brj9c
-
-// xn--xkc2dl3a5ee0h ("India" Tamil) : IN
-// India
-இந்தியா
-xn--xkc2dl3a5ee0h
-
-// xn--mgba3a4f16a ("Iran" Persian) : IR
-ایران
-xn--mgba3a4f16a
-
-// xn--mgba3a4fra ("Iran" Arabic) : IR
-ايران
-xn--mgba3a4fra
-
-// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO
-// National Information Technology Center (NITC)
-// Royal Scientific Society, Al-Jubeiha
-الاردن
-xn--mgbayh7gpa
-
-// xn--3e0b707e ("Republic of Korea" Hangul) : KR
-한국
-xn--3e0b707e
-
-// xn--80ao21a ("Kaz" Kazakh) : KZ
-қаз
-xn--80ao21a
-
-// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
-// http://nic.lk
-ලංකා
-xn--fzc2c9e2c
-
-// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK
-// http://nic.lk
-இலங்கை
-xn--xkc2al3hye2a
-
-// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA
-المغرب
-xn--mgbc0a9azcg
-
-// xn--l1acc ("mon" Mongolian) : MN
-мон
-xn--l1acc
-
-// xn--mgbx4cd0ab ("Malaysia" Malay) : MY
-مليسيا
-xn--mgbx4cd0ab
-
-// xn--mgb9awbf ("Oman" Arabic) : OM
-عمان
-xn--mgb9awbf
-
-// xn--ygbi2ammx ("Falasteen" Arabic) : PS
-// The Palestinian National Internet Naming Authority (PNINA)
-// http://www.pnina.ps
-فلسطين
-xn--ygbi2ammx
-
-// xn--90a3ac ("srb" Cyrillic) : RS
-// http://www.rnids.rs/en/the-.срб-domain
-срб
-xn--90a3ac
-пр.срб
-xn--o1ac.xn--90a3ac
-орг.срб
-xn--c1avg.xn--90a3ac
-обр.срб
-xn--90azh.xn--90a3ac
-од.срб
-xn--d1at.xn--90a3ac
-упр.срб
-xn--o1ach.xn--90a3ac
-ак.срб
-xn--80au.xn--90a3ac
-
-// xn--p1ai ("rf" Russian-Cyrillic) : RU
-// http://www.cctld.ru/en/docs/rulesrf.php
-рф
-xn--p1ai
-
-// xn--wgbl6a ("Qatar" Arabic) : QA
-// http://www.ict.gov.qa/
-قطر
-xn--wgbl6a
-
-// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA
-// http://www.nic.net.sa/
-السعودية
-xn--mgberp4a5d4ar
-
-// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA
-السعودیة
-xn--mgberp4a5d4a87g
-
-// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA
-السعودیۃ
-xn--mgbqly7c0a67fbc
-
-// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA
-السعوديه
-xn--mgbqly7cvafr
-
-// xn--ogbpf8fl ("Syria" Arabic) : SY
-سورية
-xn--ogbpf8fl
-
-// xn--mgbtf8fl ("Syria" Arabic) variant : SY
-سوريا
-xn--mgbtf8fl
-
-// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG
-新加坡
-xn--yfro4i67o
-
-// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG
-சிங்கப்பூர்
-xn--clchc0ea0b2g2a9gcd
-
-// xn--o3cw4h ("Thai" Thai) : TH
-// http://www.thnic.co.th
-ไทย
-xn--o3cw4h
-
-// xn--pgbs0dh ("Tunis") : TN
-// http://nic.tn
-تونس
-xn--pgbs0dh
-
-// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
-台灣
-xn--kpry57d
-
-// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
-台湾
-xn--kprw13d
-
-// xn--nnx388a ("Taiwan") variant : TW
-臺灣
-xn--nnx388a
-
-// xn--j1amh ("ukr" Cyrillic) : UA
-укр
-xn--j1amh
-
-// xn--mgb2ddes ("AlYemen" Arabic) : YE
-اليمن
-xn--mgb2ddes
-
-// xxx : http://icmregistry.com
-xxx
-
-// ye : http://www.y.net.ye/services/domain_name.htm
-*.ye
-
-// za : http://www.zadna.org.za/slds.html
-*.za
-
-// zm : http://en.wikipedia.org/wiki/.zm
-*.zm
-
-// zw : http://en.wikipedia.org/wiki/.zw
-*.zw
-
-
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-04-07T06:02:08Z
-
-// aaa : 2015-02-26 American Automobile Association, Inc.
-aaa
-
-// abb : 2014-10-24 ABB Ltd
-abb
-
-// abbott : 2014-07-24 Abbott Laboratories, Inc.
-abbott
-
-// abogado : 2014-04-24 Top Level Domain Holdings Limited
-abogado
-
-// academy : 2013-11-07 Half Oaks, LLC
-academy
-
-// accenture : 2014-08-15 Accenture plc
-accenture
-
-// accountant : 2014-11-20 dot Accountant Limited
-accountant
-
-// accountants : 2014-03-20 Knob Town, LLC
-accountants
-
-// aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG
-aco
-
-// active : 2014-05-01 The Active Network, Inc
-active
-
-// actor : 2013-12-12 United TLD Holdco Ltd.
-actor
-
-// ads : 2014-12-04 Charleston Road Registry Inc.
-ads
-
-// adult : 2014-10-16 ICM Registry AD LLC
-adult
-
-// aeg : 2015-03-19 Aktiebolaget Electrolux
-aeg
-
-// afl : 2014-10-02 Australian Football League
-afl
-
-// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
-africa
-
-// africamagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-africamagic
-
-// agency : 2013-11-14 Steel Falls, LLC
-agency
-
-// aig : 2014-12-18 American International Group, Inc.
-aig
-
-// airforce : 2014-03-06 United TLD Holdco Ltd.
-airforce
-
-// airtel : 2014-10-24 Bharti Airtel Limited
-airtel
-
-// alibaba : 2015-01-15 Alibaba Group Holding Limited
-alibaba
-
-// alipay : 2015-01-15 Alibaba Group Holding Limited
-alipay
-
-// allfinanz : 2014-07-03 Allfinanz Deutsche Vermögensberatung Aktiengesellschaft
-allfinanz
-
-// alsace : 2014-07-02 REGION D ALSACE
-alsace
-
-// amsterdam : 2014-07-24 Gemeente Amsterdam
-amsterdam
-
-// analytics : 2014-12-18 Campus IP LLC
-analytics
-
-// android : 2014-08-07 Charleston Road Registry Inc.
-android
-
-// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-anquan
-
-// apartments : 2014-12-11 June Maple, LLC
-apartments
-
-// aquarelle : 2014-07-24 Aquarelle.com
-aquarelle
-
-// aramco : 2014-11-20 Aramco Services Company
-aramco
-
-// archi : 2014-02-06 STARTING DOT LIMITED
-archi
-
-// army : 2014-03-06 United TLD Holdco Ltd.
-army
-
-// arte : 2014-12-11 Association Relative à la Télévision Européenne G.E.I.E.
-arte
-
-// associates : 2014-03-06 Baxter Hill, LLC
-associates
-
-// attorney : 2014-03-20
-attorney
-
-// auction : 2014-03-20
-auction
-
-// audio : 2014-03-20 Uniregistry, Corp.
-audio
-
-// author : 2014-12-18 Amazon EU S.à r.l.
-author
-
-// auto : 2014-11-13 Uniregistry, Corp.
-auto
-
-// autos : 2014-01-09 DERAutos, LLC
-autos
-
-// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
-avianca
-
-// axa : 2013-12-19 AXA SA
-axa
-
-// azure : 2014-12-18 Microsoft Corporation
-azure
-
-// baidu : 2015-01-08 Baidu, Inc.
-baidu
-
-// band : 2014-06-12
-band
-
-// bank : 2014-09-25 fTLD Registry Services LLC
-bank
-
-// bar : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
-bar
-
-// barcelona : 2014-07-24 Municipi de Barcelona
-barcelona
-
-// barclaycard : 2014-11-20 Barclays Bank PLC
-barclaycard
-
-// barclays : 2014-11-20 Barclays Bank PLC
-barclays
-
-// bargains : 2013-11-14 Half Hallow, LLC
-bargains
-
-// bauhaus : 2014-04-17 Werkhaus GmbH
-bauhaus
-
-// bayern : 2014-01-23 Bayern Connect GmbH
-bayern
-
-// bbc : 2014-12-18 British Broadcasting Corporation
-bbc
-
-// bbva : 2014-10-02 BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
-bbva
-
-// bcg : 2015-04-02 The Boston Consulting Group, Inc.
-bcg
-
-// bcn : 2014-07-24 Municipi de Barcelona
-bcn
-
-// beer : 2014-01-09 Top Level Domain Holdings Limited
-beer
-
-// bentley : 2014-12-18 Bentley Motors Limited
-bentley
-
-// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG
-berlin
-
-// best : 2013-12-19 BestTLD Pty Ltd
-best
-
-// bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited
-bharti
-
-// bible : 2014-06-19 American Bible Society
-bible
-
-// bid : 2013-12-19 dot Bid Limited
-bid
-
-// bike : 2013-08-27 Grand Hollow, LLC
-bike
-
-// bing : 2014-12-18 Microsoft Corporation
-bing
-
-// bingo : 2014-12-04 Sand Cedar, LLC
-bingo
-
-// bio : 2014-03-06 STARTING DOT LIMITED
-bio
-
-// black : 2014-01-16 Afilias Limited
-black
-
-// blackfriday : 2014-01-16 Uniregistry, Corp.
-blackfriday
-
-// bloomberg : 2014-07-17 Bloomberg IP Holdings LLC
-bloomberg
-
-// blue : 2013-11-07 Afilias Limited
-blue
-
-// bms : 2014-10-30 Bristol-Myers Squibb Company
-bms
-
-// bmw : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
-bmw
-
-// bnl : 2014-07-24 Banca Nazionale del Lavoro
-bnl
-
-// bnpparibas : 2014-05-29 BNP Paribas
-bnpparibas
-
-// boats : 2014-12-04 DERBoats, LLC
-boats
-
-// bom : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br
-bom
-
-// bond : 2014-06-05 Bond University Limited
-bond
-
-// boo : 2014-01-30 Charleston Road Registry Inc.
-boo
-
-// boots : 2015-01-08 THE BOOTS COMPANY PLC
-boots
-
-// bot : 2014-12-18 Amazon EU S.à r.l.
-bot
-
-// boutique : 2013-11-14 Over Galley, LLC
-boutique
-
-// bradesco : 2014-12-18 Banco Bradesco S.A.
-bradesco
-
-// bridgestone : 2014-12-18 Bridgestone Corporation
-bridgestone
-
-// broadway : 2014-12-22 Celebrate Broadway, Inc.
-broadway
-
-// broker : 2014-12-11 IG Group Holdings PLC
-broker
-
-// brother : 2015-01-29 Brother Industries, Ltd.
-brother
-
-// brussels : 2014-02-06 DNS.be vzw
-brussels
-
-// budapest : 2013-11-21 Top Level Domain Holdings Limited
-budapest
-
-// build : 2013-11-07 Plan Bee LLC
-build
-
-// builders : 2013-11-07 Atomic Madison, LLC
-builders
-
-// business : 2013-11-07 Spring Cross, LLC
-business
-
-// buy : 2014-12-18 Amazon EU S.à r.l.
-buy
-
-// buzz : 2013-10-02 DOTSTRATEGY CO.
-buzz
-
-// bzh : 2014-02-27 Association www.bzh
-bzh
-
-// cab : 2013-10-24 Half Sunset, LLC
-cab
-
-// cafe : 2015-02-11 Pioneer Canyon, LLC
-cafe
-
-// cal : 2014-07-24 Charleston Road Registry Inc.
-cal
-
-// call : 2014-12-18 Amazon EU S.à r.l.
-call
-
-// camera : 2013-08-27 Atomic Maple, LLC
-camera
-
-// camp : 2013-11-07 Delta Dynamite, LLC
-camp
-
-// cancerresearch : 2014-05-15 Australian Cancer Research Foundation
-cancerresearch
-
-// canon : 2014-09-12 Canon Inc.
-canon
-
-// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-capetown
-
-// capital : 2014-03-06 Delta Mill, LLC
-capital
-
-// car : 2015-01-22 Charleston Road Registry Inc.
-car
-
-// caravan : 2013-12-12 Caravan International, Inc.
-caravan
-
-// cards : 2013-12-05 Foggy Hollow, LLC
-cards
-
-// care : 2014-03-06 Goose Cross
-care
-
-// career : 2013-10-09 dotCareer LLC
-career
-
-// careers : 2013-10-02 Wild Corner, LLC
-careers
-
-// cars : 2014-11-13 Uniregistry, Corp.
-cars
-
-// cartier : 2014-06-23 Richemont DNS Inc.
-cartier
-
-// casa : 2013-11-21 Top Level Domain Holdings Limited
-casa
-
-// cash : 2014-03-06 Delta Lake, LLC
-cash
-
-// casino : 2014-12-18 Binky Sky, LLC
-casino
-
-// catering : 2013-12-05 New Falls. LLC
-catering
-
-// cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-cba
-
-// cbn : 2014-08-22 The Christian Broadcasting Network, Inc.
-cbn
-
-// center : 2013-11-07 Tin Mill, LLC
-center
-
-// ceo : 2013-11-07 CEOTLD Pty Ltd
-ceo
-
-// cern : 2014-06-05 European Organization for Nuclear Research (
-cern
-
-// cfa : 2014-08-28 CFA Institute
-cfa
-
-// cfd : 2014-12-11 IG Group Holdings PLC
-cfd
-
-// channel : 2014-05-08 Charleston Road Registry Inc.
-channel
-
-// chat : 2014-12-04 Sand Fields, LLC
-chat
-
-// cheap : 2013-11-14 Sand Cover, LLC
-cheap
-
-// chloe : 2014-10-16 Richemont DNS Inc.
-chloe
-
-// christmas : 2013-11-21 Uniregistry, Corp.
-christmas
-
-// chrome : 2014-07-24 Charleston Road Registry Inc.
-chrome
-
-// church : 2014-02-06 Holly Fields, LLC
-church
-
-// cipriani : 2015-02-19 Hotel Cipriani Srl
-cipriani
-
-// circle : 2014-12-18 Amazon EU S.à r.l.
-circle
-
-// cisco : 2014-12-22 Cisco Technology, Inc.
-cisco
-
-// citic : 2014-01-09 CITIC Group Corporation
-citic
-
-// city : 2014-05-29 Snow Sky, LLC
-city
-
-// cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc.
-cityeats
-
-// claims : 2014-03-20 Black Corner, LLC
-claims
-
-// cleaning : 2013-12-05 Fox Shadow, LLC
-cleaning
-
-// click : 2014-06-05 Uniregistry, Corp.
-click
-
-// clinic : 2014-03-20 Goose Park, LLC
-clinic
-
-// clothing : 2013-08-27 Steel Lake, LLC
-clothing
-
-// club : 2013-11-08 .CLUB DOMAINS, LLC
-club
-
-// coach : 2014-10-09 Koko Island, LLC
-coach
-
-// codes : 2013-10-31 Puff Willow, LLC
-codes
-
-// coffee : 2013-10-17 Trixy Cover, LLC
-coffee
-
-// college : 2014-01-16 XYZ.COM LLC
-college
-
-// cologne : 2014-02-05 NetCologne Gesellschaft für Telekommunikation mbH
-cologne
-
-// commbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-commbank
-
-// community : 2013-12-05 Fox Orchard, LLC
-community
-
-// company : 2013-11-07 Silver Avenue, LLC
-company
-
-// computer : 2013-10-24 Pine Mill, LLC
-computer
-
-// comsec : 2015-01-08 VeriSign, Inc.
-comsec
-
-// condos : 2013-12-05 Pine House, LLC
-condos
-
-// construction : 2013-09-16 Fox Dynamite, LLC
-construction
-
-// consulting : 2013-12-05
-consulting
-
-// contact : 2015-01-08 Top Level Spectrum, Inc.
-contact
-
-// contractors : 2013-09-10 Magic Woods, LLC
-contractors
-
-// cooking : 2013-11-21 Top Level Domain Holdings Limited
-cooking
-
-// cool : 2013-11-14 Koko Lake, LLC
-cool
-
-// corsica : 2014-09-25 Collectivité Territoriale de Corse
-corsica
-
-// country : 2013-12-19 Top Level Domain Holdings Limited
-country
-
-// coupon : 2015-02-26 Amazon EU S.à r.l.
-coupon
-
-// coupons : 2015-03-26 Black Island, LLC
-coupons
-
-// courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD
-courses
-
-// credit : 2014-03-20 Snow Shadow, LLC
-credit
-
-// creditcard : 2014-03-20 Binky Frostbite, LLC
-creditcard
-
-// creditunion : 2015-01-22 CUNA Performance Resources, LLC
-creditunion
-
-// cricket : 2014-10-09 dot Cricket Limited
-cricket
-
-// crown : 2014-10-24 Crown Equipment Corporation
-crown
-
-// crs : 2014-04-03 Federated Co-operatives Limited
-crs
-
-// cruises : 2013-12-05 Spring Way, LLC
-cruises
-
-// csc : 2014-09-25 Alliance-One Services, Inc.
-csc
-
-// cuisinella : 2014-04-03 SALM S.A.S.
-cuisinella
-
-// cymru : 2014-05-08 Nominet UK
-cymru
-
-// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
-cyou
-
-// dabur : 2014-02-06 Dabur India Limited
-dabur
-
-// dad : 2014-01-23 Charleston Road Registry Inc.
-dad
-
-// dance : 2013-10-24 United TLD Holdco Ltd.
-dance
-
-// date : 2014-11-20 dot Date Limited
-date
-
-// dating : 2013-12-05 Pine Fest, LLC
-dating
-
-// datsun : 2014-03-27 NISSAN MOTOR CO., LTD.
-datsun
-
-// day : 2014-01-30 Charleston Road Registry Inc.
-day
-
-// dclk : 2014-11-20 Charleston Road Registry Inc.
-dclk
-
-// dealer : 2014-12-22 Dealer Dot Com, Inc.
-dealer
-
-// deals : 2014-05-22 Sand Sunset, LLC
-deals
-
-// degree : 2014-03-06
-degree
-
-// delivery : 2014-09-11 Steel Station, LLC
-delivery
-
-// dell : 2014-10-24 Dell Inc.
-dell
-
-// delta : 2015-02-19 Delta Air Lines, Inc.
-delta
-
-// democrat : 2013-10-24 United TLD Holdco Ltd.
-democrat
-
-// dental : 2014-03-20 Tin Birch, LLC
-dental
-
-// dentist : 2014-03-20
-dentist
-
-// desi : 2013-11-14 Desi Networks LLC
-desi
-
-// design : 2014-11-07 Top Level Design, LLC
-design
-
-// dev : 2014-10-16 Charleston Road Registry Inc.
-dev
-
-// diamonds : 2013-09-22 John Edge, LLC
-diamonds
-
-// diet : 2014-06-26 Uniregistry, Corp.
-diet
-
-// digital : 2014-03-06 Dash Park, LLC
-digital
-
-// direct : 2014-04-10 Half Trail, LLC
-direct
-
-// directory : 2013-09-20 Extra Madison, LLC
-directory
-
-// discount : 2014-03-06 Holly Hill, LLC
-discount
-
-// dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
-dnp
-
-// docs : 2014-10-16 Charleston Road Registry Inc.
-docs
-
-// dog : 2014-12-04 Koko Mill, LLC
-dog
-
-// doha : 2014-09-18 Communications Regulatory Authority (CRA)
-doha
-
-// domains : 2013-10-17 Sugar Cross, LLC
-domains
-
-// doosan : 2014-04-03 Doosan Corporation
-doosan
-
-// download : 2014-11-20 dot Support Limited
-download
-
-// drive : 2015-03-05 Charleston Road Registry Inc.
-drive
-
-// dstv : 2015-03-12 MultiChoice (Proprietary) Limited
-dstv
-
-// dubai : 2015-01-01 Dubai Smart Government Department
-dubai
-
-// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-durban
-
-// dvag : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-dvag
-
-// earth : 2014-12-04 Interlink Co., Ltd.
-earth
-
-// eat : 2014-01-23 Charleston Road Registry Inc.
-eat
-
-// edeka : 2014-12-18 EDEKA Verband kaufmännischer Genossenschaften e.V.
-edeka
-
-// education : 2013-11-07 Brice Way, LLC
-education
-
-// email : 2013-10-31 Spring Madison, LLC
-email
-
-// emerck : 2014-04-03 Merck KGaA
-emerck
-
-// energy : 2014-09-11 Binky Birch, LLC
-energy
-
-// engineer : 2014-03-06 United TLD Holdco Ltd.
-engineer
-
-// engineering : 2014-03-06 Romeo Canyon
-engineering
-
-// enterprises : 2013-09-20 Snow Oaks, LLC
-enterprises
-
-// epson : 2014-12-04 Seiko Epson Corporation
-epson
-
-// equipment : 2013-08-27 Corn Station, LLC
-equipment
-
-// erni : 2014-04-03 ERNI Group Holding AG
-erni
-
-// esq : 2014-05-08 Charleston Road Registry Inc.
-esq
-
-// estate : 2013-08-27 Trixy Park, LLC
-estate
-
-// eurovision : 2014-04-24 European Broadcasting Union (EBU)
-eurovision
-
-// eus : 2013-12-12 Puntueus Fundazioa
-eus
-
-// events : 2013-12-05 Pioneer Maple, LLC
-events
-
-// everbank : 2014-05-15 EverBank
-everbank
-
-// exchange : 2014-03-06 Spring Falls, LLC
-exchange
-
-// expert : 2013-11-21 Magic Pass, LLC
-expert
-
-// exposed : 2013-12-05 Victor Beach, LLC
-exposed
-
-// express : 2015-02-11 Sea Sunset, LLC
-express
-
-// fage : 2014-12-18 Fage International S.A.
-fage
-
-// fail : 2014-03-06 Atomic Pipe, LLC
-fail
-
-// fairwinds : 2014-11-13 FairWinds Partners, LLC
-fairwinds
-
-// faith : 2014-11-20 dot Faith Limited
-faith
-
-// family : 2015-04-02 Bitter Galley, LLC
-family
-
-// fan : 2014-03-06
-fan
-
-// fans : 2014-11-07 Asiamix Digital Limited
-fans
-
-// farm : 2013-11-07 Just Maple, LLC
-farm
-
-// fashion : 2014-07-03 Top Level Domain Holdings Limited
-fashion
-
-// fast : 2014-12-18 Amazon EU S.à r.l.
-fast
-
-// feedback : 2013-12-19 Top Level Spectrum, Inc.
-feedback
-
-// ferrero : 2014-12-18 Ferrero Trading Lux S.A.
-ferrero
-
-// film : 2015-01-08 Motion Picture Domain Registry Pty Ltd
-film
-
-// final : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br
-final
-
-// finance : 2014-03-20 Cotton Cypress, LLC
-finance
-
-// financial : 2014-03-06 Just Cover, LLC
-financial
-
-// firestone : 2014-12-18 Bridgestone Corporation
-firestone
-
-// firmdale : 2014-03-27 Firmdale Holdings Limited
-firmdale
-
-// fish : 2013-12-12 Fox Woods, LLC
-fish
-
-// fishing : 2013-11-21 Top Level Domain Holdings Limited
-fishing
-
-// fit : 2014-11-07 Top Level Domain Holdings Limited
-fit
-
-// fitness : 2014-03-06 Brice Orchard, LLC
-fitness
-
-// flickr : 2015-04-02 Yahoo! Domain Services Inc.
-flickr
-
-// flights : 2013-12-05 Fox Station, LLC
-flights
-
-// florist : 2013-11-07 Half Cypress, LLC
-florist
-
-// flowers : 2014-10-09 Uniregistry, Corp.
-flowers
-
-// flsmidth : 2014-07-24 FLSmidth A/S
-flsmidth
-
-// fly : 2014-05-08 Charleston Road Registry Inc.
-fly
-
-// foo : 2014-01-23 Charleston Road Registry Inc.
-foo
-
-// football : 2014-12-18 Foggy Farms, LLC
-football
-
-// ford : 2014-11-13 Ford Motor Company
-ford
-
-// forex : 2014-12-11 IG Group Holdings PLC
-forex
-
-// forsale : 2014-05-22
-forsale
-
-// forum : 2015-04-02 Fegistry, LLC
-forum
-
-// foundation : 2013-12-05 John Dale, LLC
-foundation
-
-// frl : 2014-05-15 FRLregistry B.V.
-frl
-
-// frogans : 2013-12-19 OP3FT
-frogans
-
-// frontier : 2015-02-05 Frontier Communications Corporation
-frontier
-
-// fund : 2014-03-20 John Castle, LLC
-fund
-
-// furniture : 2014-03-20 Lone Fields, LLC
-furniture
-
-// futbol : 2013-09-20
-futbol
-
-// fyi : 2015-04-02 Silver Tigers, LLC
-fyi
-
-// gal : 2013-11-07 Asociación puntoGAL
-gal
-
-// gallery : 2013-09-13 Sugar House, LLC
-gallery
-
-// gallup : 2015-02-19 Gallup, Inc.
-gallup
-
-// garden : 2014-06-26 Top Level Domain Holdings Limited
-garden
-
-// gbiz : 2014-07-17 Charleston Road Registry Inc.
-gbiz
-
-// gdn : 2014-07-31 Joint Stock Company
-gdn
-
-// gea : 2014-12-04 GEA Group Aktiengesellschaft
-gea
-
-// gent : 2014-01-23 COMBELL GROUP NV/SA
-gent
-
-// genting : 2015-03-12 Resorts World Inc Pte. Ltd.
-genting
-
-// ggee : 2014-01-09 GMO Internet, Inc.
-ggee
-
-// gift : 2013-10-17 Uniregistry, Corp.
-gift
-
-// gifts : 2014-07-03 Goose Sky, LLC
-gifts
-
-// gives : 2014-03-06 United TLD Holdco Ltd.
-gives
-
-// giving : 2014-11-13 Giving Limited
-giving
-
-// glass : 2013-11-07 Black Cover, LLC
-glass
-
-// gle : 2014-07-24 Charleston Road Registry Inc.
-gle
-
-// global : 2014-04-17 Dot GLOBAL AS
-global
-
-// globo : 2013-12-19 Globo Comunicação e Participações S.A
-globo
-
-// gmail : 2014-05-01 Charleston Road Registry Inc.
-gmail
-
-// gmo : 2014-01-09 GMO Internet, Inc.
-gmo
-
-// gmx : 2014-04-24 1&1 Mail & Media GmbH
-gmx
-
-// gold : 2015-01-22 June Edge, LLC
-gold
-
-// goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
-goldpoint
-
-// golf : 2014-12-18 Lone falls, LLC
-golf
-
-// goo : 2014-12-18 NTT Resonant Inc.
-goo
-
-// goog : 2014-11-20 Charleston Road Registry Inc.
-goog
-
-// google : 2014-07-24 Charleston Road Registry Inc.
-google
-
-// gop : 2014-01-16 Republican State Leadership Committee, Inc.
-gop
-
-// got : 2014-12-18 Amazon EU S.à r.l.
-got
-
-// gotv : 2015-03-12 MultiChoice (Proprietary) Limited
-gotv
-
-// graphics : 2013-09-13 Over Madison, LLC
-graphics
-
-// gratis : 2014-03-20 Pioneer Tigers, LLC
-gratis
-
-// green : 2014-05-08 Afilias Limited
-green
-
-// gripe : 2014-03-06 Corn Sunset, LLC
-gripe
-
-// group : 2014-08-15 Romeo Town, LLC
-group
-
-// gucci : 2014-11-13 Guccio Gucci S.p.a.
-gucci
-
-// guge : 2014-08-28 Charleston Road Registry Inc.
-guge
-
-// guide : 2013-09-13 Snow Moon, LLC
-guide
-
-// guitars : 2013-11-14 Uniregistry, Corp.
-guitars
-
-// guru : 2013-08-27 Pioneer Cypress, LLC
-guru
-
-// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
-hamburg
-
-// hangout : 2014-11-13 Charleston Road Registry Inc.
-hangout
-
-// haus : 2013-12-05
-haus
-
-// hdfcbank : 2015-02-12 HDFC Bank Limited
-hdfcbank
-
-// health : 2015-02-11 DotHealth, LLC
-health
-
-// healthcare : 2014-06-12 Silver Glen, LLC
-healthcare
-
-// help : 2014-06-26 Uniregistry, Corp.
-help
-
-// helsinki : 2015-02-05 City of Helsinki
-helsinki
-
-// here : 2014-02-06 Charleston Road Registry Inc.
-here
-
-// hermes : 2014-07-10 HERMES INTERNATIONAL
-hermes
-
-// hiphop : 2014-03-06 Uniregistry, Corp.
-hiphop
-
-// hitachi : 2014-10-31 Hitachi, Ltd.
-hitachi
-
-// hiv : 2014-03-13 dotHIV gemeinnuetziger e.V.
-hiv
-
-// hockey : 2015-03-19 Half Willow, LLC
-hockey
-
-// holdings : 2013-08-27 John Madison, LLC
-holdings
-
-// holiday : 2013-11-07 Goose Woods, LLC
-holiday
-
-// homedepot : 2015-04-02 Homer TLC, Inc.
-homedepot
-
-// homes : 2014-01-09 DERHomes, LLC
-homes
-
-// honda : 2014-12-18 Honda Motor Co., Ltd.
-honda
-
-// horse : 2013-11-21 Top Level Domain Holdings Limited
-horse
-
-// host : 2014-04-17 DotHost Inc.
-host
-
-// hosting : 2014-05-29 Uniregistry, Corp.
-hosting
-
-// hoteles : 2015-03-05 Travel Reservations SRL
-hoteles
-
-// hotmail : 2014-12-18 Microsoft Corporation
-hotmail
-
-// house : 2013-11-07 Sugar Park, LLC
-house
-
-// how : 2014-01-23 Charleston Road Registry Inc.
-how
-
-// hsbc : 2014-10-24 HSBC Holdings PLC
-hsbc
-
-// htc : 2015-04-02 HTC corporation
-htc
-
-// ibm : 2014-07-31 International Business Machines Corporation
-ibm
-
-// icbc : 2015-02-19 Industrial and Commercial Bank of China Limited
-icbc
-
-// ice : 2014-10-30 IntercontinentalExchange, Inc.
-ice
-
-// icu : 2015-01-08 One.com A/S
-icu
-
-// ifm : 2014-01-30 ifm electronic gmbh
-ifm
-
-// iinet : 2014-07-03 Connect West Pty. Ltd.
-iinet
-
-// immo : 2014-07-10 Auburn Bloom, LLC
-immo
-
-// immobilien : 2013-11-07 United TLD Holdco Ltd.
-immobilien
-
-// industries : 2013-12-05 Outer House, LLC
-industries
-
-// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD.
-infiniti
-
-// ing : 2014-01-23 Charleston Road Registry Inc.
-ing
-
-// ink : 2013-12-05 Top Level Design, LLC
-ink
-
-// institute : 2013-11-07 Outer Maple, LLC
-institute
-
-// insurance : 2015-02-19 fTLD Registry Services LLC
-insurance
-
-// insure : 2014-03-20 Pioneer Willow, LLC
-insure
-
-// international : 2013-11-07 Wild Way, LLC
-international
-
-// investments : 2014-03-20 Holly Glen, LLC
-investments
-
-// ipiranga : 2014-08-28 Ipiranga Produtos de Petroleo S.A.
-ipiranga
-
-// irish : 2014-08-07 Dot-Irish LLC
-irish
-
-// iselect : 2015-02-11 iSelect Ltd
-iselect
-
-// ist : 2014-08-28 Istanbul Metropolitan Municipality
-ist
-
-// istanbul : 2014-08-28 Istanbul Metropolitan Municipality
-istanbul
-
-// itau : 2014-10-02 Itau Unibanco Holding S.A.
-itau
-
-// iwc : 2014-06-23 Richemont DNS Inc.
-iwc
-
-// jaguar : 2014-11-13 Jaguar Land Rover Ltd
-jaguar
-
-// java : 2014-06-19 Oracle Corporation
-java
-
-// jcb : 2014-11-20 JCB Co., Ltd.
-jcb
-
-// jetzt : 2014-01-09 New TLD Company AB
-jetzt
-
-// jewelry : 2015-03-05 Wild Bloom, LLC
-jewelry
-
-// jio : 2015-04-02 Affinity Names, Inc.
-jio
-
-// jlc : 2014-12-04 Richemont DNS Inc.
-jlc
-
-// jll : 2015-04-02 Jones Lang LaSalle Incorporated
-jll
-
-// jmp : 2015-03-26 Matrix IP LLC
-jmp
-
-// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-joburg
-
-// jot : 2014-12-18 Amazon EU S.à r.l.
-jot
-
-// joy : 2014-12-18 Amazon EU S.à r.l.
-joy
-
-// jprs : 2014-09-18 Japan Registry Services Co., Ltd.
-jprs
-
-// juegos : 2014-03-20 Uniregistry, Corp.
-juegos
-
-// kaufen : 2013-11-07 United TLD Holdco Ltd.
-kaufen
-
-// kddi : 2014-09-12 KDDI CORPORATION
-kddi
-
-// kfh : 2014-12-04 Kuwait Finance House
-kfh
-
-// kim : 2013-09-23 Afilias Limited
-kim
-
-// kinder : 2014-11-07 Ferrero Trading Lux S.A.
-kinder
-
-// kitchen : 2013-09-20 Just Goodbye, LLC
-kitchen
-
-// kiwi : 2013-09-20 DOT KIWI LIMITED
-kiwi
-
-// koeln : 2014-01-09 NetCologne Gesellschaft für Telekommunikation mbH
-koeln
-
-// komatsu : 2015-01-08 Komatsu Ltd.
-komatsu
-
-// kpn : 2015-01-08 Koninklijke KPN N.V.
-kpn
-
-// krd : 2013-12-05 KRG Department of Information Technology
-krd
-
-// kred : 2013-12-19 KredTLD Pty Ltd
-kred
-
-// kyknet : 2015-03-05 Electronic Media Network (Pty) Ltd
-kyknet
-
-// kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen
-kyoto
-
-// lacaixa : 2014-01-09 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA
-lacaixa
-
-// lancaster : 2015-02-12 LANCASTER
-lancaster
-
-// land : 2013-09-10 Pine Moon, LLC
-land
-
-// landrover : 2014-11-13 Jaguar Land Rover Ltd
-landrover
-
-// lasalle : 2015-04-02 Jones Lang LaSalle Incorporated
-lasalle
-
-// lat : 2014-10-16 ECOM-LAC Federaciòn de Latinoamèrica y el Caribe para Internet y el Comercio Electrònico
-lat
-
-// latrobe : 2014-06-16 La Trobe University
-latrobe
-
-// law : 2015-01-22 Minds + Machines Group Limited
-law
-
-// lawyer : 2014-03-20
-lawyer
-
-// lds : 2014-03-20 IRI Domain Management, LLC (
-lds
-
-// lease : 2014-03-06 Victor Trail, LLC
-lease
-
-// leclerc : 2014-08-07 A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
-leclerc
-
-// legal : 2014-10-16 Blue Falls, LLC
-legal
-
-// lgbt : 2014-05-08 Afilias Limited
-lgbt
-
-// liaison : 2014-10-02 Liaison Technologies, Incorporated
-liaison
-
-// lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
-lidl
-
-// life : 2014-02-06 Trixy Oaks, LLC
-life
-
-// lifeinsurance : 2015-01-15 American Council of Life Insurers
-lifeinsurance
-
-// lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc.
-lifestyle
-
-// lighting : 2013-08-27 John McCook, LLC
-lighting
-
-// like : 2014-12-18 Amazon EU S.à r.l.
-like
-
-// limited : 2014-03-06 Big Fest, LLC
-limited
-
-// limo : 2013-10-17 Hidden Frostbite, LLC
-limo
-
-// lincoln : 2014-11-13 Ford Motor Company
-lincoln
-
-// linde : 2014-12-04 Linde Aktiengesellschaft
-linde
-
-// link : 2013-11-14 Uniregistry, Corp.
-link
-
-// live : 2014-12-04 Half Woods, LLC
-live
-
-// lixil : 2015-03-19 LIXIL Group Corporation
-lixil
-
-// loan : 2014-11-20 dot Loan Limited
-loan
-
-// loans : 2014-03-20 June Woods, LLC
-loans
-
-// lol : 2015-01-30 Uniregistry, Corp.
-lol
-
-// london : 2013-11-14 Dot London Domains Limited
-london
-
-// lotte : 2014-11-07 Lotte Holdings Co., Ltd.
-lotte
-
-// lotto : 2014-04-10 Afilias Limited
-lotto
-
-// love : 2014-12-22 Merchant Law Group LLP
-love
-
-// ltd : 2014-09-25 Over Corner, LLC
-ltd
-
-// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA
-ltda
-
-// lupin : 2014-11-07 LUPIN LIMITED
-lupin
-
-// luxe : 2014-01-09 Top Level Domain Holdings Limited
-luxe
-
-// luxury : 2013-10-17 Luxury Partners, LLC
-luxury
-
-// madrid : 2014-05-01 Comunidad de Madrid
-madrid
-
-// maif : 2014-10-02 Mutuelle Assurance Instituteur France (MAIF)
-maif
-
-// maison : 2013-12-05 Victor Frostbite, LLC
-maison
-
-// makeup : 2015-01-15 L'Oréal
-makeup
-
-// man : 2014-12-04 MAN SE
-man
-
-// management : 2013-11-07 John Goodbye, LLC
-management
-
-// mango : 2013-10-24 PUNTO FA S.L.
-mango
-
-// market : 2014-03-06
-market
-
-// marketing : 2013-11-07 Fern Pass, LLC
-marketing
-
-// markets : 2014-12-11 IG Group Holdings PLC
-markets
-
-// marriott : 2014-10-09 Marriott Worldwide Corporation
-marriott
-
-// mba : 2015-04-02 Lone Hollow, LLC
-mba
-
-// media : 2014-03-06 Grand Glen, LLC
-media
-
-// meet : 2014-01-16
-meet
-
-// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
-melbourne
-
-// meme : 2014-01-30 Charleston Road Registry Inc.
-meme
-
-// memorial : 2014-10-16 Dog Beach, LLC
-memorial
-
-// men : 2015-02-26 Exclusive Registry Limited
-men
-
-// menu : 2013-09-11 Wedding TLD2, LLC
-menu
-
-// meo : 2014-11-07 PT Comunicacoes S.A.
-meo
-
-// miami : 2013-12-19 Top Level Domain Holdings Limited
-miami
-
-// microsoft : 2014-12-18 Microsoft Corporation
-microsoft
-
-// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
-mini
-
-// mma : 2014-11-07 MMA IARD
-mma
-
-// mnet : 2015-03-05 Electronic Media Network (Pty) Ltd
-mnet
-
-// mobily : 2014-12-18 GreenTech Consultancy Company W.L.L.
-mobily
-
-// moda : 2013-11-07 United TLD Holdco Ltd.
-moda
-
-// moe : 2013-11-13 Interlink Co., Ltd.
-moe
-
-// moi : 2014-12-18 Amazon EU S.à r.l.
-moi
-
-// monash : 2013-09-30 Monash University
-monash
-
-// money : 2014-10-16 Outer McCook, LLC
-money
-
-// montblanc : 2014-06-23 Richemont DNS Inc.
-montblanc
-
-// mormon : 2013-12-05 IRI Domain Management, LLC (
-mormon
-
-// mortgage : 2014-03-20
-mortgage
-
-// moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
-moscow
-
-// motorcycles : 2014-01-09 DERMotorcycles, LLC
-motorcycles
-
-// mov : 2014-01-30 Charleston Road Registry Inc.
-mov
-
-// movie : 2015-02-05 New Frostbite, LLC
-movie
-
-// movistar : 2014-10-16 Telefónica S.A.
-movistar
-
-// mtn : 2014-12-04 MTN Dubai Limited
-mtn
-
-// mtpc : 2014-11-20 Mitsubishi Tanabe Pharma Corporation
-mtpc
-
-// mtr : 2015-03-12 MTR Corporation Limited
-mtr
-
-// multichoice : 2015-03-12 MultiChoice (Proprietary) Limited
-multichoice
-
-// mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
-mutual
-
-// mzansimagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-mzansimagic
-
-// nadex : 2014-12-11 IG Group Holdings PLC
-nadex
-
-// nagoya : 2013-10-24 GMO Registry, Inc.
-nagoya
-
-// naspers : 2015-02-12 Intelprop (Proprietary) Limited
-naspers
-
-// natura : 2015-03-12 NATURA COSMÉTICOS S.A.
-natura
-
-// navy : 2014-03-06 United TLD Holdco Ltd.
-navy
-
-// nec : 2015-01-08 NEC Corporation
-nec
-
-// netbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-netbank
-
-// network : 2013-11-14 Trixy Manor, LLC
-network
-
-// neustar : 2013-12-05 NeuStar, Inc.
-neustar
-
-// new : 2014-01-30 Charleston Road Registry Inc.
-new
-
-// news : 2014-12-18
-news
-
-// nexus : 2014-07-24 Charleston Road Registry Inc.
-nexus
-
-// ngo : 2014-03-06 Public Interest Registry
-ngo
-
-// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK)
-nhk
-
-// nico : 2014-12-04 DWANGO Co., Ltd.
-nico
-
-// ninja : 2013-11-07 United TLD Holdco Ltd.
-ninja
-
-// nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
-nissan
-
-// nokia : 2015-01-08 Nokia Corporation
-nokia
-
-// norton : 2014-12-04 Symantec Corporation
-norton
-
-// nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-nowruz
-
-// nra : 2014-05-22 NRA Holdings Company, INC.
-nra
-
-// nrw : 2013-11-21 Minds + Machines GmbH
-nrw
-
-// ntt : 2014-10-31 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
-ntt
-
-// nyc : 2014-01-23 The City of New York by and through the New York City Department of Information Technology & Telecommunications
-nyc
-
-// obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
-obi
-
-// office : 2015-03-12 Microsoft Corporation
-office
-
-// okinawa : 2013-12-05 BusinessRalliart Inc.
-okinawa
-
-// omega : 2015-01-08 The Swatch Group Ltd
-omega
-
-// one : 2014-11-07 One.com A/S
-one
-
-// ong : 2014-03-06 Public Interest Registry
-ong
-
-// onl : 2013-09-16 I-Registry Ltd.
-onl
-
-// online : 2015-01-15 DotOnline Inc.
-online
-
-// ooo : 2014-01-09 INFIBEAM INCORPORATION LIMITED
-ooo
-
-// oracle : 2014-06-19 Oracle Corporation
-oracle
-
-// orange : 2015-03-12 Orange Brand Services Limited
-orange
-
-// organic : 2014-03-27 Afilias Limited
-organic
-
-// orientexpress : 2015-02-05 Belmond Ltd.
-orientexpress
-
-// osaka : 2014-09-04 Interlink Co., Ltd.
-osaka
-
-// otsuka : 2013-10-11 Otsuka Holdings Co., Ltd.
-otsuka
-
-// ovh : 2014-01-16 OVH SAS
-ovh
-
-// page : 2014-12-04 Charleston Road Registry Inc.
-page
-
-// pamperedchef : 2015-02-05 The Pampered Chef, Ltd.
-pamperedchef
-
-// panerai : 2014-11-07 Richemont DNS Inc.
-panerai
-
-// paris : 2014-01-30 City of Paris
-paris
-
-// pars : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-pars
-
-// partners : 2013-12-05 Magic Glen, LLC
-partners
-
-// parts : 2013-12-05 Sea Goodbye, LLC
-parts
-
-// party : 2014-09-11 Blue Sky Registry Limited
-party
-
-// passagens : 2015-03-05 Travel Reservations SRL
-passagens
-
-// payu : 2015-02-12 MIH PayU B.V.
-payu
-
-// pharmacy : 2014-06-19 National Association of Boards of Pharmacy
-pharmacy
-
-// philips : 2014-11-07 Koninklijke Philips N.V.
-philips
-
-// photo : 2013-11-14 Uniregistry, Corp.
-photo
-
-// photography : 2013-09-20 Sugar Glen, LLC
-photography
-
-// photos : 2013-10-17 Sea Corner, LLC
-photos
-
-// physio : 2014-05-01 PhysBiz Pty Ltd
-physio
-
-// piaget : 2014-10-16 Richemont DNS Inc.
-piaget
-
-// pics : 2013-11-14 Uniregistry, Corp.
-pics
-
-// pictet : 2014-06-26 Pictet Europe S.A.
-pictet
-
-// pictures : 2014-03-06 Foggy Sky, LLC
-pictures
-
-// pid : 2015-01-08 Top Level Spectrum, Inc.
-pid
-
-// pin : 2014-12-18 Amazon EU S.à r.l.
-pin
-
-// pink : 2013-10-01 Afilias Limited
-pink
-
-// pizza : 2014-06-26 Foggy Moon, LLC
-pizza
-
-// place : 2014-04-24 Snow Galley, LLC
-place
-
-// play : 2015-03-05 Charleston Road Registry Inc.
-play
-
-// plumbing : 2013-09-10 Spring Tigers, LLC
-plumbing
-
-// plus : 2015-02-05 Sugar Mill, LLC
-plus
-
-// pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-pohl
-
-// poker : 2014-07-03 Afilias Domains No. 5 Limited
-poker
-
-// porn : 2014-10-16 ICM Registry PN LLC
-porn
-
-// praxi : 2013-12-05 Praxi S.p.A.
-praxi
-
-// press : 2014-04-03 DotPress Inc.
-press
-
-// prod : 2014-01-23 Charleston Road Registry Inc.
-prod
-
-// productions : 2013-12-05 Magic Birch, LLC
-productions
-
-// prof : 2014-07-24 Charleston Road Registry Inc.
-prof
-
-// promo : 2014-12-18 Play.PROMO Oy
-promo
-
-// properties : 2013-12-05 Big Pass, LLC
-properties
-
-// property : 2014-05-22 Uniregistry, Corp.
-property
-
-// pub : 2013-12-12 United TLD Holdco Ltd.
-pub
-
-// qpon : 2013-11-14 dotCOOL, Inc.
-qpon
-
-// quebec : 2013-12-19 PointQuébec Inc
-quebec
-
-// quest : 2015-03-26 Quest ION Limited
-quest
-
-// racing : 2014-12-04 Premier Registry Limited
-racing
-
-// read : 2014-12-18 Amazon EU S.à r.l.
-read
-
-// realtor : 2014-05-29 Real Estate Domains LLC
-realtor
-
-// realty : 2015-03-19 Fegistry, LLC
-realty
-
-// recipes : 2013-10-17 Grand Island, LLC
-recipes
-
-// red : 2013-11-07 Afilias Limited
-red
-
-// redstone : 2014-10-31 Redstone Haute Couture Co., Ltd.
-redstone
-
-// redumbrella : 2015-03-26 Travelers TLD, LLC
-redumbrella
-
-// rehab : 2014-03-06 United TLD Holdco Ltd.
-rehab
-
-// reise : 2014-03-13 dotreise GmbH
-reise
-
-// reisen : 2014-03-06 New Cypress, LLC
-reisen
-
-// reit : 2014-09-04 National Association of Real Estate Investment Trusts, Inc.
-reit
-
-// reliance : 2015-04-02 Reliance Industries Limited
-reliance
-
-// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd.
-ren
-
-// rent : 2014-12-04 DERRent, LLC
-rent
-
-// rentals : 2013-12-05 Big Hollow,LLC
-rentals
-
-// repair : 2013-11-07 Lone Sunset, LLC
-repair
-
-// report : 2013-12-05 Binky Glen, LLC
-report
-
-// republican : 2014-03-20 United TLD Holdco Ltd.
-republican
-
-// rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
-rest
-
-// restaurant : 2014-07-03 Snow Avenue, LLC
-restaurant
-
-// review : 2014-11-20 dot Review Limited
-review
-
-// reviews : 2013-09-13
-reviews
-
-// rich : 2013-11-21 I-Registry Ltd.
-rich
-
-// ricoh : 2014-11-20 Ricoh Company, Ltd.
-ricoh
-
-// ril : 2015-04-02 Reliance Industries Limited
-ril
-
-// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO
-rio
-
-// rip : 2014-07-10 United TLD Holdco Ltd.
-rip
-
-// rocher : 2014-12-18 Ferrero Trading Lux S.A.
-rocher
-
-// rocks : 2013-11-14
-rocks
-
-// rodeo : 2013-12-19 Top Level Domain Holdings Limited
-rodeo
-
-// room : 2014-12-18 Amazon EU S.à r.l.
-room
-
-// rsvp : 2014-05-08 Charleston Road Registry Inc.
-rsvp
-
-// ruhr : 2013-10-02 regiodot GmbH & Co. KG
-ruhr
-
-// run : 2015-03-19 Snow Park, LLC
-run
-
-// rwe : 2015-04-02 RWE AG
-rwe
-
-// ryukyu : 2014-01-09 BusinessRalliart Inc.
-ryukyu
-
-// saarland : 2013-12-12 dotSaarland GmbH
-saarland
-
-// safe : 2014-12-18 Amazon EU S.à r.l.
-safe
-
-// safety : 2015-01-08 Safety Registry Services, LLC.
-safety
-
-// sakura : 2014-12-18 SAKURA Internet Inc.
-sakura
-
-// sale : 2014-10-16
-sale
-
-// salon : 2014-12-11 Outer Orchard, LLC
-salon
-
-// samsung : 2014-04-03 SAMSUNG SDS CO., LTD
-samsung
-
-// sandvik : 2014-11-13 Sandvik AB
-sandvik
-
-// sandvikcoromant : 2014-11-07 Sandvik AB
-sandvikcoromant
-
-// sanofi : 2014-10-09 Sanofi
-sanofi
-
-// sap : 2014-03-27 SAP AG
-sap
-
-// sapo : 2014-11-07 PT Comunicacoes S.A.
-sapo
-
-// sarl : 2014-07-03 Delta Orchard, LLC
-sarl
-
-// sas : 2015-04-02 Research IP LLC
-sas
-
-// saxo : 2014-10-31 Saxo Bank A/S
-saxo
-
-// sbi : 2015-03-12 STATE BANK OF INDIA
-sbi
-
-// sbs : 2014-11-07 SPECIAL BROADCASTING SERVICE CORPORATION
-sbs
-
-// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-sca
-
-// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited (
-scb
-
-// schmidt : 2014-04-03 SALM S.A.S.
-schmidt
-
-// scholarships : 2014-04-24 Scholarships.com, LLC
-scholarships
-
-// school : 2014-12-18 Little Galley, LLC
-school
-
-// schule : 2014-03-06 Outer Moon, LLC
-schule
-
-// schwarz : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
-schwarz
-
-// science : 2014-09-11 dot Science Limited
-science
-
-// scor : 2014-10-31 SCOR SE
-scor
-
-// scot : 2014-01-23 Dot Scot Registry Limited
-scot
-
-// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
-seat
-
-// seek : 2014-12-04 Seek Limited
-seek
-
-// sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A.
-sener
-
-// services : 2014-02-27 Fox Castle, LLC
-services
-
-// sew : 2014-07-17 SEW-EURODRIVE GmbH & Co KG
-sew
-
-// sex : 2014-11-13 ICM Registry SX LLC
-sex
-
-// sexy : 2013-09-11 Uniregistry, Corp.
-sexy
-
-// sharp : 2014-05-01 Sharp Corporation
-sharp
-
-// shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-shia
-
-// shiksha : 2013-11-14 Afilias Limited
-shiksha
-
-// shoes : 2013-10-02 Binky Galley, LLC
-shoes
-
-// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-shouji
-
-// show : 2015-03-05 Snow Beach, LLC
-show
-
-// shriram : 2014-01-23 Shriram Capital Ltd.
-shriram
-
-// sina : 2015-03-12 Sina Corporation
-sina
-
-// singles : 2013-08-27 Fern Madison, LLC
-singles
-
-// site : 2015-01-15 DotSite Inc.
-site
-
-// skin : 2015-01-15 L'Oréal
-skin
-
-// sky : 2014-06-19 Sky IP International Ltd, a company incorporated in England and Wales, operating via its registered Swiss branch
-sky
-
-// skype : 2014-12-18 Microsoft Corporation
-skype
-
-// smile : 2014-12-18 Amazon EU S.à r.l.
-smile
-
-// sncf : 2015-02-19 Société Nationale des Chemins de fer Francais S N C F
-sncf
-
-// soccer : 2015-03-26 Foggy Shadow, LLC
-soccer
-
-// social : 2013-11-07 United TLD Holdco Ltd.
-social
-
-// software : 2014-03-20
-software
-
-// sohu : 2013-12-19 Sohu.com Limited
-sohu
-
-// solar : 2013-11-07 Ruby Town, LLC
-solar
-
-// solutions : 2013-11-07 Silver Cover, LLC
-solutions
-
-// song : 2015-02-26 Amazon EU S.à r.l.
-song
-
-// sony : 2015-01-08 Sony Corporation
-sony
-
-// soy : 2014-01-23 Charleston Road Registry Inc.
-soy
-
-// space : 2014-04-03 DotSpace Inc.
-space
-
-// spiegel : 2014-02-05 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG
-spiegel
-
-// spot : 2015-02-26 Amazon EU S.à r.l.
-spot
-
-// spreadbetting : 2014-12-11 IG Group Holdings PLC
-spreadbetting
-
-// stada : 2014-11-13 STADA Arzneimittel AG
-stada
-
-// star : 2015-01-08 Star India Private Limited
-star
-
-// starhub : 2015-02-05 StarHub Limited
-starhub
-
-// statebank : 2015-03-12 STATE BANK OF INDIA
-statebank
-
-// statoil : 2014-12-04 Statoil ASA
-statoil
-
-// stc : 2014-10-09 Saudi Telecom Company
-stc
-
-// stcgroup : 2014-10-09 Saudi Telecom Company
-stcgroup
-
-// stockholm : 2014-12-18 Stockholms kommun
-stockholm
-
-// storage : 2014-12-22 Self Storage Company LLC
-storage
-
-// studio : 2015-02-11 Spring Goodbye, LLC
-studio
-
-// study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD
-study
-
-// style : 2014-12-04 Binky Moon, LLC
-style
-
-// sucks : 2014-12-22 Vox Populi Registry Inc.
-sucks
-
-// supersport : 2015-03-05 SuperSport International Holdings Proprietary Limited
-supersport
-
-// supplies : 2013-12-19 Atomic Fields, LLC
-supplies
-
-// supply : 2013-12-19 Half Falls, LLC
-supply
-
-// support : 2013-10-24 Grand Orchard, LLC
-support
-
-// surf : 2014-01-09 Top Level Domain Holdings Limited
-surf
-
-// surgery : 2014-03-20 Tin Avenue, LLC
-surgery
-
-// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION
-suzuki
-
-// swatch : 2015-01-08 The Swatch Group Ltd
-swatch
-
-// swiss : 2014-10-16 Swiss Confederation
-swiss
-
-// sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet
-sydney
-
-// symantec : 2014-12-04 Symantec Corporation
-symantec
-
-// systems : 2013-11-07 Dash Cypress, LLC
-systems
-
-// tab : 2014-12-04 Tabcorp Holdings Limited
-tab
-
-// taipei : 2014-07-10 Taipei City Government
-taipei
-
-// taobao : 2015-01-15 Alibaba Group Holding Limited
-taobao
-
-// tatamotors : 2015-03-12 Tata Motors Ltd
-tatamotors
-
-// tatar : 2014-04-24 Limited Liability Company
-tatar
-
-// tattoo : 2013-08-30 Uniregistry, Corp.
-tattoo
-
-// tax : 2014-03-20 Storm Orchard, LLC
-tax
-
-// taxi : 2015-03-19 Pine Falls, LLC
-taxi
-
-// tci : 2014-09-12 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-tci
-
-// team : 2015-03-05 Atomic Lake, LLC
-team
-
-// tech : 2015-01-30 Dot Tech LLC
-tech
-
-// technology : 2013-09-13 Auburn Falls
-technology
-
-// telecity : 2015-02-19 TelecityGroup International Limited
-telecity
-
-// telefonica : 2014-10-16 Telefónica S.A.
-telefonica
-
-// temasek : 2014-08-07 Temasek Holdings (Private) Limited
-temasek
-
-// tennis : 2014-12-04 Cotton Bloom, LLC
-tennis
-
-// thd : 2015-04-02 Homer TLC, Inc.
-thd
-
-// theater : 2015-03-19 Blue Tigers, LLC
-theater
-
-// tickets : 2015-02-05 Accent Media Limited
-tickets
-
-// tienda : 2013-11-14 Victor Manor, LLC
-tienda
-
-// tiffany : 2015-01-30 Tiffany and Company
-tiffany
-
-// tips : 2013-09-20 Corn Willow, LLC
-tips
-
-// tires : 2014-11-07 Dog Edge, LLC
-tires
-
-// tirol : 2014-04-24 punkt Tirol GmbH
-tirol
-
-// tmall : 2015-01-15 Alibaba Group Holding Limited
-tmall
-
-// today : 2013-09-20 Pearl Woods, LLC
-today
-
-// tokyo : 2013-11-13 GMO Registry, Inc.
-tokyo
-
-// tools : 2013-11-21 Pioneer North, LLC
-tools
-
-// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd.
-top
-
-// toray : 2014-12-18 Toray Industries, Inc.
-toray
-
-// toshiba : 2014-04-10 TOSHIBA Corporation
-toshiba
-
-// tours : 2015-01-22 Sugar Station, LLC
-tours
-
-// town : 2014-03-06 Koko Moon, LLC
-town
-
-// toys : 2014-03-06 Pioneer Orchard, LLC
-toys
-
-// trade : 2014-01-23 Elite Registry Limited
-trade
-
-// trading : 2014-12-11 IG Group Holdings PLC
-trading
-
-// training : 2013-11-07 Wild Willow, LLC
-training
-
-// travelers : 2015-03-26 Travelers TLD, LLC
-travelers
-
-// travelersinsurance : 2015-03-26 Travelers TLD, LLC
-travelersinsurance
-
-// trust : 2014-10-16
-trust
-
-// trv : 2015-03-26 Travelers TLD, LLC
-trv
-
-// tui : 2014-07-03 TUI AG
-tui
-
-// tunes : 2015-02-26 Amazon EU S.à r.l.
-tunes
-
-// tushu : 2014-12-18 Amazon EU S.à r.l.
-tushu
-
-// tvs : 2015-02-19 T V SUNDRAM IYENGAR & SONS LIMITED
-tvs
-
-// ubs : 2014-12-11 UBS AG
-ubs
-
-// university : 2014-03-06 Little Station, LLC
-university
-
-// uno : 2013-09-11 Dot Latin LLC
-uno
-
-// uol : 2014-05-01 UBN INTERNET LTDA.
-uol
-
-// vacations : 2013-12-05 Atomic Tigers, LLC
-vacations
-
-// vana : 2014-12-11 Lifestyle Domain Holdings, Inc.
-vana
-
-// vegas : 2014-01-16 Dot Vegas, Inc.
-vegas
-
-// ventures : 2013-08-27 Binky Lake, LLC
-ventures
-
-// versicherung : 2014-03-20 dotversicherung-registry GmbH
-versicherung
-
-// vet : 2014-03-06
-vet
-
-// viajes : 2013-10-17 Black Madison, LLC
-viajes
-
-// video : 2014-10-16
-video
-
-// viking : 2015-04-02 Viking River Cruises (Bermuda) Ltd.
-viking
-
-// villas : 2013-12-05 New Sky, LLC
-villas
-
-// vip : 2015-01-22 Minds + Machines Group Limited
-vip
-
-// virgin : 2014-09-25 Virgin Enterprises Limited
-virgin
-
-// vision : 2013-12-05 Koko Station, LLC
-vision
-
-// vista : 2014-09-18 Vistaprint Limited
-vista
-
-// vistaprint : 2014-09-18 Vistaprint Limited
-vistaprint
-
-// viva : 2014-11-07 Saudi Telecom Company
-viva
-
-// vlaanderen : 2014-02-06 DNS.be vzw
-vlaanderen
-
-// vodka : 2013-12-19 Top Level Domain Holdings Limited
-vodka
-
-// vote : 2013-11-21 Monolith Registry LLC
-vote
-
-// voting : 2013-11-13 Valuetainment Corp.
-voting
-
-// voto : 2013-11-21 Monolith Registry LLC
-voto
-
-// voyage : 2013-08-27 Ruby House, LLC
-voyage
-
-// vuelos : 2015-03-05 Travel Reservations SRL
-vuelos
-
-// wales : 2014-05-08 Nominet UK
-wales
-
-// walter : 2014-11-13 Sandvik AB
-walter
-
-// wang : 2013-10-24 Zodiac Leo Limited
-wang
-
-// wanggou : 2014-12-18 Amazon EU S.à r.l.
-wanggou
-
-// watch : 2013-11-14 Sand Shadow, LLC
-watch
-
-// watches : 2014-12-22 Richemont DNS Inc.
-watches
-
-// weather : 2015-01-08 The Weather Channel, LLC
-weather
-
-// weatherchannel : 2015-03-12 The Weather Channel, LLC
-weatherchannel
-
-// webcam : 2014-01-23 dot Webcam Limited
-webcam
-
-// website : 2014-04-03 DotWebsite Inc.
-website
-
-// wed : 2013-10-01 Atgron, Inc.
-wed
-
-// wedding : 2014-04-24 Top Level Domain Holdings Limited
-wedding
-
-// weibo : 2015-03-05 Sina Corporation
-weibo
-
-// weir : 2015-01-29 Weir Group IP Limited
-weir
-
-// whoswho : 2014-02-20 Who's Who Registry
-whoswho
-
-// wien : 2013-10-28 punkt.wien GmbH
-wien
-
-// wiki : 2013-11-07 Top Level Design, LLC
-wiki
-
-// williamhill : 2014-03-13 William Hill Organization Limited
-williamhill
-
-// win : 2014-11-20 First Registry Limited
-win
-
-// windows : 2014-12-18 Microsoft Corporation
-windows
-
-// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC
-wme
-
-// work : 2013-12-19 Top Level Domain Holdings Limited
-work
-
-// works : 2013-11-14 Little Dynamite, LLC
-works
-
-// world : 2014-06-12 Bitter Fields, LLC
-world
-
-// wtc : 2013-12-19 World Trade Centers Association, Inc.
-wtc
-
-// wtf : 2014-03-06 Hidden Way, LLC
-wtf
-
-// xbox : 2014-12-18 Microsoft Corporation
-xbox
-
-// xerox : 2014-10-24 Xerox DNHC LLC
-xerox
-
-// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-xihuan
-
-// xin : 2014-12-11 Elegant Leader Limited
-xin
-
-// xn--11b4c3d : 2015-01-15 VeriSign Sarl
-कॉम
-xn--11b4c3d
-
-// xn--1ck2e1b : 2015-02-26 Amazon EU S.à r.l.
-セール
-xn--1ck2e1b
-
-// xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd.
-佛山
-xn--1qqw23a
-
-// xn--30rr7y : 2014-06-12 Excellent First Limited
-慈善
-xn--30rr7y
-
-// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
-集团
-xn--3bst00m
-
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED
-在线
-xn--3ds443g
-
-// xn--3pxu8k : 2015-01-15 VeriSign Sarl
-点看
-xn--3pxu8k
-
-// xn--42c2d9a : 2015-01-15 VeriSign Sarl
-คอม
-xn--42c2d9a
-
-// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited
-八卦
-xn--45q11c
-
-// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment
-موقع
-xn--4gbrim
-
-// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
-公益
-xn--55qw42g
-
-// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center）
-公司
-xn--55qx5d
-
-// xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited
-网站
-xn--5tzm5g
-
-// xn--6frz82g : 2013-09-23 Afilias Limited
-移动
-xn--6frz82g
-
-// xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited
-我爱你
-xn--6qq986b3xl
-
-// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
-москва
-xn--80adxhks
-
-// xn--80asehdb : 2013-07-14 CORE Association
-онлайн
-xn--80asehdb
-
-// xn--80aswg : 2013-07-14 CORE Association
-сайт
-xn--80aswg
-
-// xn--8y0a063a : 2015-03-26 China United Network Communications Corporation Limited
-联通
-xn--8y0a063a
-
-// xn--9dbq2a : 2015-01-15 VeriSign Sarl
-קום
-xn--9dbq2a
-
-// xn--9et52u : 2014-06-12 RISE VICTORY LIMITED
-时尚
-xn--9et52u
-
-// xn--9krt00a : 2015-03-12 Sina Corporation
-微博
-xn--9krt00a
-
-// xn--b4w605ferd : 2014-08-07 Temasek Holdings (Private) Limited
-淡马锡
-xn--b4w605ferd
-
-// xn--bck1b9a5dre4c : 2015-02-26 Amazon EU S.à r.l.
-ファッション
-xn--bck1b9a5dre4c
-
-// xn--c1avg : 2013-11-14 Public Interest Registry
-орг
-xn--c1avg
-
-// xn--c2br7g : 2015-01-15 VeriSign Sarl
-नेट
-xn--c2br7g
-
-// xn--cck2b3b : 2015-02-26 Amazon EU S.à r.l.
-ストア
-xn--cck2b3b
-
-// xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
-삼성
-xn--cg4bki
-
-// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY.HONGKONG LIMITED
-商标
-xn--czr694b
-
-// xn--czrs0t : 2013-12-19 Wild Island, LLC
-商店
-xn--czrs0t
-
-// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited
-商城
-xn--czru2d
-
-// xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives “The Smart Internet”
-дети
-xn--d1acj3b
-
-// xn--eckvdtc9d : 2014-12-18 Amazon EU S.à r.l.
-ポイント
-xn--eckvdtc9d
-
-// xn--efvy88h : 2014-08-22 Xinhua News Agency Guangdong Branch 新华通讯社广东分社
-新闻
-xn--efvy88h
-
-// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited
-工行
-xn--estv75g
-
-// xn--fhbei : 2015-01-15 VeriSign Sarl
-كوم
-xn--fhbei
-
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED
-中文网
-xn--fiq228c5hs
-
-// xn--fiq64b : 2013-10-14 CITIC Group Corporation
-中信
-xn--fiq64b
-
-// xn--fjq720a : 2014-05-22 Will Bloom, LLC
-娱乐
-xn--fjq720a
-
-// xn--flw351e : 2014-07-31 Charleston Road Registry Inc.
-谷歌
-xn--flw351e
-
-// xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited
-购物
-xn--g2xx48c
-
-// xn--gckr3f0f : 2015-02-26 Amazon EU S.à r.l.
-クラウド
-xn--gckr3f0f
-
-// xn--hxt814e : 2014-05-15 Zodiac Libra Limited
-网店
-xn--hxt814e
-
-// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
-संगठन
-xn--i1b6b1a6a2e
-
-// xn--imr513n : 2014-12-11 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED
-餐厅
-xn--imr513n
-
-// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center）
-网络
-xn--io0a7i
-
-// xn--j1aef : 2015-01-15 VeriSign Sarl
-ком
-xn--j1aef
-
-// xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
-诺基亚
-xn--jlq61u9w7b
-
-// xn--jvr189m : 2015-02-26 Amazon EU S.à r.l.
-食品
-xn--jvr189m
-
-// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
-飞利浦
-xn--kcrx77d1x4a
-
-// xn--kpu716f : 2014-12-22 Richemont DNS Inc.
-手表
-xn--kpu716f
-
-// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd
-手机
-xn--kput3i
-
-// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company
-ارامكو
-xn--mgba3a3ejt
-
-// xn--mgbab2bd : 2013-10-31 CORE Association
-بازار
-xn--mgbab2bd
-
-// xn--mgbb9fbpob : 2014-12-18 GreenTech Consultancy Company W.L.L.
-موبايلي
-xn--mgbb9fbpob
-
-// xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-همراه
-xn--mgbt3dhd
-
-// xn--mk1bu44c : 2015-01-15 VeriSign Sarl
-닷컴
-xn--mk1bu44c
-
-// xn--mxtq1m : 2014-03-06 Net-Chinese Co., Ltd.
-政府
-xn--mxtq1m
-
-// xn--ngbc5azd : 2013-07-13 International Domain Registry Pty. Ltd.
-شبكة
-xn--ngbc5azd
-
-// xn--ngbe9e0a : 2014-12-04 Kuwait Finance House
-بيتك
-xn--ngbe9e0a
-
-// xn--nqv7f : 2013-11-14 Public Interest Registry
-机构
-xn--nqv7f
-
-// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry
-组织机构
-xn--nqv7fs00ema
-
-// xn--nyqy26a : 2014-11-07 Stable Tone Limited
-健康
-xn--nyqy26a
-
-// xn--p1acf : 2013-12-12 Rusnames Limited
-рус
-xn--p1acf
-
-// xn--pbt977c : 2014-12-22 Richemont DNS Inc.
-珠宝
-xn--pbt977c
-
-// xn--pssy2u : 2015-01-15 VeriSign Sarl
-大拿
-xn--pssy2u
-
-// xn--q9jyb4c : 2013-09-17 Charleston Road Registry Inc.
-みんな
-xn--q9jyb4c
-
-// xn--qcka1pmc : 2014-07-31 Charleston Road Registry Inc.
-グーグル
-xn--qcka1pmc
-
-// xn--rhqv96g : 2013-09-11 Stable Tone Limited
-世界
-xn--rhqv96g
-
-// xn--rovu88b : 2015-02-26 Amazon EU S.à r.l.
-書籍
-xn--rovu88b
-
-// xn--ses554g : 2014-01-16
-网址
-xn--ses554g
-
-// xn--t60b56a : 2015-01-15 VeriSign Sarl
-닷넷
-xn--t60b56a
-
-// xn--tckwe : 2015-01-15 VeriSign Sarl
-コム
-xn--tckwe
-
-// xn--unup4y : 2013-07-14 Spring Fields, LLC
-游戏
-xn--unup4y
-
-// xn--vermgensberater-ctb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-vermögensberater
-xn--vermgensberater-ctb
-
-// xn--vermgensberatung-pwb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-vermögensberatung
-xn--vermgensberatung-pwb
-
-// xn--vhquv : 2013-08-27 Dash McCook, LLC
-企业
-xn--vhquv
-
-// xn--vuq861b : 2014-10-16 Beijing Tele-info Network Technology Co., Ltd.
-信息
-xn--vuq861b
-
-// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd.
-广东
-xn--xhq521b
-
-// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
-政务
-xn--zfr164b
-
-// xyz : 2013-12-05 XYZ.COM LLC
-xyz
-
-// yachts : 2014-01-09 DERYachts, LLC
-yachts
-
-// yahoo : 2015-04-02 Yahoo! Domain Services Inc.
-yahoo
-
-// yamaxun : 2014-12-18 Amazon EU S.à r.l.
-yamaxun
-
-// yandex : 2014-04-10 YANDEX, LLC
-yandex
-
-// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
-yodobashi
-
-// yoga : 2014-05-29 Top Level Domain Holdings Limited
-yoga
-
-// yokohama : 2013-12-12 GMO Registry, Inc.
-yokohama
-
-// youtube : 2014-05-01 Charleston Road Registry Inc.
-youtube
-
-// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-yun
-
-// zara : 2014-11-07 Industria de Diseño Textil, S.A. (INDITEX, S.A.)
-zara
-
-// zero : 2014-12-18 Amazon EU S.à r.l.
-zero
-
-// zip : 2014-05-08 Charleston Road Registry Inc.
-zip
-
-// zone : 2013-11-14 Outer Falls, LLC
-zone
-
-// zuerich : 2014-11-07 Kanton Zürich (Canton of Zurich)
-zuerich
-
-
-// ===END ICANN DOMAINS===
-// ===BEGIN PRIVATE DOMAINS===
-// (Note: these are in alphabetical order by company name)
-
-// Amazon CloudFront : https://aws.amazon.com/cloudfront/
-// Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22
-cloudfront.net
-
-// Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Osman Surkatty <osmans@amazon.com> 2014-12-16
-ap-northeast-1.compute.amazonaws.com
-ap-southeast-1.compute.amazonaws.com
-ap-southeast-2.compute.amazonaws.com
-cn-north-1.compute.amazonaws.cn
-compute.amazonaws.cn
-compute.amazonaws.com
-compute-1.amazonaws.com
-eu-west-1.compute.amazonaws.com
-eu-central-1.compute.amazonaws.com
-sa-east-1.compute.amazonaws.com
-us-east-1.amazonaws.com
-us-gov-west-1.compute.amazonaws.com
-us-west-1.compute.amazonaws.com
-us-west-2.compute.amazonaws.com
-z-1.compute-1.amazonaws.com
-z-2.compute-1.amazonaws.com
-
-// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
-// Submitted by Adam Stein <astein@amazon.com> 2013-04-02
-elasticbeanstalk.com
-
-// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
-// Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27
-elb.amazonaws.com
-
-// Amazon S3 : https://aws.amazon.com/s3/
-// Submitted by Courtney Eckhardt <coec@amazon.com> 2013-03-22
-s3.amazonaws.com
-s3-us-west-2.amazonaws.com
-s3-us-west-1.amazonaws.com
-s3-eu-west-1.amazonaws.com
-s3-ap-southeast-1.amazonaws.com
-s3-ap-southeast-2.amazonaws.com
-s3-ap-northeast-1.amazonaws.com
-s3-sa-east-1.amazonaws.com
-s3-us-gov-west-1.amazonaws.com
-s3-fips-us-gov-west-1.amazonaws.com
-s3-website-us-east-1.amazonaws.com
-s3-website-us-west-2.amazonaws.com
-s3-website-us-west-1.amazonaws.com
-s3-website-eu-west-1.amazonaws.com
-s3-website-ap-southeast-1.amazonaws.com
-s3-website-ap-southeast-2.amazonaws.com
-s3-website-ap-northeast-1.amazonaws.com
-s3-website-sa-east-1.amazonaws.com
-s3-website-us-gov-west-1.amazonaws.com
-
-// BetaInABox
-// Submitted by adrian@betainabox.com 2012-09-13
-betainabox.com
-
-// CentralNic : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2012-09-27
-ae.org
-ar.com
-br.com
-cn.com
-com.de
-com.se
-de.com
-eu.com
-gb.com
-gb.net
-hu.com
-hu.net
-jp.net
-jpn.com
-kr.com
-mex.com
-no.com
-qc.com
-ru.com
-sa.com
-se.com
-se.net
-uk.com
-uk.net
-us.com
-uy.com
-za.bz
-za.com
-
-// Africa.com Web Solutions Ltd : https://registry.africa.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-africa.com
-
-// iDOT Services Limited : http://www.domain.gr.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-gr.com
-
-// Radix FZC : http://domains.in.net
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-in.net
-
-// US REGISTRY LLC : http://us.org
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-us.org
-
-// co.com Registry, LLC : https://registry.co.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-co.com
-
-// c.la : http://www.c.la/
-c.la
-
-// cloudControl : https://www.cloudcontrol.com/
-// Submitted by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23
-cloudcontrolled.com
-cloudcontrolapp.com
-
-// co.ca : http://registry.co.ca/
-co.ca
-
-// CoDNS B.V.
-co.nl
-co.no
-
-// Commerce Guys, SAS
-// Submitted by Damien Tournoud <damien@commerceguys.com> 2015-01-22
-*.platform.sh
-
-// Cupcake : https://cupcake.io/
-// Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08
-cupcake.is
-
-// DreamHost : http://www.dreamhost.com/
-// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
-dreamhosters.com
-
-// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
-dyndns-at-home.com
-dyndns-at-work.com
-dyndns-blog.com
-dyndns-free.com
-dyndns-home.com
-dyndns-ip.com
-dyndns-mail.com
-dyndns-office.com
-dyndns-pics.com
-dyndns-remote.com
-dyndns-server.com
-dyndns-web.com
-dyndns-wiki.com
-dyndns-work.com
-dyndns.biz
-dyndns.info
-dyndns.org
-dyndns.tv
-at-band-camp.net
-ath.cx
-barrel-of-knowledge.info
-barrell-of-knowledge.info
-better-than.tv
-blogdns.com
-blogdns.net
-blogdns.org
-blogsite.org
-boldlygoingnowhere.org
-broke-it.net
-buyshouses.net
-cechire.com
-dnsalias.com
-dnsalias.net
-dnsalias.org
-dnsdojo.com
-dnsdojo.net
-dnsdojo.org
-does-it.net
-doesntexist.com
-doesntexist.org
-dontexist.com
-dontexist.net
-dontexist.org
-doomdns.com
-doomdns.org
-dvrdns.org
-dyn-o-saur.com
-dynalias.com
-dynalias.net
-dynalias.org
-dynathome.net
-dyndns.ws
-endofinternet.net
-endofinternet.org
-endoftheinternet.org
-est-a-la-maison.com
-est-a-la-masion.com
-est-le-patron.com
-est-mon-blogueur.com
-for-better.biz
-for-more.biz
-for-our.info
-for-some.biz
-for-the.biz
-forgot.her.name
-forgot.his.name
-from-ak.com
-from-al.com
-from-ar.com
-from-az.net
-from-ca.com
-from-co.net
-from-ct.com
-from-dc.com
-from-de.com
-from-fl.com
-from-ga.com
-from-hi.com
-from-ia.com
-from-id.com
-from-il.com
-from-in.com
-from-ks.com
-from-ky.com
-from-la.net
-from-ma.com
-from-md.com
-from-me.org
-from-mi.com
-from-mn.com
-from-mo.com
-from-ms.com
-from-mt.com
-from-nc.com
-from-nd.com
-from-ne.com
-from-nh.com
-from-nj.com
-from-nm.com
-from-nv.com
-from-ny.net
-from-oh.com
-from-ok.com
-from-or.com
-from-pa.com
-from-pr.com
-from-ri.com
-from-sc.com
-from-sd.com
-from-tn.com
-from-tx.com
-from-ut.com
-from-va.com
-from-vt.com
-from-wa.com
-from-wi.com
-from-wv.com
-from-wy.com
-ftpaccess.cc
-fuettertdasnetz.de
-game-host.org
-game-server.cc
-getmyip.com
-gets-it.net
-go.dyndns.org
-gotdns.com
-gotdns.org
-groks-the.info
-groks-this.info
-ham-radio-op.net
-here-for-more.info
-hobby-site.com
-hobby-site.org
-home.dyndns.org
-homedns.org
-homeftp.net
-homeftp.org
-homeip.net
-homelinux.com
-homelinux.net
-homelinux.org
-homeunix.com
-homeunix.net
-homeunix.org
-iamallama.com
-in-the-band.net
-is-a-anarchist.com
-is-a-blogger.com
-is-a-bookkeeper.com
-is-a-bruinsfan.org
-is-a-bulls-fan.com
-is-a-candidate.org
-is-a-caterer.com
-is-a-celticsfan.org
-is-a-chef.com
-is-a-chef.net
-is-a-chef.org
-is-a-conservative.com
-is-a-cpa.com
-is-a-cubicle-slave.com
-is-a-democrat.com
-is-a-designer.com
-is-a-doctor.com
-is-a-financialadvisor.com
-is-a-geek.com
-is-a-geek.net
-is-a-geek.org
-is-a-green.com
-is-a-guru.com
-is-a-hard-worker.com
-is-a-hunter.com
-is-a-knight.org
-is-a-landscaper.com
-is-a-lawyer.com
-is-a-liberal.com
-is-a-libertarian.com
-is-a-linux-user.org
-is-a-llama.com
-is-a-musician.com
-is-a-nascarfan.com
-is-a-nurse.com
-is-a-painter.com
-is-a-patsfan.org
-is-a-personaltrainer.com
-is-a-photographer.com
-is-a-player.com
-is-a-republican.com
-is-a-rockstar.com
-is-a-socialist.com
-is-a-soxfan.org
-is-a-student.com
-is-a-teacher.com
-is-a-techie.com
-is-a-therapist.com
-is-an-accountant.com
-is-an-actor.com
-is-an-actress.com
-is-an-anarchist.com
-is-an-artist.com
-is-an-engineer.com
-is-an-entertainer.com
-is-by.us
-is-certified.com
-is-found.org
-is-gone.com
-is-into-anime.com
-is-into-cars.com
-is-into-cartoons.com
-is-into-games.com
-is-leet.com
-is-lost.org
-is-not-certified.com
-is-saved.org
-is-slick.com
-is-uberleet.com
-is-very-bad.org
-is-very-evil.org
-is-very-good.org
-is-very-nice.org
-is-very-sweet.org
-is-with-theband.com
-isa-geek.com
-isa-geek.net
-isa-geek.org
-isa-hockeynut.com
-issmarterthanyou.com
-isteingeek.de
-istmein.de
-kicks-ass.net
-kicks-ass.org
-knowsitall.info
-land-4-sale.us
-lebtimnetz.de
-leitungsen.de
-likes-pie.com
-likescandy.com
-merseine.nu
-mine.nu
-misconfused.org
-mypets.ws
-myphotos.cc
-neat-url.com
-office-on-the.net
-on-the-web.tv
-podzone.net
-podzone.org
-readmyblog.org
-saves-the-whales.com
-scrapper-site.net
-scrapping.cc
-selfip.biz
-selfip.com
-selfip.info
-selfip.net
-selfip.org
-sells-for-less.com
-sells-for-u.com
-sells-it.net
-sellsyourhome.org
-servebbs.com
-servebbs.net
-servebbs.org
-serveftp.net
-serveftp.org
-servegame.org
-shacknet.nu
-simple-url.com
-space-to-rent.com
-stuff-4-sale.org
-stuff-4-sale.us
-teaches-yoga.com
-thruhere.net
-traeumtgerade.de
-webhop.biz
-webhop.info
-webhop.net
-webhop.org
-worse-than.tv
-writesthisblog.com
-
-// Fastly Inc. http://www.fastly.com/
-// Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31
-a.ssl.fastly.net
-b.ssl.fastly.net
-global.ssl.fastly.net
-a.prod.fastly.net
-global.prod.fastly.net
-
-// Firebase, Inc.
-// Submitted by Chris Raynor <chris@firebase.com> 2014-01-21
-firebaseapp.com
-
-// Flynn : https://flynn.io
-// Submitted by Jonathan Rudenberg <jonathan@flynn.io> 2014-07-12
-flynnhub.com
-
-// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
-// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
-service.gov.uk
-
-// GitHub, Inc.
-// Submitted by Ben Toews <btoews@github.com> 2014-02-06
-github.io
-githubusercontent.com
-
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12
-ro.com
-
-// Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com> 2014-12-19
-appspot.com
-blogspot.ae
-blogspot.be
-blogspot.bj
-blogspot.ca
-blogspot.cf
-blogspot.ch
-blogspot.co.at
-blogspot.co.il
-blogspot.co.nz
-blogspot.co.uk
-blogspot.com
-blogspot.com.ar
-blogspot.com.au
-blogspot.com.br
-blogspot.com.es
-blogspot.com.tr
-blogspot.cv
-blogspot.cz
-blogspot.de
-blogspot.dk
-blogspot.fi
-blogspot.fr
-blogspot.gr
-blogspot.hk
-blogspot.hu
-blogspot.ie
-blogspot.in
-blogspot.it
-blogspot.jp
-blogspot.kr
-blogspot.mr
-blogspot.mx
-blogspot.nl
-blogspot.no
-blogspot.pt
-blogspot.re
-blogspot.ro
-blogspot.ru
-blogspot.se
-blogspot.sg
-blogspot.sk
-blogspot.td
-blogspot.tw
-codespot.com
-googleapis.com
-googlecode.com
-pagespeedmobilizer.com
-withgoogle.com
-
-// Heroku : https://www.heroku.com/
-// Submitted by Tom Maher <tmaher@heroku.com> 2013-05-02
-herokuapp.com
-herokussl.com
-
-// iki.fi
-// Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
-iki.fi
-
-// info.at : http://www.info.at/
-biz.at
-info.at
-
-// Michau Enterprises Limited : http://www.co.pl/
-co.pl
-
-// Microsoft : http://microsoft.com
-// Submitted by Barry Dorrans <bdorrans@microsoft.com> 2014-01-24
-azurewebsites.net
-azure-mobile.net
-cloudapp.net
-
-// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
-// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02
-nfshost.com
-
-// NYC.mn : http://www.information.nyc.mn
-// Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
-nyc.mn
-
-// One Fold Media : http://www.onefoldmedia.com/
-// Submitted by Eddie Jones <eddie@onefoldmedia.com> 2014-06-10
-nid.io
-
-// Opera Software, A.S.A.
-// Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
-
-// OutSystems
-// Submitted by Duarte Santos <domain-admin@outsystemscloud.com> 2014-03-11
-outsystemscloud.com
-
-// .pl domains (grandfathered)
-art.pl
-gliwice.pl
-krakow.pl
-poznan.pl
-wroc.pl
-zakopane.pl
-
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
-
-// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
-// Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
-rhcloud.com
-
-// SinaAppEngine : http://sae.sina.com.cn/
-// Submitted by SinaAppEngine <saesupport@sinacloud.com> 2015-02-02
-sinaapp.com
-vipsinaapp.com
-1kapp.com
-
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
-gda.pl
-gdansk.pl
-gdynia.pl
-med.pl
-sopot.pl
-
-// UDR Limited : http://www.udr.hk.com
-// Submitted by registry <hostmaster@udr.hk.com> 2014-11-07
-hk.com
-hk.org
-ltd.hk
-inc.hk
-
-// Yola : https://www.yola.com/
-// Submitted by Stefano Rivera <stefano@yola.com> 2014-07-09
-yolasite.com
-
-// ZaNiC : http://www.za.net/
-// Submitted by registry <hostmaster@nic.za.net> 2009-10-03
-za.net
-za.org
-
-// ===END PRIVATE DOMAINS===
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/update_CloudFlare.sh b/trunk/package/feeds/packages/ddns-scripts/files/update_CloudFlare.sh
deleted file mode 100644
index 22817404..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/update_CloudFlare.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# script for sending updates to cloudflare.com
-#.2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# many thanks to Paul for testing and feedback during development
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# using following options from /etc/config/ddns
-# option username - your cloudflare e-mail
-# option password - cloudflare api key, you can get it from cloudflare.com/my-account/
-# option domain   - your full hostname to update, in cloudflare its subdomain.domain
-#			i.e. myhost.example.com where myhost is the subdomain and example.com is your domain
-#
-# variable __IP already defined with the ip-address to use for update
-#
-[ $use_https -eq 0 ] && write_log 14 "Cloudflare only support updates via Secure HTTP (HTTPS). Please correct configuration!"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-local __RECID __URL __KEY __KEYS __FOUND __SUBDOM __DOMAIN __TLD
-
-# split given Host/Domain into TLD, registrable domain, and subdomain
-split_FQDN $domain __TLD __DOMAIN __SUBDOM
-[ $? -ne 0 -o -z "$__DOMAIN" ] && \
-	write_log 14 "Wrong Host/Domain configuration ($domain). Please correct configuration!"
-
-# put together what we need
-__DOMAIN="$__DOMAIN.$__TLD"
-
-# parse OpenWrt script with
-# functions for parsing and generating json
-. /usr/share/libubox/jshn.sh
-
-# function copied from /usr/share/libubox/jshn.sh
-# from BB14.09 for backward compatibility to AA12.09
-grep -i "json_get_keys" /usr/share/libubox/jshn.sh >/dev/null 2>&1 || json_get_keys() {
-	local __dest="$1"
-	local _tbl_cur
-
-	if [ -n "$2" ]; then
-		json_get_var _tbl_cur "$2"
-	else
-		_json_get_var _tbl_cur JSON_CUR
-	fi
-	local __var="${JSON_PREFIX}KEYS_${_tbl_cur}"
-	eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
-}
-
-# function to "sed" unwanted string parts from DATFILE
-cleanup() {
-	# based on the sample output on cloudflare.com homepage we need to do some cleanup
-	sed -i 's/^[ \t]*//;s/[ \t]*$//' $DATFILE	# remove invisible chars at beginning and end of lines
-	sed -i '/^-$/d' $DATFILE			# remove lines with "-" (dash)
-	sed -i '/^$/d' $DATFILE				# remove empty lines
-	sed -i "#'##g" $DATFILE				# remove "'" (single quote)
-}
-
-# build url according to cloudflare client api at https://www.cloudflare.com/docs/client-api.html
-# to "rec_load_all" to detect rec_id needed for update
-__URL="https://www.cloudflare.com/api_json.html"	# https://www.cloudflare.com/api_json.html
-__URL="${__URL}?a=rec_load_all"				#  -d 'a=rec_load_all'
-__URL="${__URL}&tkn=$password"				#  -d 'tkn=8afbe6dea02407989af4dd4c97bb6e25'
-__URL="${__URL}&email=$username"			#  -d 'email=sample@example.com'
-__URL="${__URL}&z=$__DOMAIN"				#  -d 'z=example.com'
-
-# lets request the data
-do_transfer "$__URL" || return 1
-
-cleanup				# cleanup dat file
-json_load "$(cat $DATFILE)"	# lets extract data
-__FOUND=0			# found record indicator
-json_get_var __RES "result"	# cloudflare result of last request
-json_get_var __MSG "msg"	# cloudflare error message
-[ "$__RES" != "success" ] && {
-	write_log 4 "'rec_load_all' failed with error: \n$__MSG"
-	return 1
-}
-
-json_select "response"
-json_select "recs"
-json_select "objs"
-json_get_keys __KEYS
-for __KEY in $__KEYS; do
-	local __ZONE __DISPLAY __NAME __TYPE
-	json_select "$__KEY"
-#	json_get_var __ZONE "zone_name"		# for debugging
-#	json_get_var __DISPLAY "display_name"	# for debugging
-	json_get_var __NAME "name"
-	json_get_var __TYPE "type"
-	if [ "$__NAME" = "$domain" ]; then
-		# we must verify IPv4 and IPv6 because there might be both for the same host
-		[ \( $use_ipv6 -eq 0 -a "$__TYPE" = "A" \) -o \( $use_ipv6 -eq 1 -a "$__TYPE" = "AAAA" \) ] && {
-			__FOUND=1	# mark found
-			break		# found leave for loop
-		}
-	fi
-	json_select ..
-done
-[ $__FOUND -eq 0 ] && {
-	# we don't need to continue trying to update cloudflare because record to update does not exist
-	# user has to setup record first outside ddns-scripts
-	write_log 14 "No valid record found at Cloudflare setup. Please create first!"
-}
-json_get_var __RECID "rec_id"	# last thing to do get rec_id
-json_cleanup			# cleanup
-write_log 7 "rec_id '$__RECID' detected for host/domain '$domain'"
-
-# build url according to cloudflare client api at https://www.cloudflare.com/docs/client-api.html
-# for "rec_edit" to update IP address
-__URL="https://www.cloudflare.com/api_json.html"	# https://www.cloudflare.com/api_json.html
-__URL="${__URL}?a=rec_edit"				#  -d 'a=rec_edit'
-__URL="${__URL}&tkn=$password"				#  -d 'tkn=8afbe6dea02407989af4dd4c97bb6e25'
-__URL="${__URL}&id=$__RECID"				#  -d 'id=9001'
-__URL="${__URL}&email=$username"			#  -d 'email=sample@example.com'
-__URL="${__URL}&z=$__DOMAIN"				#  -d 'z=example.com'
-
-[ $use_ipv6 -eq 0 ] && __URL="${__URL}&type=A"		#  -d 'type=A'		(IPv4)
-[ $use_ipv6 -eq 1 ] && __URL="${__URL}&type=AAAA"	#  -d 'type=AAAA'	(IPv6)
-
-# handle subdomain or domain record
-[ -n "$__SUBDOM" ] && __URL="${__URL}&name=$__SUBDOM"	#  -d 'name=sub'	(HOST/SUBDOMAIN)
-[ -z "$__SUBDOM" ] && __URL="${__URL}&name=$__DOMAIN"	#  -d 'name=example.com'(DOMAIN)
-
-__URL="${__URL}&content=$__IP"				#  -d 'content=1.2.3.4'
-__URL="${__URL}&service_mode=0"				#  -d 'service_mode=0'
-__URL="${__URL}&ttl=1"					#  -d 'ttl=1'
-
-# lets do the update
-do_transfer "$__URL" || return 1
-
-cleanup				# cleanup tmp file
-json_load "$(cat $DATFILE)"	# lets extract data
-json_get_var __RES "result"	# cloudflare result of last request
-json_get_var __MSG "msg"	# cloudflare error message
-[ "$__RES" != "success" ] && {
-	write_log 4 "'rec_edit' failed with error:\n$__MSG"
-	return 1
-}
-write_log 7 "Update of rec_id '$__RECID' successful"
-return 0
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/update_No-IP.com.sh b/trunk/package/feeds/packages/ddns-scripts/files/update_No-IP.com.sh
deleted file mode 100644
index 9d73448e..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/update_No-IP.com.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# script for sending updates to no-ip.com / noip.com
-#.2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# provider did not reactivate records, if no IP change was recognized
-# so we send a dummy (localhost) and a seconds later we send the correct IP addr
-#
-local __DUMMY
-local __UPDURL="http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
-# inside url we need username and password
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-# set IP version dependend dummy (localhost)
-[ $use_ipv6 -eq 0 ] && __DUMMY="127.0.0.1" || __DUMMY="::1"
-
-# lets do DUMMY transfer
-write_log 7 "sending dummy IP to 'no-ip.com'"
-__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__DUMMY#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "'no-ip.com' answered:\n$(cat $DATFILE)"
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -E "good|nochg" $DATFILE >/dev/null 2>&1 || return 1
-
-# lets wait a seconds
-sleep 1
-
-# now send the correct data
-write_log 7 "sending real IP to 'no-ip.com'"
-__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "'no-ip.com' answered:\n$(cat $DATFILE)"
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -E "good|nochg" $DATFILE >/dev/null 2>&1
-return $?	# "0" if "good" or "nochg" found
-
diff --git a/trunk/package/feeds/packages/ddns-scripts/files/update_nsupdate.sh b/trunk/package/feeds/packages/ddns-scripts/files/update_nsupdate.sh
deleted file mode 100644
index 1af94041..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/files/update_nsupdate.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# The script directly updates a PowerDNS (or maybe bind server) via nsupdate from bind-client package.
-#.based on github request #957 by Jan Riechers <de at r-jan dot de>
-#.2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# using following options from /etc/config/ddns
-# option username   - keyname 
-# option password   - shared secret (base64 encoded)
-# option domain     - full qualified domain to update
-# option dns_server - DNS server to update
-#
-# variable __IP already defined with the ip-address to use for update
-#
-local __TTL=600		#.preset DNS TTL (in seconds)
-local __RRTYPE __PW __TCP
-
-[ -x /usr/bin/nsupdate ] || write_log 14 "'nsupdate' not installed or not executable !"
-
-[ -z "$username" ]   && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ]   && write_log 14 "Service section not configured correctly! Missing 'password'"
-[ -z "$dns_server" ] && write_log 14 "Service section not configured correctly! Missing 'dns_server'"
-
-[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
-[ $force_dnstcp -ne 0 ] && __TCP="-v" || __TCP=""
-
-# create command file
-cat >$DATFILE <<-EOF
-server $dns_server
-key $username $password
-update del $domain $__RRTYPE
-update add $domain $__TTL $__RRTYPE $__IP
-show
-send
-quit
-EOF
-
-/usr/bin/nsupdate -d $__TCP $DATFILE >$ERRFILE 2>&1
-
-# nsupdate always return success
-write_log 7 "nsupdate reports:\n$(cat $ERRFILE)"
-
-return 0
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/ddns-scripts/samples/ddns.config_sample b/trunk/package/feeds/packages/ddns-scripts/samples/ddns.config_sample
deleted file mode 100644
index b96a7af4..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/samples/ddns.config_sample
+++ /dev/null
@@ -1,299 +0,0 @@
-#
-#
-# Here you find a description on every parameter supported
-# and used by ddns-scripts and corresponding LuCI application
-#
-# Inside your ddns configuration file (/etc/config/ddns)
-# you might not find some of below described options.
-# This is because you don't need to define options
-# if using there defaults. The LuCI application will delete
-# options that configured to there default values.
-#
-# If you have a working ddns configuration from old ddns-scripts (Version 1.x)
-# everything will function the same with new scripts
-# without any changes to the configuration.
-#
-# If you like to use this file for your configuration then
-# use a copy, because the used software to modify the
-# configuration files will throw away all empty lines
-# and those starting with # (comments).
-#
-
-#####################################################################
-# Global application settings
-#
-config ddns "global"
-
-	###########
-	# set date format to use for display date in logfiles
-	# and LuCI web application.
-	# For codes see man pages of date command.
-	# default: "%F %R" (ISO 8601 format)
-#	option date_format "%F %R"
-
-	###########
-	# set run directory to use for .pid and .update files
-	# there will be a separate file for every running service section
-	# default: "/var/run/ddns"
-#	option run_dir "/var/run/ddns"
-
-	###########
-	# set log directory to use for .log files
-	# there will be a separate file for every running service section
-	# default: "/var/log/ddns"
-#	option log_dir "/var/log/ddns"
-
-	###########
-	# set number of lines stored in .log file before auto truncated
-	# default: "250" lines
-#	option log_lines "250"
-
-	###########
-	# Whether to allow to send Private/Special IP's to the DDNS provider
-	# IPv4: 0.x, 10.x, 127.x, 172.16.x-172.31.x, 192.168.x
-	# IPv6: ::, Fxxx:
-	# default: "0"	disabled
-#	option allow_local_ip "0"
-
-#####################################################################
-# DDNS service settings
-#
-# for each service you want to serve you need a separate configuration
-# if you need IPv4 and IPv6 you need to setup 2 separate configurations
-# with different names. (i.e. "myddns_ipv4" and "myddns_ipv6")
-# do not use white-spaces or dashes "-" or "@" ":" "!" or
-# other special characters inside name.
-config service "myddns"
-
-	########### Basic settings ########################
-
-	###########
-	# enable/disable this service section
-	# default: "0"	disabled
-	option enabled "0"
-
-	###########
-	# detecting/sending IPv4 or IPv6 address to the DDNS provider
-	# set to "1" if you want to use IPv6
-	# default: "0"	use IPv4
-	option use_ipv6 "0"
-
-	###########
-	# defines the network as defined in /etc/config/network
-	# to be monitored for up/down events to start via hotplug
-	default: "wan"	for IPv4
-	default: "wan6"	for IPv6
-	option interface "wan"
-
-	###########
-	# Next you need to specify the name of the service you are
-	# connecting to "eg. dyndns.org".  The format of the update
-	# urls for several different dynamic dns services is specified
-	# in the "/usr/lib/ddns/services" file for IPv4 and in
-	# "/usr/lib/ddns/service_ipv6" file. This list is hardly complete
-	# as there are many, many different dynamic dns services.
-	# If your service is on the list you can merely specify it with the
-	# "service_name" option.  Otherwise you will need to determine
-	# the format of the url to update with.  You can either add an
-	# entry to the "/usr/lib/ddns/services" or "services_ipv6" file
-	# or specify this with the "update_url" option.
-	# If your ddns provider doesn't work with ddns-scripts because
-	# there are additional parameters or other special thinks to be done,
-	# then you could write your own script to send updates to your ddns provider.
-	# Have a look into /usr/lib/ddns/update_sample.sh
-	# The script is specified in "update_script"
-	# Either set "service_name" or one of "update_url" and "update_script"
-	# default: none
-	option service_name "dyndns.org"
-
-	# sample:
-	# "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-#	option update_url   ""
-
-	# sample:
-	# "/usr/lib/ddns/update_sample.sh"
-#	option update_script   ""
-
-	###########
-	# You must specify your domain/host name, your username and your password
-	# as you get from you DDNS provider. Keep an eye on providers help pages.
-	#
-	# Your DNS name / replace [DOMAIN] in update_url
-	# default: none
-	option domain ""
-
-	# Username of your DDNS service account / replace [USERNAME] in update_url
-	# default: none
-	option username ""
-
-	# Password of your DDNS service account / replace [PASSWORD] in update_url
-	# default: none
-	option password ""
-
-	###########
-	# use HTTPS for secure communication with you DDNS provider
-	# personally found some providers having problems when not sending
-	# updates via HTTPS. You must not specify "https://" in update_url.
-	# It's modified by the scripts themselves
-	# Needs GNU Wget (with SSL support) or cURL to be installed.
-	# default: "0"	do not use HTTPS
-	option use_https "0"
-
-	# if using HTTPS (see above) the transfer program tries to verify
-	# the providers server certificate. For verification there needs to be
-	# the counterpart on this machine. Specify the path or path/file where
-	# the transfer program can find them. (might need package CA-certificates)
-	# if you don't want to verify servers certificate (insecure) you should
-	# this parameter to "IGNORE" (in capital letters)
-	# default: (none)	path where CA-certificate package is installed
-	option cacert "/etc/ssl/certs"
-
-	###########
-	# for logging and control if everything work fine you can get information inside
-	# system log . Critical Errors are always send to system log.
-	# You can define which information you like to log
-	# 1 == info, notice, warning, errors
-	# 2 == notice, warning, errors
-	# 3 == warning, errors
-	# 4 == errors
-	# default: "0" off
-	option use_syslog  "0"
-
-	###########
-	# for logging and control if everything work fine you can get information inside
-	# log file. You find the file per default in /var/log/ddns/[sectionname].log
-	# The path can be modified for all log files in ddns.global section (see above)
-	# default: "1" on
-	option use_logfile "1"
-
-	########### Advanced settings #####################
-
-	###########
-	# you need to specify how ddns-scripts should detect you current local ip.
-	# the ip_source could be set to "network", "web", "interface" or "script"
-	# the parameters below specifying the additional information needed for
-	# the corresponding ip_spource configuration
-	# default: "network"
-
-	# ip_source "network" additional uses option ip_network and detects the
-	# current local ip on network as defined in /etc/config/network
-	# default: "wan"  using IPv4
-	# default: "wan6" using IPv6
-	option ip_source  "network"
-	option ip_network "wan"
-
-	# ip_source "web" additional uses option ip_url and detects the current
-	# local ip from special web sides that response with the ip address of
-	# calling host. If you are behind a firewall/NAT this is the best option
-	# since none of the local networks or interfaces will have the external ip.
-	# default: "http://checkip.dyndns.com"   using IPv4
-	# default: "http://checkipv6.dyndns.com" using IPv6
-#	option ip_source "web"
-#	option ip_url    "http://checkip.dyndns.com"
-
-	# ip_source "interface" additional uses option ip_interface
-	# ip_source "interface" uses one of the locally installed physical interfaces
-	# to detect independent from network they configured to.
-	# default: none
-#	option ip_source    "interface"
-#	option ip_interface "eth1"
-
-	# ip_source "script" additional uses option ip_script
-	# it's useful if you want to write your own script to detect the
-	# current local ip. put full path into ip_script option.
-	# The script must be executable.
-	# default: none
-#	option ip_source "script"
-#	option ip_script ""
-
-	###########
-	# force_ipversion option will set the "-4" respectively "-6" parameter
-	# on command line of transfer and DNS lookup program.
-	# So the whole communication uses the selected IP version between both ends.
-	# needs GNU Wget or cURL installed for transfer and
-	# BIND's host for DNS lookup.
-	# default: "0" disabled
-	option force_ipversion "0"
-
-	###########
-	# Normally the current (in the internet) registered ip is detected using the
-	# local defined name lookup policies (i.e. /etc/resolve.conf etc.)
-	# Specify here a DNS server to use instead of the defaults.
-	# you can use hostname or ip address
-	# i.e. "google-public-dns-a.google.com"
-	# default: none
-#	option dns_server "google-public-dns-a.google.com"
-
-	# By default every DNS call is made via UDP protocol
-	# Some internet provider offer modems that cache UDP DNS requests.
-	# They also redirect calls to external servers to local.
-	# To force the usage of TCP for DNS requests enable this option
-	# Needs BIND's host program be installed
-	# default: "0" disabled
-#	option force_dnstcp "0"
-
-	###########
-	# If a Proxy is need to access HTTP/HTTPS pages on the WEB
-	# it can be configured here also for sending updates to the
-	# DDNS provider. If you configured use_https='1' above, you
-	# need to setup your HTTPS proxy here, otherwise your
-	# HTTP proxy. !!! You should not detect your current IP
-	# ip_source='web' (see above) because this request is also
-	# send via the configured proxy !!!
-	# Syntax: [user:password@]proxy:port !port is required !
-	# IPv6 address must be in squared brackets "[...]"
-	# default: none
-#	option proxy ''
-
-	###########
-	# In some very special configurations i.e. Multi WAN environment
-	# in a NAT cascade it might be necessary to define
-	# a network to use for communication.
-	# should use option ip_source "web" (see above)
-	# Needs GNU Wget (with SSL support) or cURL to be installed.
-	# GNU Wget will use IP address and cURL the physical device 
-	# of the given network
-	# default: none
-#	option bind_network "wan7"
-
-	########### Timer settings ########################
-
-	###########
-	# defines the time interval to check if local IP has changed
-	# After the first start and first update send, the system will
-	# wait this time before verify if update was successful send.
-	# !!! checks below 5 minutes make no sense because the Internet
-	# needs about 5-10 minutes to sync an IP-change to all DNS servers !!!
-	# accepted unit entry’s: 'seconds' 'minutes' 'hours'
-	# minimum 5 minutes == 300 seconds
-	# default 10 minutes
-	option check_interval	'10'
-	option check_unit	'minutes'
-
-	###########
-	# force to send an update to service provider, if no change was detected.
-	# consult DDNS providers documentation if your DDNS entry might timeout.
-	# accepted unit entry’s: 'minutes' 'hours' 'days'
-	# minimum needs to be greater or equal check interval (see above)
-	# A special setting of '0' is allowed, which forces the script to run once.
-	# It sends an update, verify if update was accepted by DNS
-	# (retry if not) and finish. Useful if you want to start by your own (i.e. cron)
-	# default 3 days == 72 hours
-	option force_interval	'72'
-	option force_unit	'hours'
-
-	###########
-	# if error happen on detecting, sending or updating the
-	# script will retry the relevant action for retry_count times
-	# before stopping script execution.
-	# default: 5
-	option retry_count '5'
-
-	###########
-	# if error happen on detecting, sending or updating the
-	# script will retry the relevant action.
-	# here you define the time to wait before retry is started
-	# accepted unit entry’s: 'seconds' 'minutes'
-	# default: 60 seconds
-	option retry_interval	'60'
-	option retry_unit	'seconds'
diff --git a/trunk/package/feeds/packages/ddns-scripts/samples/getlocalip_sample.sh b/trunk/package/feeds/packages/ddns-scripts/samples/getlocalip_sample.sh
deleted file mode 100755
index b98806b6..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/samples/getlocalip_sample.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# sample script for detecting local IP
-# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option ip_source	'script'
-# option ip_script 	'/usr/lib/ddns/getlocalip_sample.sh -6' !!! parameters ALLOWED
-#
-# the script is executed (not parsed) inside get_local_ip() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-#
-# useful when this box is the only DDNS client in the network
-# IP adresses of "internal" boxes could be detected with this script
-# so no need to install ddns client on every "internal" box
-# On IPv6 every internal box normally has it's own external IP
-#
-# This script should
-# 	- return the IP address via stdout	echo -n "...."	!!! without line feed
-#	- report errors via stderr		echo "...." >&2
-#	- return an error code ('0' for success)	exit 123
-
-case $1 in
-	-4)	echo -n "8.8.8.8"		# never append linefeed or simular
-		exit 0
-		;;				# IP's of Googles public DNS
-	-6)	echo -n "2001:4860:4860::8888"
-		exit 0
-		;;
-	*)	echo "$0 - Invalid or missing parameter" >&2
-		exit 1
-esac
-echo "Should never come here" >&2
-exit 2
diff --git a/trunk/package/feeds/packages/ddns-scripts/samples/update_sample.sh b/trunk/package/feeds/packages/ddns-scripts/samples/update_sample.sh
deleted file mode 100644
index 1799d229..00000000
--- a/trunk/package/feeds/packages/ddns-scripts/samples/update_sample.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-# sample script for sending user defined updates
-# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option update_script '/usr/lib/ddns/update_sample.sh'
-#
-# the script is parsed (not executed) inside send_update() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-# so you can use all available functions and global variables inside this script
-# already defined in dynamic_dns_updater.sh and dynamic_dns_functions.sh
-#
-# It make sence to define the update url ONLY inside this script
-# because it's anyway unique to the update script
-# otherwise it should work with the default scripts
-#
-# the code here is the copy of the default used inside send_update()
-#
-# tested with spdns.de
-local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
-# inside url we need username and password
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-# do replaces in URL
-__URL=$(echo $__URL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
-
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -E "good|nochg" $DATFILE >/dev/null 2>&1
-return $?	# "0" if "good" or "nochg" found
-
diff --git a/trunk/package/feeds/packages/debootstrap/Makefile b/trunk/package/feeds/packages/debootstrap/Makefile
deleted file mode 100644
index a55ba353..00000000
--- a/trunk/package/feeds/packages/debootstrap/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2010 Gianluigi Tiesi <sherpya@netfarm.it>
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=debootstrap
-PKG_VERSION:=1.0.67
-PKG_RELEASE:=1
-PKG_MAINTAINER=Daniel Golle <daniel@makrotopia.org>
-
-PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap
-PKG_MD5SUM:=e7854d4b10ab860f08921525406debdd
-PKG_LICENSE:=Unique
-PKG_LICENSE_FILES:=debian/copyright
-
-UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf -
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/debootstrap
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Bootstrap a basic Debian system
-  URL:=http://wiki.debian.org/Debootstrap
-  DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum +ar
-endef
-
-define Package/debootstrap/description
- debootstrap is used to create a Debian base system from scratch, without
- requiring the availability of dpkg or apt. It does this by downloading .deb
- files from a mirror site, and carefully unpacking them into a directory which
- can eventually be chrooted into.
-endef
-
-define Build/Compile
-# file pkgdetails.c was imported from debian package base-installer version 1.130
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) ./files/pkgdetails.c -o $(PKG_BUILD_DIR)/usr/share/debootstrap/pkgdetails
-endef
-
-define Package/debootstrap/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share/debootstrap
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/share/debootstrap/pkgdetails $(1)/usr/share/debootstrap
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/functions $(1)/usr/share/debootstrap
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/devices.tar.gz $(1)/usr/share/debootstrap
-	$(INSTALL_DIR) $(1)/usr/share/debootstrap/scripts
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/scripts/* $(1)/usr/share/debootstrap/scripts
-endef
-
-$(eval $(call BuildPackage,debootstrap))
diff --git a/trunk/package/feeds/packages/debootstrap/files/pkgdetails.c b/trunk/package/feeds/packages/debootstrap/files/pkgdetails.c
deleted file mode 100644
index 99ee1900..00000000
--- a/trunk/package/feeds/packages/debootstrap/files/pkgdetails.c
+++ /dev/null
@@ -1,347 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#define MAX_LINE 1000
-#define MAX_PKGS 100
-
-char *checksum_field=NULL;
-
-static void oom_die(void)
-{
-    fputs("Out of memory!\n", stderr);
-    exit(1);
-}
-
-static char *xvasprintf(const char *fmt, va_list ap) {
-    char *ret;
-
-    if (vasprintf (&ret, fmt, ap) < 0) {
-        if (errno == ENOMEM)
-            oom_die();
-        return NULL;
-    }
-    return ret;
-}
-
-static char *xasprintf(const char *fmt, ...) {
-    va_list ap;
-    char *ret;
-
-    va_start(ap, fmt);
-    ret = xvasprintf(fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
-static char *fieldcpy(char *dst, char *fld) {
-    while (*fld && *fld != ':') 
-        fld++;
-    if (!*(fld++)) 
-        return NULL;
-    while (isspace(*fld)) fld++;
-    return strcpy(dst, fld);
-}
-
-static void outputdeps(char *deps) {
-    char *pch = deps;
-
-    while (1) {
-        while (isspace(*pch)) pch++;
-        if (!*pch) break;
-
-        while (*pch && *pch != '(' && *pch != '|' && *pch != ','
-               && !isspace(*pch))
-        {
-            fputc(*pch++, stdout);
-        }
-        fputc('\n', stdout);
-        while (*pch && *pch++ != ',') (void)NULL;
-    }
-}
-
-static void dogetdeps(char *pkgsfile, char **in_pkgs, int pkgc) {
-    char buf[MAX_LINE];
-    char cur_pkg[MAX_LINE];
-    char cur_deps[MAX_LINE];
-    char cur_predeps[MAX_LINE];
-    char prev_pkg[MAX_LINE];
-    char *pkgs[MAX_PKGS];
-    int i;
-    int skip;
-    FILE *f;
-    int output_pkg = -1;
-
-    cur_pkg[0] = cur_deps[0] = cur_predeps[0] = prev_pkg[0] = '\0';
-
-    for (i = 0; i < pkgc; i++) pkgs[i] = in_pkgs[i];
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        exit(1);
-    }
-
-    skip = 1;
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            int any = 0;
-            skip = 1;
-            fieldcpy(cur_pkg, buf);
-            if (strcmp(cur_pkg, prev_pkg) != 0) {
-                if (output_pkg != -1)
-                    pkgs[output_pkg] = NULL;
-                if (cur_deps[0])
-                    outputdeps(cur_deps);
-                if (cur_predeps[0])
-                    outputdeps(cur_predeps);
-                strcpy(prev_pkg, cur_pkg);
-            }
-            cur_deps[0] = cur_predeps[0] = '\0';
-            output_pkg = -1;
-	    for (i = 0; i < pkgc; i++) {
-		if (!pkgs[i]) continue;
-		any = 1;
-                if (strcmp(cur_pkg, pkgs[i]) == 0) {
-                    skip = 0;
-                    output_pkg = i;
-                    break;
-                }
-            }
-            if (!any) break;
-        } else if (!skip && strncasecmp(buf, "Depends:", 8) == 0)
-            fieldcpy(cur_deps, buf);
-        else if (!skip && strncasecmp(buf, "Pre-Depends:", 12) == 0)
-            fieldcpy(cur_predeps, buf);
-    }
-    if (cur_deps[0])
-        outputdeps(cur_deps);
-    if (cur_predeps[0])
-        outputdeps(cur_predeps);
-    fclose(f);
-}
-
-static void dopkgmirrorpkgs(int uniq, char *mirror, char *pkgsfile, 
-        char *fieldname, char **in_pkgs, int pkgc) 
-{
-    char buf[MAX_LINE];
-    char cur_field[MAX_LINE];
-    char cur_pkg[MAX_LINE];
-    char cur_ver[MAX_LINE];
-    char cur_arch[MAX_LINE];
-    char cur_size[MAX_LINE];
-    char cur_checksum[MAX_LINE];
-    char cur_filename[MAX_LINE];
-    char prev_pkg[MAX_LINE];
-    char *pkgs[MAX_PKGS];
-    int i;
-    FILE *f;
-    char *output = NULL;
-    int output_pkg = -1;
-
-    cur_field[0] = cur_pkg[0] = cur_ver[0] = cur_arch[0] = cur_filename[0] = prev_pkg[0] = '\0';
-
-    for (i = 0; i < pkgc; i++) pkgs[i] = in_pkgs[i];
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        exit(1);
-    }
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, fieldname, strlen(fieldname)) == 0) {
-            fieldcpy(cur_field, buf);
-	}
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            fieldcpy(cur_pkg, buf);
-            if (strcmp(cur_pkg, prev_pkg) != 0) {
-                if (output)
-                    fputs(output, stdout);
-                if (uniq && output_pkg != -1)
-                    pkgs[output_pkg] = NULL;
-                strcpy(prev_pkg, cur_pkg);
-            }
-            free(output);
-            output = NULL;
-            output_pkg = -1;
-        } else if (strncasecmp(buf, "Version:", 8) == 0) {
-            fieldcpy(cur_ver, buf);
-        } else if (strncasecmp(buf, "Architecture:", 13) == 0) {
-            fieldcpy(cur_arch, buf);
-        } else if (strncasecmp(buf, "Size:", 5) == 0) {
-            fieldcpy(cur_size, buf);
-        } else if (strncasecmp(buf, checksum_field, strlen(checksum_field)) == 0
-	           && buf[strlen(checksum_field)] == ':') {
-            fieldcpy(cur_checksum, buf);
-        } else if (strncasecmp(buf, "Filename:", 9) == 0) {
-            fieldcpy(cur_filename, buf);
-        } else if (!*buf) {
-	    int any = 0;
-	    for (i = 0; i < pkgc; i++) {
-		if (!pkgs[i]) continue;
-		any = 1;
-                if (strcmp(cur_field, pkgs[i]) == 0) {
-                    free(output);
-                    output = xasprintf("%s %s %s %s %s %s %s\n", cur_pkg, cur_ver, cur_arch, mirror, cur_filename, cur_checksum, cur_size);
-                    output_pkg = i;
-		    break;
-		}
-            }
-	    if (!any) break;
-            cur_field[0] = '\0';
-        }
-    }
-    if (output)
-        fputs(output, stdout);
-    if (uniq && output_pkg != -1)
-        pkgs[output_pkg] = NULL;
-    fclose(f);
-
-    /* any that weren't found are returned as "pkg -" */
-    if (uniq) {
-        for (i = 0; i < pkgc; i++) {
-            if (pkgs[i]) {
-                printf("%s -\n", pkgs[i]);
-            }
-        }
-    }
-}
-
-static void dopkgstanzas(char *pkgsfile, char **pkgs, int pkgc)
-{
-    char buf[MAX_LINE];
-    char *accum;
-    size_t accum_size = 0, accum_alloc = MAX_LINE * 2;
-    char cur_pkg[MAX_LINE];
-    FILE *f;
-
-    accum = malloc(accum_alloc);
-    if (!accum)
-        oom_die();
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        free(accum);
-        exit(1);
-    }
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf) {
-	    size_t len = strlen(buf);
-            if (accum_size + len + 1 > accum_alloc) {
-                accum_alloc = (accum_size + len + 1) * 2;
-                accum = realloc(accum, accum_alloc);
-                if (!accum)
-                    oom_die();
-            }
-            strcpy(accum + accum_size, buf);
-	    accum_size += len;
-        }
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            fieldcpy(cur_pkg, buf);
-        } else if (!*buf) {
-            int i;
-            for (i = 0; i < pkgc; i++) {
-                if (!pkgs[i]) continue;
-                if (strcmp(cur_pkg, pkgs[i]) == 0) {
-                    fputs(accum, stdout);
-		    if (accum[accum_size - 1] != '\n')
-			fputs("\n\n", stdout);
-		    else if (accum[accum_size - 2] != '\n')
-			fputc('\n', stdout);
-                    break;
-                }
-            }
-            *accum = '\0';
-            accum_size = 0;
-        }
-    }
-    fclose(f);
-
-    free(accum);
-}
-
-static int dotranslatewgetpercent(int low, int high, int end, char *str) {
-    int ch;
-    int val, lastval;
-
-    /* print out anything that looks like a % on its own line, appropriately
-     * scaled */
-
-    lastval = val = 0;
-    while ( (ch = getchar()) != EOF ) {
-        if (isdigit(ch)) {
-	    val *= 10; val += ch - '0';
-	} else if (ch == '%') {
-	    float f = (float) val / 100.0 * (high - low) + low;
-	    if (str) {
-	    	printf("P: %d %d %s\n", (int) f, end, str);
-	    } else {
-	    	printf("P: %d %d\n", (int) f, end);
-	    }
-	    lastval = val;
-	} else {
-	    val = 0;
-	}
-    }
-    return lastval == 100;
-}
-
-int main(int argc, char *argv[]) {
-    checksum_field=getenv("DEBOOTSTRAP_CHECKSUM_FIELD");
-    if (checksum_field == NULL) {
-        checksum_field="MD5sum";
-    }
-
-    if ((argc == 6 || argc == 5) && strcmp(argv[1], "WGET%") == 0) {
-	if (dotranslatewgetpercent(atoi(argv[2]), atoi(argv[3]), 
-	                           atoi(argv[4]), argc == 6 ? argv[5] : NULL))
-	{
-	    exit(0);
-	} else {
-	    exit(1);
-	}
-    } else if (argc >= 4 && strcmp(argv[1], "GETDEPS") == 0) {
-        int i;
-        for (i = 3; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dogetdeps(argv[2], argv+i, MAX_PKGS);
-	}
-	dogetdeps(argv[2], argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 5 && strcmp(argv[1], "PKGS") == 0) {
-        int i;
-        for (i = 4; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgmirrorpkgs(1, argv[2], argv[3], "Package:", argv+i, MAX_PKGS);
-	}
-	dopkgmirrorpkgs(1, argv[2], argv[3], "Package:", argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 6 && strcmp(argv[1], "FIELD") == 0) {
-        int i;
-        for (i = 5; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgmirrorpkgs(0, argv[3], argv[4], argv[2], argv+i, MAX_PKGS);
-	}
-	dopkgmirrorpkgs(0, argv[3], argv[4], argv[2], argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 4 && strcmp(argv[1], "STANZAS") == 0) {
-	int i;
-	for (i = 3; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgstanzas(argv[2], argv+i, MAX_PKGS);
-	}
-	dopkgstanzas(argv[2], argv+i, argc-i);
-	exit(0);
-    } else {
-        fprintf(stderr, "usage: %s PKGS mirror packagesfile pkgs..\n", argv[0]);
-        fprintf(stderr, "   or: %s FIELD field mirror packagesfile pkgs..\n", 
-                argv[0]);
-        fprintf(stderr, "   or: %s GETDEPS packagesfile pkgs..\n", argv[0]);
-        fprintf(stderr, "   or: %s STANZAS packagesfile pkgs..\n", argv[0]);
-	fprintf(stderr, "   or: %s WGET%% low high end reason\n", argv[0]);
-        exit(1);
-    }
-}
diff --git a/trunk/package/feeds/packages/debootstrap/patches/100-busybox_fix.patch b/trunk/package/feeds/packages/debootstrap/patches/100-busybox_fix.patch
deleted file mode 100644
index 5e8db057..00000000
--- a/trunk/package/feeds/packages/debootstrap/patches/100-busybox_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -859,8 +859,6 @@ choose_extractor () {
- 
- 	if [ -n "$EXTRACTOR_OVERRIDE" ]; then
- 		extractor="$EXTRACTOR_OVERRIDE"
--	elif type dpkg-deb >/dev/null 2>&1; then
--		extractor="dpkg-deb"
- 	else
- 		extractor="ar"
- 	fi
diff --git a/trunk/package/feeds/packages/dhcpcd/Makefile b/trunk/package/feeds/packages/dhcpcd/Makefile
deleted file mode 100644
index 9add7347..00000000
--- a/trunk/package/feeds/packages/dhcpcd/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dhcpcd
-PKG_VERSION:=6.4.3
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=ftp://roy.marples.name/pub/dhcpcd \
-    http://roy.marples.name/downloads/dhcpcd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=b22005c131e7108ecf598b6a4ac091eb
-
-PKG_LICENSE:=BSD-2c
-PKG_LICENSE_FILES:=
-
-PKG_MAINTAINER:=Roy Marples <roy@marples.name>
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dhcpcd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
-  URL:=http://roy.marples.name/projects/dhcpcd
-endef
-
-define Package/dhcpcd/description
-  DHCPv4, IPv6RS and DHCPv6 client with IPv4LL support
-  dhcpcd is a one stop network management daemon which includes
-    * RFC compliant DHCPv4 and DHCPv6 clients
-    * DHCPv6 Prefix Delegation support
-    * IPv4LL (aka ZeroConf) support
-    * ARP address conflict resolution
-    * Link carrier detection
-    * Wireless SSID profiles
-    * ARP ping profiles
-endef
-
-CONFIGURE_ARGS+=	--prefix=/ --sbindir=/sbin \
-			--libexecdir=/lib/dhcpcd --dbdir=/var/dhcpcd
-
-define Package/dhcpcd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/dhcpcd/dhcpcd-hooks
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/dhcpcd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/dhcpcd/dhcpcd-run-hooks \
-	    $(1)/lib/dhcpcd/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/dhcpcd/dhcpcd-hooks/* \
-	    $(1)/lib/dhcpcd/dhcpcd-hooks/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/dhcpcd.init $(1)/etc/init.d/dhcpcd
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dhcpcd.conf $(1)/etc/dhcpcd.conf
-endef
-
-$(eval $(call BuildPackage,dhcpcd))
diff --git a/trunk/package/feeds/packages/dhcpcd/files/dhcpcd.init b/trunk/package/feeds/packages/dhcpcd/files/dhcpcd.init
deleted file mode 100755
index 2fad41dd..00000000
--- a/trunk/package/feeds/packages/dhcpcd/files/dhcpcd.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-START=30
-STOP=85
-USE_PROCD=1
-
-start_service()
-{
-	procd_open_instance
-	procd_set_param command /sbin/dhcpcd -B
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service()
-{
-	/sbin/dhcpcd -n
-}
diff --git a/trunk/package/feeds/packages/diffutils/Makefile b/trunk/package/feeds/packages/diffutils/Makefile
deleted file mode 100644
index b313dafa..00000000
--- a/trunk/package/feeds/packages/diffutils/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2008-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=diffutils
-PKG_VERSION:=3.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/diffutils
-PKG_MD5SUM:=99180208ec2a82ce71f55b0d7389f1b3
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-PKG_LICENSE:=GPL-3.0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/diffutils
-  SECTION:=devel
-  CATEGORY:=Development
-  DEPENDS:=+USE_GLIBC:librt
-  TITLE:=diffutils
-  URL:=http://www.gnu.org/software/diffutils/
-endef
-
-define Package/diffutils/description
-  The Diffutils package contains programs that show the differences between
-  files or directories.
-endef
-
-CONFIGURE_VARS += \
-	ac_cv_func_mempcpy=n
-TARGET_CFLAGS += --std=c99
-
-define Package/diffutils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/
-endef
-
-define Package/diffutils/preinst
-#!/bin/sh
-for x in sdiff diff3 diff cmp; do
-  [ -L "$${IPKG_INSTROOT}/usr/bin/$$x" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/$$x"
-done
-exit 0
-endef
-
-define Package/diffutils/postrm
-#!/bin/sh
-for x in sdiff diff3 diff cmp; do
-  /bin/busybox $$x -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/$$x
-done
-exit 0
-endef
-
-$(eval $(call BuildPackage,diffutils))
diff --git a/trunk/package/feeds/packages/dkjson/Makefile b/trunk/package/feeds/packages/dkjson/Makefile
deleted file mode 100644
index d6990789..00000000
--- a/trunk/package/feeds/packages/dkjson/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 20013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dkjson
-PKG_VERSION:=2.5
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dkolf.de/src/dkjson-lua.fsl/tarball/
-PKG_MD5SUM:=af6b5f3df681e208f1dfb1a724a87e7c
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dkjson
-	SUBMENU:=Lua
-	SECTION:=lang
-	CATEGORY:=Languages
-	TITLE:=DKJSON
-	URL:=http://dkolf.de/src/dkjson-lua.fsl/home
-	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+lua
-endef
-
-define Package/dkjson/description
-	Lua JSON parser/serializer with UTF-8 support
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/dkjson/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dkjson.lua $(1)/usr/lib/lua/
-endef
-
-$(eval $(call BuildPackage,dkjson))
diff --git a/trunk/package/feeds/packages/dmapd/Makefile b/trunk/package/feeds/packages/dmapd/Makefile
deleted file mode 100644
index e573523b..00000000
--- a/trunk/package/feeds/packages/dmapd/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmapd
-PKG_VERSION:=0.0.71
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
-PKG_MD5SUM:=cee310509e39db782110267edac4fe9a
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=2
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/dmapd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libdmapsharing +libdb47 +vips
-  TITLE:= dmapd
-  URL:=http://www.flyn.org/projects/dmapd/
-  USERID:=dmapd=56:dmapd=56
-endef
-
-define Package/dmapd/decription
-	Dmapd is a DMAP server
-endef
-
-define Package/dmapd/conffiles
-/etc/dmapd.conf
-endef
-
-TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-define Package/dmapd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/distro/dmapd.conf $(1)/etc/
-	$(INSTALL_BIN) ./files/dmapd.init $(1)/etc/init.d/dmapd
-	$(INSTALL_DIR) $(1)/usr/lib/dmapd/$(PKG_VERSION)/modules
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/dmapd \
-		$(1)/usr/sbin/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdmapd.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/dmapd/$(PKG_VERSION)/modules/*.so \
-		$(1)/usr/lib/dmapd/$(PKG_VERSION)/modules/
-endef
-
-$(eval $(call BuildPackage,dmapd))
diff --git a/trunk/package/feeds/packages/dmapd/files/dmapd.init b/trunk/package/feeds/packages/dmapd/files/dmapd.init
deleted file mode 100644
index 76ecd501..00000000
--- a/trunk/package/feeds/packages/dmapd/files/dmapd.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
-
-START=60
-
-start() {
-	[ -d /var/run/dmapd ] || {
-		mkdir -m 0755 -p /var/run/dmapd
-		chown dmapd:dmapd /var/run/dmapd
-	}
-	[ -d /var/db/dmapd/DAAP ] || {
-		mkdir -m 0755 -p /var/db/dmapd/DAAP
-		chown dmapd:dmapd /var/db/dmapd/DAAP
-	}
-	[ -d /var/db/dmapd/DPAP ] || {
-		mkdir -m 0755 -p /var/db/dmapd/DPAP
-		chown dmapd:dmapd /var/db/dmapd/DPAP
-	}
-	mkdir -m 0755 -p /var/lock/subsys
-	mkdir -m 0755 -p /var/media/music
-	mkdir -m 0755 -p /var/media/pictures
-
-	service_start /usr/sbin/dmapd -u dmapd -g dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k
-}
-
-stop() {
-	service_stop /usr/sbin/dmapd
-}
diff --git a/trunk/package/feeds/packages/dmapd/patches/001-dmapd_conf.patch b/trunk/package/feeds/packages/dmapd/patches/001-dmapd_conf.patch
deleted file mode 100644
index 9c1e60a3..00000000
--- a/trunk/package/feeds/packages/dmapd/patches/001-dmapd_conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/distro/dmapd.conf
-+++ b/distro/dmapd.conf
-@@ -3,7 +3,7 @@
- Database-Dir=/var/db/dmapd
- 
- # Name that will be used to identify share:
--Share-Name=dmapd
-+Share-Name=OpenWrt
- 
- # User that dmapd will run as, current user if undefined:
- User=dmapd
diff --git a/trunk/package/feeds/packages/dmapd/patches/002-make_unit_test_optionnal.patch b/trunk/package/feeds/packages/dmapd/patches/002-make_unit_test_optionnal.patch
deleted file mode 100644
index 3f42f6b2..00000000
--- a/trunk/package/feeds/packages/dmapd/patches/002-make_unit_test_optionnal.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -233,7 +233,13 @@ else
-   AM_CONDITIONAL(USE_LIBDB, false)
- fi
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+dnl Test if --enable-unit-test given
-+AC_ARG_ENABLE(unit-test, [AC_HELP_STRING([--enable-unit-test],[enable unit test])])
-+if test "x$enable_unit_test" = "xyes" ; then
-+  PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+else
-+  have_check=no
-+fi
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- 
- AM_CONDITIONAL(FLYN, test "$FLYN")
diff --git a/trunk/package/feeds/packages/dmidecode/Makefile b/trunk/package/feeds/packages/dmidecode/Makefile
deleted file mode 100644
index 0f255dd8..00000000
--- a/trunk/package/feeds/packages/dmidecode/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmidecode
-PKG_VERSION:=2.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/dmidecode
-PKG_MD5SUM:=a406f3cbb27736491698697beeddb781
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dmidecode
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=@(TARGET_x86||TARGET_x86_64)
-  TITLE:=Displays BIOS informations.
-  URL:=http://www.nongnu.org/dmidecode/
-endef
-
-define Package/dmidecode/description
-	Dmidecode reports information about your system's hardware
-	as described in your system BIOS according to the SMBIOS/DMI
-	standard.
-endef
-
-MAKE_FLAGS += \
-	prefix="/usr"
-
-define Package/dmidecode/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,dmidecode))
diff --git a/trunk/package/feeds/packages/dmx_usb_module/Makefile b/trunk/package/feeds/packages/dmx_usb_module/Makefile
deleted file mode 100644
index d9e458fb..00000000
--- a/trunk/package/feeds/packages/dmx_usb_module/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=dmx_usb_module
-PKG_VERSION:=0.1.20130818
-PKG_RELEASE:=0.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/lowlander/dmx_usb_module.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ee99ca7edbd9e093480ad63341ac007394047bde
-PKG_MAINTAINER:=Martijn Zilverschoon <martijn@friedzombie.com>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/usb-serial-dmx_usb_module
-	SECTION:=kernel
-	CATEGORY:=Kernel modules
-	SUBMENU:=USB Support
-	TITLE:=Support for FTDI RS485 based DMX modules
-	URL:=http://www.erwinrol.com/open-dmx-usb-linux-driver/
-	FILES:=$(PKG_BUILD_DIR)/dmx_usb.$(LINUX_KMOD_SUFFIX)
-	AUTOLOAD:=$(call AutoProbe,dmx_usb)
-	DEPENDS+=kmod-usb-serial
-endef
-
-define KernelPackage/usb-serial-dmx_usb_module/description
-	Open DMX USB is an open USB to DMX dongle hardware design developed by Enttec.
-	The Open in Open DMX USB refers to the fact that everybody is free to use the
-	design and produce its own USB DMX Dongle without paying any licenses.
-endef
-
-DMX_MAKE_OPTS:= -C $(PKG_BUILD_DIR) \
-	PATH="$(TARGET_PATH)" \
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	TARGET="$(HAL_TARGET)" \
-	TOOLPREFIX="$(KERNEL_CROSS)" \
-	TOOLPATH="$(KERNEL_CROSS)" \
-	KERNELPATH="$(LINUX_DIR)" \
-	LDOPTS=" "
-
-define Build/Compile
-  $(MAKE) $(DMX_MAKE_OPTS) M=$(PKG_BUILD_DIR)
-endef
-
-$(eval $(call KernelPackage,usb-serial-dmx_usb_module))
diff --git a/trunk/package/feeds/packages/dmx_usb_module/patches/001-dmx_usb_Makefile.patch b/trunk/package/feeds/packages/dmx_usb_module/patches/001-dmx_usb_Makefile.patch
deleted file mode 100644
index 2a03d948..00000000
--- a/trunk/package/feeds/packages/dmx_usb_module/patches/001-dmx_usb_Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,8 +12,7 @@ KDIR	:= /lib/modules/$(shell uname -r)/build
- PWD	:= $(shell pwd)
- 
- default:
--	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
--	gcc -O2 -pipe -Wall dmx_usb_test.c -o dmx_usb_test
-+	$(MAKE) -C $(KERNELPATH) SUBDIRS=$(PWD) modules
- 
- endif
- 
-
diff --git a/trunk/package/feeds/packages/dnscrypt-proxy/Makefile b/trunk/package/feeds/packages/dnscrypt-proxy/Makefile
deleted file mode 100644
index 22458fbf..00000000
--- a/trunk/package/feeds/packages/dnscrypt-proxy/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnscrypt-proxy
-PKG_VERSION:=1.4.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy
-PKG_MD5SUM:=54d172236a8f321fb5689ff81767f1ba
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
-PKG_LICENSE:=ISC
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dnscrypt-proxy/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  DEPENDS:=+libsodium
-  URL:=http://dnscrypt.org/
-  MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
-endef
-
-define Package/dnscrypt-proxy
-  $(call Package/dnscrypt-proxy/Default)
-  TITLE:=A tool for securing communications between a client and a DNS resolver
-endef
-
-define Package/dnscrypt-proxy/description
-  dnscrypt-proxy provides local service which can be used directly as your
-  local resolver or as a DNS forwarder, encrypting and authenticating requests
-  using the DNSCrypt protocol and passing them to an upstream server.
-  The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography
-  and is very similar to DNSCurve, but focuses on securing communications between
-  a client and its first-level resolver.
-endef
-
-define Package/hostip
-  $(call Package/dnscrypt-proxy/Default)
-  TITLE:=Resolver to IPv4 or IPv6 addresses
-endef
-
-define Package/hostip/description
-  The DNSCrypt proxy ships with a simple tool named hostip that resolves a name
-  to IPv4 or IPv6 addresses.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	--prefix=/usr \
-	--disable-ssp \
-	)
-endef
-
-TARGET_CFLAGS += \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-TARGET_LDFLAGS += \
-	-Wl,-gc-sections
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)"
-
-define Package/dnscrypt-proxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnscrypt-proxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share/dnscrypt-proxy
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv $(1)/usr/share/dnscrypt-proxy/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/dnscrypt-proxy.init $(1)/etc/init.d/dnscrypt-proxy
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/dnscrypt-proxy.config $(1)/etc/config/dnscrypt-proxy
-endef
-
-define Package/dnscrypt-proxy/postinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-        echo "Enabling rc.d symlink for dnscrypt-proxy"
-        /etc/init.d/dnscrypt-proxy enable
-fi
-exit 0
-endef
-
-define Package/dnscrypt-proxy/prerm
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-        echo "Removing rc.d symlink for dnscrypt-proxy"
-        /etc/init.d/dnscrypt-proxy disable
-fi
-exit 0
-endef
-
-define Package/dnscrypt-proxy/conffiles
-  /etc/config/dnscrypt-proxy
-endef
-
-define Package/hostip/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/hostip $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,dnscrypt-proxy))
-$(eval $(call BuildPackage,hostip))
diff --git a/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.config b/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.config
deleted file mode 100644
index d0dbc2d0..00000000
--- a/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config dnscrypt-proxy
-	option address '127.0.0.1'
-	option port '5353'
-	# option resolver 'opendns'
-	# option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'
diff --git a/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.init b/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.init
deleted file mode 100644
index 24f29ae2..00000000
--- a/trunk/package/feeds/packages/dnscrypt-proxy/files/dnscrypt-proxy.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-
-start_instance () {
-	local section="$1"
-	config_get address         "$section" 'address'
-	config_get port            "$section" 'port'
-	config_get resolver        "$section" 'resolver'
-	config_get resolvers_list  "$section" 'resolvers_list'
-
-	service_start /usr/sbin/dnscrypt-proxy -d \
-		-a ${address}:${port} \
-		-u nobody \
-		-L ${resolvers_list:-'/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'} \
-		-R ${resolver:-'opendns'}
-}
-
-start() {
-	config_load 'dnscrypt-proxy'
-	config_foreach start_instance 'dnscrypt-proxy'
-}
-
-stop() {
-	service_stop /usr/sbin/dnscrypt-proxy
-}
-
diff --git a/trunk/package/feeds/packages/dosfstools/Makefile b/trunk/package/feeds/packages/dosfstools/Makefile
deleted file mode 100644
index 41483f2e..00000000
--- a/trunk/package/feeds/packages/dosfstools/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dosfstools
-PKG_VERSION:=3.0.27
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=David Bonnes <david.bonnes@gmail.com>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://daniel-baumann.ch/files/software/dosfstools \
-		http://fossies.org/linux/misc
-PKG_MD5SUM:=2e31e7bdf92998e41ed17de505a4a552
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/dosfstools/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://www.daniel-baumann.ch/software/dosfstools/
-  SUBMENU:=Filesystem
-  DEPENDS:=$(ICONV_DEPENDS)
-endef
-
-define Package/dosfsck
-  $(call Package/dosfstools/Default)
-  TITLE:=fsck (fsck.fat) utility from dosfstools
-endef
-
-define Package/dosfslabel
-  $(call Package/dosfstools/Default)
-  TITLE:=fslabel (fatlabel) utility from dosfstools
-endef
-
-define Package/mkdosfs
-  $(call Package/dosfstools/Default)
-  TITLE:=mkfs (mkfs.fat) utility from dosfstools
-endef
-
-define Package/dosfsck/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(fsck.vfat and fsck.fat for checking integrity of FAT volumes)
-endef
-
-define Package/dosfslabel/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(fatlabel for reading and writing labels of FAT volumes)
-endef
-
-define Package/mkdosfs/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(mkfs.vfat and mkfs.fat for creating FAT volumes)
-endef
-
-LDFLAGS+=$(ICONV_LDFLAGS)
-LDLIBS+=-liconv
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" \
-		PREFIX="/usr" \
-		SBINDIR="/usr/sbin" \
-		LDFLAGS="$(LDFLAGS)" \
-		LDLIBS="$(LDLIBS)" \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \
-		PREFIX="$(PKG_INSTALL_DIR)/usr" \
-		SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin" \
-		install-bin
-endef
-
-define Package/dosfsck/install
-	$(INSTALL_DIR) $(1)/lib/functions/fsck
-	$(INSTALL_DATA) ./files/dosfsck.sh $(1)/lib/functions/fsck/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.fat $(1)/usr/sbin/
-	(cd $(1)/usr/sbin; ln -sf fsck.fat fsck.msdos; ln -sf fsck.fat fsck.vfat; ln -sf fsck.fat dosfsck)
-endef
-
-define Package/dosfslabel/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fatlabel $(1)/usr/sbin/
-endef
-
-define Package/mkdosfs/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.fat $(1)/usr/sbin/
-	(cd $(1)/usr/sbin; ln -sf mkfs.fat mkfs.msdos; ln -sf mkfs.fat mkfs.vfat)
-endef
-
-$(eval $(call BuildPackage,dosfsck))
-$(eval $(call BuildPackage,dosfslabel))
-$(eval $(call BuildPackage,mkdosfs))
diff --git a/trunk/package/feeds/packages/dosfstools/files/dosfsck.sh b/trunk/package/feeds/packages/dosfstools/files/dosfsck.sh
deleted file mode 100644
index bcc29b95..00000000
--- a/trunk/package/feeds/packages/dosfstools/files/dosfsck.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright 2010 Vertical Communications
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-fsck_dosfsck() {
-	dosfsck -p "$device" 2>&1 | logger -t "fstab: dosfsck ($device)"
-	local status="$?"
-	case "$status" in
-		0|1) ;; #success
-		2) reboot;;
-		4) echo "dosfsck ($device): Warning! Uncorrected errors."| logger -t fstab
-			return 1
-			;;
-		*) echo "dosfsck ($device): Error $status. Check not complete."| logger -t fstab;;
-	esac
-	return 0
-}
-
-fsck_dos() {
-	fsck_dosfsck "$@"
-}
-
-fsck_vfat() {
-	fsck_dosfsck "$@"
-}
-
-append libmount_known_fsck "dos"
-append libmount_known_fsck "vfat"
diff --git a/trunk/package/feeds/packages/dovecot/Makefile b/trunk/package/feeds/packages/dovecot/Makefile
deleted file mode 100644
index 1032d977..00000000
--- a/trunk/package/feeds/packages/dovecot/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dovecot
-PKG_VERSION:=2.2.15
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.dovecot.org/releases/2.2
-PKG_MD5SUM:=c6c176943bd832c780fbb5d2f8850952
-PKG_LICENSE:=LGPL-2.1 MIT BSD-3-Clause Unique
-PKG_LICENSE_FILES:=COPYING COPYING.LGPL COPYING.MIT
-
-PKG_BUILD_DEPENDS:=libiconv
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dovecot
-  SECTION:=mail
-  CATEGORY:=Mail
-  DEPENDS:=+DOVECOT_LDAP:libopenldap +libopenssl +librt +zlib +libbz2 +libcap
-  TITLE:=An IMAP and POP3 daemon
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.dovecot.org/
-  USERID:=dovecot=59:dovecot=59
-endef
-
-define Package/dovecot/description
- Dovecot is a program which provides POP3 and IMAP services.
-endef
-
-define Package/dovecot/config
-        menu "Select dovecot build options"
-                depends on PACKAGE_dovecot
-                config DOVECOT_LDAP
-                        bool "LDAP support"
-                        default n
-                        help
-                          Implements LDAP support in dovecot.
-        endmenu
-endef
-
-CONFIGURE_ARGS += \
-	--without-gssapi \
-	--without-pam \
-	--with-moduledir=/usr/lib/dovecot/modules \
-	--with-notify=dnotify \
-	--without-lzma \
-	--without-lz4
-
-ifneq ($(strip $(CONFIG_DOVECOT_LDAP)),)
-  CONFIGURE_ARGS+= \
-	--with-ldap=yes
-else
-  CONFIGURE_ARGS+= \
-	--with-ldap=no
-endif
-
-CONFIGURE_VARS += \
-	RPCGEN= \
-	i_cv_signed_size_t=no \
-	i_cv_signed_time_t=no \
-	i_cv_gmtime_max_time_t=32 \
-	i_cv_mmap_plays_with_write=yes \
-	i_cv_fd_passing=yes \
-	i_cv_c99_vsnprintf=yes \
-	lib_cv_va_copy=yes \
-	lib_cv_va_copy=yes \
-	lib_cv___va_copy=yes \
-	lib_cv_va_val_copy=yes
-
-define Package/dovecot/install
-	$(INSTALL_DIR)  $(1)/etc/init.d \
-			$(1)/etc/dovecot \
-			$(1)/usr/share/doc/dovecot/example-config \
-			$(1)/usr/lib/dovecot \
-			$(1)/usr/bin \
-			$(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/etc/dovecot/* $(1)/etc/dovecot/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/dovecot/example-config $(1)/usr/share/doc/dovecot/example-config
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/doveconf $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot
-	rm  $(1)/usr/lib/dovecot/dovecot-config
-	find $(1)/usr/lib/dovecot/ -name "*.a" -o -name "*.la" | xargs rm
-endef
-
-$(eval $(call BuildPackage,dovecot))
diff --git a/trunk/package/feeds/packages/dovecot/files/dovecot.init b/trunk/package/feeds/packages/dovecot/files/dovecot.init
deleted file mode 100644
index 1f831842..00000000
--- a/trunk/package/feeds/packages/dovecot/files/dovecot.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2013 OpenWrt.org
-
-START=75
-STOP=75
-
-USE_PROCD=1
-
-start_service() {
-	mkdir -p -m 0755 /var/lib/dovecot
-	mkdir -p -m 0755 /var/run/dovecot
-	chmod 0750 /var/lib/dovecot
-	procd_open_instance
-	procd_set_param command /usr/sbin/dovecot -F
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/dovecot/patches/001-configure_in.patch b/trunk/package/feeds/packages/dovecot/patches/001-configure_in.patch
deleted file mode 100644
index 70642d64..00000000
--- a/trunk/package/feeds/packages/dovecot/patches/001-configure_in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -504,9 +504,9 @@ have_ioloop=no
- 
- if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then
-   AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
--    AC_TRY_RUN([
-+    AC_TRY_LINK([
-       #include <sys/epoll.h>
--  
-+    ], [
-       int main()
-       {
- 	return epoll_create(5) < 1;
-@@ -639,7 +639,7 @@ fi
- dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
- dnl * It may also be broken in AIX.
- AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
--  AC_TRY_RUN([
-+  AC_TRY_LINK([
-     #define _XOPEN_SOURCE 600
-     #include <stdio.h>
-     #include <stdlib.h>
-@@ -648,6 +648,7 @@ AC_CACHE_CHECK([whether posix_fallocate(
-     #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
-       possibly broken posix_fallocate
-     #endif
-+  ], [
-     int main() {
-       int fd = creat("conftest.temp", 0600);
-       int ret;
diff --git a/trunk/package/feeds/packages/dtndht/Makefile b/trunk/package/feeds/packages/dtndht/Makefile
deleted file mode 100644
index be4385ce..00000000
--- a/trunk/package/feeds/packages/dtndht/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dtndht
-PKG_VERSION:=0.2.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=37c33910ac7e760aad4db81724aeb4fb
-PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
-PKG_LICENSE:=Apache-2.0
-
-PKG_INSTALL:=1
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dtndht
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl
-  TITLE:=Library for DHT lookups for DTNs
-endef
-
-define Package/dtndht/description
- A library with DHT functions for DTN name lookups.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/dtndht/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,dtndht))
diff --git a/trunk/package/feeds/packages/dump1090/Config.in b/trunk/package/feeds/packages/dump1090/Config.in
deleted file mode 100644
index cee0aa5d..00000000
--- a/trunk/package/feeds/packages/dump1090/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config DUMP1090_DUMP
-	bool "dump1090"
-	depends on PACKAGE_dump1090
-	default y
-	help
-		dump1090 ModeS Receiver
-
-config DUMP1090_WWW
-	bool "website files"
-	depends on DUMP1090_DUMP
-	default y
-	help
-		HTML website files for showing planes
-
-config DUMP1090_VIEW
-	bool "view1090"
-	depends on PACKAGE_dump1090
-	default n
-	help
-		view1090 dump1090 Viewer
diff --git a/trunk/package/feeds/packages/dump1090/Makefile b/trunk/package/feeds/packages/dump1090/Makefile
deleted file mode 100644
index 82ce06a6..00000000
--- a/trunk/package/feeds/packages/dump1090/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dump1090
-PKG_VERSION:=2014-11-09
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/MalcolmRobb/dump1090.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=bff92c4ad772a0a8d433f788d39dae97e00e4dbe
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=BSD-3c
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_DUMP1090_DUMP \
-	CONFIG_DUMP1090_WWW \
-	CONFIG_DUMP1090_VIEW
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dump1090
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Mode S decoder for the Realtek RTL2832U
-  URL:=https://github.com/MalcolmRobb/dump1090
-  DEPENDS:=+libpthread +librtlsdr
-endef
-
-define Package/dump1090/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/dump1090/description
- Dump1090 is a Mode S decoder specifically designed for RTLSDR devices.
- Embedded HTTP server that displays the currently detected aircrafts on
- Google Maps. Network output in Basestation and AVR formats.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)"
-
-define Package/dump1090/install
-	$(INSTALL_DIR) $(1)/usr/bin
-
-ifneq ($(CONFIG_DUMP1090_DUMP),)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/dump1090.init $(1)/etc/init.d/dump1090
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/dump1090.config $(1)/etc/config/dump1090
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
-ifneq ($(CONFIG_DUMP1090_WWW),)
-	$(INSTALL_DIR) $(1)/usr/share/dump1090
-	$(CP) $(PKG_BUILD_DIR)/public_html/* $(1)/usr/share/dump1090
-endif
-endif
-ifneq ($(CONFIG_DUMP1090_VIEW),)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/view1090 $(1)/usr/bin
-endif
-endef
-
-$(eval $(call BuildPackage,dump1090))
diff --git a/trunk/package/feeds/packages/dump1090/files/dump1090.config b/trunk/package/feeds/packages/dump1090/files/dump1090.config
deleted file mode 100644
index 53d40ef7..00000000
--- a/trunk/package/feeds/packages/dump1090/files/dump1090.config
+++ /dev/null
@@ -1,39 +0,0 @@
-config dump1090 main
-	option disabled '1'
-	option respawn '1'
-	option device_index ''
-	option gain ''
-	option enable_agc '0'
-	option freq ''
-	option ifile ''
-	option raw '0'
-	option net '1'
-	option modeac '0'
-	option net_beast '0'
-	option net_only '0'
-	option net_bind_address ''
-	option net_http_port '8080'
-	option net_ri_port ''
-	option net_ro_port ''
-	option net_sbs_port ''
-	option net_bi_port ''
-	option net_bo_port ''
-	option net_ro_size ''
-	option net_ro_rate ''
-	option net_heartbeat ''
-	option net_buffer ''
-	option lat ''
-	option lon ''
-	option fix '0'
-	option no_fix '0'
-	option no_crc_check '0'
-	option phase_enhance '0'
-	option agressive '0'
-	option mlat '0'
-	option stats '0'
-	option stats_every ''
-	option onlyaddr '0'
-	option metric '0'
-	option snip ''
-	option debug ''
-	option ppm ''
diff --git a/trunk/package/feeds/packages/dump1090/files/dump1090.init b/trunk/package/feeds/packages/dump1090/files/dump1090.init
deleted file mode 100644
index bc0755fb..00000000
--- a/trunk/package/feeds/packages/dump1090/files/dump1090.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=90
-STOP=10
-USE_PROCD=1
-
-append_arg() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get val "$cfg" "$var"
-	[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
-}
-
-append_bool() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get_bool val "$cfg" "$var" "$def"
-	[ "$val" = 1 ] && procd_append_param command "$opt"
-}
-
-start_instance() {
-	local cfg="$1"
-	local aux
-
-	config_get_bool aux "$cfg" 'disabled' '0'
-	[ "$aux" = 1 ] && return 1
-
-	procd_open_instance
-
-	procd_set_param command /usr/bin/dump1090
-	procd_append_param command "--quiet"
-
-	append_arg "$cfg" device_index "--device-index"
-	append_arg "$cfg" gain "--gain"
-	append_bool "$cfg" enable_agc "--enable-agc"
-	append_arg "$cfg" freq "--freq"
-	append_arg "$cfg" ifile "--ifile"
-	append_bool "$cfg" raw "--raw"
-	append_bool "$cfg" net "--net"
-	append_bool "$cfg" modeac "--modeac"
-	append_bool "$cfg" net_beast "--net-beast"
-	append_bool "$cfg" net_only "--net-only"
-	append_arg "$cfg" net_bind_address "--net-bind-address"
-	append_arg "$cfg" net_http_port "--net-http-port"
-	append_arg "$cfg" net_ri_port "--net-ri-port"
-	append_arg "$cfg" net_ro_port "--net-ro-port"
-	append_arg "$cfg" net_sbs_port "--net-sbs-port"
-	append_arg "$cfg" net_bi_port "--net-bi-port"
-	append_arg "$cfg" net_bo_port "--net-bo-port"
-	append_arg "$cfg" net_ro_size "--net-ro-size"
-	append_arg "$cfg" net_ro_rate "--net-ro-rate"
-	append_arg "$cfg" net_heartbeat "--net-heartbeat"
-	append_arg "$cfg" net_buffer "--net-buffer"
-	append_arg "$cfg" lat "--lat"
-	append_arg "$cfg" lon "--lon"
-	append_bool "$cfg" fix "--fix"
-	append_bool "$cfg" no_fix "--no-fix"
-	append_bool "$cfg" no_crc_check "--no-crc-check"
-	append_bool "$cfg" phase_enhance "--phase-enhance"
-	append_bool "$cfg" agressive "--agressive"
-	append_bool "$cfg" mlat "--mlat"
-	append_bool "$cfg" stats "--stats"
-	append_arg "$cfg" stats_every "--stats-every"
-	append_bool "$cfg" onlyaddr "--onlyaddr"
-	append_bool "$cfg" metric "--metric"
-	append_arg "$cfg" snip "--snip"
-	append_arg "$cfg" debug "--debug"
-	append_arg "$cfg" ppm "--ppm"
-
-	config_get_bool aux "$cfg" 'respawn' '0'
-	[ "$aux" = 1 ] && procd_set_param respawn
-
-	procd_close_instance
-}
-
-service_triggers() { 
-	procd_add_reload_trigger "dump1090" 
-} 
-
-start_service() {
-	config_load dump1090
-	config_foreach start_instance dump1090
-}
diff --git a/trunk/package/feeds/packages/dump1090/patches/100-html_dir.patch b/trunk/package/feeds/packages/dump1090/patches/100-html_dir.patch
deleted file mode 100644
index 8976057f..00000000
--- a/trunk/package/feeds/packages/dump1090/patches/100-html_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dump1090.h
-+++ b/dump1090.h
-@@ -178,7 +178,7 @@
- #define MODES_NET_SNDBUF_MAX  (7)               
- 
- #ifndef HTMLPATH
--#define HTMLPATH   "./public_html"      // default path for gmap.html etc
-+#define HTMLPATH   "/usr/share/dump1090"      // default path for gmap.html etc
- #endif
- 
- #define MODES_NOTUSED(V) ((void) V)
diff --git a/trunk/package/feeds/packages/e2guardian/Makefile b/trunk/package/feeds/packages/e2guardian/Makefile
deleted file mode 100644
index 0823d95f..00000000
--- a/trunk/package/feeds/packages/e2guardian/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=e2guardian
-PKG_VERSION:=3.0.4
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/e2guardian/e2guardian/archive/
-PKG_MD5SUM:=f8ffac7ac4f040b672cc4e62121bf4c5
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/e2guardian
-  SECTION:=net
-  DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib +libpcre
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=E2Guardian
-  URL:=http://e2guardian.org/cms/
-endef
-
-define Package/e2guardian/conffiles
-/etc/e2guardian/e2guardianf1.conf
-/etc/config/e2guardian
-endef
-
-CONFIGURE_VARS += \
-	INCLUDES="" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \
-	LIBS="-lpthread"
-
-CONFIGURE_ARGS += \
-		--with-sysconfsubdir=e2guardian \
-		--with-proxyuser=root \
-		--with-proxygroup=root \
-		--enable-pcre=yes
-
-define Build/Configure
-	$(call Build/Configure/Default,$CONFIGURE_ARGS)
-endef
-
-define Package/e2guardian/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2guardian $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/e2guardian $(1)/etc/
-	$(INSTALL_CONF) ./files/e2guardianf1.conf $(1)/etc/e2guardian/e2guardianf1.conf
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/e2guardian.config $(1)/etc/config/e2guardian
-
-	$(INSTALL_DIR) $(1)/usr/share/e2guardian
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/e2guardian/transparent1x1.gif $(1)/usr/share/e2guardian/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/e2guardian/blockedflash.swf $(1)/usr/share/e2guardian/
-
-	$(INSTALL_DIR) $(1)/usr/share/e2guardian/languages/ukenglish
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/e2guardian/languages/ukenglish/* $(1)/usr/share/e2guardian/languages/ukenglish/
-
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/e2guardian.init $(1)/etc/init.d/e2guardian
-endef
-
-$(eval $(call BuildPackage,e2guardian))
diff --git a/trunk/package/feeds/packages/e2guardian/files/e2guardian.config b/trunk/package/feeds/packages/e2guardian/files/e2guardian.config
deleted file mode 100644
index 2b46f203..00000000
--- a/trunk/package/feeds/packages/e2guardian/files/e2guardian.config
+++ /dev/null
@@ -1,70 +0,0 @@
-config e2guardian 'e2guardian'
-	option config_file '/etc/e2guardian/e2guardianf1.conf'
-	option languagedir '/usr/share/e2guardian/languages'
-	option language 'ukenglish'
-	option loglevel '2'
-	option logexceptionhits '2'
-	option logfileformat '1'
-	option loglocation '/dev/null'
-	option maxuploadsize '-1'
-	option filterip ''
-	option filterports '8080'
-	option proxyip '127.0.0.1'
-	option proxyport '3128'
-	option proxytimeout '20'
-	option proxyexchange '20'
-	option pcontimeout '55'
-	option accessdeniedaddress 'http://YOURSERVER.YOURDOMAIN/cgi-bin/e2guardian.pl'
-	option usecustombannedimage 'on'
-	option custombannedimagefile '/usr/share/e2guardian/transparent1x1.gif'
-	option usecustombannedflash 'on'
-	option custombannedflashfile '/usr/share/e2guardian/blockedflash.swf'
-	option filtergroups '1'
-	option filtergroupslist '/etc/e2guardian/lists/filtergroupslist'
-	option bannediplist '/etc/e2guardian/lists/bannediplist'
-	option exceptioniplist '/etc/e2guardian/lists/exceptioniplist'
-	option perroomdirectory '/etc/e2guardian/lists/bannedrooms/'
-	option showweightedfound 'on'
-	option weightedphrasemode '2'
-	option urlcachenumber '1000'
-	option urlcacheage '900'
-	option scancleancache 'on'
-	option phrasefiltermode '2'
-	option preservecase '0'
-	option hexdecodecontent 'off'
-	option forcequicksearch 'off'
-	option reverseaddresslookups 'off'
-	option reverseclientiplookups 'off'
-	option logclienthostnames 'off'
-	option createlistcachefiles 'on'
-	option prefercachedlists 'off'
-	option maxcontentfiltersize '256'
-	option maxcontentramcachescansize '2000'
-	option maxcontentfilecachescansize '20000'
-	option filecachedir '/tmp'
-	option deletedownloadedtempfiles 'on'
-	option initialtrickledelay '20'
-	option trickledelay '10'
-	option downloadmanager '/etc/e2guardian/downloadmanagers/default.conf'
-	option contentscannertimeout '60'
-	option contentscanexceptions 'off'
-	option recheckreplacedurls 'off'
-	option forwardedfor 'off'
-	option usexforwardedfor 'off'
-	option logconnectionhandlingerrors 'on'
-	option logchildprocesshandling 'off'
-	option maxchildren '180'
-	option minchildren '20'
-	option minsparechildren '16'
-	option preforkchildren '10'
-	option maxsparechildren '32'
-	option maxagechildren '500'
-	option maxips '0'
-	option ipcfilename '/tmp/.dguardianipc'
-	option urlipcfilename '/tmp/.dguardianurlipc'
-	option ipipcfilename '/tmp/.dguardianipipc'
-	option nodaemon 'off'
-	option nologger 'off'
-	option logadblocks 'off'
-	option loguseragent 'off'
-	option softrestart 'off'
diff --git a/trunk/package/feeds/packages/e2guardian/files/e2guardian.init b/trunk/package/feeds/packages/e2guardian/files/e2guardian.init
deleted file mode 100644
index 132b61f8..00000000
--- a/trunk/package/feeds/packages/e2guardian/files/e2guardian.init
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/e2guardian
-CONFIGFILE="/tmp/e2guardian/e2guardian.conf"
-
-validate_e2guardian_section() {
-	uci_validate_section e2guardian e2guardian "${1}" \
-		'config_file:string' \
-		'accessdeniedaddress:string' \
-		'bannediplist:string' \
-		'contentscanexceptions:string' \
-		'contentscannertimeout:uinteger' \
-		'createlistcachefiles:string' \
-		'custombannedflashfile:string' \
-		'custombannedimagefile:string' \
-		'deletedownloadedtempfiles:string' \
-		'downloadmanager:string' \
-		'exceptioniplist:string' \
-		'filecachedir:string' \
-		'filtergroups:uinteger' \
-		'filtergroupslist:string' \
-		'filterip:ipaddr' \
-		'filterports:port:8080' \
-		'forcequicksearch:string' \
-		'forwardedfor:string' \
-		'hexdecodecontent:string' \
-		'initialtrickledelay:uinteger' \
-		'ipcfilename:string' \
-		'ipipcfilename:string' \
-		'languagedir:string' \
-		'language:string' \
-		'logadblocks:string' \
-		'logchildprocesshandling:string' \
-		'logclienthostnames:string' \
-		'logconnectionhandlingerrors:string' \
-		'logexceptionhits:range(0,2)' \
-		'logfileformat:range(1,6)' \
-		'loglevel:range(0,3)' \
-		'loglocation:string' \
-		'loguseragent:string' \
-		'maxagechildren:uinteger' \
-		'maxchildren:uinteger' \
-		'maxcontentfilecachescansize:uinteger' \
-		'maxcontentfiltersize:uinteger' \
-		'maxcontentramcachescansize:uinteger' \
-		'maxips:uinteger' \
-		'maxsparechildren:uinteger' \
-		'maxuploadsize:integer' \
-		'minchildren:uinteger' \
-		'minsparechildren:uinteger' \
-		'nodaemon:string' \
-		'nologger:string' \
-		'pcontimeout:range(5,300)' \
-		'perroomdirectory:string' \
-		'phrasefiltermode:range(0,3)' \
-		'prefercachedlists:string' \
-		'preforkchildren:uinteger' \
-		'preservecase:range(0,2)' \
-		'proxyexchange:range(20,300)' \
-		'proxyip:ipaddr' \
-		'proxyport:port:3128' \
-		'proxytimeout:range(5,100)' \
-		'recheckreplacedurls:string' \
-		'reverseaddresslookups:string' \
-		'reverseclientiplookups:string' \
-		'scancleancache:string' \
-		'showweightedfound:string' \
-		'softrestart:string' \
-		'trickledelay:uinteger' \
-		'urlcacheage:uinteger' \
-		'urlcachenumber:uinteger' \
-		'urlipcfilename:string' \
-		'usecustombannedflash:string' \
-		'usecustombannedimage:string' \
-		'usexforwardedfor:string' \
-		'weightedphrasemode:range(0,2)'
-}
-
-start_service() {
-
-	local config_file accessdeniedaddress bannediplist contentscanexceptions contentscannertimeout \
-		createlistcachefiles custombannedflashfile custombannedimagefile deletedownloadedtempfiles \
-		downloadmanager exceptioniplist filecachedir loglocation \
-		filtergroups filtergroupslist filterip filterports forcequicksearch forwardedfor hexdecodecontent \
-		initialtrickledelay ipcfilename ipipcfilename language languagedir logadblocks logchildprocesshandling \
-		logclienthostnames logconnectionhandlingerrors logexceptionhits logfileformat loglevel loguseragent \
-		maxagechildren maxchildren maxcontentfilecachescansize maxcontentfiltersize maxcontentramcachescansize \
-		maxips maxsparechildren maxuploadsize minchildren minsparechildren nodaemon nologger \
-		pcontimeout perroomdirectory phrasefiltermode prefercachedlists preforkchildren preservecase proxyexchange \
-		proxyip proxyport proxytimeout recheckreplacedurls reverseaddresslookups reverseclientiplookups scancleancache \
-		showweightedfound softrestart trickledelay urlcacheage urlcachenumber urlipcfilename usecustombannedflash \
-		usecustombannedimage usexforwardedfor weightedphrasemode
-
-	validate_e2guardian_section e2guardian || {
-		echo "validation failed"
-		return 1
-	}
-
-	mkdir -p $(dirname $CONFIGFILE)
-	ln -sf $config_file $(dirname $CONFIGFILE)
-
-	echo "accessdeniedaddress = " $accessdeniedaddress > $CONFIGFILE
-	echo "bannediplist = " $bannediplist >> $CONFIGFILE
-	echo "contentscanexceptions = " $contentscanexceptions >> $CONFIGFILE
-	echo "contentscannertimeout = " $contentscannertimeout >> $CONFIGFILE
-	echo "createlistcachefiles = " $createlistcachefiles >> $CONFIGFILE
-	echo "custombannedflashfile = " $custombannedflashfile >> $CONFIGFILE
-	echo "custombannedimagefile = " $custombannedimagefile >> $CONFIGFILE
-	echo "deletedownloadedtempfiles = " $deletedownloadedtempfiles >> $CONFIGFILE
-	echo "downloadmanager = " $downloadmanager >> $CONFIGFILE
-	echo "exceptioniplist = " $exceptioniplist >> $CONFIGFILE
-	echo "filecachedir = " $filecachedir >> $CONFIGFILE
-	echo "filtergroups = " $filtergroups >> $CONFIGFILE
-	echo "filtergroupslist = " $filtergroupslist >> $CONFIGFILE
-	echo "filterip = " $filterip >> $CONFIGFILE
-	echo "filterports = " $filterports >> $CONFIGFILE
-	echo "forcequicksearch = " $forcequicksearch >> $CONFIGFILE
-	echo "forwardedfor = " $forwardedfor >> $CONFIGFILE
-	echo "hexdecodecontent = " $hexdecodecontent >> $CONFIGFILE
-	echo "initialtrickledelay = " $initialtrickledelay >> $CONFIGFILE
-	echo "ipcfilename = " $ipcfilename >> $CONFIGFILE
-	echo "ipipcfilename = " $ipipcfilename >> $CONFIGFILE
-	echo "language = " $language >> $CONFIGFILE
-	echo "languagedir = " $languagedir >> $CONFIGFILE
-	echo "logadblocks = " $logadblocks >> $CONFIGFILE
-	echo "logchildprocesshandling = " $logchildprocesshandling >> $CONFIGFILE
-	echo "logclienthostnames = " $logclienthostnames >> $CONFIGFILE
-	echo "logconnectionhandlingerrors = " $logconnectionhandlingerrors >> $CONFIGFILE
-	echo "logexceptionhits = " $logexceptionhits >> $CONFIGFILE
-	echo "logfileformat = " $logfileformat >> $CONFIGFILE
-	echo "loglevel = " $loglevel >> $CONFIGFILE
-	echo "loglocation = " $loglocation >> $CONFIGFILE
-	echo "loguseragent = " $loguseragent >> $CONFIGFILE
-	echo "maxagechildren = " $maxagechildren >> $CONFIGFILE
-	echo "maxchildren = " $maxchildren >> $CONFIGFILE
-	echo "maxcontentfilecachescansize = " $maxcontentfilecachescansize >> $CONFIGFILE
-	echo "maxcontentfiltersize = " $maxcontentfiltersize >> $CONFIGFILE
-	echo "maxcontentramcachescansize = " $maxcontentramcachescansize >> $CONFIGFILE
-	echo "maxips = " $maxips >> $CONFIGFILE
-	echo "maxsparechildren = " $maxsparechildren >> $CONFIGFILE
-	echo "maxuploadsize = " $maxuploadsize >> $CONFIGFILE
-	echo "minchildren = " $minchildren >> $CONFIGFILE
-	echo "minsparechildren = " $minsparechildren >> $CONFIGFILE
-	echo "nodaemon = " $nodaemon >> $CONFIGFILE
-	echo "nologger = " $nologger >> $CONFIGFILE
-	echo "pcontimeout = " $pcontimeout >> $CONFIGFILE
-	echo "perroomdirectory = " $perroomdirectory >> $CONFIGFILE
-	echo "phrasefiltermode = " $phrasefiltermode >> $CONFIGFILE
-	echo "prefercachedlists = " $prefercachedlists >> $CONFIGFILE
-	echo "preforkchildren = " $preforkchildren >> $CONFIGFILE
-	echo "preservecase = " $preservecase >> $CONFIGFILE
-	echo "proxyexchange = " $proxyexchange >> $CONFIGFILE
-	echo "proxyip = " $proxyip >> $CONFIGFILE
-	echo "proxyport = " $proxyport >> $CONFIGFILE
-	echo "proxytimeout = " $proxytimeout >> $CONFIGFILE
-	echo "recheckreplacedurls = " $recheckreplacedurls >> $CONFIGFILE
-	echo "reverseaddresslookups = " $reverseaddresslookups >> $CONFIGFILE
-	echo "reverseclientiplookups = " $reverseclientiplookups >> $CONFIGFILE
-	echo "scancleancache = " $scancleancache >> $CONFIGFILE
-	echo "showweightedfound = " $showweightedfound >> $CONFIGFILE
-	echo "softrestart = " $softrestart >> $CONFIGFILE
-	echo "trickledelay = " $trickledelay >> $CONFIGFILE
-	echo "urlcacheage = " $urlcacheage >> $CONFIGFILE
-	echo "urlcachenumber = " $urlcachenumber >> $CONFIGFILE
-	echo "urlipcfilename = " $urlipcfilename >> $CONFIGFILE
-	echo "usecustombannedflash = " $usecustombannedflash >> $CONFIGFILE
-	echo "usecustombannedimage = " $usecustombannedimage >> $CONFIGFILE
-	echo "usexforwardedfor = " $usexforwardedfor >> $CONFIGFILE
-	echo "weightedphrasemode = " $weightedphrasemode >> $CONFIGFILE
-
-	procd_open_instance
-	procd_set_param command $PROG -N -c "$CONFIGFILE"
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-	e2guardian -s | awk -F':' '{ print $2}' | xargs kill -9
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "e2guardian"
-	procd_add_validation validate_e2guardian_section
-}
diff --git a/trunk/package/feeds/packages/e2guardian/files/e2guardianf1.conf b/trunk/package/feeds/packages/e2guardian/files/e2guardianf1.conf
deleted file mode 100644
index 21a145a4..00000000
--- a/trunk/package/feeds/packages/e2guardian/files/e2guardianf1.conf
+++ /dev/null
@@ -1,426 +0,0 @@
-# e2guardian filter group config file for version 3.0.4
-
-
-# Filter group mode
-# This option determines whether members of this group have their web access
-# unfiltered, filtered, or banned.
-#
-# 0 = banned
-# 1 = filtered
-# 2 = unfiltered (exception)
-#
-# Only filter groups with a mode of 1 need to define phrase, URL, site, extension,
-# mimetype and PICS lists; in other modes, these options are ignored to conserve
-# memory.
-#
-# Defaults to 0 if unspecified.
-# Unauthenticated users are treated as being in the first filter group.
-groupmode = 1
-
-# Filter group name
-# Used to fill in the -FILTERGROUP- placeholder in the HTML template file, and to
-# name the group in the access logs
-# Defaults to empty string
-#groupname = ''
-groupname = ''
-
-# Content filtering files location
-bannedphraselist = 'etc/e2guardian/lists/bannedphraselist'
-weightedphraselist = 'etc/e2guardian/lists/weightedphraselist'
-exceptionphraselist = 'etc/e2guardian/lists/exceptionphraselist'
-bannedsitelist = 'etc/e2guardian/lists/bannedsitelist'
-greysitelist = 'etc/e2guardian/lists/greysitelist'
-bannedsslsitelist = 'etc/e2guardian/lists/bannedsslsitelist'
-greysslsitelist = 'etc/e2guardian/lists/greysslsitelist'
-exceptionsitelist = 'etc/e2guardian/lists/exceptionsitelist'
-bannedurllist = 'etc/e2guardian/lists/bannedurllist'
-greyurllist = 'etc/e2guardian/lists/greyurllist'
-exceptionurllist = 'etc/e2guardian/lists/exceptionurllist'
-exceptionregexpurllist = 'etc/e2guardian/lists/exceptionregexpurllist'
-bannedregexpurllist = 'etc/e2guardian/lists/bannedregexpurllist'
-picsfile = 'etc/e2guardian/lists/pics'
-contentregexplist = 'etc/e2guardian/lists/contentregexplist'
-urlregexplist = 'etc/e2guardian/lists/urlregexplist'
-refererexceptionsitelist = 'etc/e2guardian/lists/refererexceptionsitelist'
-refererexceptionurllist = 'etc/e2guardian/lists/refererexceptionurllist'
-embededreferersitelist = 'etc/e2guardian/lists/embededreferersitelist'
-embededrefererurllist = 'etc/e2guardian/lists/embededrefererurllist'
-urlredirectregexplist = 'etc/e2guardian/lists/urlredirectregexplist'
-
-# local versions of lists (where LOCAL_LISTS enabled)
-#localbannedsitelist = 'etc/e2guardian/lists/localbannedsitelist'
-#localgreysitelist = 'etc/e2guardian/lists/localgreysitelist'
-#localexceptionsitelist = 'etc/e2guardian/lists/localexceptionsitelist'
-#localbannedurllist = 'etc/e2guardian/lists/localbannedurllist'
-#localgreyurllist = 'etc/e2guardian/lists/localgreyurllist'
-#localexceptionurllist = 'etc/e2guardian/lists/localexceptionurllist'
-#localbannedsslsitelist = 'etc/e2guardian/lists/localbannedsslsitelist'
-#localgreysslsitelist = 'etc/e2guardian/lists/localgreysslsitelist'
-#localbannedsearchlist = 'etc/e2guardian/lists/localbannedsearchlist'
-
-!! Not compiled !! authexceptionsitelist = 'etc/e2guardian/lists/authexceptionsitelist'
-!! Not compiled !! authexceptionurllist = 'etc/e2guardian/lists/authexceptionurllist'
-
-# Filetype filtering
-#
-# Allow bannedregexpurllist with grey list mode
-# bannedregexpheaderlist and bannedregexpurllist
-#
-# bannedregexwithblanketblock = off
-#
-# Blanket download blocking
-# If enabled, all files will be blocked, unless they match the
-# exceptionextensionlist or exceptionmimetypelist.
-# These lists do not override virus scanning.
-# Exception lists defined above override all types of filtering, including
-# the blanket download block.
-# Defaults to disabled.
-# (on | off)
-#
-blockdownloads = off
-exceptionextensionlist = 'etc/e2guardian/lists/exceptionextensionlist'
-exceptionmimetypelist = 'etc/e2guardian/lists/exceptionmimetypelist'
-#
-# Use the following lists to block specific kinds of file downloads.
-# The two exception lists above can be used to override these.
-#
-bannedextensionlist = 'etc/e2guardian/lists/bannedextensionlist'
-bannedmimetypelist = 'etc/e2guardian/lists/bannedmimetypelist'
-#
-# In either file filtering mode, the following list can be used to override
-# MIME type & extension blocks for particular domains & URLs (trusted download sites).
-#
-exceptionfilesitelist = 'etc/e2guardian/lists/exceptionfilesitelist'
-exceptionfileurllist = 'etc/e2guardian/lists/exceptionfileurllist'
-
-# POST protection (web upload and forms)
-# does not block forms without any file upload, i.e. this is just for
-# blocking or limiting uploads
-# measured in kibibytes after MIME encoding and header bumph
-# use 0 for a complete block
-# use higher (e.g. 512 = 512Kbytes) for limiting
-# use -1 for no blocking
-#maxuploadsize = 512
-#maxuploadsize = 0
-maxuploadsize = -1
-
-# Categorise without blocking:
-# Supply categorised lists here and the category string shall be logged against
-# matching requests, but matching these lists does not perform any filtering
-# action.
-#logsitelist = 'etc/e2guardian/lists/logsitelist'
-#logurllist = 'etc/e2guardian/lists/logurllist'
-#logregexpurllist = 'etc/e2guardian/lists/logregexpurllist'
-
-# Outgoing HTTP header rules:
-# Optional lists for blocking based on, and modification of, outgoing HTTP
-# request headers.  Format for headerregexplist is one modification rule per
-# line, similar to content/URL modifications.  Format for
-# bannedregexpheaderlist is one regular expression per line, with matching
-# headers causing a request to be blocked.
-# Headers are matched/replaced on a line-by-line basis, not as a contiguous
-# block.
-# Use for example, to remove cookies or prevent certain user-agents.
-headerregexplist = 'etc/e2guardian/lists/headerregexplist'
-bannedregexpheaderlist = 'etc/e2guardian/lists/bannedregexpheaderlist'
-addheaderregexplist = 'etc/e2guardian/lists/addheaderregexplist'
-
-# Weighted phrase mode
-# Optional; overrides the weightedphrasemode option in e2guardian.conf
-# for this particular group.  See documentation for supported values in
-# that file.
-#weightedphrasemode = 0
-
-# Naughtiness limit
-# This the limit over which the page will be blocked.  Each weighted phrase is given
-# a value either positive or negative and the values added up.  Phrases to do with
-# good subjects will have negative values, and bad subjects will have positive
-# values.  See the weightedphraselist file for examples.
-# As a guide:
-# 50 is for young children,  100 for old children,  160 for young adults.
-naughtynesslimit = 50
-
-# Search term blocking
-# Search terms can be extracted from search URLs and filtered using one or
-# both of two different methods.
-
-# Method 1 is that developed by Protex where specific
-# search terms are contained in a bannedsearchlist.
-# (localbannedsearchlist and bannedsearchoveridelist can be used to suppliment
-# and overide this list as required.)
-# These lists contain banned search words combinations on each line.
-# Words are separated by '+' and must be in sorted order within a line.
-#    so to block 'sexy girl' then the list must contain the line
-#    	girl+sexy
-#    and this will block both 'sexy girl' and 'girl sexy'
-# To use this method, the searchregexplist must be enabled and the bannedsearchlist(s) defined
-
-# Method 2 is uses the
-# bannedphraselist, weightedphraselist and exceptionphraselist, with a separate
-# threshold for blocking than that used for normal page content.
-# To do this, the searchregexplist must be enabled and searchtermlimit
-# must be grater than 0.
-
-#
-# Search engine regular expression list (need for both options)
-# List of regular expressions for matching search engine URLs.  It is assumed
-# that the search terms themselves will be contained in the
-# of output of each expression.
-#searchregexplist = 'etc/e2guardian/lists/searchregexplist'
-#
-# Banned Search Term list(s) for option 1
-#bannedsearchlist = 'etc/e2guardian/lists/bannedsearchlist'
-#bannedsearchoveridelist = 'etc/e2guardian/lists/bannedsearchoveridelist'
-
-
-# Search term limit (for Option 2)
-# The limit over which requests will be blocked for containing search terms
-# which match the weightedphraselist.  This should usually be lower than the
-# 'naughtynesslimit' value above, because the amount of text being filtered
-# is only a few words, rather than a whole page.
-# This option must be uncommented if searchregexplist is uncommented.
-# A value of 0 here indicates that search terms should be extracted,
-# but no phrase filtering should be performed on the resulting text.
-#searchtermlimit = 0
-#
-# Search term phrase lists (for Option 2)
-# If the three lines below are uncommented, search term blocking will use
-# the banned, weighted & exception phrases from these lists, instead of using
-# the same phrase lists as for page content.  This is optional but recommended,
-# as weights for individual phrases in the "normal" lists may not be
-# appropriate for blocking when those phrases appear in a much smaller block
-# of text.
-# Please note that all or none of the below should be uncommented, not a
-# mixture.
-#bannedsearchtermlist = 'etc/e2guardian/lists/bannedsearchtermlist'
-#weightedsearchtermlist = 'etc/e2guardian/lists/weightedsearchtermlist'
-#exceptionsearchtermlist = 'etc/e2guardian/lists/exceptionsearchtermlist'
-
-# Category display threshold
-# This option only applies to pages blocked by weighted phrase filtering.
-# Defines the minimum score that must be accumulated within a particular
-# category in order for it to show up on the block pages' category list.
-# All categories under which the page scores positively will be logged; those
-# that were not displayed to the user appear in brackets.
-#
-# -1 = display only the highest scoring category
-# 0 = display all categories (default)
-# > 0 = minimum score for a category to be displayed
-categorydisplaythreshold = 0
-
-# Embedded URL weighting
-# When set to something greater than zero, this option causes URLs embedded within a
-# page's HTML (from links, image tags, etc.) to be extracted and checked against the
-# bannedsitelist and bannedurllist. Each link to a banned page causes the amount set
-# here to be added to the page's weighting.
-# The behaviour of this option with regards to multiple occurrences of a site/URL is
-# affected by the weightedphrasemode setting.
-#
-# NB: Currently, this feature uses regular expressions that require the PCRE library.
-# As such, it is only available if you compiled DansGuardian with '--enable-pcre=yes'.
-# You can check compile-time options by running 'e2guardian -v'.
-#
-# Set to 0 to disable.
-# Defaults to 0.
-# WARNING: This option is highly CPU intensive!
-embeddedurlweight = 0
-
-# Enable PICS rating support
-#
-# Defaults to disabled
-# (on | off)
-enablepics = off
-
-# Temporary Denied Page Bypass
-# This provides a link on the denied page to bypass the ban for a few minutes.  To be
-# secure it uses a random hashed secret generated at daemon startup.  You define the
-# number of seconds the bypass will function for before the deny will appear again.
-# To allow the link on the denied page to appear you will need to edit the template.html
-# or e2guardian.pl file for your language.
-# 300 = enable for 5 minutes
-# 0 = disable ( defaults to 0 )
-# -1 = enable but you require a separate program/CGI to generate a valid link
-bypass = 0
-
-# Temporary Denied Page Bypass Secret Key
-# Rather than generating a random key you can specify one.  It must be more than 8 chars.
-# '' = generate a random one (recommended and default)
-# 'Mary had a little lamb.' = an example
-# '76b42abc1cd0fdcaf6e943dcbc93b826' = an example
-bypasskey = ''
-
-# Infection/Scan Error Bypass
-# Similar to the 'bypass' setting, but specifically for bypassing files scanned and found
-# to be infected, or files that trigger scanner errors - for example, archive types with
-# recognised but unsupported compression schemes, or corrupt archives.
-# The option specifies the number of seconds for which the bypass link will be valid.
-# 300 = enable for 5 minutes
-# 0 = disable (default)
-# -1 = enable, but require a separate program/CGI to generate a valid link
-infectionbypass = 0
-
-# Infection/Scan Error Bypass Secret Key
-# Same as the 'bypasskey' option, but used for infection bypass mode.
-infectionbypasskey = ''
-
-# Infection/Scan Error Bypass on Scan Errors Only
-# Enable this option to allow infectionbypass links only when virus scanning fails,
-# not when a file is found to contain a virus.
-# on = enable (default and highly recommended)
-# off = disable
-infectionbypasserrorsonly = on
-
-# Disable content scanning
-# If you enable this option you will disable content scanning for this group.
-# Content scanning primarily is AV scanning (if enabled) but could include
-# other types.
-# (on|off) default = off.
-disablecontentscan = off
-
-# Enable Deep URL Analysis
-# When enabled, DG looks for URLs within URLs, checking against the bannedsitelist and
-# bannedurllist. This can be used, for example, to block images originating from banned
-# sites from appearing in Google Images search results, as the original URLs are
-# embedded in the thumbnail GET requests.
-# (on|off) default = off
-deepurlanalysis = off
-
-# reportinglevel
-#
-# -1 = log, but do not block - Stealth mode
-#  0 = just say 'Access Denied'
-#  1 = report why but not what denied phrase
-#  2 = report fully
-#  3 = use HTML template file (accessdeniedaddress ignored) - recommended
-#
-# If defined, this overrides the global setting in e2guardian.conf for
-# members of this filter group.
-#
-reportinglevel = 3
-
-# accessdeniedaddress is the address of your web server to which the cgi
-# e2guardian reporting script was copied. Only used in reporting levels
-# 1 and 2.
-#
-# This webserver must be either:
-#  1. Non-proxied. Either a machine on the local network, or listed as an
-#     exception in your browser's proxy configuration.
-#  2. Added to the exceptionsitelist. Option 1 is preferable; this option is
-#     only for users using both transparent proxying and a non-local server
-#     to host this script.
-#
-# If defined, this overrides the global setting in e2guardian.conf for
-# members of this filter group.
-#
-#accessdeniedaddress = 'http://YOURSERVER.YOURDOMAIN/cgi-bin/e2guardian.pl'
-
-# sslaccessdeniedaddress is the address of your web server to which the static page
-# e2guardian reporting was copied. Only used in reporting levels 3 (avoid blank page)
-# Work only in firefox with ssldeniedrewrite off
-
-# sslaccessdeniedaddress = 'http://YOURSERVER.YOURDOMAIN/denyssl.htm'
-
-# Break SSL protocol and redirect to another HTTPS website for denied page (sslaccessdeniedaddress url)
-
-#ssldeniedrewrite = 'on'
-
-# HTML Template override
-# If defined, this specifies a custom HTML template file for members of this
-# filter group, overriding the global setting in e2guardian.conf. This is
-# only used in reporting level 3.
-#
-# The default template file path is <languagedir>/<language>/template.h
-# e.g. share/e2guardian/languages/ukenglish/template.html when using 'ukenglish'
-# language.
-#
-# This option generates a file path of the form:
-# <languagedir>/<language>/<htmltemplate>
-# e.g. share/e2guardian/languages/ukenglish/custom.html
-#
-#htmltemplate = 'custom.html'
-
-# Non standard delimiter (only used with accessdeniedaddress)
-# To help preserve the full banned URL, including parameters, the variables
-# passed into the access denied CGI are separated using non-standard
-# delimiters. This can be useful to ensure correct operation of the filter
-# bypass modes. Parameters are split using "::" in place of "&", and "==" in
-# place of "=".
-# Default is enabled, but to go back to the standard mode, disable it.
-
-#nonstandarddelimiter = off
-
-# Email reporting - original patch by J. Gauthier
-
-# Use SMTP
-# If on, will enable system wide events to be reported by email.
-# need to configure mail program (see 'mailer' in global config)
-# and email recipients
-# default usesmtp = off
-#!! Not compiled !!usesmtp = off
-
-# mailfrom
-# who the email would come from
-# example: mailfrom = 'e2guardian@mycompany.com'
-#!! Not compiled !!mailfrom = ''
-
-# avadmin
-# who the virus emails go to (if notify av is on)
-# example: avadmin = 'admin@mycompany.com'
-#!! Not compiled !!avadmin = ''
-
-# contentdmin
-# who the content emails go to (when thresholds are exceeded)
-# and contentnotify is on
-# example: contentadmin = 'admin@mycompany.com'
-#!! Not compiled !!contentadmin = ''
-
-# avsubject
-# Subject of the email sent when a virus is caught.
-# only applicable if notifyav is on
-# default avsubject = 'e2guardian virus block'
-#!! Not compiled !!avsubject = 'e2guardian virus block'
-
-# content
-# Subject of the email sent when violation thresholds are exceeded
-# default contentsubject = 'e2guardian violation'
-#!! Not compiled !!contentsubject = 'e2guardian violation'
-
-# notifyAV
-# This will send a notification, if usesmtp/notifyav is on, any time an
-# infection is found.
-# Important: If this option is off, viruses will still be recorded like a
-# content infraction.
-#!! Not compiled !!notifyav = off
-
-# notifycontent
-# This will send a notification, if usesmtp is on, based on thresholds
-# below
-#!! Not compiled !!notifycontent = off
-
-# thresholdbyuser
-# results are only predictable with user authenticated configs
-# if enabled the violation/threshold count is kept track of by the user
-#!! Not compiled !!thresholdbyuser = off
-
-#violations
-# number of violations before notification
-# setting to 0 will never trigger a notification
-#!! Not compiled !!violations = 0
-
-#threshold
-# this is in seconds. If 'violations' occur in 'threshold' seconds, then
-# a notification is made.
-# if this is set to 0, then whenever the set number of violations are made a
-# notifaction will be sent.
-#!! Not compiled !!threshold = 0
-
-#SSL certificate checking
-# Check that ssl certificates for servers on https connections are valid
-# and signed by a ca in the configured path
-sslcertcheck = off
-
-#SSL man in the middle
-# Forge ssl certificates for all sites, decrypt the data then re encrypt it
-# using a different private key. Used to filter ssl sites
-sslmitm = off
-
diff --git a/trunk/package/feeds/packages/elfutils/Makefile b/trunk/package/feeds/packages/elfutils/Makefile
deleted file mode 100644
index d3e1552c..00000000
--- a/trunk/package/feeds/packages/elfutils/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=elfutils
-PKG_VERSION:=0.161
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://fedorahosted.org/releases/e/l/$(PKG_NAME)/$(PKG_VERSION)
-PKG_MD5SUM:=e1b9847c9a6a1ad340de8d47a863ec52
-PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3
-
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/elfutils/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(INTL_DEPENDS)
-  TITLE:=ELF manipulation libraries
-  URL:=https://fedorahosted.org/elfutils/
-endef
-
-define Package/libasm
-  $(call Package/elfutils/Default)
-  TITLE+= (libasm)
-  DEPENDS:=libelf1
-endef
-
-define Package/libdw
-  $(call Package/elfutils/Default)
-  DEPENDS:=libelf1 +zlib +libbz2
-  TITLE+= (libdw)
-endef
-
-define Package/libelf1
-  $(call Package/elfutils/Default)
-  TITLE+= (libelf)
-endef
-
-ifeq ($(CONFIG_BUILD_NLS),y)
-TARGET_LDFLAGS += "-lintl"
-endif
-
-ifdef CONFIG_USE_UCLIBC
-CONFIGURE_VARS += \
-	LIBS="-largp"
-endif
-
-ifdef CONFIG_USE_MUSL
-CONFIGURE_VARS += \
-	LIBS="-largp"
-endif
-
-CONFIGURE_ARGS += \
-	--disable-werror \
-	--without-lzma
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libasm/libasm.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libasm/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libasm/libasm.so* $(1)/usr/lib/
-endef
-
-define Package/libdw/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/
-endef
-
-define Package/libelf1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libasm))
-$(eval $(call BuildPackage,libdw))
-$(eval $(call BuildPackage,libelf1))
diff --git a/trunk/package/feeds/packages/elfutils/patches/001-elfutils-portability.patch b/trunk/package/feeds/packages/elfutils/patches/001-elfutils-portability.patch
deleted file mode 100644
index 7539f8bb..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/001-elfutils-portability.patch
+++ /dev/null
@@ -1,1871 +0,0 @@
---- elfutils/backends/ChangeLog
-+++ elfutils/backends/ChangeLog
-@@ -433,6 +433,10 @@
- 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
- 	GNU_Power_ABI_Struct_Return.
- 
-+2009-01-23  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
-+
- 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -760,6 +764,11 @@
- 	* sparc_init.c: Likewise.
- 	* x86_64_init.c: Likewise.
- 
-+2005-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
-+	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
-+
- 2005-11-19  Roland McGrath  <roland@redhat.com>
- 
- 	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -782,6 +791,9 @@
- 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
- 	(CLEANFILES): Add libebl_$(m).so.
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
- 	* ppc64_reloc.def: Likewise.
- 
---- elfutils/backends/Makefile.am
-+++ elfutils/backends/Makefile.am
-@@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- 	$(LINK) -shared -o $(@:.map=.so) \
- 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- 		-Wl,--version-script,$(@:.so=.map) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	@$(textrel_check)
- 
- libebl_i386.so: $(cpu_i386)
---- elfutils/backends/Makefile.in
-+++ elfutils/backends/Makefile.in
-@@ -83,6 +83,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = backends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -285,6 +286,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -316,6 +318,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -378,11 +381,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
- 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \
- 	libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS))
-@@ -888,7 +891,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- 	$(LINK) -shared -o $(@:.map=.so) \
- 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- 		-Wl,--version-script,$(@:.so=.map) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	@$(textrel_check)
- 
- libebl_i386.so: $(cpu_i386)
---- elfutils/ChangeLog
-+++ elfutils/ChangeLog
-@@ -187,6 +187,8 @@
- 
- 2012-01-24  Mark Wielaard  <mjw@redhat.com>
- 
-+	* configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.
-+
- 	* COPYING: Fix address. Updated version from gnulib.
- 
- 2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -205,6 +207,9 @@
- 
- 2011-10-08  Mike Frysinger  <vapier@gentoo.org>
- 
-+	* configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR
-+	automake option.
-+
- 	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
- 
- 2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -226,6 +231,10 @@
- 
- 	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
- 
-+2009-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Use sed and expr instead of modern bash extensions.
-+
- 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* configure.ac: Update for more modern autoconf.
-@@ -234,6 +243,10 @@
- 
- 	* configure.ac (zip_LIBS): Check for liblzma too.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
-+
- 2009-04-19  Roland McGrath  <roland@redhat.com>
- 
- 	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -245,6 +258,8 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* configure.ac: Check for __builtin_popcount.
-+
- 	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
- 
- 	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -325,6 +340,10 @@
- 	* configure.ac: Add dummy automake conditional to get dependencies
- 	for non-generic linker right.  See src/Makefile.am.
- 
-+2005-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Check for --as-needed linker option.
-+
- 2005-11-18  Roland McGrath  <roland@redhat.com>
- 
- 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -372,6 +391,17 @@
- 	* Makefile.am (all_SUBDIRS): Add libdwfl.
- 	* configure.ac: Write libdwfl/Makefile.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac (WEXTRA): Check for -Wextra and set this substitution.
-+
-+	* configure.ac: Check for struct stat st_?tim members.
-+	* src/strip.c (process_file): Use st_?time if st_?tim are not there.
-+
-+	* configure.ac: Check for futimes function.
-+	* src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
-+	(handle_ar) [! HAVE_FUTIMES]: Likewise.
-+
- 2005-05-19  Roland McGrath  <roland@redhat.com>
- 
- 	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
---- elfutils/config/ChangeLog
-+++ elfutils/config/ChangeLog
-@@ -71,6 +71,10 @@
- 
- 	* known-dwarf.awk: Use gawk.
- 
-+2011-10-08  Mike Frysinger  <vapier@gentoo.org>
-+
-+	* eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.
-+
- 2010-07-02  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elfutils.spec.in: Add more BuildRequires.
---- elfutils/config/eu.am
-+++ elfutils/config/eu.am
-@@ -1,6 +1,6 @@
- ## Common automake fragments for elfutils subdirectory makefiles.
- ##
--## Copyright (C) 2010, 2014 Red Hat, Inc.
-+## Copyright (C) 2010-2011, 2014 Red Hat, Inc.
- ##
- ## This file is part of elfutils.
- ##
-@@ -29,13 +29,21 @@
- ## not, see <http://www.gnu.org/licenses/>.
- ##
- 
-+WEXTRA = @WEXTRA@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
-+
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
- 	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-+	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
-+	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
- 	    $($(*F)_CFLAGS)
- 
-+if BUILD_WERROR
-+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)
-+endif
-+
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- 
- %.os: %.c %.o
---- elfutils/config/Makefile.in
-+++ elfutils/config/Makefile.in
-@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -178,6 +179,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/config.h.in
-+++ elfutils/config.h.in
-@@ -3,6 +3,9 @@
- /* Should ar and ranlib use -D behavior by default? */
- #undef DEFAULT_AR_DETERMINISTIC
- 
-+/* Have __builtin_popcount. */
-+#undef HAVE_BUILTIN_POPCOUNT
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-@@ -102,4 +105,7 @@
- /* Define for large files, on AIX-style hosts. */
- #undef _LARGE_FILES
- 
-+/* Stubbed out if missing compiler support. */
-+#undef __thread
-+
- #include <eu-config.h>
---- elfutils/configure
-+++ elfutils/configure
-@@ -663,6 +663,8 @@ ZLIB_TRUE
- LIBEBL_SUBDIR
- TESTS_RPATH_FALSE
- TESTS_RPATH_TRUE
-+BUILD_WERROR_FALSE
-+BUILD_WERROR_TRUE
- BUILD_STATIC_FALSE
- BUILD_STATIC_TRUE
- USE_VALGRIND_FALSE
-@@ -678,6 +680,8 @@ NEVER_TRUE
- base_cpu
- NATIVE_LD_FALSE
- NATIVE_LD_TRUE
-+LD_AS_NEEDED
-+WEXTRA
- NM
- READELF
- ac_ct_AR
-@@ -798,6 +802,7 @@ enable_debugpred
- enable_gprof
- enable_gcov
- enable_valgrind
-+enable_werror
- enable_tests_rpath
- enable_libebl_subdir
- with_zlib
-@@ -1455,6 +1460,7 @@ Optional Features:
-   --enable-gprof          build binaries with gprof support
-   --enable-gcov           build binaries with gcov support
-   --enable-valgrind       run all tests under valgrind
-+  --disable-werror        do not build with -Werror
-   --enable-tests-rpath    build $ORIGIN-using rpath into tests
-   --enable-libebl-subdir=DIR
-                           install libebl_CPU modules in $(libdir)/DIR
-@@ -4843,6 +4849,130 @@ if test "x$ac_cv_c99" != xyes; then :
-   as_fn_error $? "gcc with C99 support required" "$LINENO" 5
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
-+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
-+if ${ac_cv_cc_wextra+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+void foo (void) { }
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_cc_wextra=yes
-+else
-+  ac_cv_cc_wextra=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
-+$as_echo "$ac_cv_cc_wextra" >&6; }
-+
-+if test "x$ac_cv_cc_wextra" = xyes; then :
-+  WEXTRA=-Wextra
-+else
-+  WEXTRA=-W
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
-+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
-+if ${ac_cv_cc_gnu89_inline+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+void foo (void)
-+{
-+  inline void bar (void) {}
-+  bar ();
-+}
-+extern inline void baz (void) {}
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_cc_gnu89_inline=yes
-+else
-+  ac_cv_cc_gnu89_inline=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
-+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
-+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
-+  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
-+$as_echo_n "checking for --as-needed linker option... " >&6; }
-+if ${ac_cv_as_needed+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&5'
-+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
-+$as_echo "$ac_cv_as_needed" >&6; }
-+if test "x$ac_cv_as_needed" = xyes; then :
-+  LD_AS_NEEDED=-Wl,--as-needed
-+else
-+  LD_AS_NEEDED=
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
-+$as_echo_n "checking for __builtin_popcount... " >&6; }
-+if ${ac_cv_popcount+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+exit (__builtin_popcount (127));
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_popcount=yes
-+else
-+  ac_cv_popcount=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
-+$as_echo "$ac_cv_popcount" >&6; }
-+if test "x$ac_cv_popcount" = xyes; then :
-+
-+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
- $as_echo_n "checking for __thread support... " >&6; }
- if ${ac_cv_tls+:} false; then :
-@@ -4879,7 +5009,13 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
- $as_echo "$ac_cv_tls" >&6; }
- if test "x$ac_cv_tls" != xyes; then :
--  as_fn_error $? "__thread support required" "$LINENO" 5
-+  if test "$use_locks" = yes; then :
-+  as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
-+else
-+
-+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
-+
-+fi
- fi
- 
- # Check whether --enable-largefile was given.
-@@ -5246,6 +5382,22 @@ else
- fi
- 
- 
-+# Check whether --enable-werror was given.
-+if test "${enable_werror+set}" = set; then :
-+  enableval=$enable_werror; enable_werror=$enableval
-+else
-+  enable_werror=yes
-+fi
-+
-+ if test "$enable_werror" = yes; then
-+  BUILD_WERROR_TRUE=
-+  BUILD_WERROR_FALSE='#'
-+else
-+  BUILD_WERROR_TRUE='#'
-+  BUILD_WERROR_FALSE=
-+fi
-+
-+
- # Check whether --enable-tests-rpath was given.
- if test "${enable_tests_rpath+set}" = set; then :
-   enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5983,7 +6135,7 @@ case "$eu_version" in
- esac
- 
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6729,6 +6881,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
-   as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
-+  as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
-   as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
---- elfutils/configure.ac
-+++ elfutils/configure.ac
-@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"])
- AS_IF([test "x$ac_cv_c99" != xyes],
-       AC_MSG_ERROR([gcc with C99 support required]))
- 
-+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],
-+		  ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
-+CFLAGS="$old_CFLAGS"])
-+AC_SUBST(WEXTRA)
-+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
-+
-+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+void foo (void)
-+{
-+  inline void bar (void) {}
-+  bar ();
-+}
-+extern inline void baz (void) {}
-+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
-+CFLAGS="$old_CFLAGS"])
-+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
-+      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
-+
-+AC_CACHE_CHECK([for --as-needed linker option],
-+	       ac_cv_as_needed, [dnl
-+cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*])
-+AS_IF([test "x$ac_cv_as_needed" = xyes],
-+      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
-+AC_SUBST(LD_AS_NEEDED)
-+
-+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
-+	       ac_cv_popcount=yes, ac_cv_popcount=no)])
-+AS_IF([test "x$ac_cv_popcount" = xyes],
-+      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
-+
- AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
- # Use the same flags that we use for our DSOs, so the test is representative.
- # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) {
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"])
- AS_IF([test "x$ac_cv_tls" != xyes],
--      AC_MSG_ERROR([__thread support required]))
-+      [AS_IF([test "$use_locks" = yes],
-+	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
-+	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
-+			[Stubbed out if missing compiler support.])])])
- 
- dnl This test must come as early as possible after the compiler configuration
- dnl tests, because the choice of the file model can (in principle) affect
-@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
- AM_CONDITIONAL(BUILD_STATIC, [dnl
- test "$use_gprof" = yes -o "$use_gcov" = yes])
- 
-+AC_ARG_ENABLE([werror],
-+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),
-+	       [enable_werror=$enableval], [enable_werror=yes])
-+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)
-+
- AC_ARG_ENABLE([tests-rpath],
- AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
- 	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -302,7 +358,7 @@ case "$eu_version" in
- esac
- 
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
- 
- AC_CHECK_SIZEOF(long)
- 
---- elfutils/lib/ChangeLog
-+++ elfutils/lib/ChangeLog
-@@ -65,6 +65,9 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
-+	(__builtin_popcount): New inline function.
-+
- 	* eu-config.h: Add multiple inclusion protection.
- 
- 2009-01-17  Ulrich Drepper  <drepper@redhat.com>
-@@ -121,6 +124,11 @@
- 	* Makefile.am (libeu_a_SOURCES): Add it.
- 	* system.h: Declare crc32_file.
- 
-+2005-02-07  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-04-30  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile.am: Use -ffunction-sections for xmalloc.c.
---- elfutils/lib/eu-config.h
-+++ elfutils/lib/eu-config.h
-@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
- /* This macro is used by the tests conditionalize for standalone building.  */
- #define ELFUTILS_HEADER(name) <lib##name.h>
- 
-+#ifndef HAVE_BUILTIN_POPCOUNT
-+# define __builtin_popcount hakmem_popcount
-+static inline unsigned int __attribute__ ((unused))
-+hakmem_popcount (unsigned int x)
-+{
-+  /* HAKMEM 169 */
-+  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
-+  return ((n + (n >> 3)) & 030707070707) % 63;
-+}
-+#endif	/* HAVE_BUILTIN_POPCOUNT */
-+
- 
- #ifdef SHARED
- # define OLD_VERSION(name, version) \
---- elfutils/lib/Makefile.in
-+++ elfutils/lib/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = lib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -197,6 +198,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -228,6 +230,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -289,9 +292,11 @@ top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- 	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1) -fpic
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
---- elfutils/libasm/ChangeLog
-+++ elfutils/libasm/ChangeLog
-@@ -87,6 +87,11 @@
- 	* asm_error.c: Add new error ASM_E_IOERROR.
- 	* libasmP.h: Add ASM_E_IOERROR definition.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libasm/Makefile.in
-+++ elfutils/libasm/Makefile.in
-@@ -83,8 +83,9 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- noinst_PROGRAMS = $(am__EXEEXT_1)
--@USE_LOCKS_TRUE@am__append_1 = -lpthread
-+@USE_LOCKS_TRUE@am__append_2 = -lpthread
- subdir = libasm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -248,6 +249,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -279,6 +281,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -341,11 +344,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
- 	-I$(top_srcdir)/libdw
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \
- 	libasm.so.$(VERSION)
-@@ -373,7 +376,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
- 
- libasm_pic_a_SOURCES = 
- am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
--libasm_so_LDLIBS = $(am__append_1)
-+libasm_so_LDLIBS = $(am__append_2)
- libasm_so_SOURCES = 
- noinst_HEADERS = libasmP.h symbolhash.h
- EXTRA_DIST = libasm.map
---- elfutils/libcpu/ChangeLog
-+++ elfutils/libcpu/ChangeLog
-@@ -51,6 +51,9 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
-+	compilers that don't realize it's noreturn.
-+
- 	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
- 	substitution that can produce leading whitespace.
- 
-@@ -380,6 +383,11 @@
- 	* defs/i386.doc: New file.
- 	* defs/x86_64: New file.
- 
-+2005-04-04  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it instead of -Wextra.
-+
- 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libcpu/i386_disasm.c
-+++ elfutils/libcpu/i386_disasm.c
-@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
- 
- 			default:
- 			  assert (! "INVALID not handled");
-+			  abort ();
- 			}
- 		    }
- 		  else
---- elfutils/libcpu/Makefile.in
-+++ elfutils/libcpu/Makefile.in
-@@ -84,6 +84,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am i386_lex.c i386_parse.c \
- 	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- 	$(am__noinst_HEADERS_DIST) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
- subdir = libcpu
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -223,6 +224,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -254,6 +256,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -316,10 +319,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	-I$(srcdir)/../libdw -I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- 	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic \
--	-fdollars-in-identifiers
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1) -fpic -fdollars-in-identifiers
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(foreach P,i386 x86_64,$P_defs \
- 	$P.mnemonics)
---- elfutils/libdw/ChangeLog
-+++ elfutils/libdw/ChangeLog
-@@ -717,6 +717,10 @@
- 
- 	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
- 
-+2011-07-20  Mark Wielaard  <mjw@redhat.com>
-+
-+	* dwarf_begin_elf.c: Add fallback for be64toh if not defined.
-+
- 2011-07-14  Mark Wielaard  <mjw@redhat.com>
- 
- 	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -1076,6 +1080,10 @@
- 
- 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* libdw.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-10  Roland McGrath  <roland@redhat.com>
- 
- 	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1844,6 +1852,11 @@
- 
- 2005-05-31  Roland McGrath  <roland@redhat.com>
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
- 	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
- 	formref offset.
- 
---- elfutils/libdw/dwarf_begin_elf.c
-+++ elfutils/libdw/dwarf_begin_elf.c
-@@ -47,6 +47,14 @@
- #if USE_ZLIB
- # include <endian.h>
- # define crc32		loser_crc32
-+# ifndef be64toh
-+#  include <byteswap.h>
-+#  if __BYTE_ORDER == __LITTLE_ENDIAN
-+#   define be64toh(x) bswap_64 (x)
-+#  else
-+#   define be64toh(x) (x)
-+#  endif
-+# endif
- # include <zlib.h>
- # undef crc32
- #endif
---- elfutils/libdw/libdw.h
-+++ elfutils/libdw/libdw.h
-@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
- 
- 
- /* Inline optimizations.  */
--#ifdef __OPTIMIZE__
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- /* Return attribute code of given attribute.  */
- __libdw_extern_inline unsigned int
- dwarf_whatattr (Dwarf_Attribute *attr)
---- elfutils/libdw/Makefile.in
-+++ elfutils/libdw/Makefile.in
-@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	ChangeLog
--@BUILD_STATIC_TRUE@am__append_1 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@BUILD_STATIC_TRUE@am__append_2 = -fpic
- noinst_PROGRAMS = $(am__EXEEXT_1)
- subdir = libdw
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -298,6 +299,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -329,6 +331,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -390,10 +393,11 @@ top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- 	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1) $(am__append_2)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
---- elfutils/libdwelf/Makefile.in
-+++ elfutils/libdwelf/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = libdwelf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -258,6 +260,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -320,11 +323,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- 	-I$(srcdir)/../libdwfl -I$(srcdir)/../libebl
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libdwelf_pic_a_OBJECTS)
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
---- elfutils/libdwfl/ChangeLog
-+++ elfutils/libdwfl/ChangeLog
-@@ -571,6 +571,21 @@
- 	(dwfl_module_addrsym) (i_to_symfile): New function.
- 	(dwfl_module_addrsym) (search_table): Use it.
- 
-+2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
-+
-+	Older OS compatibility bits.
-+	* linux-core-attach.c (be64toh, le64toh, be32toh, le32toh): Provide
-+	fallbacks if not defined by system.
-+
-+2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
-+
-+	Handle T-stopped detach for old kernels.
-+	* linux-pid-attach.c (struct pid_arg): New field stopped.
-+	(ptrace_attach): New parameter stoppedp.  Set it appropriately.
-+	(pid_set_initial_registers): Pass the new field.
-+	(pid_thread_detach): Handle the case of STOPPED for old kernels.
-+	(__libdwfl_attach_state_for_pid): Initialize STOPPED.
-+
- 2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
- 	    Mark Wielaard  <mjw@redhat.com>
- 
-@@ -2336,6 +2351,11 @@
- 
- 2005-07-21  Roland McGrath  <roland@redhat.com>
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-07-21  Roland McGrath  <roland@redhat.com>
-+
- 	* Makefile.am (noinst_HEADERS): Add loc2c.c.
- 
- 	* test2.c (main): Check sscanf result to quiet warning.
---- elfutils/libdwfl/linux-core-attach.c
-+++ elfutils/libdwfl/linux-core-attach.c
-@@ -29,6 +29,35 @@
- #include "libdwflP.h"
- #include <fcntl.h>
- #include "system.h"
-+#include <endian.h>
-+#include <byteswap.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# ifndef be64toh
-+#  define be64toh(x) bswap_64 (x)
-+# endif
-+# ifndef le64toh
-+#  define le64toh(x) (x)
-+# endif
-+# ifndef be32toh
-+#  define be32toh(x) bswap_32 (x)
-+# endif
-+# ifndef le32toh
-+#  define le32toh(x) (x)
-+# endif
-+#else
-+# ifndef be64toh
-+#  define be64toh(x) (x)
-+# endif
-+# ifndef le64toh
-+#  define le64toh(x) bswap_64 (x)
-+# endif
-+# ifndef be32toh
-+#  define be32toh(x) (x)
-+# endif
-+# ifndef le32toh
-+#  define le32toh(x) bswap_32 (x)
-+# endif
-+#endif
- 
- #include "../libdw/memory-access.h"
- 
---- elfutils/libdwfl/linux-pid-attach.c
-+++ elfutils/libdwfl/linux-pid-attach.c
-@@ -255,6 +255,11 @@ void
- internal_function
- __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
- {
-+  // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special
-+  // handling of the detachment to keep the process State: T (stopped).
-+  if (tid_was_stopped)
-+    syscall (__NR_tkill, tid, SIGSTOP);
-+
-   /* This handling is needed only on older Linux kernels such as
-      2.6.32-358.23.2.el6.ppc64.  Later kernels such as
-      3.11.7-200.fc19.x86_64 remember the T (stopped) state
-@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool
-      PTRACE_DETACH.  */
-   ptrace (PTRACE_DETACH, tid, NULL,
- 	  (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0));
-+
-+  if (tid_was_stopped)
-+    {
-+      // Wait till the SIGSTOP settles down.
-+      int i;
-+      for (i = 0; i < 100000; i++)
-+	if (linux_proc_pid_is_stopped (tid))
-+	  break;
-+    }
- }
- 
- static void
---- elfutils/libdwfl/Makefile.in
-+++ elfutils/libdwfl/Makefile.in
-@@ -82,9 +82,10 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
--@ZLIB_TRUE@am__append_1 = gzip.c
--@BZLIB_TRUE@am__append_2 = bzip2.c
--@LZMA_TRUE@am__append_3 = lzma.c
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@ZLIB_TRUE@am__append_2 = gzip.c
-+@BZLIB_TRUE@am__append_3 = bzip2.c
-+@LZMA_TRUE@am__append_4 = lzma.c
- subdir = libdwfl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -286,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -317,6 +319,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -379,11 +382,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. -I$(srcdir) \
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	-I$(srcdir)/../libdw -I$(srcdir)/../libdwelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -413,8 +416,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
- 	dwfl_module_register_names.c dwfl_segment_report_module.c \
- 	link_map.c core-file.c open.c image-header.c dwfl_frame.c \
- 	frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
--	linux-core-attach.c dwfl_frame_regs.c $(am__append_1) \
--	$(am__append_2) $(am__append_3)
-+	linux-core-attach.c dwfl_frame_regs.c $(am__append_2) \
-+	$(am__append_3) $(am__append_4)
- libdwfl = $(libdw)
- libdw = ../libdw/libdw.so
- libelf = ../libelf/libelf.so
---- elfutils/libebl/ChangeLog
-+++ elfutils/libebl/ChangeLog
-@@ -765,6 +765,11 @@
- 	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
- 	tracking works right.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* libebl_x86_64.map: Add x86_64_core_note.
---- elfutils/libebl/Makefile.in
-+++ elfutils/libebl/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = libebl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -249,6 +250,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -280,6 +282,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -342,9 +345,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- 	-I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- 	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1) -fpic
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS)
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
---- elfutils/libelf/ChangeLog
-+++ elfutils/libelf/ChangeLog
-@@ -244,6 +244,11 @@
- 
- 	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
- 
-+2011-03-10  Roland McGrath  <roland@redhat.com>
-+
-+	* gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32
-+	argument, since some implementations are buggy macros.
-+
- 2011-02-26  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -921,6 +926,11 @@
- 
- 	* elf.h: Update from glibc.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-08  Roland McGrath  <roland@redhat.com>
- 
- 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
---- elfutils/libelf/common.h
-+++ elfutils/libelf/common.h
-@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
-   (Var) = (sizeof (Var) == 1						      \
- 	   ? (unsigned char) (Var)					      \
- 	   : (sizeof (Var) == 2						      \
--	      ? bswap_16 (Var)						      \
-+	      ? (unsigned short int) bswap_16 (Var)			      \
- 	      : (sizeof (Var) == 4					      \
- 		 ? bswap_32 (Var)					      \
- 		 : bswap_64 (Var))))
-@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)
-   (Dst) = (sizeof (Var) == 1						      \
- 	   ? (unsigned char) (Var)					      \
- 	   : (sizeof (Var) == 2						      \
--	      ? bswap_16 (Var)						      \
-+	      ? (unsigned short int) bswap_16 (Var)			      \
- 	      : (sizeof (Var) == 4					      \
- 		 ? bswap_32 (Var)					      \
- 		 : bswap_64 (Var))))
---- elfutils/libelf/gnuhash_xlate.h
-+++ elfutils/libelf/gnuhash_xlate.h
-@@ -1,5 +1,5 @@
- /* Conversion functions for versioning information.
--   Copyright (C) 2006, 2007 Red Hat, Inc.
-+   Copyright (C) 2006-2011 Red Hat, Inc.
-    This file is part of elfutils.
-    Written by Ulrich Drepper <drepper@redhat.com>, 2006.
- 
-@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void
-   dest32 = (Elf32_Word *) &dest64[bitmask_words];
-   while (len >= 4)
-     {
--      *dest32++ = bswap_32 (*src32++);
-+      *dest32 = bswap_32 (*src32);
-+      ++dest32;
-+      ++src32;
-       len -= 4;
-     }
- }
---- elfutils/libelf/Makefile.in
-+++ elfutils/libelf/Makefile.in
-@@ -84,9 +84,10 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	ChangeLog
--@BUILD_STATIC_TRUE@am__append_1 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@BUILD_STATIC_TRUE@am__append_2 = -fpic
- noinst_PROGRAMS = $(am__EXEEXT_1)
--@USE_LOCKS_TRUE@am__append_2 = -lpthread
-+@USE_LOCKS_TRUE@am__append_3 = -lpthread
- subdir = libelf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -291,6 +292,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -322,6 +324,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -382,10 +385,11 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- 	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1) $(am__append_2)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \
- 	libelf.so.$(VERSION)
-@@ -449,7 +453,7 @@ libelf_a_SOURCES = elf_version.c elf_has
- 
- libelf_pic_a_SOURCES = 
- am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
--libelf_so_LDLIBS = $(am__append_2)
-+libelf_so_LDLIBS = $(am__append_3)
- libelf_so_SOURCES = 
- noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
- 		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
---- elfutils/m4/Makefile.in
-+++ elfutils/m4/Makefile.in
-@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -176,6 +177,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/Makefile.in
-+++ elfutils/Makefile.in
-@@ -263,6 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -294,6 +295,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/src/addr2line.c
-+++ elfutils/src/addr2line.c
-@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl
-       bool parsed = false;
-       int i, j;
-       char *name = NULL;
--      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
-+      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
- 	  && string[i] == '\0')
- 	parsed = adjust_to_section (name, &addr, dwfl);
--      switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
-+      switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
- 	{
- 	default:
- 	  break;
---- elfutils/src/ChangeLog
-+++ elfutils/src/ChangeLog
-@@ -1371,8 +1371,16 @@
- 	* readelf.c (attr_callback): Use print_block only when we don't use
- 	print_ops.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* ld.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-14  Roland McGrath  <roland@redhat.com>
- 
-+	* strings.c (read_block): Conditionalize posix_fadvise use
-+	on [POSIX_FADV_SEQUENTIAL].
-+	From Petr Salinger <Petr.Salinger@seznam.cz>.
-+
- 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
- 
- 2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -1536,6 +1544,8 @@
- 	* readelf.c (print_debug_frame_section): Use t instead of j formats
- 	for ptrdiff_t OFFSET.
- 
-+	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
-+
- 2009-01-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1719,6 +1729,11 @@
- 	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
- 	is valid in RELRO.
- 
-+2008-03-01  Roland McGrath  <roland@redhat.com>
-+
-+	* readelf.c (dump_archive_index): Tweak portability hack
-+	to match [__GNUC__ < 4] too.
-+
- 2008-02-29  Roland McGrath  <roland@redhat.com>
- 
- 	* readelf.c (print_attributes): Add a cast.
-@@ -1970,6 +1985,8 @@
- 
- 	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
- 
-+	* Makefile.am (readelf_no_Werror): New variable.
-+
- 2007-10-15  Roland McGrath  <roland@redhat.com>
- 
- 	* make-debug-archive.in: New file.
-@@ -2409,6 +2426,10 @@
- 	* elflint.c (valid_e_machine): Add EM_ALPHA.
- 	Reported by Christian Aichinger <Greek0@gmx.net>.
- 
-+	* strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
-+	MADV_SEQUENTIAL if undefined.  	Don't call posix_madvise
-+	if neither is defined.
-+
- 2006-08-08  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2485,6 +2506,10 @@
- 	* Makefile.am: Add hacks to create dependency files for non-generic
- 	linker.
- 
-+2006-04-05  Roland McGrath  <roland@redhat.com>
-+
-+	* strings.c (MAP_POPULATE): Define to 0 if undefined.
-+
- 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2833,6 +2858,11 @@
- 	* readelf.c (print_debug_loc_section): Fix indentation for larger
- 	address size.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-30  Roland McGrath  <roland@redhat.com>
- 
- 	* readelf.c (print_debug_line_section): Print section offset of each
---- elfutils/src/findtextrel.c
-+++ elfutils/src/findtextrel.c
-@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *
- 
- 
- static void
--check_rel (size_t nsegments, struct segments segments[nsegments],
-+check_rel (size_t nsegments, struct segments segments[
-+#if __GNUC__ >= 4
-+						      nsegments
-+#endif
-+	   ],
- 	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
- 	   const char *fname, bool more_than_one, void **knownsrcs)
- {
---- elfutils/src/ld.h
-+++ elfutils/src/ld.h
-@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
- 
- /* Checked whether the symbol is undefined and referenced from a DSO.  */
- extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- #ifdef __GNUC_STDC_INLINE__
- __attribute__ ((__gnu_inline__))
- #endif
-@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin
- 
-   return sym->defined && sym->in_dso;
- }
-+#endif	/* Optimizing and not GCC 4.2.  */
- 
- #endif	/* ld.h */
---- elfutils/src/Makefile.am
-+++ elfutils/src/Makefile.am
-@@ -89,6 +89,11 @@ endif
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
- 
-+# Buggy old compilers or libc headers.
-+readelf_no_Werror = yes
-+strings_no_Werror = yes
-+addr2line_no_Wformat = yes
-+
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- 	   $(demanglelib)
---- elfutils/src/Makefile.in
-+++ elfutils/src/Makefile.in
-@@ -85,6 +85,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am ldlex.c ldscript.c \
- 	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- 	$(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
- 	strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
- 	findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
-@@ -93,9 +94,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
- @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- # We never build this library but we need to get the dependency files
- # of all the linker backends that might be used in a non-generic linker.
--@NEVER_TRUE@am__append_1 = libdummy.a
-+@NEVER_TRUE@am__append_2 = libdummy.a
- # -ldl is always needed for libebl.
--@NATIVE_LD_TRUE@am__append_2 = libld_elf.a
-+@NATIVE_LD_TRUE@am__append_3 = libld_elf.a
- @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -159,7 +160,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
- 	ldscript.$(OBJEXT) symbolhash.$(OBJEXT) sectionhash.$(OBJEXT) \
- 	versionhash.$(OBJEXT)
- ld_OBJECTS = $(am_ld_OBJECTS)
--ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_2)
-+ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_3)
- ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
- 	$@
- am_libld_elf_i386_so_OBJECTS =
-@@ -340,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +373,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -434,11 +437,11 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	-I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
- 	-I$(srcdir)/../libdwfl -I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \
- 	$(ld_modules:.c=.os) *.gconv
-@@ -452,8 +455,8 @@ AM_LFLAGS = -Pld -olex.yy.c
- native_ld = @native_ld@
- ld_dsos = libld_elf_i386_pic.a
- @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
--@NATIVE_LD_FALSE@	$(am__append_1)
--@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_1)
-+@NATIVE_LD_FALSE@	$(am__append_2)
-+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)
- @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
- @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
- ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -479,13 +482,18 @@ libeu = ../lib/libeu.a
- 
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
-+
-+# Buggy old compilers or libc headers.
-+readelf_no_Werror = yes
-+strings_no_Werror = yes
-+addr2line_no_Wformat = yes
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- 	   $(demanglelib)
- 
- size_LDADD = $(libelf) $(libeu)
- strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl
--ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_2)
-+ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_3)
- ld_LDFLAGS = -rdynamic
- elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl
- findtextrel_LDADD = $(libdw) $(libelf)
---- elfutils/src/readelf.c
-+++ elfutils/src/readelf.c
-@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p)
-   return base;
- }
- 
-+static const char *listptr_name;
-+
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
--  const char *name = arg;
-+  const char *const name = listptr_name;
-   struct listptr *p1 = (void *) a;
-   struct listptr *p2 = (void *) b;
- 
-@@ -4467,8 +4469,11 @@ static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
-   if (table->n > 0)
--    qsort_r (table->table, table->n, sizeof table->table[0],
--	     &compare_listptr, (void *) name);
-+    {
-+      listptr_name = name;
-+      qsort (table->table, table->n, sizeof table->table[0],
-+	     &compare_listptr);
-+    }
- }
- 
- static bool
-@@ -9539,7 +9544,7 @@ dump_archive_index (Elf *elf, const char
- 	  if (unlikely (elf_rand (elf, as_off) == 0)
- 	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
- 			   == NULL))
--#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
-+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4
- 	    while (1)
- #endif
- 	      error (EXIT_FAILURE, 0,
---- elfutils/src/strings.c
-+++ elfutils/src/strings.c
-@@ -43,6 +43,10 @@
- 
- #include <system.h>
- 
-+#ifndef MAP_POPULATE
-+# define MAP_POPULATE 0
-+#endif
-+
- 
- /* Prototypes of local functions.  */
- static int read_fd (int fd, const char *fname, off64_t fdlen);
-@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off
- 		    fd, start_off);
-       if (mem != MAP_FAILED)
- 	{
-+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
-+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
-+#endif
-+#ifdef POSIX_MADV_SEQUENTIAL
- 	  /* We will go through the mapping sequentially.  */
- 	  (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
-+#endif
- 	  break;
- 	}
-       if (errno != EINVAL && errno != ENOMEM)
-@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, o
-       elfmap_off = from & ~(ps - 1);
-       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
- 
-+#ifdef POSIX_FADV_SEQUENTIAL
-       if (unlikely (elfmap == MAP_FAILED))
- 	/* Let the kernel know we are going to read everything in sequence.  */
- 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
-+#endif
-     }
- 
-   if (unlikely (elfmap == MAP_FAILED))
---- elfutils/src/strip.c
-+++ elfutils/src/strip.c
-@@ -45,6 +45,12 @@
- #include <libebl.h>
- #include <system.h>
- 
-+#ifdef HAVE_FUTIMES
-+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
-+#else
-+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
-+#endif
-+
- typedef uint8_t GElf_Byte;
- 
- /* Name and version of program.  */
-@@ -318,8 +324,18 @@ process_file (const char *fname)
- 
-       /* If we have to preserve the timestamp, we need it in the
- 	 format utimes() understands.  */
-+#ifdef HAVE_STRUCT_STAT_ST_ATIM
-       TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
-+#else
-+      tv[0].tv_sec = pre_st.st_atime;
-+      tv[0].tv_usec = 0;
-+#endif
-+#ifdef HAVE_STRUCT_STAT_ST_MTIM
-       TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
-+#else
-+      tv[1].tv_sec = pre_st.st_atime;
-+      tv[1].tv_usec = 0;
-+#endif
-     }
- 
-   /* Open the file.  */
-@@ -2091,7 +2107,7 @@ while computing checksum for debug infor
-   /* If requested, preserve the timestamp.  */
-   if (tvp != NULL)
-     {
--      if (futimes (fd, tvp) != 0)
-+      if (FUTIMES (fd, output_fname, tvp) != 0)
- 	{
- 	  error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"),
-@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char
- 
-   if (tvp != NULL)
-     {
--      if (unlikely (futimes (fd, tvp) != 0))
-+      if (unlikely (FUTIMES (fd, fname, tvp) != 0))
- 	{
- 	  error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"), fname);
---- elfutils/tests/backtrace.c
-+++ elfutils/tests/backtrace.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <argp.h>
-+#include <sys/syscall.h>
- #include ELFUTILS_HEADER(dwfl)
- 
- #ifndef __linux__
---- elfutils/tests/ChangeLog
-+++ elfutils/tests/ChangeLog
-@@ -421,6 +421,13 @@
- 
- 2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
- 
-+	Handle T-stopped detach for old kernels.
-+	* backtrace.c: Include sys/syscall.h.
-+	(linux_proc_pid_is_stopped): New function.
-+	(ptrace_detach_stopped): Handle old kernels.
-+
-+2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
-+
- 	* Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
- 	backtrace-data and backtrace-dwarf.
- 	(BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
-@@ -1285,6 +1292,8 @@
- 
- 2008-01-21  Roland McGrath  <roland@redhat.com>
- 
-+	* line2addr.c (main): Revert last change.
-+
- 	* testfile45.S.bz2: Add tests for cltq, cqto.
- 	* testfile45.expect.bz2: Adjust.
- 
-@@ -1993,6 +2002,11 @@
- 	* Makefile.am (TESTS): Add run-elflint-test.sh.
- 	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-24  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* get-files.c (main): Use correct format specifier.
---- elfutils/tests/line2addr.c
-+++ elfutils/tests/line2addr.c
-@@ -124,7 +124,7 @@ main (int argc, char *argv[])
-     {
-       struct args a = { .arg = argv[cnt] };
- 
--      switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
-+      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
- 	{
- 	default:
- 	case 0:
---- elfutils/tests/Makefile.am
-+++ elfutils/tests/Makefile.am
-@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf)
- get_files_LDADD = $(libdw) $(libelf)
- get_aranges_LDADD = $(libdw) $(libelf)
- allfcts_LDADD = $(libdw) $(libelf)
-+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
---- elfutils/tests/Makefile.in
-+++ elfutils/tests/Makefile.in
-@@ -80,13 +80,14 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(top_srcdir)/config/test-driver ChangeLog
--@STANDALONE_FALSE@am__append_1 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/libdwfl -I$(top_srcdir)/libdwelf \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/lib -I..
- 
--@STANDALONE_FALSE@am__append_2 = -Wl,-rpath-link,../libasm:../libdw:../libelf
--@TESTS_RPATH_TRUE@am__append_3 = -Wl,-rpath,$(BUILD_RPATH)
-+@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf
-+@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)
- check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
- 	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
- 	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -113,7 +114,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
- 	deleted$(EXEEXT) deleted-lib.so$(EXEEXT) \
- 	aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) $(am__EXEEXT_1) \
- 	$(am__EXEEXT_2) $(am__EXEEXT_4)
--@BIARCH_TRUE@am__append_4 = backtrace-child-biarch
-+@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
- TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
- 	test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
- 	update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
-@@ -159,14 +160,14 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-stack-i-test.sh run-readelf-dwz-multi.sh \
- 	run-allfcts-multi.sh run-deleted.sh run-linkmap-cut.sh \
- 	run-aggregate-size.sh vdsosyms$(EXEEXT) run-readelf-A.sh \
--	$(am__EXEEXT_2) $(am__append_7) $(am__append_8) \
-+	$(am__EXEEXT_2) $(am__append_8) $(am__append_9) \
- 	$(am__EXEEXT_4)
--@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
- @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
--@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
--@ZLIB_TRUE@am__append_8 = run-readelf-zdebug.sh
--@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
-+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
-+@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
-+@ZLIB_TRUE@am__append_9 = run-readelf-zdebug.sh
- @HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
-+@HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS)
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -787,6 +788,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -818,6 +820,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -877,12 +880,12 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
--AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_1)
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $($(*F)_CFLAGS)
--
-+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+	$($(*F)_no_Werror),,-Werror) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+	$(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -890,7 +893,7 @@ textrel_msg = echo "WARNING: TEXTREL fou
- @FATAL_TEXTREL_TRUE@textrel_found = $(textrel_msg); exit 1
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then $(textrel_found); fi
- BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
--AM_LDFLAGS = $(am__append_2) $(am__append_3)
-+AM_LDFLAGS = $(am__append_3) $(am__append_4)
- @TESTS_RPATH_FALSE@tests_rpath = no
- @TESTS_RPATH_TRUE@tests_rpath = yes
- asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
-@@ -1106,6 +1109,7 @@ get_lines_LDADD = $(libdw) $(libelf)
- get_files_LDADD = $(libdw) $(libelf)
- get_aranges_LDADD = $(libdw) $(libelf)
- allfcts_LDADD = $(libdw) $(libelf)
-+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
diff --git a/trunk/package/feeds/packages/elfutils/patches/002-argp_standalone.patch b/trunk/package/feeds/packages/elfutils/patches/002-argp_standalone.patch
deleted file mode 100644
index d1511a90..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/002-argp_standalone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- elfutils-0.160/lib/color.c.old	2014-11-06 03:46:43.584116134 -0200
-+++ elfutils-0.160/lib/color.c	2014-11-06 03:47:25.840116128 -0200
-@@ -131,8 +131,10 @@
-   - 'never', 'no', 'none'\n\
-   - 'auto', 'tty', 'if-tty'\n"),
- 		     program_invocation_short_name, arg);
-+          char program_invocation_short_name_nonconst[sizeof(program_invocation_short_name)];
-+          strcpy(program_invocation_short_name_nonconst, program_invocation_short_name);
- 	      argp_help (&color_argp, stderr, ARGP_HELP_SEE,
--			 program_invocation_short_name);
-+			 program_invocation_short_name_nonconst);
- 	      exit (EXIT_FAILURE);
- 	    }
- 	}
diff --git a/trunk/package/feeds/packages/elfutils/patches/003-libint-stub.patch b/trunk/package/feeds/packages/elfutils/patches/003-libint-stub.patch
deleted file mode 100644
index c9ceb37c..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/003-libint-stub.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- elfutils-0.160/libelf/libelfP.h.old	2014-11-06 01:47:55.420116984 -0200
-+++ elfutils-0.160/libelf/libelfP.h	2014-11-06 01:48:33.368116980 -0200
-@@ -43,6 +43,9 @@
- #include <string.h>
- 
-+#ifdef _ /* fix libintl-stub */
-+#undef _
-+#endif
- /* gettext helper macros.  */
- #define _(Str) dgettext ("elfutils", Str)
- 
- 
---- elfutils-0.160/libdw/libdwP.h.old	2014-11-06 02:27:12.628116703 -0200
-+++ elfutils-0.160/libdw/libdwP.h	2014-11-06 02:27:39.816116700 -0200
-@@ -36,7 +36,9 @@
- #include <libdw.h>
- #include <dwarf.h>
- 
--
-+#ifdef _ /* fix libintl-stub */
-+#undef _
-+#endif
- /* gettext helper macros.  */
- #define _(Str) dgettext ("elfutils", Str)
- 
---- elfutils-0.160/libdwfl/libdwflP.h.old	2014-11-06 02:31:20.112116673 -0200
-+++ elfutils-0.160/libdwfl/libdwflP.h	2014-11-06 02:33:00.548116661 -0200
-@@ -46,6 +46,9 @@
- 
- typedef struct Dwfl_Process Dwfl_Process;
- 
-+#ifdef _ /* fix libintl-stub */
-+#undef _
-+#endif
- /* gettext helper macros.  */
- #define _(Str) dgettext ("elfutils", Str)
- 
---- elfutils-0.160/libasm/libasmP.h.old	2014-11-06 02:31:32.064116672 -0200
-+++ elfutils-0.160/libasm/libasmP.h	2014-11-06 02:33:08.656116660 -0200
-@@ -33,6 +33,9 @@
- 
- #include <libasm.h>
- 
-+#ifdef _ /* fix libintl-stub */
-+#undef _
-+#endif
- /* gettext helper macros.  */
- #define _(Str) dgettext ("elfutils", Str)
- 
diff --git a/trunk/package/feeds/packages/elfutils/patches/004-maybe-uninitialized.patch b/trunk/package/feeds/packages/elfutils/patches/004-maybe-uninitialized.patch
deleted file mode 100644
index 7d54d71f..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/004-maybe-uninitialized.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- elfutils-0.160/libelf/elf_getarsym.c.org	2014-11-06 01:56:58.664116919 -0200
-+++ elfutils-0.160/libelf/elf_getarsym.c	2014-11-06 01:57:09.396116918 -0200
-@@ -166,7 +166,7 @@
- 
-       /* We have an archive.  The first word in there is the number of
- 	 entries in the table.  */
--      uint64_t n;
-+      uint64_t n = 0;
-       size_t off = elf->start_offset + SARMAG + sizeof (struct ar_hdr);
-       if (read_number_entries (&n, elf, &off, index64_p) < 0)
- 	{
diff --git a/trunk/package/feeds/packages/elfutils/patches/004-memcpy_def.patch b/trunk/package/feeds/packages/elfutils/patches/004-memcpy_def.patch
deleted file mode 100644
index 62e4d0ca..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/004-memcpy_def.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -34,6 +34,11 @@
- /* Get the ELF types.  */
- #include <elf.h>
- 
-+#ifndef _LIBC
-+#ifndef __mempcpy
-+#define __mempcpy mempcpy
-+#endif
-+#endif
- 
- /* Known translation types.  */
- typedef enum
diff --git a/trunk/package/feeds/packages/elfutils/patches/005-build_only_libs.patch b/trunk/package/feeds/packages/elfutils/patches/005-build_only_libs.patch
deleted file mode 100644
index b8b45945..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/005-build_only_libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- elfutils-0.160/Makefile.in.old	2014-11-06 03:56:04.828116067 -0200
-+++ elfutils-0.160/Makefile.in	2014-11-06 03:57:03.380116060 -0200
-@@ -359,8 +359,7 @@
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
--	  backends src po tests
-+SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libasm
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
---- elfutils-0.160/Makefile.am.old	2014-11-06 03:58:13.012116051 -0200
-+++ elfutils-0.160/Makefile.am	2014-11-06 03:58:25.948116050 -0200
-@@ -23,8 +23,7 @@
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
--	  backends src po tests
-+SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libasm
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
diff --git a/trunk/package/feeds/packages/elfutils/patches/006-libdw_LIBS.patch b/trunk/package/feeds/packages/elfutils/patches/006-libdw_LIBS.patch
deleted file mode 100644
index aaa35f94..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/006-libdw_LIBS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- elfutils-0.161/libdw/Makefile.in.orig	2015-01-16 03:50:15.311237461 -0200
-+++ elfutils-0.161/libdw/Makefile.in	2015-01-16 03:55:35.082090075 -0200
-@@ -969,7 +969,7 @@
- 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- 		-Wl,--version-script,$<,--no-undefined \
- 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--		-ldl $(zip_LIBS)
-+		-ldl $(zip_LIBS) $(LIBS)
- 	@$(textrel_check)
- 	ln -fs $@ $@.$(VERSION)
- 
diff --git a/trunk/package/feeds/packages/elfutils/patches/100-musl-compat.patch b/trunk/package/feeds/packages/elfutils/patches/100-musl-compat.patch
deleted file mode 100644
index 076b9cf8..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/100-musl-compat.patch
+++ /dev/null
@@ -1,788 +0,0 @@
---- a/lib/system.h
-+++ b/lib/system.h
-@@ -68,6 +68,16 @@ extern int crc32_file (int fd, uint32_t
- 
- #define gettext_noop(Str) Str
- 
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__							      \
-+    ({ long int __result;						      \
-+       do __result = (long int) (expression);				      \
-+       while (__result == -1L && errno == EINTR);			      \
-+       __result; }))
-+#endif
-+
-+#define error(status, errno, ...) err(status, __VA_ARGS__)
- 
- static inline ssize_t __attribute__ ((unused))
- pwrite_retry (int fd, const void *buf, size_t len, off_t off)
---- a/lib/color.c
-+++ b/lib/color.c
-@@ -32,7 +32,7 @@
- #endif
- 
- #include <argp.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stdlib.h>
- #include <string.h>
---- a/lib/xmalloc.c
-+++ b/lib/xmalloc.c
-@@ -30,7 +30,7 @@
- # include <config.h>
- #endif
- 
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stddef.h>
- #include <stdlib.h>
---- a/src/addr2line.c
-+++ b/src/addr2line.c
-@@ -23,7 +23,7 @@
- #include <argp.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <inttypes.h>
- #include <libdwfl.h>
---- a/src/ar.c
-+++ b/src/ar.c
-@@ -22,7 +22,7 @@
- 
- #include <argp.h>
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <libintl.h>
---- a/src/arlib2.c
-+++ b/src/arlib2.c
-@@ -20,7 +20,7 @@
- # include <config.h>
- #endif
- 
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <limits.h>
- #include <string.h>
---- a/src/arlib.c
-+++ b/src/arlib.c
-@@ -21,7 +21,7 @@
- #endif
- 
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <gelf.h>
- #include <libintl.h>
- #include <stdio.h>
---- a/src/elfcmp.c
-+++ b/src/elfcmp.c
-@@ -23,7 +23,7 @@
- #include <argp.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <locale.h>
- #include <libintl.h>
---- a/src/elflint.c
-+++ b/src/elflint.c
-@@ -24,7 +24,7 @@
- #include <assert.h>
- #include <byteswap.h>
- #include <endian.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/src/findtextrel.c
-+++ b/src/findtextrel.c
-@@ -23,7 +23,7 @@
- #include <argp.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <libdw.h>
---- a/src/i386_ld.c
-+++ b/src/i386_ld.c
-@@ -20,7 +20,7 @@
- #endif
- 
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stdlib.h>
- #include <string.h>
---- a/src/ld.c
-+++ b/src/ld.c
-@@ -21,7 +21,7 @@
- 
- #include <argp.h>
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <libelf.h>
- #include <libintl.h>
---- a/src/ldgeneric.c
-+++ b/src/ldgeneric.c
-@@ -23,7 +23,7 @@
- #include <ctype.h>
- #include <dlfcn.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <fnmatch.h>
- #include <gelf.h>
---- a/src/ldlex.c
-+++ b/src/ldlex.c
-@@ -1099,7 +1099,7 @@ char *ldtext;
- #include <assert.h>
- #include <ctype.h>
- #include <elf.h>
--#include <error.h>
-+#include <err.h>
- #include <inttypes.h>
- #include <libintl.h>
- #include <stdbool.h>
---- a/src/ldscript.c
-+++ b/src/ldscript.c
-@@ -95,7 +95,7 @@
- #endif
- 
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stdbool.h>
- #include <stdint.h>
-@@ -106,7 +106,7 @@
- #include <system.h>
- #include <ld.h>
- 
--/* The error handler.  */
-+/* The err.handler.  */
- static void yyerror (const char *s);
- 
- /* Some helper functions we need to construct the data structures
---- a/src/nm.c
-+++ b/src/nm.c
-@@ -26,7 +26,7 @@
- #include <ctype.h>
- #include <dwarf.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/src/objdump.c
-+++ b/src/objdump.c
-@@ -21,7 +21,7 @@
- #endif
- 
- #include <argp.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <inttypes.h>
- #include <libintl.h>
---- a/src/ranlib.c
-+++ b/src/ranlib.c
-@@ -24,7 +24,7 @@
- #include <argp.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <libintl.h>
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -25,7 +25,7 @@
- #include <ctype.h>
- #include <dwarf.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/src/size.c
-+++ b/src/size.c
-@@ -21,7 +21,7 @@
- #endif
- 
- #include <argp.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/src/stack.c
-+++ b/src/stack.c
-@@ -18,7 +18,7 @@
- #include <config.h>
- #include <assert.h>
- #include <argp.h>
--#include <error.h>
-+#include <err.h>
- #include <stdlib.h>
- #include <inttypes.h>
- #include <stdio.h>
---- a/src/strings.c
-+++ b/src/strings.c
-@@ -25,7 +25,7 @@
- #include <ctype.h>
- #include <endian.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/src/strip.c
-+++ b/src/strip.c
-@@ -24,7 +24,7 @@
- #include <assert.h>
- #include <byteswap.h>
- #include <endian.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <libelf.h>
---- a/src/unstrip.c
-+++ b/src/unstrip.c
-@@ -31,7 +31,7 @@
- #include <argp.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <fnmatch.h>
- #include <libintl.h>
---- a/tests/addrscopes.c
-+++ b/tests/addrscopes.c
-@@ -25,7 +25,7 @@
- #include <stdio_ext.h>
- #include <locale.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- 
- 
---- a/tests/allregs.c
-+++ b/tests/allregs.c
-@@ -21,7 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- #include <locale.h>
- #include <argp.h>
- #include <assert.h>
---- a/tests/backtrace.c
-+++ b/tests/backtrace.c
-@@ -24,7 +24,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <unistd.h>
- #include <dwarf.h>
- #include <sys/resource.h>
---- a/tests/backtrace-data.c
-+++ b/tests/backtrace-data.c
-@@ -27,7 +27,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <unistd.h>
- #include <dwarf.h>
- #include <sys/resource.h>
---- a/tests/buildid.c
-+++ b/tests/buildid.c
-@@ -23,7 +23,7 @@
- #include ELFUTILS_HEADER(elf)
- #include ELFUTILS_HEADER(dwelf)
- #include <stdio.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/types.h>
---- a/tests/debugaltlink.c
-+++ b/tests/debugaltlink.c
-@@ -23,7 +23,7 @@
- #include ELFUTILS_HEADER(dw)
- #include ELFUTILS_HEADER(dwelf)
- #include <stdio.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/types.h>
---- a/tests/debuglink.c
-+++ b/tests/debuglink.c
-@@ -21,7 +21,7 @@
- #include <errno.h>
- #include ELFUTILS_HEADER(dwelf)
- #include <stdio.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/types.h>
---- a/tests/dwfl-addr-sect.c
-+++ b/tests/dwfl-addr-sect.c
-@@ -23,7 +23,7 @@
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- #include <locale.h>
- #include <argp.h>
- #include ELFUTILS_HEADER(dwfl)
---- a/tests/dwfl-bug-addr-overflow.c
-+++ b/tests/dwfl-bug-addr-overflow.c
-@@ -20,7 +20,7 @@
- #include <inttypes.h>
- #include <stdio.h>
- #include <stdio_ext.h>
--#include <error.h>
-+#include <err.h>
- #include <locale.h>
- #include ELFUTILS_HEADER(dwfl)
- 
---- a/tests/dwfl-bug-fd-leak.c
-+++ b/tests/dwfl-bug-fd-leak.c
-@@ -24,7 +24,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <unistd.h>
- #include <dwarf.h>
- #include <sys/resource.h>
---- a/tests/dwfl-bug-getmodules.c
-+++ b/tests/dwfl-bug-getmodules.c
-@@ -18,7 +18,7 @@
- #include <config.h>
- #include ELFUTILS_HEADER(dwfl)
- 
--#include <error.h>
-+#include <err.h>
- 
- static const Dwfl_Callbacks callbacks =
-   {
---- a/tests/dwfllines.c
-+++ b/tests/dwfllines.c
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- 
- int
- main (int argc, char *argv[])
---- a/tests/dwflmodtest.c
-+++ b/tests/dwflmodtest.c
-@@ -23,7 +23,7 @@
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- #include <locale.h>
- #include <argp.h>
- #include ELFUTILS_HEADER(dwfl)
---- a/tests/dwfl-report-elf-align.c
-+++ b/tests/dwfl-report-elf-align.c
-@@ -20,7 +20,7 @@
- #include <inttypes.h>
- #include <stdio.h>
- #include <stdio_ext.h>
--#include <error.h>
-+#include <err.h>
- #include <locale.h>
- #include <string.h>
- #include <stdlib.h>
---- a/tests/dwflsyms.c
-+++ b/tests/dwflsyms.c
-@@ -25,7 +25,7 @@
- #include <stdio.h>
- #include <stdio_ext.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- 
- static const char *
---- a/tests/early-offscn.c
-+++ b/tests/early-offscn.c
-@@ -19,7 +19,7 @@
- #endif
- 
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <stdio.h>
---- a/tests/ecp.c
-+++ b/tests/ecp.c
-@@ -16,7 +16,7 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <stdlib.h>
---- a/tests/find-prologues.c
-+++ b/tests/find-prologues.c
-@@ -25,7 +25,7 @@
- #include <stdio_ext.h>
- #include <locale.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <fnmatch.h>
- 
---- a/tests/funcretval.c
-+++ b/tests/funcretval.c
-@@ -25,7 +25,7 @@
- #include <stdio_ext.h>
- #include <locale.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <fnmatch.h>
- 
---- a/tests/funcscopes.c
-+++ b/tests/funcscopes.c
-@@ -25,7 +25,7 @@
- #include <stdio_ext.h>
- #include <locale.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <fnmatch.h>
- 
---- a/tests/line2addr.c
-+++ b/tests/line2addr.c
-@@ -26,7 +26,7 @@
- #include <locale.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- 
- 
- static void
---- a/tests/low_high_pc.c
-+++ b/tests/low_high_pc.c
-@@ -25,7 +25,7 @@
- #include <stdio_ext.h>
- #include <locale.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <fnmatch.h>
- 
---- a/tests/md5-sha1-test.c
-+++ b/tests/md5-sha1-test.c
-@@ -19,7 +19,7 @@
- #endif
- 
- #include <string.h>
--#include <error.h>
-+#include <err.h>
- 
- #include "md5.h"
- #include "sha1.h"
---- a/tests/rdwrmmap.c
-+++ b/tests/rdwrmmap.c
-@@ -15,7 +15,7 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
---- a/tests/saridx.c
-+++ b/tests/saridx.c
-@@ -17,7 +17,7 @@
- 
- #include <config.h>
- 
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <stdio.h>
---- a/tests/sectiondump.c
-+++ b/tests/sectiondump.c
-@@ -18,7 +18,7 @@
- #include <config.h>
- 
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <fcntl.h>
- #include <gelf.h>
- #include <inttypes.h>
---- a/tests/varlocs.c
-+++ b/tests/varlocs.c
-@@ -25,7 +25,7 @@
- #include <dwarf.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -29,6 +29,7 @@
- #ifndef _LIBELF_H
- #define _LIBELF_H 1
- 
-+#include <fcntl.h>
- #include <sys/types.h>
- 
- /* Get the ELF types.  */
---- a/libasm/asm_end.c
-+++ b/libasm/asm_end.c
-@@ -32,7 +32,7 @@
- #endif
- 
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stdio.h>
- #include <stdlib.h>
---- a/libasm/asm_newscn.c
-+++ b/libasm/asm_newscn.c
-@@ -32,7 +32,7 @@
- #endif
- 
- #include <assert.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- #include <stdlib.h>
- #include <string.h>
---- a/libcpu/i386_gendis.c
-+++ b/libcpu/i386_gendis.c
-@@ -31,7 +31,7 @@
- # include <config.h>
- #endif
- 
--#include <error.h>
-+#include <err.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
---- a/libcpu/i386_lex.c
-+++ b/libcpu/i386_lex.c
-@@ -571,7 +571,7 @@ char *i386_text;
- #endif
- 
- #include <ctype.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- 
- #include <system.h>
---- a/libcpu/i386_lex.l
-+++ b/libcpu/i386_lex.l
-@@ -31,7 +31,7 @@
- #endif
- 
- #include <ctype.h>
--#include <error.h>
-+#include <err.h>
- #include <libintl.h>
- 
- #include <system.h>
---- a/libcpu/i386_parse.c
-+++ b/libcpu/i386_parse.c
-@@ -107,7 +107,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <errno.h>
--#include <error.h>
-+#include <err.h>
- #include <inttypes.h>
- #include <libintl.h>
- #include <math.h>
---- a/libdw/libdw_alloc.c
-+++ b/libdw/libdw_alloc.c
-@@ -31,7 +31,7 @@
- # include <config.h>
- #endif
- 
--#include <error.h>
-+#include <err.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <sys/param.h>
-@@ -74,5 +74,5 @@ __attribute ((noreturn, visibility ("hid
- __libdw_oom (void)
- {
-   while (1)
--    error (EXIT_FAILURE, ENOMEM, "libdw");
-+    err (EXIT_FAILURE, "libdw: out of memory");
- }
---- a/libebl/eblopenbackend.c
-+++ b/libebl/eblopenbackend.c
-@@ -32,7 +32,7 @@
- 
- #include <assert.h>
- #include <dlfcn.h>
--#include <error.h>
-+#include <err.h>
- #include <libelfP.h>
- #include <dwarf.h>
- #include <stdlib.h>
---- a/src/ldlex.l
-+++ b/src/ldlex.l
-@@ -23,7 +23,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <elf.h>
--#include <error.h>
-+#include <err.h>
- #include <inttypes.h>
- #include <libintl.h>
- #include <stdbool.h>
---- a/libebl/eblwstrtab.c
-+++ b/libebl/eblwstrtab.c
-@@ -305,7 +305,7 @@ copystrings (struct Ebl_WStrent *nodep,
- 
-   /* Process the current node.  */
-   nodep->offset = *offsetp;
--  *freep = wmempcpy (*freep, nodep->string, nodep->len);
-+  *freep = wmemcpy (*freep, nodep->string, nodep->len) + nodep->len;
-   *offsetp += nodep->len * sizeof (wchar_t);
- 
-   for (subs = nodep->next; subs != NULL; subs = subs->next)
---- a/libdwfl/dwfl_error.c
-+++ b/libdwfl/dwfl_error.c
-@@ -128,6 +128,7 @@ const char *
- dwfl_errmsg (error)
-      int error;
- {
-+  static __thread char s[64] = "";
-   if (error == 0 || error == -1)
-     {
-       int last_error = global_error;
-@@ -142,7 +143,8 @@ dwfl_errmsg (error)
-   switch (error &~ 0xffff)
-     {
-     case OTHER_ERROR (ERRNO):
--      return strerror_r (error & 0xffff, "bad", 0);
-+      strerror_r (error & 0xffff, s, sizeof(s));
-+      return s;
-     case OTHER_ERROR (LIBELF):
-       return elf_errmsg (error & 0xffff);
-     case OTHER_ERROR (LIBDW):
---- a/libdwfl/libdwfl.h
-+++ b/libdwfl/libdwfl.h
-@@ -31,6 +31,27 @@
- 
- #include "libdw.h"
- #include <stdio.h>
-+#include <unistd.h>
-+#include <alloca.h>
-+#include <string.h>
-+
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+#ifndef strndupa
-+#define strndupa(s, n) \
-+	(__extension__ ({const char *__in = (s); \
-+			 size_t __len = strnlen (__in, (n)) + 1; \
-+			 char *__out = (char *) alloca (__len); \
-+			 __out[__len-1] = '\0'; \
-+			 (char *) memcpy (__out, __in, __len-1);}))
-+#endif
- 
- /* Handle for a session using the library.  */
- typedef struct Dwfl Dwfl;
---- a/libdwfl/find-debuginfo.c
-+++ b/libdwfl/find-debuginfo.c
-@@ -338,7 +338,7 @@ dwfl_standard_find_debuginfo (Dwfl_Modul
-       /* If FILE_NAME is a symlink, the debug file might be associated
- 	 with the symlink target name instead.  */
- 
--      char *canon = canonicalize_file_name (file_name);
-+      char *canon = realpath (file_name, NULL);
-       if (canon != NULL && strcmp (file_name, canon))
- 	fd = find_debuginfo_in_path (mod, canon,
- 				     debuglink_file, debuglink_crc,
---- a/libdwfl/dwfl_build_id_find_elf.c
-+++ b/libdwfl/dwfl_build_id_find_elf.c
-@@ -80,7 +80,7 @@ __libdwfl_open_by_build_id (Dwfl_Module
- 	{
- 	  if (*file_name != NULL)
- 	    free (*file_name);
--	  *file_name = canonicalize_file_name (name);
-+	  *file_name = realpath (name, NULL);
- 	  if (*file_name == NULL)
- 	    {
- 	      *file_name = name;
---- a/libelf/elf_getarsym.c
-+++ b/libelf/elf_getarsym.c
-@@ -284,7 +284,7 @@ elf_getarsym (elf, ptr)
- 		arsym[cnt].as_off = file_data->u32[cnt];
- 
- 	      arsym[cnt].as_hash = _dl_elf_hash (str_data);
--	      str_data = rawmemchr (str_data, '\0') + 1;
-+	      str_data = memchr (str_data, '\0', SIZE_MAX) + 1;
- 	    }
- 
- 	  /* At the end a special entry.  */
diff --git a/trunk/package/feeds/packages/elfutils/patches/101-no-fts.patch b/trunk/package/feeds/packages/elfutils/patches/101-no-fts.patch
deleted file mode 100644
index 9dd7ee24..00000000
--- a/trunk/package/feeds/packages/elfutils/patches/101-no-fts.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/libdwfl/argp-std.c
-+++ b/libdwfl/argp-std.c
-@@ -52,9 +52,6 @@ static const struct argp_option options[
-   { "linux-process-map", 'M', "FILE", 0,
-     N_("Find addresses in files mapped as read from FILE"
-        " in Linux /proc/PID/maps format"), 0 },
--  { "kernel", 'k', NULL, 0, N_("Find addresses in the running kernel"), 0 },
--  { "offline-kernel", 'K', "RELEASE", OPTION_ARG_OPTIONAL,
--    N_("Kernel with all modules"), 0 },
-   { "debuginfo-path", OPT_DEBUGINFO, "PATH", 0,
-     N_("Search path for separate debuginfo files"), 0 },
-   { NULL, 0, NULL, 0, NULL, 0 }
-@@ -81,15 +78,6 @@ static const Dwfl_Callbacks proc_callbac
-     .find_elf = INTUSE(dwfl_linux_proc_find_elf),
-   };
- 
--static const Dwfl_Callbacks kernel_callbacks =
--  {
--    .find_debuginfo = INTUSE(dwfl_standard_find_debuginfo),
--    .debuginfo_path = &debuginfo_path,
--
--    .find_elf = INTUSE(dwfl_linux_kernel_find_elf),
--    .section_address = INTUSE(dwfl_linux_kernel_module_section_address),
--  };
--
- /* Structure held at state->HOOK.  */
- struct parse_opt
- {
-@@ -219,43 +207,6 @@ parse_opt (int key, char *arg, struct ar
-       }
-       break;
- 
--    case 'k':
--      {
--	struct parse_opt *opt = state->hook;
--	if (opt->dwfl == NULL)
--	  {
--	    Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks);
--	    int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl);
--	    if (result != 0)
--	      return fail (dwfl, result, _("cannot load kernel symbols"));
--	    result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl);
--	    if (result != 0)
--	      /* Non-fatal to have no modules since we do have the kernel.  */
--	      failure (dwfl, result, _("cannot find kernel modules"));
--	    opt->dwfl = dwfl;
--	  }
--	else
--	  goto toomany;
--      }
--      break;
--
--    case 'K':
--      {
--	struct parse_opt *opt = state->hook;
--	if (opt->dwfl == NULL)
--	  {
--	    Dwfl *dwfl = INTUSE(dwfl_begin) (&offline_callbacks);
--	    int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg,
--								   NULL);
--	    if (result != 0)
--	      return fail (dwfl, result, _("cannot find kernel or modules"));
--	    opt->dwfl = dwfl;
--	  }
--	else
--	  goto toomany;
--      }
--      break;
--
-     case ARGP_KEY_SUCCESS:
-       {
- 	struct parse_opt *opt = state->hook;
---- a/libdwfl/Makefile.in
-+++ b/libdwfl/Makefile.in
-@@ -113,7 +113,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
- 	dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
- 	dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
- 	find-debuginfo.c dwfl_build_id_find_elf.c \
--	dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
-+	dwfl_build_id_find_debuginfo.c \
- 	linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
- 	dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
- 	dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
-@@ -142,7 +142,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
- 	dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
- 	find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
- 	dwfl_build_id_find_debuginfo.$(OBJEXT) \
--	linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \
-+	linux-proc-maps.$(OBJEXT) \
- 	dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
- 	cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
- 	dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
-@@ -402,7 +402,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
- 	dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
- 	dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
- 	find-debuginfo.c dwfl_build_id_find_elf.c \
--	dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \
-+	dwfl_build_id_find_debuginfo.c \
- 	linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
- 	dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
- 	dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
-@@ -540,7 +540,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-pid-attach.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@
diff --git a/trunk/package/feeds/packages/emailrelay/Makefile b/trunk/package/feeds/packages/emailrelay/Makefile
deleted file mode 100644
index bbcd6148..00000000
--- a/trunk/package/feeds/packages/emailrelay/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=emailrelay
-PKG_VERSION:=1.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
-PKG_SOURCE_URL:=@SF/emailrelay/$(PKG_VERSION)
-PKG_MD5SUM:=0892fbf993407c6b5a16f96e23299b62
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/emailrelay/Default
-  SECTION:=net
-  SUBMENU:=Web Servers/Proxies
-  CATEGORY:=Network
-  DEPENDS:=$(CXX_DEPENDS)
-  TITLE:=A simple SMTP proxy and MTA
-  URL:=http://emailrelay.sourceforge.net/
-  MAINTAINER := Federico Di Marco <fededim@gmail.com>
-endef
-
-
-define Package/emailrelay
-$(call Package/emailrelay/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+=+libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/emailrelay-nossl
-$(call Package/emailrelay/Default)
-  TITLE+= (no SSL support)
-  VARIANT:=nossl
-endef
-
-
-
-define Package/emailrelay/Default/description
- Emailrelay is a simple SMTP proxy and store-and-forward message transfer agent (MTA). 
- 
- When running as a proxy all e-mail messages can be passed through 
-  a user-defined program, such as a spam filter, which can drop, 
-  re-address or edit messages as they pass through. When running 
-  as a store-and-forward MTA incoming messages are stored in a 
-  local spool directory, and then forwarded to the next SMTP 
-  server on request.
-endef
-
-
-define Package/emailrelay/description
-$(call Package/emailrelay/Default/description)
-
- This package is built with OpenSSL support (SSMTP is supported).
-endef
-
-define Package/emailrelay-nossl/description
-$(call Package/emailrelay/Default/description)
-
- This package is built without SSL support (no SSMTP)
-endef
-
-
-define Package/emailrelay/conffiles
-/etc/emailrelay.auth
-endef
-
-define Package/emailrelay-nossl/conffiles
-/etc/emailrelay.auth
-endef
-
-CONFIGURE_ARGS += \
-	--with-pam=no
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"	
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-openssl
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--with-openssl=no
-endif
-
-define Package/emailrelay/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/main/emailrelay $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/main/emailrelay-filter-copy $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/main/emailrelay-passwd $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/main/emailrelay-poke $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/main/emailrelay-submit $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) files/$(PKG_NAME).auth $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-Package/emailrelay-nossl/install = $(Package/emailrelay/install)
-
-
-$(eval $(call BuildPackage,emailrelay))
-$(eval $(call BuildPackage,emailrelay-nossl))
diff --git a/trunk/package/feeds/packages/emailrelay/files/emailrelay.auth b/trunk/package/feeds/packages/emailrelay/files/emailrelay.auth
deleted file mode 100644
index 3d11bf0f..00000000
--- a/trunk/package/feeds/packages/emailrelay/files/emailrelay.auth
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# emailrelay secrets file
-#
-#see http://emailrelay.sourceforge.net/reference.html for reference
-
-#Mostly used options:
-#
-#NONE server specifies ip address range allowed to connect to emailrelay SMTP server
-#LOGIN client specifies the credentials to be used when forwarding emails to another SMTP server
-#LOGIN server specifies the credentials to be needed to authenticate with the emailrelay SMTP server
-
-#Examples:
-#
-#NONE server 192.168.1.* keyword
-#LOGIN client smtpuser@smtpserver smtppassword
-#LOGIN server user1 secret
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/emailrelay/files/emailrelay.init b/trunk/package/feeds/packages/emailrelay/files/emailrelay.init
deleted file mode 100644
index c63d2f06..00000000
--- a/trunk/package/feeds/packages/emailrelay/files/emailrelay.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-#see http://emailrelay.sourceforge.net/reference.html for command line reference
-
-START=90
-
-
-start() {
-        logger -t 'emailrelay' "Starting emailrelay service."
-        service_start emailrelay --as-server --poll 60 --forward-to smtpserver:smtpport --spool-dir /tmp --client-tls --client-auth /etc/emailrelay.auth --server-auth /etc/emailrelay.auth --log
-}
-
-stop() {
-        logger -t 'emailrelay' "Stopping emailrelay service."
-        killall -9 emailrelay
-}
diff --git a/trunk/package/feeds/packages/engine_pkcs11/Makefile b/trunk/package/feeds/packages/engine_pkcs11/Makefile
deleted file mode 100644
index dbdafdab..00000000
--- a/trunk/package/feeds/packages/engine_pkcs11/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=engine_pkcs11
-PKG_VERSION:=20131021
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1+
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/OpenSC/engine_pkcs11.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5abdc7e0d6d519d2514e3eccc116b335bc427254
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_FIXUP:=libtool
-
-PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/engine_pkcs11
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=PKCS#11 OpenSSL engine
-  URL:=https://www.opensc-project.org/opensc/wiki/
-  DEPENDS:=+libopenssl +libp11
-endef
-
-define Package/engine_pkcs11/description
-  engine_pkcs11 is an implementation of OpenSSL engine interface.
-endef
-
-define Package/engine_pkcs11/install
-	$(INSTALL_DIR) $(1)/usr/lib/engines
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/engines/engine_pkcs11.so $(1)/usr/lib/engines/
-endef
-
-$(eval $(call BuildPackage,engine_pkcs11))
diff --git a/trunk/package/feeds/packages/erlang/Makefile b/trunk/package/feeds/packages/erlang/Makefile
deleted file mode 100644
index 2423f374..00000000
--- a/trunk/package/feeds/packages/erlang/Makefile
+++ /dev/null
@@ -1,335 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=erlang
-PKG_VERSION:=17.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= http://www.erlang.org/download/ \
-	http://erlang.mirror.su.se/
-PKG_MD5SUM:=346dd0136bf1cc28cebc140e505206bb
-
-PKG_LICENSE:=ErlPL-1.1
-PKG_LICENSE_FILES:=EPLICENCE
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_BUILD_DEPENDS:=erlang/host openssl
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/otp_src_$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/otp_src_$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/erlang/Default
-  SUBMENU:=Erlang
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Erlang/OTP programming language
-  URL:=http://www.erlang.org/
-endef
-
-define Package/erlang/Default/description
- Erlang/OTP is a general-purpose programming language and runtime
- environment. Erlang has built-in support for concurrency, distribution
- and fault tolerance.
-endef
-
-define Package/erlang
-$(call Package/erlang/Default)
-  DEPENDS+= +libncurses +librt +zlib
-  PROVIDES:= erlang-erts=6.4 erlang-kernel=3.2 erlang-sasl=2.4.1 erlang-stdlib=2.4
-endef
-
-define Package/erlang/description
-$(call Package/erlang/Default/description)
- .
- This package contains the runtime implementation and a minimal set of
- modules (erts, kernel, sasl & stdlib).
-endef
-
-
-define Package/erlang-asn1
-$(call Package/erlang/Default)
-  TITLE:=Abstract Syntax Notation One (ASN.1) support
-  VERSION:=3.0.4
-  DEPENDS+= +erlang +erlang-syntax-tools
-endef
-
-define Package/erlang-asn1/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides Abstract Syntax Notation One (ASN.1)
- support.
-endef
-
-
-define Package/erlang-compiler
-$(call Package/erlang/Default)
-  TITLE:=Byte code compiler
-  VERSION:=5.0.4
-  DEPENDS+= +erlang +erlang-hipe
-endef
-
-define Package/erlang-compiler/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a byte code compiler for Erlang which
- produces highly compact code.
-endef
-
-
-define Package/erlang-crypto
-$(call Package/erlang/Default)
-  TITLE:=Cryptography support
-  VERSION:=3.5
-  DEPENDS+= +erlang +libopenssl
-endef
-
-define Package/erlang-crypto/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides functions for computation of message
- digests, and encryption and decryption functions.
-endef
-
-
-define Package/erlang-hipe
-$(call Package/erlang/Default)
-  TITLE:=High Performance Erlang
-  VERSION:=3.11.3
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-hipe/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides HiPE (High Performance Erlang)
- support.
-endef
-
-
-define Package/erlang-inets
-$(call Package/erlang/Default)
-  TITLE:=Internet clients and servers
-  VERSION:=5.10.6
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-inets/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a container for Internet clients and
- servers. Currently a FTP client, a HTTP client and server, and a tftp
- client and server have been incorporated in Inets.
-endef
-
-
-define Package/erlang-mnesia
-$(call Package/erlang/Default)
-  TITLE:=Distributed database
-  VERSION:=4.12.5
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-mnesia/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides a distributed DataBase Management
- System (DBMS), appropriate for telecommunications applications and
- other Erlang applications which require continuous operation and
- exhibit soft real-time properties.
-endef
-
-
-define Package/erlang-runtime-tools
-$(call Package/erlang/Default)
-  TITLE:=Low-profile debugging/tracing tools
-  VERSION:=1.8.16
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-runtime-tools/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides low footprint tracing/debugging tools
- suitable for inclusion in a production system.
-endef
-
-
-define Package/erlang-snmp
-$(call Package/erlang/Default)
-  TITLE:=Simple Network Management Protocol (SNMP) support
-  VERSION:=5.1.1
-  DEPENDS+= +erlang +erlang-asn1
-endef
-
-define Package/erlang-snmp/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides Simple Network Management Protocol
- (SNMP) support including a MIB compiler and tools for creating SNMP
- agents.
-endef
-
-
-define Package/erlang-ssh
-$(call Package/erlang/Default)
-  TITLE:=Secure Shell (SSH) support
-  VERSION:=3.2
-  DEPENDS+= +erlang +erlang-crypto
-endef
-
-define Package/erlang-ssh/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides an implementation of the Secure Shell
- protocol, with SSH & SFTP support.
-endef
-
-
-define Package/erlang-ssl
-$(call Package/erlang/Default)
-  TITLE:=Secure Sockets Layer (SSL) support
-  VERSION:=6.0
-  DEPENDS+= +erlang +erlang-crypto
-endef
-
-define Package/erlang-ssl/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides support for secure communication over
- sockets.
-endef
-
-
-define Package/erlang-syntax-tools
-$(call Package/erlang/Default)
-  TITLE:=Abstract Erlang syntax trees handling support
-  VERSION:=1.6.18
-  DEPENDS+= +erlang
-endef
-
-define Package/erlang-syntax-tools/description
-$(call Package/erlang/Default/description)
- .
- This Erlang/OTP package provides support for handling abstract Erlang
- syntax trees.
-endef
-
-
-# Host
-
-HOST_CONFIGURE_ARGS += \
-	--disable-hipe \
-	--disable-smp-support \
-	--without-javac
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) all
-endef
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-
-# Target
-
-CONFIGURE_ARGS += \
-	--disable-hipe \
-	--disable-smp-support \
-	--without-javac \
-	--enable-dynamic-ssl-lib
-
-CONFIGURE_VARS += \
-	SHLIB_LD="$(TARGET_CC)" \
-	TARGET_ARCH="$(TARGET_ARCH)" \
-	ac_cv_func_mmap_fixed_mapped=yes \
-	ac_cv_path_WX_CONFIG_PATH=no \
-	erl_xcomp_getaddrinfo=no \
-	erl_xcomp_sysroot="$(STAGING_DIR)"
-
-EXTRA_LDFLAGS+=-lz
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		noboot
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Package/erlang/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	for f in epmd erl erlc escript run_erl; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$$f $(1)/usr/bin/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/bin
-	for f in erl erlc escript run_erl start start.boot start.script start_clean.boot start_erl start_sasl.boot to_erl; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/bin/$$$$f $(1)/usr/lib/erlang/bin/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/lib
-	for m in erts kernel sasl stdlib; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$m-* $(1)/usr/lib/erlang/lib/ ; \
-		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/examples ; \
-		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/src ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/erlang
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/erts-* $(1)/usr/lib/erlang/
-	rm -rf $(1)/usr/lib/erlang/erts-*/{doc,include,lib,man,src}
-	rm -rf $(1)/usr/lib/erlang/erts-*/bin/*.src
-	$(INSTALL_DIR) $(1)/usr/lib/erlang/releases
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/releases/* $(1)/usr/lib/erlang/releases/
-	$(SED) 's,%ERL_ROOT%,/usr/lib/erlang,g' \
-		$(1)/usr/lib/erlang/releases/RELEASES.src
-	mv -f $(1)/usr/lib/erlang/releases/RELEASES.src \
-		$(1)/usr/lib/erlang/releases/RELEASES
-	for f in bin/erl bin/start erts-*/bin/erl erts-*/bin/start; do \
-		$(SED) 's,^\(ROOTDIR\)=.*,\1=/usr/lib/erlang,g' \
-			$(1)/usr/lib/erlang/$$$$f ; \
-	done
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/obj/*/*.a $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/include/*.h $(1)/usr/include/
-endef
-
-define BuildModule
-
-  define Package/erlang-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/erlang/lib
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$$$$$m-* $$(1)/usr/lib/erlang/lib/ ; \
-		rm -rf $$(1)/usr/lib/erlang/lib/$$$$$$$$m-*/{examples,priv/obj,src} ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,erlang-$(1)))
-
-endef
-
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,erlang))
-$(eval $(call BuildModule,asn1,asn1))
-$(eval $(call BuildModule,compiler,compiler))
-$(eval $(call BuildModule,crypto,crypto))
-$(eval $(call BuildModule,hipe,hipe))
-$(eval $(call BuildModule,inets,inets))
-$(eval $(call BuildModule,mnesia,mnesia))
-$(eval $(call BuildModule,runtime-tools,runtime_tools))
-$(eval $(call BuildModule,snmp,snmp))
-$(eval $(call BuildModule,ssh,ssh))
-$(eval $(call BuildModule,ssl,ssl))
-$(eval $(call BuildModule,syntax-tools,syntax_tools))
diff --git a/trunk/package/feeds/packages/erlang/patches/101-emulator_includes.patch b/trunk/package/feeds/packages/erlang/patches/101-emulator_includes.patch
deleted file mode 100644
index 5a413af4..00000000
--- a/trunk/package/feeds/packages/erlang/patches/101-emulator_includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/erts/emulator/Makefile.in
-+++ b/erts/emulator/Makefile.in
-@@ -682,7 +682,7 @@ $(OBJDIR)/beam_emu.o: beam/beam_emu.c
- endif
- 
- $(OBJDIR)/%.o: beam/%.c
--	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-+	$(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
- 
- $(OBJDIR)/%.o: $(TARGET)/%.c
- 	$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
diff --git a/trunk/package/feeds/packages/erlang/patches/103-disable_emacs.patch b/trunk/package/feeds/packages/erlang/patches/103-disable_emacs.patch
deleted file mode 100644
index 94121952..00000000
--- a/trunk/package/feeds/packages/erlang/patches/103-disable_emacs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/tools/Makefile
-+++ b/lib/tools/Makefile
-@@ -23,7 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
- # Macros
- # ----------------------------------------------------
- 
--SUB_DIRECTORIES = c_src src doc/src examples priv emacs
-+SUB_DIRECTORIES = c_src src doc/src examples priv
- 
- include vsn.mk
- VSN = $(TOOLS_VSN)
diff --git a/trunk/package/feeds/packages/espeak/Makefile b/trunk/package/feeds/packages/espeak/Makefile
deleted file mode 100644
index fd06c6ef..00000000
--- a/trunk/package/feeds/packages/espeak/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=espeak
-PKG_VERSION:=1.48.04
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.zip
-PKG_SOURCE_URL:=@SF/espeak
-PKG_MD5SUM:=cadd7482eaafe9239546bdc09fa244c3
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=License.txt
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-source
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/espeak
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libpthread +libstdcpp +portaudio
-  TITLE:=Speech synthesizer
-  URL:=http://espeak.sourceforge.net/
-endef
-
-define Package/espeak/description
- eSpeak is a compact open source software speech synthesizer for English and
- other languages.
-endef
-
-MAKE_FLAGS+= \
-	AUDIO="portaudio" \
-	DATADIR="/usr/share/espeak" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-
-MAKE_PATH:=./src
-
-define Package/espeak/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/espeak $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libespeak.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/espeak $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,espeak))
diff --git a/trunk/package/feeds/packages/espeak/patches/101-portaudio.patch b/trunk/package/feeds/packages/espeak/patches/101-portaudio.patch
deleted file mode 100644
index ff396b3a..00000000
--- a/trunk/package/feeds/packages/espeak/patches/101-portaudio.patch
+++ /dev/null
@@ -1,2093 +0,0 @@
---- a/src/portaudio.h
-+++ /dev/null
-@@ -1,466 +0,0 @@
--// NOTE: Copy this file to  portaudio.h  in order to compile with V18 portaudio
--
--
--#ifndef PORT_AUDIO_H
--#define PORT_AUDIO_H
--
--#ifdef __cplusplus
--extern "C"
--{
--#endif /* __cplusplus */
--
--/*
-- * $Id: portaudio.h,v 1.5 2002/03/26 18:04:22 philburk Exp $
-- * PortAudio Portable Real-Time Audio Library
-- * PortAudio API Header File
-- * Latest version available at: http://www.audiomulch.com/portaudio/
-- *
-- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
-- *
-- * Permission is hereby granted, free of charge, to any person obtaining
-- * a copy of this software and associated documentation files
-- * (the "Software"), to deal in the Software without restriction,
-- * including without limitation the rights to use, copy, modify, merge,
-- * publish, distribute, sublicense, and/or sell copies of the Software,
-- * and to permit persons to whom the Software is furnished to do so,
-- * subject to the following conditions:
-- *
-- * The above copyright notice and this permission notice shall be
-- * included in all copies or substantial portions of the Software.
-- *
-- * Any person wishing to distribute modifications to the Software is
-- * requested to send the modifications to the original developer so that
-- * they can be incorporated into the canonical version.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- *
-- */
--
--typedef int PaError;
--typedef enum {
--    paNoError = 0,
--
--    paHostError = -10000,
--    paInvalidChannelCount,
--    paInvalidSampleRate,
--    paInvalidDeviceId,
--    paInvalidFlag,
--    paSampleFormatNotSupported,
--    paBadIODeviceCombination,
--    paInsufficientMemory,
--    paBufferTooBig,
--    paBufferTooSmall,
--    paNullCallback,
--    paBadStreamPtr,
--    paTimedOut,
--    paInternalError,
--    paDeviceUnavailable
--} PaErrorNum;
--
--/*
-- Pa_Initialize() is the library initialisation function - call this before
-- using the library.
--
--*/
--
--PaError Pa_Initialize( void );
--
--/*
-- Pa_Terminate() is the library termination function - call this after
-- using the library.
--
--*/
--
--PaError Pa_Terminate( void );
--
--/*
-- Pa_GetHostError() returns a host specific error code.
-- This can be called after receiving a PortAudio error code of paHostError.
--
--*/
--
--long Pa_GetHostError( void );
--
--/*
-- Pa_GetErrorText() translates the supplied PortAudio error number
-- into a human readable message.
-- 
--*/
--
--const char *Pa_GetErrorText( PaError errnum );
--
--/*
-- Sample formats
-- 
-- These are formats used to pass sound data between the callback and the
-- stream. Each device has a "native" format which may be used when optimum
-- efficiency or control over conversion is required.
-- 
-- Formats marked "always available" are supported (emulated) by all 
-- PortAudio implementations.
-- 
-- The floating point representation (paFloat32) uses +1.0 and -1.0 as the 
-- maximum and minimum respectively.
--
-- paUInt8 is an unsigned 8 bit format where 128 is considered "ground"
--
--*/
--
--typedef unsigned long PaSampleFormat;
--#define paFloat32      ((PaSampleFormat) (1<<0)) /*always available*/
--#define paInt16        ((PaSampleFormat) (1<<1)) /*always available*/
--#define paInt32        ((PaSampleFormat) (1<<2)) /*always available*/
--#define paInt24        ((PaSampleFormat) (1<<3))
--#define paPackedInt24  ((PaSampleFormat) (1<<4))
--#define paInt8         ((PaSampleFormat) (1<<5))
--#define paUInt8        ((PaSampleFormat) (1<<6))
--#define paCustomFormat ((PaSampleFormat) (1<<16))
--
--/*
-- Device enumeration mechanism.
-- 
-- Device ids range from 0 to Pa_CountDevices()-1.
-- 
-- Devices may support input, output or both.
--
--*/
--
--typedef int PaDeviceID;
--#define paNoDevice -1
--
--int Pa_CountDevices( void );
--
--typedef struct
--{
--    int structVersion;
--    const char *name;
--    int maxInputChannels;
--    int maxOutputChannels;
--    /* Number of discrete rates, or -1 if range supported. */
--    int numSampleRates;
--    /* Array of supported sample rates, or {min,max} if range supported. */
--    const double *sampleRates;
--    PaSampleFormat nativeSampleFormats;
--}
--PaDeviceInfo;
--
--/*
-- Pa_GetDefaultInputDeviceID(), Pa_GetDefaultOutputDeviceID() return the
-- default device ids for input and output respectively, or paNoDevice if
-- no device is available.
-- The result can be passed to Pa_OpenStream().
-- 
-- On the PC, the user can specify a default device by
-- setting an environment variable. For example, to use device #1.
-- 
--  set PA_RECOMMENDED_OUTPUT_DEVICE=1
-- 
-- The user should first determine the available device ids by using
-- the supplied application "pa_devs".
--
--*/
--
--PaDeviceID Pa_GetDefaultInputDeviceID( void );
--PaDeviceID Pa_GetDefaultOutputDeviceID( void );
--
--
--
--/*
-- Pa_GetDeviceInfo() returns a pointer to an immutable PaDeviceInfo structure
-- for the device specified.
-- If the device parameter is out of range the function returns NULL.
--
-- PortAudio manages the memory referenced by the returned pointer, the client
-- must not manipulate or free the memory. The pointer is only guaranteed to be
-- valid between calls to Pa_Initialize() and Pa_Terminate().
--
--*/
--
--const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceID device );
--
--/*
-- PaTimestamp is used to represent a continuous sample clock with arbitrary
-- start time that can be used for syncronization. The type is used for the
-- outTime argument to the PortAudioCallback and as the result of Pa_StreamTime()
--
--*/
--
--typedef double PaTimestamp;
--
--/*
-- PortAudioCallback is implemented by PortAudio clients.
-- 
-- inputBuffer and outputBuffer are arrays of interleaved samples,
-- the format, packing and number of channels used by the buffers are
-- determined by parameters to Pa_OpenStream() (see below).
-- 
-- framesPerBuffer is the number of sample frames to be processed by the callback.
-- 
-- outTime is the time in samples when the buffer(s) processed by
-- this callback will begin being played at the audio output.
-- See also Pa_StreamTime()
-- 
-- userData is the value of a user supplied pointer passed to Pa_OpenStream()
-- intended for storing synthesis data etc.
-- 
-- return value:
-- The callback can return a non-zero value to stop the stream. This may be
-- useful in applications such as soundfile players where a specific duration
-- of output is required. However, it is not necessary to utilise this mechanism
-- as StopStream() will also terminate the stream. A callback returning a
-- non-zero value must fill the entire outputBuffer.
-- 
-- NOTE: None of the other stream functions may be called from within the
-- callback function except for Pa_GetCPULoad().
--
--*/
--
--typedef int (PortAudioCallback)(
--    void *inputBuffer, void *outputBuffer,
--    unsigned long framesPerBuffer,
--    PaTimestamp outTime, void *userData );
--
--
--/*
-- Stream flags
-- 
-- These flags may be supplied (ored together) in the streamFlags argument to
-- the Pa_OpenStream() function.
--
--*/
--
--#define   paNoFlag      (0)
--#define   paClipOff     (1<<0)   /* disable default clipping of out of range samples */
--#define   paDitherOff   (1<<1)   /* disable default dithering */
--#define   paPlatformSpecificFlags (0x00010000)
--typedef   unsigned long PaStreamFlags;
--
--/*
-- A single PortAudioStream provides multiple channels of real-time
-- input and output audio streaming to a client application.
-- Pointers to PortAudioStream objects are passed between PortAudio functions.
--*/
--
--typedef void PortAudioStream;
--#define PaStream PortAudioStream
--
--/*
-- Pa_OpenStream() opens a stream for either input, output or both.
-- 
-- stream is the address of a PortAudioStream pointer which will receive
-- a pointer to the newly opened stream.
-- 
-- inputDevice is the id of the device used for input (see PaDeviceID above.)
-- inputDevice may be paNoDevice to indicate that an input device is not required.
-- 
-- numInputChannels is the number of channels of sound to be delivered to the
-- callback. It can range from 1 to the value of maxInputChannels in the
-- PaDeviceInfo record for the device specified by the inputDevice parameter.
-- If inputDevice is paNoDevice numInputChannels is ignored.
-- 
-- inputSampleFormat is the sample format of inputBuffer provided to the callback
-- function. inputSampleFormat may be any of the formats described by the
-- PaSampleFormat enumeration (see above). PortAudio guarantees support for
-- the device's native formats (nativeSampleFormats in the device info record)
-- and additionally 16 and 32 bit integer and 32 bit floating point formats.
-- Support for other formats is implementation defined.
-- 
-- inputDriverInfo is a pointer to an optional driver specific data structure
-- containing additional information for device setup or stream processing.
-- inputDriverInfo is never required for correct operation. If not used
-- inputDriverInfo should be NULL.
-- 
-- outputDevice is the id of the device used for output (see PaDeviceID above.)
-- outputDevice may be paNoDevice to indicate that an output device is not required.
-- 
-- numOutputChannels is the number of channels of sound to be supplied by the
-- callback. See the definition of numInputChannels above for more details.
-- 
-- outputSampleFormat is the sample format of the outputBuffer filled by the
-- callback function. See the definition of inputSampleFormat above for more
-- details.
-- 
-- outputDriverInfo is a pointer to an optional driver specific data structure
-- containing additional information for device setup or stream processing.
-- outputDriverInfo is never required for correct operation. If not used
-- outputDriverInfo should be NULL.
-- 
-- sampleRate is the desired sampleRate. For full-duplex streams it is the
-- sample rate for both input and output
-- 
-- framesPerBuffer is the length in sample frames of all internal sample buffers
-- used for communication with platform specific audio routines. Wherever
-- possible this corresponds to the framesPerBuffer parameter passed to the
-- callback function.
-- 
-- numberOfBuffers is the number of buffers used for multibuffered communication
-- with the platform specific audio routines. If you pass zero, then an optimum
-- value will be chosen for you internally. This parameter is provided only
-- as a guide - and does not imply that an implementation must use multibuffered
-- i/o when reliable double buffering is available (such as SndPlayDoubleBuffer()
-- on the Macintosh.)
-- 
-- streamFlags may contain a combination of flags ORed together.
-- These flags modify the behaviour of the streaming process. Some flags may only
-- be relevant to certain buffer formats.
-- 
-- callback is a pointer to a client supplied function that is responsible
-- for processing and filling input and output buffers (see above for details.)
-- 
-- userData is a client supplied pointer which is passed to the callback
-- function. It could for example, contain a pointer to instance data necessary
-- for processing the audio buffers.
-- 
-- return value:
-- Upon success Pa_OpenStream() returns PaNoError and places a pointer to a
-- valid PortAudioStream in the stream argument. The stream is inactive (stopped).
-- If a call to Pa_OpenStream() fails a non-zero error code is returned (see
-- PaError above) and the value of stream is invalid.
-- 
--*/
--
--PaError Pa_OpenStream( PortAudioStream** stream,
--                       PaDeviceID inputDevice,
--                       int numInputChannels,
--                       PaSampleFormat inputSampleFormat,
--                       void *inputDriverInfo,
--                       PaDeviceID outputDevice,
--                       int numOutputChannels,
--                       PaSampleFormat outputSampleFormat,
--                       void *outputDriverInfo,
--                       double sampleRate,
--                       unsigned long framesPerBuffer,
--                       unsigned long numberOfBuffers,
--                       PaStreamFlags streamFlags,
--                       PortAudioCallback *callback,
--                       void *userData );
--
--
--/*
-- Pa_OpenDefaultStream() is a simplified version of Pa_OpenStream() that opens
-- the default input and/or output devices. Most parameters have identical meaning
-- to their Pa_OpenStream() counterparts, with the following exceptions:
-- 
-- If either numInputChannels or numOutputChannels is 0 the respective device
-- is not opened. This has the same effect as passing paNoDevice in the device
-- arguments to Pa_OpenStream().
-- 
-- sampleFormat applies to both the input and output buffers.
--
--*/
--
--PaError Pa_OpenDefaultStream( PortAudioStream** stream,
--                              int numInputChannels,
--                              int numOutputChannels,
--                              PaSampleFormat sampleFormat,
--                              double sampleRate,
--                              unsigned long framesPerBuffer,
--                              unsigned long numberOfBuffers,
--                              PortAudioCallback *callback,
--                              void *userData );
--
--/*
-- Pa_CloseStream() closes an audio stream, flushing any pending buffers.
--
--*/
--
--PaError Pa_CloseStream( PortAudioStream* );
--
--/*
-- Pa_StartStream() and Pa_StopStream() begin and terminate audio processing.
-- Pa_StopStream() waits until all pending audio buffers have been played.
-- Pa_AbortStream() stops playing immediately without waiting for pending
-- buffers to complete.
--    
--*/
--
--PaError Pa_StartStream( PortAudioStream *stream );
--
--PaError Pa_StopStream( PortAudioStream *stream );
--
--PaError Pa_AbortStream( PortAudioStream *stream );
--
--/*
-- Pa_StreamActive() returns one (1) when the stream is active (ie playing
-- or recording audio), zero (0) when not playing, or a negative error number
-- if the stream is invalid.
-- The stream is active between calls to Pa_StartStream() and Pa_StopStream(),
-- but may also become inactive if the callback returns a non-zero value.
-- In the latter case, the stream is considered inactive after the last
-- buffer has finished playing.
-- 
--*/
--
--PaError Pa_StreamActive( PortAudioStream *stream );
--
--/*
-- Pa_StreamTime() returns the current output time in samples for the stream.
-- This time may be used as a time reference (for example synchronizing audio to
-- MIDI).
-- 
--*/
--
--PaTimestamp Pa_StreamTime( PortAudioStream *stream );
--
--/*
-- Pa_GetCPULoad() returns the CPU Load for the stream.
-- The "CPU Load" is a fraction of total CPU time consumed by the stream's
-- audio processing routines including, but not limited to the client supplied
-- callback.
-- A value of 0.5 would imply that PortAudio and the sound generating
-- callback was consuming roughly 50% of the available CPU time.
-- This function may be called from the callback function or the application.
-- 
--*/
--
--double Pa_GetCPULoad( PortAudioStream* stream );
--
--/*
-- Pa_GetMinNumBuffers() returns the minimum number of buffers required by
-- the current host based on minimum latency.
-- On the PC, for the DirectSound implementation, latency can be optionally set
-- by user by setting an environment variable.
-- For example, to set latency to 200 msec, put:
-- 
--    set PA_MIN_LATENCY_MSEC=200
-- 
-- in the AUTOEXEC.BAT file and reboot.
-- If the environment variable is not set, then the latency will be determined
-- based on the OS. Windows NT has higher latency than Win95.
-- 
--*/
--
--int Pa_GetMinNumBuffers( int framesPerBuffer, double sampleRate );
--
--/*
-- Pa_Sleep() puts the caller to sleep for at least 'msec' milliseconds.
-- You may sleep longer than the requested time so don't rely on this for
-- accurate musical timing.
-- 
-- Pa_Sleep() is provided as a convenience for authors of portable code (such as
-- the tests and examples in the PortAudio distribution.)
-- 
--*/
--
--void Pa_Sleep( long msec );
--
--/*
-- Pa_GetSampleSize() returns the size in bytes of a single sample in the
-- supplied PaSampleFormat, or paSampleFormatNotSupported if the format is
-- no supported.
--  
--*/
--
--PaError Pa_GetSampleSize( PaSampleFormat format );
--
--
--#ifdef __cplusplus
--}
--#endif /* __cplusplus */
--#endif /* PORT_AUDIO_H */
---- a/src/portaudio18.h
-+++ /dev/null
-@@ -1,466 +0,0 @@
--// NOTE: Copy this file to  portaudio.h  in order to compile with V18 portaudio
--
--
--#ifndef PORT_AUDIO_H
--#define PORT_AUDIO_H
--
--#ifdef __cplusplus
--extern "C"
--{
--#endif /* __cplusplus */
--
--/*
-- * $Id: portaudio.h,v 1.5 2002/03/26 18:04:22 philburk Exp $
-- * PortAudio Portable Real-Time Audio Library
-- * PortAudio API Header File
-- * Latest version available at: http://www.audiomulch.com/portaudio/
-- *
-- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
-- *
-- * Permission is hereby granted, free of charge, to any person obtaining
-- * a copy of this software and associated documentation files
-- * (the "Software"), to deal in the Software without restriction,
-- * including without limitation the rights to use, copy, modify, merge,
-- * publish, distribute, sublicense, and/or sell copies of the Software,
-- * and to permit persons to whom the Software is furnished to do so,
-- * subject to the following conditions:
-- *
-- * The above copyright notice and this permission notice shall be
-- * included in all copies or substantial portions of the Software.
-- *
-- * Any person wishing to distribute modifications to the Software is
-- * requested to send the modifications to the original developer so that
-- * they can be incorporated into the canonical version.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- *
-- */
--
--typedef int PaError;
--typedef enum {
--    paNoError = 0,
--
--    paHostError = -10000,
--    paInvalidChannelCount,
--    paInvalidSampleRate,
--    paInvalidDeviceId,
--    paInvalidFlag,
--    paSampleFormatNotSupported,
--    paBadIODeviceCombination,
--    paInsufficientMemory,
--    paBufferTooBig,
--    paBufferTooSmall,
--    paNullCallback,
--    paBadStreamPtr,
--    paTimedOut,
--    paInternalError,
--    paDeviceUnavailable
--} PaErrorNum;
--
--/*
-- Pa_Initialize() is the library initialisation function - call this before
-- using the library.
--
--*/
--
--PaError Pa_Initialize( void );
--
--/*
-- Pa_Terminate() is the library termination function - call this after
-- using the library.
--
--*/
--
--PaError Pa_Terminate( void );
--
--/*
-- Pa_GetHostError() returns a host specific error code.
-- This can be called after receiving a PortAudio error code of paHostError.
--
--*/
--
--long Pa_GetHostError( void );
--
--/*
-- Pa_GetErrorText() translates the supplied PortAudio error number
-- into a human readable message.
-- 
--*/
--
--const char *Pa_GetErrorText( PaError errnum );
--
--/*
-- Sample formats
-- 
-- These are formats used to pass sound data between the callback and the
-- stream. Each device has a "native" format which may be used when optimum
-- efficiency or control over conversion is required.
-- 
-- Formats marked "always available" are supported (emulated) by all 
-- PortAudio implementations.
-- 
-- The floating point representation (paFloat32) uses +1.0 and -1.0 as the 
-- maximum and minimum respectively.
--
-- paUInt8 is an unsigned 8 bit format where 128 is considered "ground"
--
--*/
--
--typedef unsigned long PaSampleFormat;
--#define paFloat32      ((PaSampleFormat) (1<<0)) /*always available*/
--#define paInt16        ((PaSampleFormat) (1<<1)) /*always available*/
--#define paInt32        ((PaSampleFormat) (1<<2)) /*always available*/
--#define paInt24        ((PaSampleFormat) (1<<3))
--#define paPackedInt24  ((PaSampleFormat) (1<<4))
--#define paInt8         ((PaSampleFormat) (1<<5))
--#define paUInt8        ((PaSampleFormat) (1<<6))
--#define paCustomFormat ((PaSampleFormat) (1<<16))
--
--/*
-- Device enumeration mechanism.
-- 
-- Device ids range from 0 to Pa_CountDevices()-1.
-- 
-- Devices may support input, output or both.
--
--*/
--
--typedef int PaDeviceID;
--#define paNoDevice -1
--
--int Pa_CountDevices( void );
--
--typedef struct
--{
--    int structVersion;
--    const char *name;
--    int maxInputChannels;
--    int maxOutputChannels;
--    /* Number of discrete rates, or -1 if range supported. */
--    int numSampleRates;
--    /* Array of supported sample rates, or {min,max} if range supported. */
--    const double *sampleRates;
--    PaSampleFormat nativeSampleFormats;
--}
--PaDeviceInfo;
--
--/*
-- Pa_GetDefaultInputDeviceID(), Pa_GetDefaultOutputDeviceID() return the
-- default device ids for input and output respectively, or paNoDevice if
-- no device is available.
-- The result can be passed to Pa_OpenStream().
-- 
-- On the PC, the user can specify a default device by
-- setting an environment variable. For example, to use device #1.
-- 
--  set PA_RECOMMENDED_OUTPUT_DEVICE=1
-- 
-- The user should first determine the available device ids by using
-- the supplied application "pa_devs".
--
--*/
--
--PaDeviceID Pa_GetDefaultInputDeviceID( void );
--PaDeviceID Pa_GetDefaultOutputDeviceID( void );
--
--
--
--/*
-- Pa_GetDeviceInfo() returns a pointer to an immutable PaDeviceInfo structure
-- for the device specified.
-- If the device parameter is out of range the function returns NULL.
--
-- PortAudio manages the memory referenced by the returned pointer, the client
-- must not manipulate or free the memory. The pointer is only guaranteed to be
-- valid between calls to Pa_Initialize() and Pa_Terminate().
--
--*/
--
--const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceID device );
--
--/*
-- PaTimestamp is used to represent a continuous sample clock with arbitrary
-- start time that can be used for syncronization. The type is used for the
-- outTime argument to the PortAudioCallback and as the result of Pa_StreamTime()
--
--*/
--
--typedef double PaTimestamp;
--
--/*
-- PortAudioCallback is implemented by PortAudio clients.
-- 
-- inputBuffer and outputBuffer are arrays of interleaved samples,
-- the format, packing and number of channels used by the buffers are
-- determined by parameters to Pa_OpenStream() (see below).
-- 
-- framesPerBuffer is the number of sample frames to be processed by the callback.
-- 
-- outTime is the time in samples when the buffer(s) processed by
-- this callback will begin being played at the audio output.
-- See also Pa_StreamTime()
-- 
-- userData is the value of a user supplied pointer passed to Pa_OpenStream()
-- intended for storing synthesis data etc.
-- 
-- return value:
-- The callback can return a non-zero value to stop the stream. This may be
-- useful in applications such as soundfile players where a specific duration
-- of output is required. However, it is not necessary to utilise this mechanism
-- as StopStream() will also terminate the stream. A callback returning a
-- non-zero value must fill the entire outputBuffer.
-- 
-- NOTE: None of the other stream functions may be called from within the
-- callback function except for Pa_GetCPULoad().
--
--*/
--
--typedef int (PortAudioCallback)(
--    void *inputBuffer, void *outputBuffer,
--    unsigned long framesPerBuffer,
--    PaTimestamp outTime, void *userData );
--
--
--/*
-- Stream flags
-- 
-- These flags may be supplied (ored together) in the streamFlags argument to
-- the Pa_OpenStream() function.
--
--*/
--
--#define   paNoFlag      (0)
--#define   paClipOff     (1<<0)   /* disable default clipping of out of range samples */
--#define   paDitherOff   (1<<1)   /* disable default dithering */
--#define   paPlatformSpecificFlags (0x00010000)
--typedef   unsigned long PaStreamFlags;
--
--/*
-- A single PortAudioStream provides multiple channels of real-time
-- input and output audio streaming to a client application.
-- Pointers to PortAudioStream objects are passed between PortAudio functions.
--*/
--
--typedef void PortAudioStream;
--#define PaStream PortAudioStream
--
--/*
-- Pa_OpenStream() opens a stream for either input, output or both.
-- 
-- stream is the address of a PortAudioStream pointer which will receive
-- a pointer to the newly opened stream.
-- 
-- inputDevice is the id of the device used for input (see PaDeviceID above.)
-- inputDevice may be paNoDevice to indicate that an input device is not required.
-- 
-- numInputChannels is the number of channels of sound to be delivered to the
-- callback. It can range from 1 to the value of maxInputChannels in the
-- PaDeviceInfo record for the device specified by the inputDevice parameter.
-- If inputDevice is paNoDevice numInputChannels is ignored.
-- 
-- inputSampleFormat is the sample format of inputBuffer provided to the callback
-- function. inputSampleFormat may be any of the formats described by the
-- PaSampleFormat enumeration (see above). PortAudio guarantees support for
-- the device's native formats (nativeSampleFormats in the device info record)
-- and additionally 16 and 32 bit integer and 32 bit floating point formats.
-- Support for other formats is implementation defined.
-- 
-- inputDriverInfo is a pointer to an optional driver specific data structure
-- containing additional information for device setup or stream processing.
-- inputDriverInfo is never required for correct operation. If not used
-- inputDriverInfo should be NULL.
-- 
-- outputDevice is the id of the device used for output (see PaDeviceID above.)
-- outputDevice may be paNoDevice to indicate that an output device is not required.
-- 
-- numOutputChannels is the number of channels of sound to be supplied by the
-- callback. See the definition of numInputChannels above for more details.
-- 
-- outputSampleFormat is the sample format of the outputBuffer filled by the
-- callback function. See the definition of inputSampleFormat above for more
-- details.
-- 
-- outputDriverInfo is a pointer to an optional driver specific data structure
-- containing additional information for device setup or stream processing.
-- outputDriverInfo is never required for correct operation. If not used
-- outputDriverInfo should be NULL.
-- 
-- sampleRate is the desired sampleRate. For full-duplex streams it is the
-- sample rate for both input and output
-- 
-- framesPerBuffer is the length in sample frames of all internal sample buffers
-- used for communication with platform specific audio routines. Wherever
-- possible this corresponds to the framesPerBuffer parameter passed to the
-- callback function.
-- 
-- numberOfBuffers is the number of buffers used for multibuffered communication
-- with the platform specific audio routines. If you pass zero, then an optimum
-- value will be chosen for you internally. This parameter is provided only
-- as a guide - and does not imply that an implementation must use multibuffered
-- i/o when reliable double buffering is available (such as SndPlayDoubleBuffer()
-- on the Macintosh.)
-- 
-- streamFlags may contain a combination of flags ORed together.
-- These flags modify the behaviour of the streaming process. Some flags may only
-- be relevant to certain buffer formats.
-- 
-- callback is a pointer to a client supplied function that is responsible
-- for processing and filling input and output buffers (see above for details.)
-- 
-- userData is a client supplied pointer which is passed to the callback
-- function. It could for example, contain a pointer to instance data necessary
-- for processing the audio buffers.
-- 
-- return value:
-- Upon success Pa_OpenStream() returns PaNoError and places a pointer to a
-- valid PortAudioStream in the stream argument. The stream is inactive (stopped).
-- If a call to Pa_OpenStream() fails a non-zero error code is returned (see
-- PaError above) and the value of stream is invalid.
-- 
--*/
--
--PaError Pa_OpenStream( PortAudioStream** stream,
--                       PaDeviceID inputDevice,
--                       int numInputChannels,
--                       PaSampleFormat inputSampleFormat,
--                       void *inputDriverInfo,
--                       PaDeviceID outputDevice,
--                       int numOutputChannels,
--                       PaSampleFormat outputSampleFormat,
--                       void *outputDriverInfo,
--                       double sampleRate,
--                       unsigned long framesPerBuffer,
--                       unsigned long numberOfBuffers,
--                       PaStreamFlags streamFlags,
--                       PortAudioCallback *callback,
--                       void *userData );
--
--
--/*
-- Pa_OpenDefaultStream() is a simplified version of Pa_OpenStream() that opens
-- the default input and/or output devices. Most parameters have identical meaning
-- to their Pa_OpenStream() counterparts, with the following exceptions:
-- 
-- If either numInputChannels or numOutputChannels is 0 the respective device
-- is not opened. This has the same effect as passing paNoDevice in the device
-- arguments to Pa_OpenStream().
-- 
-- sampleFormat applies to both the input and output buffers.
--
--*/
--
--PaError Pa_OpenDefaultStream( PortAudioStream** stream,
--                              int numInputChannels,
--                              int numOutputChannels,
--                              PaSampleFormat sampleFormat,
--                              double sampleRate,
--                              unsigned long framesPerBuffer,
--                              unsigned long numberOfBuffers,
--                              PortAudioCallback *callback,
--                              void *userData );
--
--/*
-- Pa_CloseStream() closes an audio stream, flushing any pending buffers.
--
--*/
--
--PaError Pa_CloseStream( PortAudioStream* );
--
--/*
-- Pa_StartStream() and Pa_StopStream() begin and terminate audio processing.
-- Pa_StopStream() waits until all pending audio buffers have been played.
-- Pa_AbortStream() stops playing immediately without waiting for pending
-- buffers to complete.
--    
--*/
--
--PaError Pa_StartStream( PortAudioStream *stream );
--
--PaError Pa_StopStream( PortAudioStream *stream );
--
--PaError Pa_AbortStream( PortAudioStream *stream );
--
--/*
-- Pa_StreamActive() returns one (1) when the stream is active (ie playing
-- or recording audio), zero (0) when not playing, or a negative error number
-- if the stream is invalid.
-- The stream is active between calls to Pa_StartStream() and Pa_StopStream(),
-- but may also become inactive if the callback returns a non-zero value.
-- In the latter case, the stream is considered inactive after the last
-- buffer has finished playing.
-- 
--*/
--
--PaError Pa_StreamActive( PortAudioStream *stream );
--
--/*
-- Pa_StreamTime() returns the current output time in samples for the stream.
-- This time may be used as a time reference (for example synchronizing audio to
-- MIDI).
-- 
--*/
--
--PaTimestamp Pa_StreamTime( PortAudioStream *stream );
--
--/*
-- Pa_GetCPULoad() returns the CPU Load for the stream.
-- The "CPU Load" is a fraction of total CPU time consumed by the stream's
-- audio processing routines including, but not limited to the client supplied
-- callback.
-- A value of 0.5 would imply that PortAudio and the sound generating
-- callback was consuming roughly 50% of the available CPU time.
-- This function may be called from the callback function or the application.
-- 
--*/
--
--double Pa_GetCPULoad( PortAudioStream* stream );
--
--/*
-- Pa_GetMinNumBuffers() returns the minimum number of buffers required by
-- the current host based on minimum latency.
-- On the PC, for the DirectSound implementation, latency can be optionally set
-- by user by setting an environment variable.
-- For example, to set latency to 200 msec, put:
-- 
--    set PA_MIN_LATENCY_MSEC=200
-- 
-- in the AUTOEXEC.BAT file and reboot.
-- If the environment variable is not set, then the latency will be determined
-- based on the OS. Windows NT has higher latency than Win95.
-- 
--*/
--
--int Pa_GetMinNumBuffers( int framesPerBuffer, double sampleRate );
--
--/*
-- Pa_Sleep() puts the caller to sleep for at least 'msec' milliseconds.
-- You may sleep longer than the requested time so don't rely on this for
-- accurate musical timing.
-- 
-- Pa_Sleep() is provided as a convenience for authors of portable code (such as
-- the tests and examples in the PortAudio distribution.)
-- 
--*/
--
--void Pa_Sleep( long msec );
--
--/*
-- Pa_GetSampleSize() returns the size in bytes of a single sample in the
-- supplied PaSampleFormat, or paSampleFormatNotSupported if the format is
-- no supported.
--  
--*/
--
--PaError Pa_GetSampleSize( PaSampleFormat format );
--
--
--#ifdef __cplusplus
--}
--#endif /* __cplusplus */
--#endif /* PORT_AUDIO_H */
---- a/src/portaudio19.h
-+++ /dev/null
-@@ -1,1127 +0,0 @@
--// NOTE: Copy this file to  portaudio.h  in order to compile with V19 portaudio
--
--#ifndef PORTAUDIO_H
--#define PORTAUDIO_H
--/*
-- * $Id: portaudio.h 1061 2006-06-19 22:46:41Z lschwardt $
-- * PortAudio Portable Real-Time Audio Library
-- * PortAudio API Header File
-- * Latest version available at: http://www.portaudio.com/
-- *
-- * Copyright (c) 1999-2002 Ross Bencina and Phil Burk
-- *
-- * Permission is hereby granted, free of charge, to any person obtaining
-- * a copy of this software and associated documentation files
-- * (the "Software"), to deal in the Software without restriction,
-- * including without limitation the rights to use, copy, modify, merge,
-- * publish, distribute, sublicense, and/or sell copies of the Software,
-- * and to permit persons to whom the Software is furnished to do so,
-- * subject to the following conditions:
-- *
-- * The above copyright notice and this permission notice shall be
-- * included in all copies or substantial portions of the Software.
-- *
-- * Any person wishing to distribute modifications to the Software is
-- * requested to send the modifications to the original developer so that
-- * they can be incorporated into the canonical version.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- */
--
--/** @file
-- @brief The PortAudio API.
--*/
--
--
--#ifdef __cplusplus
--extern "C"
--{
--#endif /* __cplusplus */
--
-- 
--/** Retrieve the release number of the currently running PortAudio build,
-- eg 1900.
--*/
--int Pa_GetVersion( void );
--
--
--/** Retrieve a textual description of the current PortAudio build,
-- eg "PortAudio V19-devel 13 October 2002".
--*/
--const char* Pa_GetVersionText( void );
--
--
--/** Error codes returned by PortAudio functions.
-- Note that with the exception of paNoError, all PaErrorCodes are negative.
--*/
--
--typedef int PaError;
--typedef enum PaErrorCode
--{
--    paNoError = 0,
--
--    paNotInitialized = -10000,
--    paUnanticipatedHostError,
--    paInvalidChannelCount,
--    paInvalidSampleRate,
--    paInvalidDevice,
--    paInvalidFlag,
--    paSampleFormatNotSupported,
--    paBadIODeviceCombination,
--    paInsufficientMemory,
--    paBufferTooBig,
--    paBufferTooSmall,
--    paNullCallback,
--    paBadStreamPtr,
--    paTimedOut,
--    paInternalError,
--    paDeviceUnavailable,
--    paIncompatibleHostApiSpecificStreamInfo,
--    paStreamIsStopped,
--    paStreamIsNotStopped,
--    paInputOverflowed,
--    paOutputUnderflowed,
--    paHostApiNotFound,
--    paInvalidHostApi,
--    paCanNotReadFromACallbackStream,      /**< @todo review error code name */
--    paCanNotWriteToACallbackStream,       /**< @todo review error code name */
--    paCanNotReadFromAnOutputOnlyStream,   /**< @todo review error code name */
--    paCanNotWriteToAnInputOnlyStream,     /**< @todo review error code name */
--    paIncompatibleStreamHostApi,
--    paBadBufferPtr
--} PaErrorCode;
--
--
--/** Translate the supplied PortAudio error code into a human readable
-- message.
--*/
--const char *Pa_GetErrorText( PaError errorCode );
--
--
--/** Library initialization function - call this before using PortAudio.
-- This function initialises internal data structures and prepares underlying
-- host APIs for use. This function MUST be called before using any other
-- PortAudio API functions.
--
-- If Pa_Initialize() is called multiple times, each successful 
-- call must be matched with a corresponding call to Pa_Terminate(). 
-- Pairs of calls to Pa_Initialize()/Pa_Terminate() may overlap, and are not 
-- required to be fully nested.
--
-- Note that if Pa_Initialize() returns an error code, Pa_Terminate() should
-- NOT be called.
--
-- @return paNoError if successful, otherwise an error code indicating the cause
-- of failure.
--
-- @see Pa_Terminate
--*/
--PaError Pa_Initialize( void );
--
--
--/** Library termination function - call this when finished using PortAudio.
-- This function deallocates all resources allocated by PortAudio since it was
-- initializied by a call to Pa_Initialize(). In cases where Pa_Initialise() has
-- been called multiple times, each call must be matched with a corresponding call
-- to Pa_Terminate(). The final matching call to Pa_Terminate() will automatically
-- close any PortAudio streams that are still open.
--
-- Pa_Terminate() MUST be called before exiting a program which uses PortAudio.
-- Failure to do so may result in serious resource leaks, such as audio devices
-- not being available until the next reboot.
--
-- @return paNoError if successful, otherwise an error code indicating the cause
-- of failure.
-- 
-- @see Pa_Initialize
--*/
--PaError Pa_Terminate( void );
--
--
--
--/** The type used to refer to audio devices. Values of this type usually
-- range from 0 to (Pa_DeviceCount-1), and may also take on the PaNoDevice
-- and paUseHostApiSpecificDeviceSpecification values.
--
-- @see Pa_DeviceCount, paNoDevice, paUseHostApiSpecificDeviceSpecification
--*/
--typedef int PaDeviceIndex;
--
--
--/** A special PaDeviceIndex value indicating that no device is available,
-- or should be used.
--
-- @see PaDeviceIndex
--*/
--#define paNoDevice ((PaDeviceIndex)-1)
--
--
--/** A special PaDeviceIndex value indicating that the device(s) to be used
-- are specified in the host api specific stream info structure.
--
-- @see PaDeviceIndex
--*/
--#define paUseHostApiSpecificDeviceSpecification ((PaDeviceIndex)-2)
--
--
--/* Host API enumeration mechanism */
--
--/** The type used to enumerate to host APIs at runtime. Values of this type
-- range from 0 to (Pa_GetHostApiCount()-1).
--
-- @see Pa_GetHostApiCount
--*/
--typedef int PaHostApiIndex;
--
--
--/** Retrieve the number of available host APIs. Even if a host API is
-- available it may have no devices available.
--
-- @return A non-negative value indicating the number of available host APIs
-- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
-- or an error is encountered.
--
-- @see PaHostApiIndex
--*/
--PaHostApiIndex Pa_GetHostApiCount( void );
--
--
--/** Retrieve the index of the default host API. The default host API will be
-- the lowest common denominator host API on the current platform and is
-- unlikely to provide the best performance.
--
-- @return A non-negative value ranging from 0 to (Pa_GetHostApiCount()-1)
-- indicating the default host API index or, a PaErrorCode (which are always
-- negative) if PortAudio is not initialized or an error is encountered.
--*/
--PaHostApiIndex Pa_GetDefaultHostApi( void );
--
--
--/** Unchanging unique identifiers for each supported host API. This type
-- is used in the PaHostApiInfo structure. The values are guaranteed to be
-- unique and to never change, thus allowing code to be written that
-- conditionally uses host API specific extensions.
--
-- New type ids will be allocated when support for a host API reaches
-- "public alpha" status, prior to that developers should use the
-- paInDevelopment type id.
--
-- @see PaHostApiInfo
--*/
--typedef enum PaHostApiTypeId
--{
--    paInDevelopment=0, /* use while developing support for a new host API */
--    paDirectSound=1,
--    paMME=2,
--    paASIO=3,
--    paSoundManager=4,
--    paCoreAudio=5,
--    paOSS=7,
--    paALSA=8,
--    paAL=9,
--    paBeOS=10,
--    paWDMKS=11,
--    paJACK=12,
--    paWASAPI=13,
--    paAudioScienceHPI=14
--} PaHostApiTypeId;
--
--
--/** A structure containing information about a particular host API. */
--
--typedef struct PaHostApiInfo
--{
--    /** this is struct version 1 */
--    int structVersion;
--    /** The well known unique identifier of this host API @see PaHostApiTypeId */
--    PaHostApiTypeId type;
--    /** A textual description of the host API for display on user interfaces. */
--    const char *name;
--
--    /**  The number of devices belonging to this host API. This field may be
--     used in conjunction with Pa_HostApiDeviceIndexToDeviceIndex() to enumerate
--     all devices for this host API.
--     @see Pa_HostApiDeviceIndexToDeviceIndex
--    */
--    int deviceCount;
--
--    /** The default input device for this host API. The value will be a
--     device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice
--     if no default input device is available.
--    */
--    PaDeviceIndex defaultInputDevice;
--
--    /** The default output device for this host API. The value will be a
--     device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice
--     if no default output device is available.
--    */
--    PaDeviceIndex defaultOutputDevice;
--    
--} PaHostApiInfo;
--
--
--/** Retrieve a pointer to a structure containing information about a specific
-- host Api.
--
-- @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1)
--
-- @return A pointer to an immutable PaHostApiInfo structure describing
-- a specific host API. If the hostApi parameter is out of range or an error
-- is encountered, the function returns NULL.
--
-- The returned structure is owned by the PortAudio implementation and must not
-- be manipulated or freed. The pointer is only guaranteed to be valid between
-- calls to Pa_Initialize() and Pa_Terminate().
--*/
--const PaHostApiInfo * Pa_GetHostApiInfo( PaHostApiIndex hostApi );
--
--
--/** Convert a static host API unique identifier, into a runtime
-- host API index.
--
-- @param type A unique host API identifier belonging to the PaHostApiTypeId
-- enumeration.
--
-- @return A valid PaHostApiIndex ranging from 0 to (Pa_GetHostApiCount()-1) or,
-- a PaErrorCode (which are always negative) if PortAudio is not initialized
-- or an error is encountered.
-- 
-- The paHostApiNotFound error code indicates that the host API specified by the
-- type parameter is not available.
--
-- @see PaHostApiTypeId
--*/
--PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type );
--
--
--/** Convert a host-API-specific device index to standard PortAudio device index.
-- This function may be used in conjunction with the deviceCount field of
-- PaHostApiInfo to enumerate all devices for the specified host API.
--
-- @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1)
--
-- @param hostApiDeviceIndex A valid per-host device index in the range
-- 0 to (Pa_GetHostApiInfo(hostApi)->deviceCount-1)
--
-- @return A non-negative PaDeviceIndex ranging from 0 to (Pa_GetDeviceCount()-1)
-- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
-- or an error is encountered.
--
-- A paInvalidHostApi error code indicates that the host API index specified by
-- the hostApi parameter is out of range.
--
-- A paInvalidDevice error code indicates that the hostApiDeviceIndex parameter
-- is out of range.
-- 
-- @see PaHostApiInfo
--*/
--PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi,
--        int hostApiDeviceIndex );
--
--
--
--/** Structure used to return information about a host error condition.
--*/
--typedef struct PaHostErrorInfo{
--    PaHostApiTypeId hostApiType;    /**< the host API which returned the error code */
--    long errorCode;                 /**< the error code returned */
--    const char *errorText;          /**< a textual description of the error if available, otherwise a zero-length string */
--}PaHostErrorInfo;
--
--
--/** Return information about the last host error encountered. The error
-- information returned by Pa_GetLastHostErrorInfo() will never be modified
-- asyncronously by errors occurring in other PortAudio owned threads
-- (such as the thread that manages the stream callback.)
--
-- This function is provided as a last resort, primarily to enhance debugging
-- by providing clients with access to all available error information.
--
-- @return A pointer to an immutable structure constaining information about
-- the host error. The values in this structure will only be valid if a
-- PortAudio function has previously returned the paUnanticipatedHostError
-- error code.
--*/
--const PaHostErrorInfo* Pa_GetLastHostErrorInfo( void );
--
--
--
--/* Device enumeration and capabilities */
--
--/** Retrieve the number of available devices. The number of available devices
-- may be zero.
--
-- @return A non-negative value indicating the number of available devices or,
-- a PaErrorCode (which are always negative) if PortAudio is not initialized
-- or an error is encountered.
--*/
--PaDeviceIndex Pa_GetDeviceCount( void );
--
--
--/** Retrieve the index of the default input device. The result can be
-- used in the inputDevice parameter to Pa_OpenStream().
--
-- @return The default input device index for the default host API, or paNoDevice
-- if no default input device is available or an error was encountered.
--*/
--PaDeviceIndex Pa_GetDefaultInputDevice( void );
--
--
--/** Retrieve the index of the default output device. The result can be
-- used in the outputDevice parameter to Pa_OpenStream().
--
-- @return The default output device index for the defualt host API, or paNoDevice
-- if no default output device is available or an error was encountered.
--
-- @note
-- On the PC, the user can specify a default device by
-- setting an environment variable. For example, to use device #1.
--<pre>
-- set PA_RECOMMENDED_OUTPUT_DEVICE=1
--</pre>
-- The user should first determine the available device ids by using
-- the supplied application "pa_devs".
--*/
--PaDeviceIndex Pa_GetDefaultOutputDevice( void );
--
--
--/** The type used to represent monotonic time in seconds that can be used
-- for syncronisation. The type is used for the outTime argument to the
-- PaStreamCallback and as the result of Pa_GetStreamTime().
--     
-- @see PaStreamCallback, Pa_GetStreamTime
--*/
--typedef double PaTime;
--
--
--/** A type used to specify one or more sample formats. Each value indicates
-- a possible format for sound data passed to and from the stream callback,
-- Pa_ReadStream and Pa_WriteStream.
--
-- The standard formats paFloat32, paInt16, paInt32, paInt24, paInt8
-- and aUInt8 are usually implemented by all implementations.
--
-- The floating point representation (paFloat32) uses +1.0 and -1.0 as the
-- maximum and minimum respectively.
--
-- paUInt8 is an unsigned 8 bit format where 128 is considered "ground"
--
-- The paNonInterleaved flag indicates that a multichannel buffer is passed
-- as a set of non-interleaved pointers.
--
-- @see Pa_OpenStream, Pa_OpenDefaultStream, PaDeviceInfo
-- @see paFloat32, paInt16, paInt32, paInt24, paInt8
-- @see paUInt8, paCustomFormat, paNonInterleaved
--*/
--typedef unsigned long PaSampleFormat;
--
--
--#define paFloat32        ((PaSampleFormat) 0x00000001) /**< @see PaSampleFormat */
--#define paInt32          ((PaSampleFormat) 0x00000002) /**< @see PaSampleFormat */
--#define paInt24          ((PaSampleFormat) 0x00000004) /**< Packed 24 bit format. @see PaSampleFormat */
--#define paInt16          ((PaSampleFormat) 0x00000008) /**< @see PaSampleFormat */
--#define paInt8           ((PaSampleFormat) 0x00000010) /**< @see PaSampleFormat */
--#define paUInt8          ((PaSampleFormat) 0x00000020) /**< @see PaSampleFormat */
--#define paCustomFormat   ((PaSampleFormat) 0x00010000)/**< @see PaSampleFormat */
--
--#define paNonInterleaved ((PaSampleFormat) 0x80000000)
--
--/** A structure providing information and capabilities of PortAudio devices.
-- Devices may support input, output or both input and output.
--*/
--typedef struct PaDeviceInfo
--{
--    int structVersion;  /* this is struct version 2 */
--    const char *name;
--    PaHostApiIndex hostApi; /* note this is a host API index, not a type id*/
--    
--    int maxInputChannels;
--    int maxOutputChannels;
--
--    /* Default latency values for interactive performance. */
--    PaTime defaultLowInputLatency;
--    PaTime defaultLowOutputLatency;
--    /* Default latency values for robust non-interactive applications (eg. playing sound files). */
--    PaTime defaultHighInputLatency;
--    PaTime defaultHighOutputLatency;
--
--    double defaultSampleRate;
--} PaDeviceInfo;
--
--
--/** Retrieve a pointer to a PaDeviceInfo structure containing information
-- about the specified device.
-- @return A pointer to an immutable PaDeviceInfo structure. If the device
-- parameter is out of range the function returns NULL.
--
-- @param device A valid device index in the range 0 to (Pa_GetDeviceCount()-1)
--
-- @note PortAudio manages the memory referenced by the returned pointer,
-- the client must not manipulate or free the memory. The pointer is only
-- guaranteed to be valid between calls to Pa_Initialize() and Pa_Terminate().
--
-- @see PaDeviceInfo, PaDeviceIndex
--*/
--const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device );
--
--
--/** Parameters for one direction (input or output) of a stream.
--*/
--typedef struct PaStreamParameters
--{
--    /** A valid device index in the range 0 to (Pa_GetDeviceCount()-1)
--     specifying the device to be used or the special constant
--     paUseHostApiSpecificDeviceSpecification which indicates that the actual
--     device(s) to use are specified in hostApiSpecificStreamInfo.
--     This field must not be set to paNoDevice.
--    */
--    PaDeviceIndex device;
--    
--    /** The number of channels of sound to be delivered to the
--     stream callback or accessed by Pa_ReadStream() or Pa_WriteStream().
--     It can range from 1 to the value of maxInputChannels in the
--     PaDeviceInfo record for the device specified by the device parameter.
--    */
--    int channelCount;
--
--    /** The sample format of the buffer provided to the stream callback,
--     a_ReadStream() or Pa_WriteStream(). It may be any of the formats described
--     by the PaSampleFormat enumeration.
--    */
--    PaSampleFormat sampleFormat;
--
--    /** The desired latency in seconds. Where practical, implementations should
--     configure their latency based on these parameters, otherwise they may
--     choose the closest viable latency instead. Unless the suggested latency
--     is greater than the absolute upper limit for the device implementations
--     should round the suggestedLatency up to the next practial value - ie to
--     provide an equal or higher latency than suggestedLatency wherever possibe.
--     Actual latency values for an open stream may be retrieved using the
--     inputLatency and outputLatency fields of the PaStreamInfo structure
--     returned by Pa_GetStreamInfo().
--     @see default*Latency in PaDeviceInfo, *Latency in PaStreamInfo
--    */
--    PaTime suggestedLatency;
--
--    /** An optional pointer to a host api specific data structure
--     containing additional information for device setup and/or stream processing.
--     hostApiSpecificStreamInfo is never required for correct operation,
--     if not used it should be set to NULL.
--    */
--    void *hostApiSpecificStreamInfo;
--
--} PaStreamParameters;
--
--
--/** Return code for Pa_IsFormatSupported indicating success. */
--#define paFormatIsSupported (0)
--
--/** Determine whether it would be possible to open a stream with the specified
-- parameters.
--
-- @param inputParameters A structure that describes the input parameters used to
-- open a stream. The suggestedLatency field is ignored. See PaStreamParameters
-- for a description of these parameters. inputParameters must be NULL for
-- output-only streams.
--
-- @param outputParameters A structure that describes the output parameters used
-- to open a stream. The suggestedLatency field is ignored. See PaStreamParameters
-- for a description of these parameters. outputParameters must be NULL for
-- input-only streams.
--
-- @param sampleRate The required sampleRate. For full-duplex streams it is the
-- sample rate for both input and output
--
-- @return Returns 0 if the format is supported, and an error code indicating why
-- the format is not supported otherwise. The constant paFormatIsSupported is
-- provided to compare with the return value for success.
--
-- @see paFormatIsSupported, PaStreamParameters
--*/
--PaError Pa_IsFormatSupported( const PaStreamParameters *inputParameters,
--                              const PaStreamParameters *outputParameters,
--                              double sampleRate );
--
--
--
--/* Streaming types and functions */
--
--
--/**
-- A single PaStream can provide multiple channels of real-time
-- streaming audio input and output to a client application. A stream
-- provides access to audio hardware represented by one or more
-- PaDevices. Depending on the underlying Host API, it may be possible 
-- to open multiple streams using the same device, however this behavior 
-- is implementation defined. Portable applications should assume that 
-- a PaDevice may be simultaneously used by at most one PaStream.
--
-- Pointers to PaStream objects are passed between PortAudio functions that
-- operate on streams.
--
-- @see Pa_OpenStream, Pa_OpenDefaultStream, Pa_OpenDefaultStream, Pa_CloseStream,
-- Pa_StartStream, Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive,
-- Pa_GetStreamTime, Pa_GetStreamCpuLoad
--
--*/
--typedef void PaStream;
--
--
--/** Can be passed as the framesPerBuffer parameter to Pa_OpenStream()
-- or Pa_OpenDefaultStream() to indicate that the stream callback will
-- accept buffers of any size.
--*/
--#define paFramesPerBufferUnspecified  (0)
--
--
--/** Flags used to control the behavior of a stream. They are passed as
-- parameters to Pa_OpenStream or Pa_OpenDefaultStream. Multiple flags may be
-- ORed together.
--
-- @see Pa_OpenStream, Pa_OpenDefaultStream
-- @see paNoFlag, paClipOff, paDitherOff, paNeverDropInput,
--  paPrimeOutputBuffersUsingStreamCallback, paPlatformSpecificFlags
--*/
--typedef unsigned long PaStreamFlags;
--
--/** @see PaStreamFlags */
--#define   paNoFlag          ((PaStreamFlags) 0)
--
--/** Disable default clipping of out of range samples.
-- @see PaStreamFlags
--*/
--#define   paClipOff         ((PaStreamFlags) 0x00000001)
--
--/** Disable default dithering.
-- @see PaStreamFlags
--*/
--#define   paDitherOff       ((PaStreamFlags) 0x00000002)
--
--/** Flag requests that where possible a full duplex stream will not discard
-- overflowed input samples without calling the stream callback. This flag is
-- only valid for full duplex callback streams and only when used in combination
-- with the paFramesPerBufferUnspecified (0) framesPerBuffer parameter. Using
-- this flag incorrectly results in a paInvalidFlag error being returned from
-- Pa_OpenStream and Pa_OpenDefaultStream.
--
-- @see PaStreamFlags, paFramesPerBufferUnspecified
--*/
--#define   paNeverDropInput  ((PaStreamFlags) 0x00000004)
--
--/** Call the stream callback to fill initial output buffers, rather than the
-- default behavior of priming the buffers with zeros (silence). This flag has
-- no effect for input-only and blocking read/write streams.
-- 
-- @see PaStreamFlags
--*/
--#define   paPrimeOutputBuffersUsingStreamCallback ((PaStreamFlags) 0x00000008)
--
--/** A mask specifying the platform specific bits.
-- @see PaStreamFlags
--*/
--#define   paPlatformSpecificFlags ((PaStreamFlags)0xFFFF0000)
--
--/**
-- Timing information for the buffers passed to the stream callback.
--*/
--typedef struct PaStreamCallbackTimeInfo{
--    PaTime inputBufferAdcTime;
--    PaTime currentTime;
--    PaTime outputBufferDacTime;
--} PaStreamCallbackTimeInfo;
--
--
--/**
-- Flag bit constants for the statusFlags to PaStreamCallback.
--
-- @see paInputUnderflow, paInputOverflow, paOutputUnderflow, paOutputOverflow,
-- paPrimingOutput
--*/
--typedef unsigned long PaStreamCallbackFlags;
--
--/** In a stream opened with paFramesPerBufferUnspecified, indicates that
-- input data is all silence (zeros) because no real data is available. In a
-- stream opened without paFramesPerBufferUnspecified, it indicates that one or
-- more zero samples have been inserted into the input buffer to compensate
-- for an input underflow.
-- @see PaStreamCallbackFlags
--*/
--#define paInputUnderflow   ((PaStreamCallbackFlags) 0x00000001)
--
--/** In a stream opened with paFramesPerBufferUnspecified, indicates that data
-- prior to the first sample of the input buffer was discarded due to an
-- overflow, possibly because the stream callback is using too much CPU time.
-- Otherwise indicates that data prior to one or more samples in the
-- input buffer was discarded.
-- @see PaStreamCallbackFlags
--*/
--#define paInputOverflow    ((PaStreamCallbackFlags) 0x00000002)
--
--/** Indicates that output data (or a gap) was inserted, possibly because the
-- stream callback is using too much CPU time.
-- @see PaStreamCallbackFlags
--*/
--#define paOutputUnderflow  ((PaStreamCallbackFlags) 0x00000004)
--
--/** Indicates that output data will be discarded because no room is available.
-- @see PaStreamCallbackFlags
--*/
--#define paOutputOverflow   ((PaStreamCallbackFlags) 0x00000008)
--
--/** Some of all of the output data will be used to prime the stream, input
-- data may be zero.
-- @see PaStreamCallbackFlags
--*/
--#define paPrimingOutput    ((PaStreamCallbackFlags) 0x00000010)
--
--/**
-- Allowable return values for the PaStreamCallback.
-- @see PaStreamCallback
--*/
--typedef enum PaStreamCallbackResult
--{
--    paContinue=0,
--    paComplete=1,
--    paAbort=2
--} PaStreamCallbackResult;
--
--
--/**
-- Functions of type PaStreamCallback are implemented by PortAudio clients.
-- They consume, process or generate audio in response to requests from an
-- active PortAudio stream.
--     
-- @param input and @param output are arrays of interleaved samples,
-- the format, packing and number of channels used by the buffers are
-- determined by parameters to Pa_OpenStream().
--     
-- @param frameCount The number of sample frames to be processed by
-- the stream callback.
--
-- @param timeInfo The time in seconds when the first sample of the input
-- buffer was received at the audio input, the time in seconds when the first
-- sample of the output buffer will begin being played at the audio output, and
-- the time in seconds when the stream callback was called.
-- See also Pa_GetStreamTime()
--
-- @param statusFlags Flags indicating whether input and/or output buffers
-- have been inserted or will be dropped to overcome underflow or overflow
-- conditions.
--
-- @param userData The value of a user supplied pointer passed to
-- Pa_OpenStream() intended for storing synthesis data etc.
--
-- @return
-- The stream callback should return one of the values in the
-- PaStreamCallbackResult enumeration. To ensure that the callback continues
-- to be called, it should return paContinue (0). Either paComplete or paAbort
-- can be returned to finish stream processing, after either of these values is
-- returned the callback will not be called again. If paAbort is returned the
-- stream will finish as soon as possible. If paComplete is returned, the stream
-- will continue until all buffers generated by the callback have been played.
-- This may be useful in applications such as soundfile players where a specific
-- duration of output is required. However, it is not necessary to utilise this
-- mechanism as Pa_StopStream(), Pa_AbortStream() or Pa_CloseStream() can also
-- be used to stop the stream. The callback must always fill the entire output
-- buffer irrespective of its return value.
--
-- @see Pa_OpenStream, Pa_OpenDefaultStream
--
-- @note With the exception of Pa_GetStreamCpuLoad() it is not permissable to call
-- PortAudio API functions from within the stream callback.
--*/
--typedef int PaStreamCallback(
--    const void *input, void *output,
--    unsigned long frameCount,
--    const PaStreamCallbackTimeInfo* timeInfo,
--    PaStreamCallbackFlags statusFlags,
--    void *userData );
--
--
--/** Opens a stream for either input, output or both.
--     
-- @param stream The address of a PaStream pointer which will receive
-- a pointer to the newly opened stream.
--     
-- @param inputParameters A structure that describes the input parameters used by
-- the opened stream. See PaStreamParameters for a description of these parameters.
-- inputParameters must be NULL for output-only streams.
--
-- @param outputParameters A structure that describes the output parameters used by
-- the opened stream. See PaStreamParameters for a description of these parameters.
-- outputParameters must be NULL for input-only streams.
-- 
-- @param sampleRate The desired sampleRate. For full-duplex streams it is the
-- sample rate for both input and output
--     
-- @param framesPerBuffer The number of frames passed to the stream callback
-- function, or the preferred block granularity for a blocking read/write stream.
-- The special value paFramesPerBufferUnspecified (0) may be used to request that
-- the stream callback will recieve an optimal (and possibly varying) number of
-- frames based on host requirements and the requested latency settings.
-- Note: With some host APIs, the use of non-zero framesPerBuffer for a callback
-- stream may introduce an additional layer of buffering which could introduce
-- additional latency. PortAudio guarantees that the additional latency
-- will be kept to the theoretical minimum however, it is strongly recommended
-- that a non-zero framesPerBuffer value only be used when your algorithm
-- requires a fixed number of frames per stream callback.
-- 
-- @param streamFlags Flags which modify the behaviour of the streaming process.
-- This parameter may contain a combination of flags ORed together. Some flags may
-- only be relevant to certain buffer formats.
--     
-- @param streamCallback A pointer to a client supplied function that is responsible
-- for processing and filling input and output buffers. If this parameter is NULL
-- the stream will be opened in 'blocking read/write' mode. In blocking mode,
-- the client can receive sample data using Pa_ReadStream and write sample data
-- using Pa_WriteStream, the number of samples that may be read or written
-- without blocking is returned by Pa_GetStreamReadAvailable and
-- Pa_GetStreamWriteAvailable respectively.
--
-- @param userData A client supplied pointer which is passed to the stream callback
-- function. It could for example, contain a pointer to instance data necessary
-- for processing the audio buffers. This parameter is ignored if streamCallback
-- is NULL.
--     
-- @return
-- Upon success Pa_OpenStream() returns paNoError and places a pointer to a
-- valid PaStream in the stream argument. The stream is inactive (stopped).
-- If a call to Pa_OpenStream() fails, a non-zero error code is returned (see
-- PaError for possible error codes) and the value of stream is invalid.
--
-- @see PaStreamParameters, PaStreamCallback, Pa_ReadStream, Pa_WriteStream,
-- Pa_GetStreamReadAvailable, Pa_GetStreamWriteAvailable
--*/
--PaError Pa_OpenStream( PaStream** stream,
--                       const PaStreamParameters *inputParameters,
--                       const PaStreamParameters *outputParameters,
--                       double sampleRate,
--                       unsigned long framesPerBuffer,
--                       PaStreamFlags streamFlags,
--                       PaStreamCallback *streamCallback,
--                       void *userData );
--
--
--/** A simplified version of Pa_OpenStream() that opens the default input
-- and/or output devices.
--
-- @param stream The address of a PaStream pointer which will receive
-- a pointer to the newly opened stream.
-- 
-- @param numInputChannels  The number of channels of sound that will be supplied
-- to the stream callback or returned by Pa_ReadStream. It can range from 1 to
-- the value of maxInputChannels in the PaDeviceInfo record for the default input
-- device. If 0 the stream is opened as an output-only stream.
--
-- @param numOutputChannels The number of channels of sound to be delivered to the
-- stream callback or passed to Pa_WriteStream. It can range from 1 to the value
-- of maxOutputChannels in the PaDeviceInfo record for the default output dvice.
-- If 0 the stream is opened as an output-only stream.
--
-- @param sampleFormat The sample format of both the input and output buffers
-- provided to the callback or passed to and from Pa_ReadStream and Pa_WriteStream.
-- sampleFormat may be any of the formats described by the PaSampleFormat
-- enumeration.
-- 
-- @param sampleRate Same as Pa_OpenStream parameter of the same name.
-- @param framesPerBuffer Same as Pa_OpenStream parameter of the same name.
-- @param streamCallback Same as Pa_OpenStream parameter of the same name.
-- @param userData Same as Pa_OpenStream parameter of the same name.
--
-- @return As for Pa_OpenStream
--
-- @see Pa_OpenStream, PaStreamCallback
--*/
--PaError Pa_OpenDefaultStream( PaStream** stream,
--                              int numInputChannels,
--                              int numOutputChannels,
--                              PaSampleFormat sampleFormat,
--                              double sampleRate,
--                              unsigned long framesPerBuffer,
--                              PaStreamCallback *streamCallback,
--                              void *userData );
--
--
--/** Closes an audio stream. If the audio stream is active it
-- discards any pending buffers as if Pa_AbortStream() had been called.
--*/
--PaError Pa_CloseStream( PaStream *stream );
--
--
--/** Functions of type PaStreamFinishedCallback are implemented by PortAudio 
-- clients. They can be registered with a stream using the Pa_SetStreamFinishedCallback
-- function. Once registered they are called when the stream becomes inactive
-- (ie once a call to Pa_StopStream() will not block).
-- A stream will become inactive after the stream callback returns non-zero,
-- or when Pa_StopStream or Pa_AbortStream is called. For a stream providing audio
-- output, if the stream callback returns paComplete, or Pa_StopStream is called,
-- the stream finished callback will not be called until all generated sample data
-- has been played.
-- 
-- @param userData The userData parameter supplied to Pa_OpenStream()
--
-- @see Pa_SetStreamFinishedCallback
--*/
--typedef void PaStreamFinishedCallback( void *userData );
--
--
--/** Register a stream finished callback function which will be called when the 
-- stream becomes inactive. See the description of PaStreamFinishedCallback for 
-- further details about when the callback will be called.
--
-- @param stream a pointer to a PaStream that is in the stopped state - if the
-- stream is not stopped, the stream's finished callback will remain unchanged 
-- and an error code will be returned.
--
-- @param streamFinishedCallback a pointer to a function with the same signature
-- as PaStreamFinishedCallback, that will be called when the stream becomes
-- inactive. Passing NULL for this parameter will un-register a previously
-- registered stream finished callback function.
--
-- @return on success returns paNoError, otherwise an error code indicating the cause
-- of the error.
--
-- @see PaStreamFinishedCallback
--*/
--PaError Pa_SetStreamFinishedCallback( PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback ); 
--
--
--/** Commences audio processing.
--*/
--PaError Pa_StartStream( PaStream *stream );
--
--
--/** Terminates audio processing. It waits until all pending
-- audio buffers have been played before it returns.
--*/
--PaError Pa_StopStream( PaStream *stream );
--
--
--/** Terminates audio processing immediately without waiting for pending
-- buffers to complete.
--*/
--PaError Pa_AbortStream( PaStream *stream );
--
--
--/** Determine whether the stream is stopped.
-- A stream is considered to be stopped prior to a successful call to
-- Pa_StartStream and after a successful call to Pa_StopStream or Pa_AbortStream.
-- If a stream callback returns a value other than paContinue the stream is NOT
-- considered to be stopped.
--
-- @return Returns one (1) when the stream is stopped, zero (0) when
-- the stream is running or, a PaErrorCode (which are always negative) if
-- PortAudio is not initialized or an error is encountered.
--
-- @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive
--*/
--PaError Pa_IsStreamStopped( PaStream *stream );
--
--
--/** Determine whether the stream is active.
-- A stream is active after a successful call to Pa_StartStream(), until it
-- becomes inactive either as a result of a call to Pa_StopStream() or
-- Pa_AbortStream(), or as a result of a return value other than paContinue from
-- the stream callback. In the latter case, the stream is considered inactive
-- after the last buffer has finished playing.
--
-- @return Returns one (1) when the stream is active (ie playing or recording
-- audio), zero (0) when not playing or, a PaErrorCode (which are always negative)
-- if PortAudio is not initialized or an error is encountered.
--
-- @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamStopped
--*/
--PaError Pa_IsStreamActive( PaStream *stream );
--
--
--
--/** A structure containing unchanging information about an open stream.
-- @see Pa_GetStreamInfo
--*/
--
--typedef struct PaStreamInfo
--{
--    /** this is struct version 1 */
--    int structVersion;
--
--    /** The input latency of the stream in seconds. This value provides the most
--     accurate estimate of input latency available to the implementation. It may
--     differ significantly from the suggestedLatency value passed to Pa_OpenStream().
--     The value of this field will be zero (0.) for output-only streams.
--     @see PaTime
--    */
--    PaTime inputLatency;
--
--    /** The output latency of the stream in seconds. This value provides the most
--     accurate estimate of output latency available to the implementation. It may
--     differ significantly from the suggestedLatency value passed to Pa_OpenStream().
--     The value of this field will be zero (0.) for input-only streams.
--     @see PaTime
--    */
--    PaTime outputLatency;
--
--    /** The sample rate of the stream in Hertz (samples per second). In cases
--     where the hardware sample rate is inaccurate and PortAudio is aware of it,
--     the value of this field may be different from the sampleRate parameter
--     passed to Pa_OpenStream(). If information about the actual hardware sample
--     rate is not available, this field will have the same value as the sampleRate
--     parameter passed to Pa_OpenStream().
--    */
--    double sampleRate;
--    
--} PaStreamInfo;
--
--
--/** Retrieve a pointer to a PaStreamInfo structure containing information
-- about the specified stream.
-- @return A pointer to an immutable PaStreamInfo structure. If the stream
-- parameter invalid, or an error is encountered, the function returns NULL.
--
-- @param stream A pointer to an open stream previously created with Pa_OpenStream.
--
-- @note PortAudio manages the memory referenced by the returned pointer,
-- the client must not manipulate or free the memory. The pointer is only
-- guaranteed to be valid until the specified stream is closed.
--
-- @see PaStreamInfo
--*/
--const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream );
--
--
--/** Determine the current time for the stream according to the same clock used
-- to generate buffer timestamps. This time may be used for syncronising other
-- events to the audio stream, for example synchronizing audio to MIDI.
--                                        
-- @return The stream's current time in seconds, or 0 if an error occurred.
--
-- @see PaTime, PaStreamCallback
--*/
--PaTime Pa_GetStreamTime( PaStream *stream );
--
--
--/** Retrieve CPU usage information for the specified stream.
-- The "CPU Load" is a fraction of total CPU time consumed by a callback stream's
-- audio processing routines including, but not limited to the client supplied
-- stream callback. This function does not work with blocking read/write streams.
--
-- This function may be called from the stream callback function or the
-- application.
--     
-- @return
-- A floating point value, typically between 0.0 and 1.0, where 1.0 indicates
-- that the stream callback is consuming the maximum number of CPU cycles possible
-- to maintain real-time operation. A value of 0.5 would imply that PortAudio and
-- the stream callback was consuming roughly 50% of the available CPU time. The
-- return value may exceed 1.0. A value of 0.0 will always be returned for a
-- blocking read/write stream, or if an error occurrs.
--*/
--double Pa_GetStreamCpuLoad( PaStream* stream );
--
--
--/** Read samples from an input stream. The function doesn't return until
-- the entire buffer has been filled - this may involve waiting for the operating
-- system to supply the data.
--
-- @param stream A pointer to an open stream previously created with Pa_OpenStream.
-- 
-- @param buffer A pointer to a buffer of sample frames. The buffer contains
-- samples in the format specified by the inputParameters->sampleFormat field
-- used to open the stream, and the number of channels specified by
-- inputParameters->numChannels. If non-interleaved samples were requested,
-- buffer is a pointer to the first element of an array of non-interleaved
-- buffer pointers, one for each channel.
--
-- @param frames The number of frames to be read into buffer. This parameter
-- is not constrained to a specific range, however high performance applications
-- will want to match this parameter to the framesPerBuffer parameter used
-- when opening the stream.
--
-- @return On success PaNoError will be returned, or PaInputOverflowed if input
-- data was discarded by PortAudio after the previous call and before this call.
--*/
--PaError Pa_ReadStream( PaStream* stream,
--                       void *buffer,
--                       unsigned long frames );
--
--
--/** Write samples to an output stream. This function doesn't return until the
-- entire buffer has been consumed - this may involve waiting for the operating
-- system to consume the data.
--
-- @param stream A pointer to an open stream previously created with Pa_OpenStream.
--
-- @param buffer A pointer to a buffer of sample frames. The buffer contains
-- samples in the format specified by the outputParameters->sampleFormat field
-- used to open the stream, and the number of channels specified by
-- outputParameters->numChannels. If non-interleaved samples were requested,
-- buffer is a pointer to the first element of an array of non-interleaved
-- buffer pointers, one for each channel.
--
-- @param frames The number of frames to be written from buffer. This parameter
-- is not constrained to a specific range, however high performance applications
-- will want to match this parameter to the framesPerBuffer parameter used
-- when opening the stream.
--
-- @return On success PaNoError will be returned, or paOutputUnderflowed if
-- additional output data was inserted after the previous call and before this
-- call.
--*/
--PaError Pa_WriteStream( PaStream* stream,
--                        const void *buffer,
--                        unsigned long frames );
--
--
--/** Retrieve the number of frames that can be read from the stream without
-- waiting.
--
-- @return Returns a non-negative value representing the maximum number of frames
-- that can be read from the stream without blocking or busy waiting or, a
-- PaErrorCode (which are always negative) if PortAudio is not initialized or an
-- error is encountered.
--*/
--signed long Pa_GetStreamReadAvailable( PaStream* stream );
--
--
--/** Retrieve the number of frames that can be written to the stream without
-- waiting.
--
-- @return Returns a non-negative value representing the maximum number of frames
-- that can be written to the stream without blocking or busy waiting or, a
-- PaErrorCode (which are always negative) if PortAudio is not initialized or an
-- error is encountered.
--*/
--signed long Pa_GetStreamWriteAvailable( PaStream* stream );
--
--
--/* Miscellaneous utilities */
--
--
--/** Retrieve the size of a given sample format in bytes.
--
-- @return The size in bytes of a single sample in the specified format,
-- or paSampleFormatNotSupported if the format is not supported.
--*/
--PaError Pa_GetSampleSize( PaSampleFormat format );
--
--
--/** Put the caller to sleep for at least 'msec' milliseconds. This function is
-- provided only as a convenience for authors of portable code (such as the tests
-- and examples in the PortAudio distribution.)
--
-- The function may sleep longer than requested so don't rely on this for accurate
-- musical timing.
--*/
--void Pa_Sleep( long msec );
--
--
--
--#ifdef __cplusplus
--}
--#endif /* __cplusplus */
--#endif /* PORTAUDIO_H */
---- a/src/wave.cpp
-+++ b/src/wave.cpp
-@@ -31,7 +31,10 @@
- #include <sys/time.h>
- #include <time.h>
- 
--#include "portaudio.h"
-+#ifdef USE_PORTAUDIO
-+#include <portaudio.h>
-+#endif
-+
- #ifdef PLATFORM_WINDOWS
- #include <windows.h>
- #else
---- a/src/wavegen.cpp
-+++ b/src/wavegen.cpp
-@@ -40,7 +40,7 @@
- #endif
- 
- #ifdef USE_PORTAUDIO
--#include "portaudio.h"
-+#include <portaudio.h>
- #undef USE_PORTAUDIO
- // determine portaudio version by looking for a #define which is not in V18
- #ifdef paNeverDropInput
diff --git a/trunk/package/feeds/packages/etherwake/Makefile b/trunk/package/feeds/packages/etherwake/Makefile
deleted file mode 100644
index 7343adc0..00000000
--- a/trunk/package/feeds/packages/etherwake/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=etherwake
-PKG_VERSION:=1.09
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/etherwake
-PKG_MD5SUM:=628e8b2a28d47f262e4c26c989402a59
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/etherwake
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=WoL client for magic packets via ethernet frames
-  URL:=http://ftp.debian.org/debian/pool/main/e/etherwake
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/etherwake/description
-	You can wake up WOL compliant Computers which have been powered down to
-	sleep mode or start WOL compliant Computers with a BIOS feature.
-	WOL is an abbreviation for Wake-on-LAN. It is a standard that allows you
-	to turn on a computer from another location over a network connection.
-	ether-wake also supports WOL passwords.
-endef
-
-define Build/Compile
-	$(TARGET_CC) $(TARGET_CFLAGS) -D__UCLIBC__ $(PKG_BUILD_DIR)/ether-wake.c -o $(PKG_BUILD_DIR)/etherwake
-endef
-
-define Package/etherwake/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/etherwake $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-define Package/etherwake/conffiles
-/etc/config/etherwake
-endef
-
-$(eval $(call BuildPackage,etherwake))
diff --git a/trunk/package/feeds/packages/etherwake/files/etherwake.config b/trunk/package/feeds/packages/etherwake/files/etherwake.config
deleted file mode 100644
index 3d8e5158..00000000
--- a/trunk/package/feeds/packages/etherwake/files/etherwake.config
+++ /dev/null
@@ -1,28 +0,0 @@
-config 'etherwake' 'setup'
-	# possible program pathes
-	option 'pathes' '/usr/bin/etherwake /usr/bin/ether-wake'
-	# use sudo, defaults to off
-	option 'sudo' 'off'
-	# interface, defaults to 'eth0'
-	# -i <ifname>
-	option 'interface' ''
-	# send wake-up packet to the broadcast address, defaults to off
-	# -b
-	option 'broadcast' 'off'
-
-config 'target'
-	# name for the target
-	option 'name' 'example'
-	# mac address to wake up
-	option 'mac' '11:22:33:44:55:66'
-	# password in hex without any delimiters
-	option 'password' 'AABBCCDDEEFF'
-	# wake up on system start, defaults to off
-	option 'wakeonboot' 'off'
-
-# To add a new target use:
-#  uci add etherwake target
-#  uci set etherwake.@target[-1].name=example
-#  uci set etherwake.@target[-1].mac=11:22:33:44:55:66
-#  uci set etherwake.@target[-1].password=AABBCCDDEEFF
-#  uci set etherwake.@target[-1].wakeonboot=off
diff --git a/trunk/package/feeds/packages/etherwake/files/etherwake.init b/trunk/package/feeds/packages/etherwake/files/etherwake.init
deleted file mode 100644
index 0504cf1c..00000000
--- a/trunk/package/feeds/packages/etherwake/files/etherwake.init
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
-
-NAME='etherwake'
-START=60
-PROGRAM=''
-
-start()
-{
-	local searchlist=''
-	local section=''
-	local value=''
-
-	config_load "${NAME}"
-
-	# check for available program
-	config_get searchlist 'setup' 'pathes'
-	PROGRAM=$(search_program "${searchlist}")
-	[ -z "${PROGRAM}" ] && {
-		echo "${initscript}: No ${NAME} program installed. Check: opkg list | grep ${NAME}"
-		exit 1
-	}
-
-	# sudo
-	config_get_bool value 'setup' 'sudo' '0'
-	[ "${value}" -ne 0 ] && PROGRAM="sudo ${PROGRAM}"
-
-	# interface
-	config_get value 'setup' 'interface'
-	[ -n "${value}" ] && append PROGRAM "-i ${value}"
-
-	# broadcast
-	config_get_bool value 'setup' 'broadcast' '0'
-	[ "${value}" -ne 0 ] && append PROGRAM '-b'
-
-	# wake up targets
-	config_foreach etherwake_start target $*
-}
-
-etherwake_start()
-{
-	local section="$1"
-	shift
-
-	local names="$*"
-
-	local value=''
-	local target=''
-
-	if [ -z "${names}" ]
-	 then
-		# check if boot target
-		config_get_bool value "${section}" 'wakeonboot' '0'
-		[ "${value}" -eq 0 ] && return 0
-
-		# wake up target
-		do_etherwake "${section}"
-		return $?
-	else
-		# name
-		config_get value "${section}" 'name'
-		[ -z "${value}" ] && return 0
-
-		for target in ${names}
-		 do
-			[ "${value}" != "${target}" ] && continue
-
-			# wake up target
-			do_etherwake "${section}"
-			return $?
-		done
-	fi
-}
-
-# execute etherwake command for target
-do_etherwake()
-{
-	local section="$1"
-	local value=''
-	local password=''
-	local args=''
-
-	# password
-	config_get value "${section}" 'password'
-	[ -n "${value}" ] && {
-		password=$(etherwake_password "${value}")
-		append args "-p ${password}"
-	}
-
-	# mac address
-	config_get value "${section}" 'mac'
-	[ -z "${value}" ] && { echo "${initscript}: Target ${section} has no MAC address"; return 1; }
-	append args "${value}"
-
-	# name
-	config_get value "${section}" 'name'
-	[ -z "${value}" ] && value="{section}"
-
-	# execute command
-	echo "${initscript}: Waking up ${value} via ${PROGRAM}${args:+ ${args}}"
-	${PROGRAM} ${args}
-	return $?
-}
-
-
-# find first available program from searchlist
-search_program()
-{
-	local searchlist="$1"
-	local test=''
-	local program=''
-
-	for test in ${searchlist} ; do
-		[ -x "${test}" ] && {
-			program="${test}"
-			break;
-		}
-	done
-
-	[ -n "${program}" ] && echo "${program}"
-
-	return
-}
-
-# prepare hex password
-etherwake_password()
-{
-	local delimiter=':'
-	local password=`echo "$1" | sed "s/../&${delimiter}/g"`
-	echo "${password%${delimiter}}"
-	return
-}
diff --git a/trunk/package/feeds/packages/etherwake/patches/100-no_ether_hostton.patch b/trunk/package/feeds/packages/etherwake/patches/100-no_ether_hostton.patch
deleted file mode 100644
index e33c06b1..00000000
--- a/trunk/package/feeds/packages/etherwake/patches/100-no_ether_hostton.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- etherwake-1.09.orig/ether-wake.c	2005-07-10 20:44:25.000000000 +0200
-+++ etherwake-1.09.orig.no_ether_hostton/ether-wake.c	2007-04-29 19:03:41.000000000 +0200
-@@ -15,7 +15,11 @@
- "	an optional password appended.\n"
- "\n"
- "	The single required parameter is the Ethernet MAC (station) address\n"
-+#if !defined(__UCLIBC__)
- "	of the machine to wake or a host ID with known NSS 'ethers' entry.\n"
-+#else
-+"	of the machine to wake.\n"
-+#endif
- "	The MAC address may be found with the 'arp' program while the target\n"
- "	machine is awake.\n"
- "\n"
-@@ -289,16 +293,22 @@
- 		if (debug)
- 			fprintf(stderr, "The target station address is %s.\n",
- 					ether_ntoa(eaddr));
-+#if !defined(__UCLIBC__)
- 	} else if (ether_hostton(hostid, eaddr) == 0) {
- 		if (debug)
- 			fprintf(stderr, "Station address for hostname %s is %s.\n",
- 					hostid, ether_ntoa(eaddr));
-+#endif
- 	} else {
- 		(void)fprintf(stderr,
- 					  "ether-wake: The Magic Packet host address must be "
- 					  "specified as\n"
-+#if !defined(__UCLIBC__)
- 					  "  - a station address, 00:11:22:33:44:55, or\n"
- 					  "  - a hostname with a known 'ethers' entry.\n");
-+#else
-+					  "  - a station address, 00:11:22:33:44:55\n");
-+#endif
- 		return -1;
- 	}
- 	return 0;
diff --git a/trunk/package/feeds/packages/etherwake/patches/110-format_security_fix.patch b/trunk/package/feeds/packages/etherwake/patches/110-format_security_fix.patch
deleted file mode 100644
index e937fb34..00000000
--- a/trunk/package/feeds/packages/etherwake/patches/110-format_security_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/ether-wake.c
-+++ b/ether-wake.c
-@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
- 		case 'D': debug++;			break;
- 		case 'i': ifname = optarg;	break;
- 		case 'p': get_wol_pw(optarg); break;
--		case 'u': printf(usage_msg); return 0;
-+		case 'u': printf("%s\n", usage_msg); return 0;
- 		case 'v': verbose++;		break;
- 		case 'V': do_version++;		break;
- 		case '?':
-@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
- 	if (verbose || do_version)
- 		printf("%s\n", version_msg);
- 	if (errflag) {
--		fprintf(stderr, brief_usage_msg);
-+		fprintf(stderr, "%s\n", brief_usage_msg);
- 		return 3;
- 	}
diff --git a/trunk/package/feeds/packages/ethtool/Makefile b/trunk/package/feeds/packages/ethtool/Makefile
deleted file mode 100644
index 5ffb8253..00000000
--- a/trunk/package/feeds/packages/ethtool/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ethtool
-PKG_VERSION:=3.18
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
-PKG_MD5SUM:=fbf1a167b88a5966a2c56a2483af68c6
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ethtool
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Display or change ethernet card settings
-  URL:=http://www.kernel.org/pub/software/network/ethtool/
-endef
-
-define Package/ethtool/description
- ethtool is a small utility for examining and tuning your ethernet-based
- network interface
-endef
-
-define Package/ethtool/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,ethtool))
diff --git a/trunk/package/feeds/packages/expat/Makefile b/trunk/package/feeds/packages/expat/Makefile
deleted file mode 100644
index db599d9f..00000000
--- a/trunk/package/feeds/packages/expat/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=expat
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=dd7dab7a5fea97d2a6a43f511449b7cd
-PKG_SOURCE_URL:=@SF/expat
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=conftools/libtool.m4
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libexpat
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=An XML parsing library
-  URL:=http://expat.sourceforge.net/
-endef
-
-define Package/libexpat/description
- A fast, non-validating, stream-oriented XML parsing library.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/expat{,_external}.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/expat.pc $(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libexpat/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libexpat))
diff --git a/trunk/package/feeds/packages/f2fs-tools/Config.in b/trunk/package/feeds/packages/f2fs-tools/Config.in
deleted file mode 100644
index 0c7ecab0..00000000
--- a/trunk/package/feeds/packages/f2fs-tools/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-menu "Configuration"
-        depends on PACKAGE_f2fs-tools
-
-config F2FS_UTILS_f2fstat
-	bool "Install f2fstat utility"
-	default y
-
-config F2FS_UTILS_fibmap_f2fs
-	bool "Install fibmap.f2fs utility"
-	default y
-
-config F2FS_UTILS_fsck_f2fs
-	bool "Install fsck.f2fs utility"
-	default y
-
-config F2FS_UTILS_dump_f2fs
-	bool "Install dump.f2fs utility"
-	select F2FS_UTILS_fsck_f2fs
-	default y
-
-config F2FS_UTILS_mkfs_f2fs
-	bool "Install mkfs.f2fs utility"
-	default y
-
-endmenu
diff --git a/trunk/package/feeds/packages/f2fs-tools/Makefile b/trunk/package/feeds/packages/f2fs-tools/Makefile
deleted file mode 100644
index 62d51556..00000000
--- a/trunk/package/feeds/packages/f2fs-tools/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=f2fs-tools
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPLv2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/
-PKG_MD5SUM:=be9bfdddf3e5fd5e701a88d0b388dc26
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/f2fs-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  TITLE:=Tools for Flash-Friendly File System (F2FS)
-  DEPENDS:=+libuuid +libf2fs
-  URL:=http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
-  MENU:=1
-endef
-
-define Package/libf2fs
-  $(call Package/lxc/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for Flash-Friendly File System (F2FS) tools
-  DEPENDS:=
-endef
-
-define Package/f2fs-tools/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libf2fs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libf2fs.so* $(1)/usr/lib/
-endef
-
-define Package/f2fs-tools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-
-ifeq ($(CONFIG_F2FS_UTILS_f2fstat),y)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/f2fstat $(1)/usr/sbin
-endif
-
-ifeq ($(CONFIG_F2FS_UTILS_fibmap_f2fs),y)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fibmap.f2fs $(1)/usr/sbin
-endif
-
-ifeq ($(CONFIG_F2FS_UTILS_fsck_f2fs),y)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fsck.f2fs $(1)/usr/sbin
-endif
-
-ifeq ($(CONFIG_F2FS_UTILS_dump_f2fs),y)
-	ln -s /usr/sbin/fsck.f2fs $(1)/usr/sbin/dump.f2fs
-endif
-
-ifeq ($(CONFIG_F2FS_UTILS_mkfs_f2fs),y)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.f2fs $(1)/usr/sbin
-endif
-
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libf2fs.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libf2fs.a $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libf2fs))
-$(eval $(call BuildPackage,f2fs-tools))
diff --git a/trunk/package/feeds/packages/f2fs-tools/patches/001-compile.patch b/trunk/package/feeds/packages/f2fs-tools/patches/001-compile.patch
deleted file mode 100644
index 2ff6ee83..00000000
--- a/trunk/package/feeds/packages/f2fs-tools/patches/001-compile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpats
- 				[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
- 				[Minor version for f2fs-tools])
- 
--AC_CHECK_FILE(.git,
--	AC_DEFINE([F2FS_TOOLS_DATE],
--		"m4_bpatsubst(f2fs_tools_gitdate,
--		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
--		[f2fs-tools date based on Git commits]),
--	AC_DEFINE([F2FS_TOOLS_DATE],
-+AC_DEFINE([F2FS_TOOLS_DATE],
- 		"f2fs_tools_date",
--		[f2fs-tools date based on Source releases]))
-+		[f2fs-tools date based on Source releases])
- 
- AC_CONFIG_SRCDIR([config.h.in])
- AC_CONFIG_HEADER([config.h])
diff --git a/trunk/package/feeds/packages/faad2/Config.in b/trunk/package/feeds/packages/faad2/Config.in
deleted file mode 100644
index 00336766..00000000
--- a/trunk/package/feeds/packages/faad2/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config FAAD2_ALWAYS_USE_FLOATING_POINT
-	depends on PACKAGE_libfaad2
-	bool "Build FAAD2 to use floating-point math even if using soft floats."
-	default n
-	help
-		By default, libfaad2 will be built to use fixed point rather
-		than floating point math if emulated floating point operations
-		are being used. (See the CONFIG_SOFT_FLOAT option.) Set this
-		option if you would like to use floating point math regardless
-		of whether floating point emulation is in use.
-		
-		For the best real-time decoding ability, leave this option off.
diff --git a/trunk/package/feeds/packages/faad2/Makefile b/trunk/package/feeds/packages/faad2/Makefile
deleted file mode 100644
index 0d1310b1..00000000
--- a/trunk/package/feeds/packages/faad2/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=faad2
-PKG_VERSION:=2.7
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/faac
-PKG_MD5SUM:=4c332fa23febc0e4648064685a3d4332
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_CONFIG_DEPENDS := \
-	CONFIG_SOFT_FLOAT \
-	CONFIG_FAAD2_ALWAYS_USE_FLOATING_POINT
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-
-# Use fixed point math, if we're using soft floats, and the user didn't
-# specifically ask to use floats anyways.
-ifeq ($(CONFIG_SOFT_FLOAT)-$(CONFIG_FAAD2_ALWAYS_USE_FLOATING_POINT),y-)
-TARGET_CFLAGS+= -DFIXED_POINT
-FAAD2_CONFIG_OPTS= --without-fp -nfp
-endif
-
-define Package/faad2/Default
-  URL:=http://www.audiocoding.com/faad2.html
-  TITLE:=Freeware Advanced Audio Decoder
-endef
-
-define Package/faad2/Default/description
-	FAAD2 is the fastest ISO AAC audio decoder available.
-	FAAD2 correctly decodes all MPEG-4 and MPEG-2 MAIN,
-	LOW, LTP, LD and ER object type AAC files.
-endef
-
-define Package/faad2
-$(call Package/faad2/Default)
-  SECTION:=sound
-  CATEGORY:=Sound
-  TITLE+=player
-  DEPENDS:=+libfaad2
-endef
-
-define Package/faad2/description
-$(call Package/faad2/Default/description)
-  This package contains a binary to play AAC or MP4 files.
-endef
-
-define Package/libfaad2
-$(call Package/faad2/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+=library
-  DEPENDS:=@BUILD_PATENTED
-  MENU:=1
-endef
-
-define Package/libfaad2/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/libfaad2/description
-$(call Package/faad2/Default/description)
-  This package contains the library.
-endef
-
-define Build/Configure
-	# This replacement were do according to many comments on the web because of gcc 3.4.5 version (.6 included).-
-	# wich doesn't recognices the -iquote parameter to AM_CFLAGS
-	($(SED) 's,-iquote $$$$(top_srcdir),-I$$$$(top_srcdir),g' $(PKG_BUILD_DIR)/libfaad/Makefile.am; \
-	$(SED) 's,-iquote $$$$(top_srcdir),-I$$$$(top_srcdir),g' $(PKG_BUILD_DIR)/libfaad/Makefile.in);
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		autoreconf -vif \
-	);
-	$(call Build/Configure/Default, \
-		--with-mp4v2 \
-		$(FAAD2_CONFIG_OPTS) \
-		--without-xmms \
-		, \
-		FAAD2_CPPFLAGS="-fno-builtin-cos -fno-builtin-sin -fno-builtin-log" \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaad.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/faad2/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/faad $(1)/usr/bin/
-endef
-
-define Package/libfaad2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaad.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,faad2))
-$(eval $(call BuildPackage,libfaad2))
diff --git a/trunk/package/feeds/packages/fakeidentd/Makefile b/trunk/package/feeds/packages/fakeidentd/Makefile
deleted file mode 100644
index ce279116..00000000
--- a/trunk/package/feeds/packages/fakeidentd/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fakeidentd
-PKG_VERSION:=2.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).c
-PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=d26693c1a7c883d1432e05fb6f7ead6e
-PKG_MAINTAINER:=Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
-PKG_LICENSE:=GPL-2.0+
-UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(1)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fakeidentd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A static, secure identd.
-  URL:=http://www.guru-group.fi/~too/sw/releases/
-endef
-
-define Package/fakeidentd/description
-	A static secure identd, only one source file.
-endef
-
-define Build/Compile
-	$(SHELL) "$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_SOURCE)" \
-	CC="$(TARGET_CC)" TRG="$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_NAME)" \
-	$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) \
-	$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -DUSE_UNIX_OS
-endef
-
-define Package/fakeidentd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,fakeidentd))
diff --git a/trunk/package/feeds/packages/fakeidentd/files/fakeidentd.init b/trunk/package/feeds/packages/fakeidentd/files/fakeidentd.init
deleted file mode 100644
index 4959ef22..00000000
--- a/trunk/package/feeds/packages/fakeidentd/files/fakeidentd.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2012 OpenWrt.org
-
-START=85
-
-start() {
-	service_start /usr/sbin/fakeidentd -r
-}
-
-stop() {
-	service_stop /usr/sbin/fakeidentd
-}
diff --git a/trunk/package/feeds/packages/fastd/Config.in b/trunk/package/feeds/packages/fastd/Config.in
deleted file mode 100644
index 5820b979..00000000
--- a/trunk/package/feeds/packages/fastd/Config.in
+++ /dev/null
@@ -1,108 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_fastd
-
-config FASTD_ENABLE_METHOD_CIPHER_TEST
-	bool "Enable cipher-test method provider"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_ENABLE_METHOD_COMPOSED_GMAC
-	bool "Enable composed-gmac method provider"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_METHOD_COMPOSED_UMAC
-	bool "Enable composed-umac method provider"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_METHOD_GENERIC_GMAC
-	bool "Enable generic-gmac method provider"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_METHOD_GENERIC_POLY1305
-	bool "Enable generic-poly1305 method provider"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_ENABLE_METHOD_GENERIC_UMAC
-	bool "Enable generic-umac method provider"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_METHOD_NULL
-	bool "Enable null method"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_METHOD_XSALSA20_POLY1305
-	bool "Enable xsalsa20-poly1305 method"
-	depends on PACKAGE_fastd
-	default n
-
-
-config FASTD_ENABLE_CIPHER_AES128_CTR
-	bool "Enable the AES128-CTR cipher"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_ENABLE_CIPHER_NULL
-	bool "Enable the null cipher"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_CIPHER_SALSA20
-	bool "Enable the Salsa20 cipher"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_ENABLE_CIPHER_SALSA2012
-	bool "Enable the Salsa20/12 cipher"
-	depends on PACKAGE_fastd
-	default y
-
-
-config FASTD_ENABLE_MAC_GHASH
-	bool "Enable the GHASH message authentication code"
-	depends on PACKAGE_fastd
-	default y
-
-config FASTD_ENABLE_MAC_UHASH
-	bool "Enable the UHASH message authentication code"
-	depends on PACKAGE_fastd
-	default y
-
-
-config FASTD_WITH_CMDLINE_USER
-	bool "Include support for setting user/group related options on the command line"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_WITH_CMDLINE_LOGGING
-	bool "Include support for setting logging related options on the command line"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_WITH_CMDLINE_OPERATION
-	bool "Include support for setting options related to the VPN operation (like mode, interface, encryption method) on the command line"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_WITH_CMDLINE_COMMANDS
-	bool "Include support for setting handler scripts (e.g. --on-up) on the command line"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_WITH_DYNAMIC_PEERS
-	bool "Include support for on-verify handlers"
-	depends on PACKAGE_fastd
-	default n
-
-config FASTD_WITH_STATUS_SOCKET
-	bool "Include support for status sockets"
-	depends on PACKAGE_fastd
-	default y
-
-
-endmenu
diff --git a/trunk/package/feeds/packages/fastd/Makefile b/trunk/package/feeds/packages/fastd/Makefile
deleted file mode 100644
index 027f5491..00000000
--- a/trunk/package/feeds/packages/fastd/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fastd
-PKG_VERSION:=17
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/81
-PKG_MD5SUM:=bad4f1948702f418b799578f83a0edb8
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYRIGHT
-
-PKG_CONFIG_DEPENDS:=\
-	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
-	CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC \
-	CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC \
-	CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC \
-	CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
-	CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
-	CONFIG_FASTD_ENABLE_METHOD_NULL \
-	CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
-	CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \
-	CONFIG_FASTD_ENABLE_CIPHER_NULL \
-	CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
-	CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
-	CONFIG_FASTD_ENABLE_MAC_GHASH \
-	CONFIG_FASTD_ENABLE_MAC_UHASH \
-	CONFIG_FASTD_WITH_CMDLINE_USER \
-	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
-	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
-	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
-	CONFIG_FASTD_WITH_DYNAMIC_PEERS \
-	CONFIG_FASTD_WITH_STATUS_SOCKET
-
-
-PKG_BUILD_DEPENDS:=nacl libuecc
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/fastd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c
-  TITLE:=Fast and Secure Tunneling Daemon
-  URL:=https://projects.universe-factory.net/projects/fastd
-  SUBMENU:=VPN
-endef
-
-define Package/fastd/config
-  source "$(SOURCE)/Config.in"
-endef
-
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-CMAKE_OPTIONS += \
-	-DCMAKE_BUILD_TYPE:STRING=MINSIZEREL \
-	-DWITH_METHOD_CIPHER_TEST:BOOL=FALSE \
-	-DWITH_METHOD_COMPOSED_GMAC:BOOL=FALSE \
-	-DWITH_METHOD_COMPOSED_UMAC:BOOL=FALSE \
-	-DWITH_METHOD_GENERIC_GMAC:BOOL=FALSE \
-	-DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \
-	-DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \
-	-DWITH_METHOD_NULL:BOOL=FALSE \
-	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \
-	-DWITH_CIPHER_AES128_CTR:BOOL=FALSE \
-	-DWITH_CIPHER_NULL:BOOL=FALSE \
-	-DWITH_CIPHER_SALSA20:BOOL=FALSE \
-	-DWITH_CIPHER_SALSA2012:BOOL=FALSE \
-	-DWITH_MAC_GHASH:BOOL=FALSE \
-	-DWITH_MAC_UHASH:BOOL=FALSE \
-	-DWITH_CMDLINE_USER:BOOL=FALSE \
-	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
-	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
-	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
-	-DWITH_DYNAMIC_PEERS:BOOL=FALSE \
-	-DWITH_STATUS_SOCKET:BOOL=FALSE \
-	-DWITH_CAPABILITIES:BOOL=FALSE \
-	-DENABLE_SYSTEMD:BOOL=FALSE \
-	-DENABLE_LIBSODIUM:BOOL=FALSE \
-	-DENABLE_LTO:BOOL=TRUE
-
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
-CMAKE_OPTIONS += -DWITH_METHOD_CIPHER_TEST:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC),y)
-CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_GMAC:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC),y)
-CMAKE_OPTIONS += -DWITH_METHOD_COMPOSED_UMAC:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC),y)
-CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_GMAC:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305),y)
-CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_POLY1305:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC),y)
-CMAKE_OPTIONS += -DWITH_METHOD_GENERIC_UMAC:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y)
-CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y)
-CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE
-endif
-
-
-ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y)
-CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_NULL),y)
-CMAKE_OPTIONS += -DWITH_CIPHER_NULL:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_SALSA20),y)
-CMAKE_OPTIONS += -DWITH_CIPHER_SALSA20:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_SALSA2012),y)
-CMAKE_OPTIONS += -DWITH_CIPHER_SALSA2012:BOOL=TRUE
-endif
-
-
-ifeq ($(CONFIG_FASTD_ENABLE_MAC_GHASH),y)
-CMAKE_OPTIONS += -DWITH_MAC_GHASH:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_ENABLE_MAC_UHASH),y)
-CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
-endif
-
-
-ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
-CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_WITH_CMDLINE_LOGGING),y)
-CMAKE_OPTIONS += -DWITH_CMDLINE_LOGGING:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_WITH_CMDLINE_OPERATION),y)
-CMAKE_OPTIONS += -DWITH_CMDLINE_OPERATION:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
-CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_WITH_DYNAMIC_PEERS),y)
-CMAKE_OPTIONS += -DWITH_DYNAMIC_PEERS:BOOL=TRUE
-endif
-
-ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y)
-CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE
-endif
-
-
-define Package/fastd/description
- Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
-endef
-
-define Package/fastd/conffiles
-/etc/config/fastd
-endef
-
-define Package/fastd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.init $(1)/etc/init.d/fastd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.config $(1)/etc/config/fastd
-	$(INSTALL_DIR) $(1)/etc/fastd
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd
-endef
-
-$(eval $(call BuildPackage,fastd))
diff --git a/trunk/package/feeds/packages/fastd/files/fastd.upgrade b/trunk/package/feeds/packages/fastd/files/fastd.upgrade
deleted file mode 100644
index 7406613d..00000000
--- a/trunk/package/feeds/packages/fastd/files/fastd.upgrade
+++ /dev/null
@@ -1 +0,0 @@
-/etc/fastd/
diff --git a/trunk/package/feeds/packages/fcgi/Makefile b/trunk/package/feeds/packages/fcgi/Makefile
deleted file mode 100644
index d1d404f8..00000000
--- a/trunk/package/feeds/packages/fcgi/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fcgi
-PKG_VERSION:=2.4.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.fastcgi.com/dist/
-PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e
-
-PKG_FIXUP:=libtool-ucxx
-
-PKG_MAINTAINER:=Jacob Siverskog <jacob@teenageengineering.com>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fcgi/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://www.fastcgi.com/
-endef
-
-define Package/fcgi
-  $(call Package/fcgi/Default)
-  MENU:=1
-  DEPENDS:= +libpthread
-  TITLE:=Shared library of FastCGI
-endef
-
-define Package/fcgixx
-  $(call Package/fcgi/Default)
-  DEPENDS:=fcgi $(CXX_DEPENDS)
-  TITLE:=Shared library of FastCGI++
-endef
-
-define Package/fcgi/description
- FastCGI is a language independent, scalable, open extension to
- CGI that provides high performance without the limitations of
- server specific APIs.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-CONFIGURE_VARS += \
-	LIBS="-lm" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi{,++}.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/fcgi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/
-endef
-
-define Package/fcgixx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi++.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,fcgi))
-$(eval $(call BuildPackage,fcgixx))
diff --git a/trunk/package/feeds/packages/fcgi/patches/100-fcgio-int-type-fix.patch b/trunk/package/feeds/packages/fcgi/patches/100-fcgio-int-type-fix.patch
deleted file mode 100644
index 0fbfbfd2..00000000
--- a/trunk/package/feeds/packages/fcgi/patches/100-fcgio-int-type-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: fcgi-2.4.0/include/fcgio.h
-===================================================================
---- fcgi-2.4.0.orig/include/fcgio.h	2007-07-17 13:30:28.000000000 +0200
-+++ fcgi-2.4.0/include/fcgio.h	2007-07-17 13:30:28.000000000 +0200
-@@ -77,10 +77,10 @@
-     virtual int sync();
- 
-     // Remove and return the current character.
--    virtual int uflow();
-+    virtual int_type uflow();
- 
-     // Fill the get area (if buffered) and return the current character.
--    virtual int underflow();
-+    virtual int_type underflow();
- 
-     // Use a buffer.  The only reasons that a buffer would be useful is
-     // to support the use of the unget()/putback() or seek() methods.  Using
-diff -urN fcgi-2.4.0/libfcgi/fcgio.cpp fcgi-2.4.0.new/libfcgi/fcgio.cpp
---- fcgi-2.4.0/libfcgi/fcgio.cpp	2002-02-24 21:12:22.000000000 +0100
-+++ fcgi-2.4.0.new/libfcgi/fcgio.cpp	2007-08-28 11:22:22.000000000 +0200
-@@ -89,7 +89,7 @@
- }
- 
- // uflow() removes the char, underflow() doesn't
--int fcgi_streambuf::uflow() 
-+std::basic_streambuf<char>::int_type fcgi_streambuf::uflow()
- {
-     int rv = underflow();
-     if (this->bufsize) gbump(1);
-@@ -97,7 +97,7 @@
- }
- 				
- // Note that the expected behaviour when there is no buffer varies
--int fcgi_streambuf::underflow()
-+std::basic_streambuf<char>::int_type fcgi_streambuf::underflow()
- {
-     if (this->bufsize)
-     {
diff --git a/trunk/package/feeds/packages/fcgi/patches/110-no_examples.patch b/trunk/package/feeds/packages/fcgi/patches/110-no_examples.patch
deleted file mode 100644
index 8c14e8ad..00000000
--- a/trunk/package/feeds/packages/fcgi/patches/110-no_examples.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN fcgi-2.4.0/Makefile.am fcgi-2.4.0.new/Makefile.am
---- fcgi-2.4.0/Makefile.am	2001-12-22 14:05:39.000000000 +0100
-+++ fcgi-2.4.0.new/Makefile.am	2007-08-28 11:05:10.000000000 +0200
-@@ -4,7 +4,7 @@
- #  $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $
- #
- 
--SUBDIRS = libfcgi cgi-fcgi examples include
-+SUBDIRS = libfcgi cgi-fcgi include
- 
- include_HEADERS = fcgi_config.h
- 
-diff -urN fcgi-2.4.0/Makefile.in fcgi-2.4.0.new/Makefile.in
---- fcgi-2.4.0/Makefile.in	2003-01-19 18:21:15.000000000 +0100
-+++ fcgi-2.4.0.new/Makefile.in	2007-08-28 11:04:55.000000000 +0200
-@@ -93,7 +93,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
--SUBDIRS = libfcgi cgi-fcgi examples include
-+SUBDIRS = libfcgi cgi-fcgi include
- 
- include_HEADERS = fcgi_config.h
- 
diff --git a/trunk/package/feeds/packages/fcgi/patches/120-stdio.patch b/trunk/package/feeds/packages/fcgi/patches/120-stdio.patch
deleted file mode 100644
index 94c78943..00000000
--- a/trunk/package/feeds/packages/fcgi/patches/120-stdio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: fcgi-2.4.0/libfcgi/fcgio.cpp
-===================================================================
---- fcgi-2.4.0.orig/libfcgi/fcgio.cpp	2014-05-15 10:43:15.153971782 +0200
-+++ fcgi-2.4.0/libfcgi/fcgio.cpp	2014-05-15 10:44:44.037974020 +0200
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <limits.h>
-+#include <stdio.h>
- #include "fcgio.h"
- 
- using std::streambuf;
diff --git a/trunk/package/feeds/packages/fdm/Config.in b/trunk/package/feeds/packages/fdm/Config.in
deleted file mode 100644
index 084695b1..00000000
--- a/trunk/package/feeds/packages/fdm/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_fdm
-
-config FDM_WITH_PCRE
-	bool
-	default y
-	select libpcre
-	prompt "Enable PCRE support (elsewhere POSIX regex)"
-
-endmenu
diff --git a/trunk/package/feeds/packages/fdm/Makefile b/trunk/package/feeds/packages/fdm/Makefile
deleted file mode 100644
index 49c02f15..00000000
--- a/trunk/package/feeds/packages/fdm/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fdm
-PKG_VERSION:=1.7
-PKG_RELEASE:=1
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/fdm
-PKG_MD5SUM:=aea0421571e8f3ec8f747a5d72c84348
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fdm
-  SECTION:=mail
-  CATEGORY:=Mail
-  TITLE:=fetch mail and deliver
-  URL:=http://fdm.sourceforge.net/
-  MAINTAINER:=Dmitry V. Zimin <pfzim@mail.ru>
-  MENU:=1
-  DEPENDS:=+tdb +zlib +libopenssl +FDM_WITH_PCRE:libpcre
-  USERID:=_fdm=99:_fdm=99
-endef
-
-define Package/fdm/description
-  fdm is a simple, lightweight replacement for mail fetch, filter
-  and delivery programs such as fetchmail and procmail. It can
-  fetch using POP3 or IMAP (with SSL) or from stdin, and deliver
-  to a pipe, file, maildir, mbox or SMTP server, based on $(if $(CONFIG_FDM_WITH_PCRE),PCRE,POSIX regexp)
-endef
-
-MAKE_FLAGS += \
-	PREFIX="/usr"\
-	$(if $(CONFIG_FDM_WITH_PCRE),PCRE=1)
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) ./src/compat/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/fdm/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/fdm/conffiles
-/etc/fdm.conf
-endef
-
-define Package/fdm/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/etc/* $(1)/etc/
-	$(INSTALL_DIR) $(1)/opt/fdm
-	chmod a+rwx $(1)/opt/fdm
-endef
-
-define Package/fdm/postinst
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	echo "Creating cron job template for user _fdm..."
-	(crontab -l -u _fdm 2>/dev/null; echo "# */13 * * * * fdm -q fetch") | crontab -u _fdm -
-	echo "Please, edit file /etc/fdm.conf and enable cron job!"
-fi
-exit 0
-endef
-
-define Package/fdm/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	echo "Don't forget disable cron job!"
-	echo "# crontab -r -u _fdm"
-fi
-exit 0
-endef
-
-$(eval $(call BuildPackage,fdm))
diff --git a/trunk/package/feeds/packages/fdm/files/etc/fdm.conf b/trunk/package/feeds/packages/fdm/files/etc/fdm.conf
deleted file mode 100644
index 56c9db48..00000000
--- a/trunk/package/feeds/packages/fdm/files/etc/fdm.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# /etc/fdm.conf example file
-# 1. Edit this file
-# 2. Test: fdm -vv fetch
-# 3. Enable cron job: crontab -e -u _fdm
-
-set maximum-size      3M
-set delete-oversized
-set queue-high        1
-set queue-low         0
-set purge-after       5
-set unmatched-mail    keep
-
-action "drop" drop
-action "keep" keep
-
-action "wakeup" exec "wol -h 192.168.0.255 -p 9 00:11:22:33:44:55"
-action "my-test-action" exec "echo \"OK\" > /tmp/fdm.ok"
-
-# This action extract *.torrent files from incoming email and put it
-# to watch-dir your torrect client application
-
-action "torrent-add" pipe "munpack -f -q -C /your-path/watch-dir/ ; for i in /your-path/watch-dir/*.torrent ; do chmod a+r \$i ; done"
-
-account "xbmc" disabled
-        pop3s
-        server   "pop.yandex.ru"
-        port     995
-        user     "username-enter-here"
-        pass     "password-enter-here"
-        new-only
-        cache    "/opt/fdm/cache"
-
-match "^Subject:[ \t]+openwrt:[ \t]*wakeup[ \t]*$" in headers actions { "wakeup" "drop" }
-match "^Subject:[ \t]+openwrt:[ \t]*torrent[ \t]+add[ \t]*\$" in headers actions { "torrent-add" "drop" }
-match "^Subject:[ \t]+openwrt:[ \t]*test[ \t]*$" in headers actions { "my-test-action" "drop" }
-match all action "keep"
diff --git a/trunk/package/feeds/packages/fdm/patches/001-base64-fix.patch b/trunk/package/feeds/packages/fdm/patches/001-base64-fix.patch
deleted file mode 100644
index ad9239bf..00000000
--- a/trunk/package/feeds/packages/fdm/patches/001-base64-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/fdm.h	2011-10-10 17:36:29.000000000 +0400
-+++ b/fdm.h	2014-11-13 12:56:59.217083683 +0300
-@@ -719,6 +719,11 @@
- size_t	 	 strlcat(char *, const char *, size_t);
- #endif
- 
-+int local_b64_ntop(uint8_t const *src, size_t srclength, char *target,
-+    size_t targsize);
-+
-+int local_b64_pton(char const *src, uint8_t *target, size_t targsize);
-+
- /* shm.c */
- char  		*shm_path(struct shm *);
- void		*shm_create(struct shm *, size_t);
diff --git a/trunk/package/feeds/packages/fdm/patches/002-base64-fix.patch b/trunk/package/feeds/packages/fdm/patches/002-base64-fix.patch
deleted file mode 100644
index 7f798a6e..00000000
--- a/trunk/package/feeds/packages/fdm/patches/002-base64-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/imap-common.c	2011-12-20 00:19:03.000000000 +0400
-+++ b/imap-common.c	2014-11-13 12:56:06.930418446 +0300
-@@ -206,7 +206,7 @@
- 
- 	size = (strlen(in) * 2) + 1;
- 	out = xcalloc(1, size);
--	if (b64_ntop(in, strlen(in), out, size) < 0) {
-+	if (local_b64_ntop(in, strlen(in), out, size) < 0) {
- 		xfree(out);
- 		return (NULL);
- 	}
-@@ -222,7 +222,7 @@
- 
- 	size = (strlen(in) * 4) + 1;
- 	out = xcalloc(1, size);
--	if (b64_pton(in, out, size) < 0) {
-+	if (local_b64_pton(in, out, size) < 0) {
- 		xfree(out);
- 		return (NULL);
- 	}
diff --git a/trunk/package/feeds/packages/fdm/src/compat/b64_ntop.c b/trunk/package/feeds/packages/fdm/src/compat/b64_ntop.c
deleted file mode 100644
index 0d222cf1..00000000
--- a/trunk/package/feeds/packages/fdm/src/compat/b64_ntop.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-//#include <config.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "fdm.h"
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-   following cases can arise:
-
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-local_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	uint8_t input[3];
-	uint8_t output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0'; /* Returned value doesn't count \0. */
-	return (datalength);
-}
diff --git a/trunk/package/feeds/packages/fdm/src/compat/b64_pton.c b/trunk/package/feeds/packages/fdm/src/compat/b64_pton.c
deleted file mode 100644
index 0e9363a9..00000000
--- a/trunk/package/feeds/packages/fdm/src/compat/b64_pton.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-//#include <config.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "fdm.h"
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-   following cases can arise:
-
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-static int b64rmap_initialized = 0;
-static uint8_t b64rmap[256];
-
-static const uint8_t b64rmap_special = 0xf0;
-static const uint8_t b64rmap_end = 0xfd;
-static const uint8_t b64rmap_space = 0xfe;
-static const uint8_t b64rmap_invalid = 0xff;
-
-/**
- * Initializing the reverse map is not thread safe.
- * Which is fine for NSD. For now...
- **/
-static void
-b64_initialize_rmap ()
-{
-	int i;
-	char ch;
-
-	/* Null: end of string, stop parsing */
-	b64rmap[0] = b64rmap_end;
-
-	for (i = 1; i < 256; ++i) {
-		ch = (char)i;
-		/* Whitespaces */
-		if (isspace(ch))
-			b64rmap[i] = b64rmap_space;
-		/* Padding: stop parsing */
-		else if (ch == Pad64)
-			b64rmap[i] = b64rmap_end;
-		/* Non-base64 char */
-		else
-			b64rmap[i] = b64rmap_invalid;
-	}
-
-	/* Fill reverse mapping for base64 chars */
-	for (i = 0; Base64[i] != '\0'; ++i)
-		b64rmap[(uint8_t)Base64[i]] = i;
-
-	b64rmap_initialized = 1;
-}
-
-static int
-b64_pton_do(char const *src, uint8_t *target, size_t targsize)
-{
-	int tarindex, state, ch;
-	uint8_t ofs;
-
-	state = 0;
-	tarindex = 0;
-
-	while (1)
-	{
-		ch = *src++;
-		ofs = b64rmap[ch];
-
-		if (ofs >= b64rmap_special) {
-			/* Ignore whitespaces */
-			if (ofs == b64rmap_space)
-				continue;
-			/* End of base64 characters */
-			if (ofs == b64rmap_end)
-				break;
-			/* A non-base64 character. */
-			return (-1);
-		}
-
-		switch (state) {
-		case 0:
-			if ((size_t)tarindex >= targsize)
-				return (-1);
-			target[tarindex] = ofs << 2;
-			state = 1;
-			break;
-		case 1:
-			if ((size_t)tarindex + 1 >= targsize)
-				return (-1);
-			target[tarindex]   |=  ofs >> 4;
-			target[tarindex+1]  = (ofs & 0x0f)
-						<< 4 ;
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if ((size_t)tarindex + 1 >= targsize)
-				return (-1);
-			target[tarindex]   |=  ofs >> 2;
-			target[tarindex+1]  = (ofs & 0x03)
-						<< 6;
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if ((size_t)tarindex >= targsize)
-				return (-1);
-			target[tarindex] |= ofs;
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (b64rmap[ch] != b64rmap_space)
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (b64rmap[ch] != b64rmap_space)
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
-
-
-static int
-b64_pton_len(char const *src)
-{
-	int tarindex, state, ch;
-	uint8_t ofs;
-
-	state = 0;
-	tarindex = 0;
-
-	while (1)
-	{
-		ch = *src++;
-		ofs = b64rmap[ch];
-
-		if (ofs >= b64rmap_special) {
-			/* Ignore whitespaces */
-			if (ofs == b64rmap_space)
-				continue;
-			/* End of base64 characters */
-			if (ofs == b64rmap_end)
-				break;
-			/* A non-base64 character. */
-			return (-1);
-		}
-
-		switch (state) {
-		case 0:
-			state = 1;
-			break;
-		case 1:
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (b64rmap[ch] != b64rmap_space)
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (b64rmap[ch] != b64rmap_space)
-					return (-1);
-
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
-
-
-int
-local_b64_pton(char const *src, uint8_t *target, size_t targsize)
-{
-	if (!b64rmap_initialized)
-		b64_initialize_rmap ();
-
-	if (target)
-		return b64_pton_do (src, target, targsize);
-	else
-		return b64_pton_len (src);
-}
diff --git a/trunk/package/feeds/packages/fftw3/Makefile b/trunk/package/feeds/packages/fftw3/Makefile
deleted file mode 100644
index 7d31b738..00000000
--- a/trunk/package/feeds/packages/fftw3/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fftw3
-PKG_VERSION:=3.3.4
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.fftw.org
-PKG_MD5SUM:=2edab8c06b24feeb3b82bbb3ebf3e7b3
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/fftw-$(PKG_VERSION)
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fftw3
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=@!avr32 +libpthread
-  VARIANT:=double
-  TITLE:=Fast Fourier transform library
-  URL:=http://www.fftw.org/
-  MAINTAINER:=Vladimir Ulrich <admin@evl.su>
-endef
-
-define Package/fftw3f
-  $(call Package/fftw3)
-  VARIANT:=single
-  TITLE+= (single precision)
-endef
-
-define Package/fftw3l
-  $(call Package/fftw3)
-  DEPENDS:=@BROKEN
-  VARIANT:=long-double
-  TITLE+= (long-double precision)
-endef
-
-define Package/fftw3/description
-	FFTW is a collection of fast C routines for computing the
-	Discrete Fourier Transform in one or more dimensions. It
-	includes complex, real, and parallel transforms, and can
-	handle arbitrary array sizes efficiently.
-endef
-
-define Package/fftw3f/description
-  $(call Package/fftw3/description)
-
-  This package contains the single precision library.
-endef
-
-define Package/fftw3l/description
-  $(call Package/fftw3/description)
-
-  This package contains the long-double precision library.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--prefix=/usr \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--enable-shared \
-	--enable-threads \
-	--enable-type-prefix \
-	--disable-debug \
-	--disable-fortran
-
-ifeq ($(BUILD_VARIANT), single)
-CONFIGURE_ARGS += \
-	--enable-single
-endif
-
-ifeq ($(BUILD_VARIANT), long-double)
-CONFIGURE_ARGS += \
-	--enable-long-double
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/fftw3.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.{a,la} $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/fftw3/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3.so* $(1)/usr/lib/
-endef
-
-define Package/fftw3f/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3f.so* $(1)/usr/lib/
-endef
-
-define Package/fftw3l/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3l.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,fftw3))
-$(eval $(call BuildPackage,fftw3f))
-$(eval $(call BuildPackage,fftw3l))
diff --git a/trunk/package/feeds/packages/fftw3/patches/001-makefile.patch b/trunk/package/feeds/packages/fftw3/patches/001-makefile.patch
deleted file mode 100644
index c5dd8571..00000000
--- a/trunk/package/feeds/packages/fftw3/patches/001-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -232,7 +232,7 @@ 
- CTAGS = ctags
- CSCOPE = cscope
- DIST_SUBDIRS = support genfft kernel simd-support dft rdft reodft api \
--	libbench2 . threads tests mpi doc tools m4
-+	libbench2 . threads mpi doc tools m4
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -444,7 +444,7 @@
- #
- @COMBINED_THREADS_TRUE@CHICKEN_EGG = threads .
- SUBDIRS = support $(GENFFT) kernel simd-support dft rdft reodft api	\
--libbench2 $(CHICKEN_EGG) tests mpi doc tools m4
-+libbench2 $(CHICKEN_EGG) mpi m4
- 
- EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in
- SIMD_LIBS = \
diff --git a/trunk/package/feeds/packages/file/Makefile b/trunk/package/feeds/packages/file/Makefile
deleted file mode 100644
index 39bf0bdd..00000000
--- a/trunk/package/feeds/packages/file/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=file
-PKG_VERSION:=5.20
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
-PKG_MD5SUM:=5d5e13eb3e0e13839da869a31790faf2
-
-PKG_LICENSE:=BSD-2c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/file/Default
-  TITLE:=File type determination
-  URL:=ftp://ftp.astron.com/pub/file/
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/file
-$(call package/file/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utility
-  DEPENDS:=+libmagic
-endef
-
-define Package/libmagic
-$(call package/file/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+zlib
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-MAKE_PATH := src
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile/magic
-	( cd $(PKG_BUILD_DIR)/magic/Magdir; \
-		for f in `ls`; do \
-			cat $$$${f}; \
-		done \
-	) > $(PKG_BUILD_DIR)/magic/magic
-endef
-Hooks/Compile/Post += Build/Compile/magic
-
-define Build/Install/magic
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/file
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/magic/magic $(PKG_INSTALL_DIR)/usr/share/file/
-endef
-Hooks/Install/Post += Build/Install/magic
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/file/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/file $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/misc
-	$(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
-	$(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/
-endef
-
-define Package/libmagic/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,file))
-$(eval $(call BuildPackage,libmagic))
diff --git a/trunk/package/feeds/packages/flac/Makefile b/trunk/package/feeds/packages/flac/Makefile
deleted file mode 100644
index 7d94cb63..00000000
--- a/trunk/package/feeds/packages/flac/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=flac
-PKG_VERSION:=1.3.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/flac/
-PKG_MD5SUM:=b9922c9a0378c88d3e901b234f852698
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_INSTALL:=1
-
-PKG_LICENSE:=GFDL-1.2 GPL-2 LGPL-2.1 BSD-3-Clause
-PKG_LICENSE_FILES:=README COPYING.FDL COPYING.GPL COPYING.LGPL COPYING.Xiph
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libflac
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Free Lossless Audio Codec library
-  URL:=https://xiph.org/flac
-endef
-
-CONFIGURE_ARGS += \
-	--disable-cpplibs \
-	--disable-sse \
-	--disable-3dnow \
-	--disable-altivec \
-	--disable-doxgen-docs \
-	--disable-local-xmms-plugin \
-	--disable-xmms-plugin \
-	--disable-ogg \
-	--disable-oggtest \
-	--disable-debug \
-	--enable-static \
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/FLAC \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libFLAC.{a,so*,la} \
-		$(1)/usr/lib/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(1)/usr/share/aclocal/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/* \
-		$(1)/usr/share/aclocal/
-endef
-
-define Package/libflac/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libFLAC.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libflac))
diff --git a/trunk/package/feeds/packages/flac/patches/001-no-docs-and-examples.patch b/trunk/package/feeds/packages/flac/patches/001-no-docs-and-examples.patch
deleted file mode 100644
index 72b26310..00000000
--- a/trunk/package/feeds/packages/flac/patches/001-no-docs-and-examples.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -31,7 +31,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = doc include m4 man src examples test build objs
-+SUBDIRS = include m4 src build objs
- 
- EXTRA_DIST = \
- 	COPYING.FDL \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,11 +30,6 @@ SUBDIRS = \
- 	flac \
- 	metaflac \
- 	$(XMMS_DIRS) \
--	test_grabbag \
--	test_libs_common \
--	test_libFLAC \
--	test_seeking \
--	test_streams \
- 	utils \
- 	$(CPPLIBS_DIRS)
- 
diff --git a/trunk/package/feeds/packages/flac/patches/002-no-utility.patch b/trunk/package/feeds/packages/flac/patches/002-no-utility.patch
deleted file mode 100644
index f7446025..00000000
--- a/trunk/package/feeds/packages/flac/patches/002-no-utility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -27,10 +27,7 @@ endif
- SUBDIRS = \
- 	share \
- 	libFLAC \
--	flac \
--	metaflac \
- 	$(XMMS_DIRS) \
--	utils \
- 	$(CPPLIBS_DIRS)
- 
- EXTRA_DIST = \
diff --git a/trunk/package/feeds/packages/flac/patches/010-automake-compat.patch b/trunk/package/feeds/packages/flac/patches/010-automake-compat.patch
deleted file mode 100644
index 83180480..00000000
--- a/trunk/package/feeds/packages/flac/patches/010-automake-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,6 +33,8 @@ ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = include m4 src build objs
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST = \
- 	COPYING.FDL \
- 	COPYING.GPL \
diff --git a/trunk/package/feeds/packages/flashrom/Config.in b/trunk/package/feeds/packages/flashrom/Config.in
deleted file mode 100644
index 552001af..00000000
--- a/trunk/package/feeds/packages/flashrom/Config.in
+++ /dev/null
@@ -1,279 +0,0 @@
-menu "Flashrom configuration"
-	depends on PACKAGE_flashrom
-
-	choice
-		prompt "Default Programmer"
-		default DEFPROG_INTERNAL if FLASHROM_PCI
-		default DEFPROG_LINUX_SPI
-
-		config DEFPROG_INTERNAL
-			depends on FRPROG_INTERNAL
-			bool "Internal"
-
-		config DEFPROG_LINUX_SPI
-			depends on FRPROG_LINUX_SPI
-			bool "Linux SPI"
-
-		config DEFPROG_SERPROG
-			depends on FRPROG_SERPROG
-			bool "Serial"
-
-		config DEFPROG_RAYER_SPI
-			depends on FRPROG_RAYER_SPI
-			bool "Rayer SPI"
-
-		config DEFPROG_PONY_SPI
-			depends on FRPROG_PONY_SPI
-			bool "Pony SPI"
-
-		config DEFPROG_NIC3COM
-			depends on FRPROG_NIC3COM
-			bool "NIC3Com"
-
-		config DEFPROG_GFXNVIDIA
-			depends on FRPROG_GFXNVIDIA
-			bool "GFX Nvidia"
-
-		config DEFPROG_SATASII
-			depends on FRPROG_SATASII
-			bool "SATASII"
-
-#		config DEFPROG_ATAHPT
-#			depends on FRPROG_ATAHPT
-#			bool "Highpoint (HPT) ATA/RAID"
-
-		config DEFPROG_ATAVIA
-			depends on FRPROG_ATAVIA
-			bool "ATAVIA"
-
-		config DEFPROG_FT2232_SPI
-			depends on FRPROG_FT2232_SPI
-			bool "FT2232 SPI"
-
-		config DEFPROG_USBBLASTER_SPI
-			depends on FRPROG_USBBLASTER_SPI
-			bool "USBBlaster SPI"
-
-#		config DEFPROG_MSTARDDC_SPI
-#			depends on FRPROG_MSTARDDC_SPI
-#			bool "MSTAR DDC SPI"
-
-		config DEFPROG_PICKIT2_SPI
-			depends on FRPROG_PICKIT2_SPI
-			bool "PICkit2 SPI"
-
-		config DEFPROG_DUMMY
-			depends on FRPROG_DUMMY
-			bool "Dummy"
-
-		config DEFPROG_DRKAISER
-			depends on FRPROG_DRKAISER
-			bool "Dr. Kaiser"
-
-		config DEFPROG_NICREALTEK
-			depends on FRPROG_NICREALTEK
-			bool "Realtek NICs"
-
-#		config DEFPROG_NICNATSEMI
-#			depends on FRPROG_NICNATSEMI
-#			bool "National Semiconductor NICs"
-
-		config DEFPROG_NICINTEL
-			depends on FRPROG_NICINTEL
-			bool "Intel NICs"
-
-		config DEFPROG_NICINTEL_SPI
-			depends on FRPROG_NICINTEL_SPI
-			bool "Intel NICs SPI"
-
-		config DEFPROG_NICINTEL_EEPROM
-			depends on FRPROG_NICINTEL_EEPROM
-			bool "Intel NICs EEPROM"
-
-		config DEFPROG_OGP_SPI
-			depends on FRPROG_OGP_SPI
-			bool "OGP SPI"
-
-		config DEFPROG_BUSPIRATE_SPI
-			depends on FRPROG_BUSPIRATE_SPI
-			bool "SPI BUS Pirate"
-
-#		config DEFPROG_DEDIPROG
-#			depends on FRPROG_DEDIPROG
-#			bool "Dediprog SF100"
-
-		config DEFPROG_SATAMV
-			depends on FRPROG_SATAMV
-			bool "Marvell SATA"
-
-		config DEFPROG_IT8212
-			depends on FRPROG_IT8212
-			bool "ITE IT8212F PATA"
-	endchoice
-
-
-	menu "Misc Programmers"
-		config FRPROG_LINUX_SPI
-			bool "Linux SPI"
-			default y
-
-#		config FRPROG_MSTARDDC_SPI
-#			bool "MSTAR DDC"
-#			default n
-
-		config FRPROG_DUMMY
-			bool "Dummy"
-			default y
-	endmenu
-
-
-	config FLASHROM_FTDI
-		bool "FTDI Support"
-		default y
-
-	menu "FTDI Programmers"
-		depends on FLASHROM_FTDI
-
-		config FRPROG_FT2232_SPI
-			depends on FLASHROM_FTDI
-			bool "FT2232 SPI"
-			default y
-
-		config FRPROG_USBBLASTER_SPI
-			depends on FLASHROM_FTDI
-			bool "USBBlaster SPI"
-			default y
-	endmenu
-
-
-	config FLASHROM_PCI
-		bool "PCI Support"
-		default y if (TARGET_x86||TARGET_x86_64)
-
-	menu "PCI Programmers"
-		depends on FLASHROM_PCI
-
-		config FRPROG_INTERNAL
-			depends on FLASHROM_PCI
-			bool "Internal"
-			default y
-
-		config FRPROG_RAYER_SPI
-			depends on FLASHROM_PCI
-			bool "Rayer SPI"
-			default y
-
-		config FRPROG_NIC3COM
-			depends on FLASHROM_PCI
-			bool "NIC3Com"
-			default y
-
-		config FRPROG_GFXNVIDIA
-			depends on FLASHROM_PCI
-			bool "GFX Nvidia"
-			default y
-
-		config FRPROG_SATASII
-			depends on FLASHROM_PCI
-			bool "SATASII"
-			default y
-
-#		config FRPROG_ATAHPT
-#			depends on FLASHROM_PCI
-#			bool "Highpoint (HPT) ATA/RAID"
-#			default n
-
-		config FRPROG_ATAVIA
-			depends on FLASHROM_PCI
-			bool "ATAVIA"
-			default y
-
-		config FRPROG_IT8212
-			depends on FLASHROM_PCI
-			bool "ITE IT8212F PATA"
-			default y
-
-		config FRPROG_DRKAISER
-			depends on FLASHROM_PCI
-			bool "Dr. Kaiser"
-			default y
-
-		config FRPROG_NICREALTEK
-			depends on FLASHROM_PCI
-			bool "Realtek NICs"
-			default y
-
-#		config FRPROG_NICNATSEMI
-#			depends on FLASHROM_PCI
-#			bool "National Semiconductor NICs"
-#			default n
-
-		config FRPROG_NICINTEL
-			depends on FLASHROM_PCI
-			bool "Intel NICs"
-			default y
-
-		config FRPROG_NICINTEL_SPI
-			depends on FLASHROM_PCI
-			bool "Intel NICs SPI"
-			default y
-
-		config FRPROG_NICINTEL_EEPROM
-			depends on FLASHROM_PCI
-			bool "Intel NICs EEPROM"
-			default y
-
-		config FRPROG_OGP_SPI
-			depends on FLASHROM_PCI
-			bool "OGP SPI"
-			default y
-
-		config FRPROG_SATAMV
-			depends on FLASHROM_PCI
-			bool "Marvell SATA"
-			default y
-	endmenu
-
-
-	config FLASHROM_SERIAL
-		bool "Serial Support"
-		default y
-
-	menu "Serial Programmers"
-		depends on FLASHROM_SERIAL
-
-		config FRPROG_SERPROG
-			depends on FLASHROM_SERIAL
-			bool "Serial"
-			default y
-
-		config FRPROG_PONY_SPI
-			depends on FLASHROM_SERIAL
-			bool "Pony SPI"
-			default y
-
-		config FRPROG_BUSPIRATE_SPI
-			depends on FLASHROM_SERIAL
-			bool "SPI BUS Pirate"
-			default y
-	endmenu
-
-
-	config FLASHROM_USB
-		bool "USB Support"
-		default y
-
-	menu "USB Programmers"
-		depends on FLASHROM_USB
-
-		config FRPROG_PICKIT2_SPI
-			depends on FLASHROM_USB
-			bool "PICkit2 SPI"
-			default y
-
-#		config FRPROG_DEDIPROG
-#			depends on FLASHROM_USB
-#			bool "Dediprog SF100"
-#			default n
-	endmenu
-endmenu
diff --git a/trunk/package/feeds/packages/flashrom/Makefile b/trunk/package/feeds/packages/flashrom/Makefile
deleted file mode 100644
index 702e63be..00000000
--- a/trunk/package/feeds/packages/flashrom/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2010-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=flashrom
-PKG_VERSION:=0.9.8
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.flashrom.org/releases
-PKG_MD5SUM:=ac513076b63ab7eb411a7694bb8f6fda
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include flashrom.mk
-
-define Package/flashrom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=FlashROM Utility
-  URL:=http://www.flashrom.org/
-  DEPENDS:=\
-	+(TARGET_x86||TARGET_x86_64):dmidecode \
-	+FLASHROM_FTDI:libftdi \
-	+FLASHROM_PCI:pciutils \
-	+FLASHROM_USB:libusb-compat
-endef
-
-define Package/flashrom/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/flashrom/description
- flashrom is an utility for identifying, reading, writing, verifying
- and erasing flash chips. It's often used to flash BIOS/EFI/coreboot
- /firmware images.
-endef
-
-MAKE_FLAGS += \
-	PREFIX="/usr"
-
-define Package/flashrom/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/flashrom $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,flashrom))
diff --git a/trunk/package/feeds/packages/flashrom/flashrom.mk b/trunk/package/feeds/packages/flashrom/flashrom.mk
deleted file mode 100644
index 14fc5d88..00000000
--- a/trunk/package/feeds/packages/flashrom/flashrom.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Flashrom configuration
-define DefineConfig
-  ifeq ($(CONFIG_FLASHROM_$(1)),)
-    MAKE_FLAGS += NEED_$(1)=0
-  endif
-endef
-define DefineProgrammer
-  ifeq ($(CONFIG_FRPROG_$(1)),)
-    MAKE_FLAGS += CONFIG_$(1)=0
-  endif
-  ifneq ($(CONFIG_DEFPROG_$(1)),)
-    MAKE_FLAGS += CONFIG_DEFAULT_PROGRAMMER=CONFIG_$(1)
-  endif
-endef
-
-# Misc
-$(eval $(call DefineProgrammer,LINUX_SPI))
-#$(eval $(call DefineProgrammer,MSTARDDC_SPI))
-$(eval $(call DefineProgrammer,DUMMY))
-
-# FTDI
-$(eval $(call DefineConfig,FTDI))
-$(eval $(call DefineProgrammer,FT2232_SPI))
-$(eval $(call DefineProgrammer,USBBLASTER_SPI))
-
-# PCI
-$(eval $(call DefineConfig,PCI))
-$(eval $(call DefineProgrammer,INTERNAL))
-$(eval $(call DefineProgrammer,RAYER_SPI))
-$(eval $(call DefineProgrammer,NIC3COM))
-$(eval $(call DefineProgrammer,GFXNVIDIA))
-$(eval $(call DefineProgrammer,SATASII))
-#$(eval $(call DefineProgrammer,ATAHPT))
-$(eval $(call DefineProgrammer,ATAVIA))
-$(eval $(call DefineProgrammer,IT8212))
-$(eval $(call DefineProgrammer,DRKAISER))
-$(eval $(call DefineProgrammer,NICREALTEK))
-#$(eval $(call DefineProgrammer,NICNATSEMI))
-$(eval $(call DefineProgrammer,NICINTEL))
-$(eval $(call DefineProgrammer,NICINTEL_SPI))
-$(eval $(call DefineProgrammer,NICINTEL_EEPROM))
-$(eval $(call DefineProgrammer,OGP_SPI))
-$(eval $(call DefineProgrammer,SATAMV))
-
-# Serial
-$(eval $(call DefineConfig,SERIAL))
-$(eval $(call DefineProgrammer,SERPROG))
-$(eval $(call DefineProgrammer,PONY_SPI))
-$(eval $(call DefineProgrammer,BUSPIRATE_SPI))
-
-# USB
-$(eval $(call DefineConfig,USB))
-$(eval $(call DefineProgrammer,PICKIT2_SPI))
-#$(eval $(call DefineProgrammer,DEDIPROG))
diff --git a/trunk/package/feeds/packages/flashrom/patches/0001-fix_internal_bitbang.patch b/trunk/package/feeds/packages/flashrom/patches/0001-fix_internal_bitbang.patch
deleted file mode 100644
index 376d6b28..00000000
--- a/trunk/package/feeds/packages/flashrom/patches/0001-fix_internal_bitbang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/programmer.h
-+++ b/programmer.h
-@@ -557,7 +557,7 @@ enum spi_controller {
- #if CONFIG_DEDIPROG == 1
- 	SPI_CONTROLLER_DEDIPROG,
- #endif
--#if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || CONFIG_PONY_SPI == 1 || (CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)))
-+#if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || CONFIG_PONY_SPI == 1 || CONFIG_INTERNAL == 1
- 	SPI_CONTROLLER_BITBANG,
- #endif
- #if CONFIG_LINUX_SPI == 1
diff --git a/trunk/package/feeds/packages/freeradius2/Config.in b/trunk/package/feeds/packages/freeradius2/Config.in
deleted file mode 100644
index cd0141ec..00000000
--- a/trunk/package/feeds/packages/freeradius2/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# FreeRADIUS avanced configuration
-
-choice
-	prompt "SSL library"
-	default FREERADIUS_OPENSSL
-	depends on PACKAGE_freeradius2-common
-
-config FREERADIUS_NOSSL
-	bool "No SSL support"
-
-config FREERADIUS_OPENSSL
-	bool "OpenSSL"
-
-endchoice
diff --git a/trunk/package/feeds/packages/freeradius2/Makefile b/trunk/package/feeds/packages/freeradius2/Makefile
deleted file mode 100644
index 1f1d86dc..00000000
--- a/trunk/package/feeds/packages/freeradius2/Makefile
+++ /dev/null
@@ -1,633 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=freeradius2
-PKG_VERSION:=2.2.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/
-PKG_MD5SUM:=e9a6f9bbee9706b008b924061ab3f915
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYRIGHT LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
-PKG_FIXUP:=autoreconf
-PKG_CHECK_FORMAT_SECURITY:=0
-
-PKG_CONFIG_DEPENDS := \
-  FREERADIUS_OPENSSL \
-  FREERADIUS_NOSSL
-
-PKG_CHECK_FORMAT_SECURITY:=0
-include $(INCLUDE_DIR)/package.mk
-
-define Package/freeradius2/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/freeradius2/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://freeradius.org/
-  SUBMENU:=FreeRADIUS (version 2)
-endef
-
-define Package/freeradius2
-  $(call Package/freeradius2/Default)
-  DEPENDS:=+libltdl +libreadline +freeradius2-common
-  TITLE:=A flexible RADIUS server (version 2)
-endef
-
-define Package/freeradius2/conffiles
-/etc/freeradius2/clients.conf
-/etc/freeradius2/radiusd.conf
-/etc/freeradius2/sites/default
-endef
-
-define Package/freeradius2-democerts
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Demo certificates to test the server
-endef
-
-define Package/freeradius2-common
-  $(call Package/freeradius2/Default)
-  TITLE:=common files
-  DEPENDS:=+libpthread +FREERADIUS_OPENSSL:libopenssl
-endef
-
-define Package/freeradius2-mod-chap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=CHAP module
-endef
-
-define Package/freeradius2-mod-chap/conffiles
-/etc/freeradius2/modules/chap
-endef
-
-define Package/freeradius2-mod-detail
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Detailed accounting module
-endef
-
-define Package/freeradius2-mod-detail/conffiles
-/etc/freeradius2/modules/detail
-endef
-
-define Package/freeradius2-mod-eap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Base EAP module
-endef
-
-define Package/freeradius2-mod-eap/conffiles
-/etc/freeradius2/eap.conf
-endef
-
-define Package/freeradius2-mod-eap-gtc
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap
-  TITLE:=EAP/GTC module
-endef
-
-define Package/freeradius2-mod-eap-md5
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap
-  TITLE:=EAP/MD5 module
-endef
-
-define Package/freeradius2-mod-eap-mschapv2
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap +freeradius2-mod-mschap
-  TITLE:=EAP/MS-CHAPv2 module
-endef
-
-define Package/freeradius2-mod-eap-peap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL
-  TITLE:=EAP/PEAP module
-endef
-
-define Package/freeradius2-mod-eap-tls
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL
-  TITLE:=EAP/TLS module
-endef
-
-define Package/freeradius2-mod-eap-ttls
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap-tls
-  TITLE:=EAP/TTLS module
-endef
-
-define Package/freeradius2-mod-exec
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=EXEC module
-endef
-
-define Package/freeradius2-mod-exec/conffiles
-/etc/freeradius2/modules/exec
-endef
-
-define Package/freeradius2-mod-expiration
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Expiration module
-endef
-
-define Package/freeradius2-mod-expiration/conffiles
-/etc/freeradius2/modules/expiration
-endef
-
-define Package/freeradius2-mod-always
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Always module
-endef
-
-define Package/freeradius2-mod-always/conffiles
-/etc/freeradius2/modules/always
-endef
-
-define Package/freeradius2-mod-expr
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=EXPR module
-endef
-
-define Package/freeradius2-mod-expr/conffiles
-/etc/freeradius2/modules/expr
-endef
-
-define Package/freeradius2-mod-attr-filter
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=ATTR filter module
-endef
-
-define Package/freeradius2-mod-attr-filter/conffiles
-/etc/freeradius2/modules/attr_filter
-/etc/freeradius2/attrs
-/etc/freeradius2/attrs.access_reject
-/etc/freeradius2/attrs.accounting_response
-/etc/freeradius2/attrs.pre-proxy
-endef
-
-define Package/freeradius2-mod-attr-rewrite
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=ATTR rewrite module
-endef
-
-define Package/freeradius2-mod-attr-rewrite/conffiles
-/etc/freeradius2/modules/attr_rewrite
-endef
-
-define Package/freeradius2-mod-files
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Module using local files for authorization
-endef
-
-define Package/freeradius2-mod-files/conffiles
-/etc/freeradius2/acct_users
-/etc/freeradius2/preproxy_users
-/etc/freeradius2/users
-/etc/freeradius2/modules/files
-endef
-
-define Package/freeradius2-mod-passwd
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Rlm passwd module
-endef
-
-define Package/freeradius2-mod-passwd/conffiles
-/etc/freeradius2/modules/passwd
-endef
-
-define Package/freeradius2-mod-ldap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2 +libopenldap
-  TITLE:=LDAP module
-endef
-
-define Package/freeradius2-mod-ldap/conffiles
-/etc/freeradius2/ldap.attrmap
-/etc/freeradius2/modules/ldap
-endef
-
-define Package/freeradius2-mod-logintime
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Logintime module
-endef
-
-define Package/freeradius2-mod-logintime/conffiles
-/etc/freeradius2/modules/logintime
-endef
-
-define Package/freeradius2-mod-mschap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=MS-CHAP and MS-CHAPv2 module
-endef
-
-define Package/freeradius2-mod-mschap/conffiles
-/etc/freeradius2/modules/mschap
-endef
-
-define Package/freeradius2-mod-pap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=PAP module
-endef
-
-define Package/freeradius2-mod-pap/conffiles
-/etc/freeradius2/modules/pap
-endef
-
-define Package/freeradius2-mod-preprocess
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Request pre-processing module
-endef
-
-define Package/freeradius2-mod-preprocess/conffiles
-/etc/freeradius2/hints
-/etc/freeradius2/huntgroups
-/etc/freeradius2/modules/preprocess
-endef
-
-define Package/freeradius2-mod-realm
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Realms handling module
-endef
-
-define Package/freeradius2-mod-realm/conffiles
-/etc/freeradius2/proxy.conf
-/etc/freeradius2/modules/realm
-endef
-
-define Package/freeradius2-mod-sql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Base SQL module
-endef
-
-define Package/freeradius2-mod-sql/conffiles
-/etc/freeradius2/sql.conf
-endef
-
-define Package/freeradius2-mod-sql-mysql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql +libmysqlclient-r
-  TITLE:=MySQL module
-endef
-
-define Package/freeradius2-mod-sql-pgsql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql +libpq
-  TITLE:=PostgreSQL module
-endef
-
-define Package/freeradius2-mod-sql-sqlite
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql +libsqlite3
-  TITLE:=SQLite module
-endef
-
-define Package/freeradius2-mod-sqlcounter
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql
-  TITLE:=Generic SQL Counter module
-endef
-
-define Package/freeradius2-mod-radutmp
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Radius UTMP module
-endef
-
-define Package/freeradius2-mod-radutmp/conffiles
-/etc/freeradius2/modules/radutmp
-/etc/freeradius2/modules/sradutmp
-endef
-
-define Package/freeradius2-utils
-  $(call Package/freeradius2/Default)
-  DEPENDS:=+freeradius2-common
-  TITLE:=Misc. client utilities
-endef
-
-define Package/freeradius2-mod-sqllog
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=SQL Logging module
-endef
-
-CONFIGURE_ARGS+= \
-	--libdir=/usr/lib/freeradius2 \
-	--libexecdir=/usr/lib/freeradius2 \
-	--enable-shared \
-	--disable-static \
-	--disable-developer \
-	--with-threads \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with,--without)-openssl \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-includes="$(STAGING_DIR)/usr/include",) \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-libraries="$(STAGING_DIR)/usr/lib",) \
-	--with-system-libtool \
-	--with-system-libltdl \
-	--enable-strict-dependencies \
-	--with-raddbdir=/etc/freeradius2 \
-	--with-radacctdir=/var/db/radacct \
-	--with-logdir=/var/log \
-	--without-edir \
-	--without-snmp \
-	--without-rlm_checkval \
-	--without-rlm_dbm \
-	--without-rlm_counter \
-	--with-rlm_expr \
-	--with-rlm_eap \
-	--without-rlm_eap_sim \
-	--without-rlm_example \
-	--without-rlm_ippool \
-	--without-rlm_krb5 \
-	--without-rlm_otp \
-	--without-rlm_smsotp \
-	--without-rlm_pam \
-	--without-rlm_perl \
-	--without-rlm_python \
-	--without-rlm_smb \
-	--with-rlm_sql \
-	--with-rlm_sqlcounter \
-	--without-rlm_sqlhpwippool \
-	--without-rlm_sqlippool \
-	--without-rlm_sql_db2 \
-	--without-rlm_sql_firebird \
-	--without-rlm_sql_freetds \
-	--without-rlm_sql_iodbc \
-	--without-rlm_sql_oracle \
-	--without-rlm_sql_sybase \
-	--without-rlm_sql_unixodbc \
-	--without-rlm_sql_log \
-	--without-rlm_unix \
-	--without-rlm_eap_tnc \
-	--without-rlm_eap_ikev2 \
-	--without-rlm_opendirectory \
-	--without-rlm_wimax \
-	--without-rlm_ruby \
-	--without-rlm_caching \
-	--without-rlm_redis \
-	--without-rlm_rediswho \
-	--without-rlm_soh \
-	--without-rlm_sim \
-	--without-rlm_replicate \
-	--without-rlm_protocol_filter \
-	--without-rlm_policy \
-	--without-rlm_linelog \
-	--without-rlm_jradius \
-	--without-rlm_fastusers \
-	--without-rlm_eap_leap \
-	--without-rlm_dynamic_clients \
-	--without-rlm_digest \
-	--without-rlm_cram \
-	--without-rlm_copy_packet \
-	--without-rlm_acct_unique \
-	--without-rlm_acctlog
-	
-
-PKG_DICTIONARIES:= \
-	freeradius freeradius.internal \
-	rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 \
-	rfc4372 rfc4675 rfc4679 \
-	microsoft \
-	wispr \
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
-  CONFIGURE_ARGS+= \
-		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_ldap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
-  CONFIGURE_ARGS+= \
-		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
-  CONFIGURE_LIBS+= -lz
-  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),)
-  CONFIGURE_ARGS+= \
-		--with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib"
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_postgresql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sqllog),)
-  CONFIGURE_ARGS+= \
-        --with-rlm_sql_log \
-        --with-experimental-modules \
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_log
-endif
-
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-sqlite),)
-  CONFIGURE_ARGS+= \
-	--with-rlm_sql_sqlite \
-	--with-experimental-modules \
-	--with-sqlite-include-dir="$(STAGING_DIR)/usr/include" \
-	--with-sqlite-lib-dir="$(STAGING_DIR)/usr/lib"
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_sqlite
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-peap),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_peap \
-		--with-rlm_eap_peap-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_peap-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_peap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-tls),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_tls \
-		--with-rlm_eap_tls-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_tls-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_tls
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-ttls),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_ttls \
-		--with-rlm_eap_ttls-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_ttls-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_ttls
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-attr-rewrite),)
-  CONFIGURE_ARGS+= --with-rlm_attr-rewrite
-else
-  CONFIGURE_ARGS+= --without-rlm_attr-rewrite
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-radutmp),)
-  CONFIGURE_ARGS+= --with-rlm_radutmp
-else
-  CONFIGURE_ARGS+= --without-rlm_radutmp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-logintime),)
-  CONFIGURE_ARGS+= --with-rlm_logintime
-else
-  CONFIGURE_ARGS+= --without-rlm_logintime
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-expiration),)
-  CONFIGURE_ARGS+= --with-rlm_expiration
-else
-  CONFIGURE_ARGS+= --without-rlm_expiration
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-always),)
-  CONFIGURE_ARGS+= --with-rlm_always
-else
-  CONFIGURE_ARGS+= --without-rlm_always
-endif
-
-CONFIGURE_VARS+= \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="$(CONFIGURE_LIBS)" \
-	MYSQL_CONFIG="no" \
-	ac_cv_lib_readline=no \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		R="$(PKG_INSTALL_DIR)" \
-		INSTALLSTRIP="" \
-		all certs install
-endef
-
-define Package/freeradius2-common/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2
-	chmod 771 $(1)/etc/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/dictionary $(1)/etc/freeradius2/ ; \
-	$(INSTALL_DIR) $(1)/usr/lib/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-eap{,-*}.so $(1)/usr/lib/freeradius2
-	$(INSTALL_DIR) $(1)/usr/share/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary $(1)/usr/share/freeradius2/
-	$(SED) "s,^\(\$$$$INCLUDE\),#\1,g" $(1)/usr/share/freeradius2/dictionary
-	for f in $(PKG_DICTIONARIES); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius2/ ; \
-		$(SED) "s,^#\(\$$$$INCLUDE dictionary\.$$$${f}\),\1,g" $(1)/usr/share/freeradius2/dictionary ; \
-	done
-endef
-
-define Package/freeradius2/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2/modules
-	$(INSTALL_DIR) $(1)/etc/freeradius2/sites
-	for f in clients.conf radiusd.conf policy.conf; do \
-		$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$${f} $(1)/etc/freeradius2/ ; \
-	done
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/sites-available/default $(1)/etc/freeradius2/sites/default
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd
-endef
-
-define Package/freeradius2-democerts/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2/certs
-	$(CP) \
-		$(PKG_BUILD_DIR)/raddb/certs/ca.pem \
-		$(PKG_BUILD_DIR)/raddb/certs/dh \
-		$(PKG_BUILD_DIR)/raddb/certs/random \
-		$(PKG_BUILD_DIR)/raddb/certs/server.pem \
-		$(1)/etc/freeradius2/certs/
-endef
-
-define Package/freeradius2-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	for f in radclient radeapclient radwho; do \
-		$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \
-	done
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeradius2
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius2 ; \
-	done
-	[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2
-	[ -z "$(4)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2/$(4)
-	for f in $(3); do \
-		$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$$$$$${f} $$(1)/etc/freeradius2/$$$$$$$${f} ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,freeradius2))
-$(eval $(call BuildPackage,freeradius2-common))
-$(eval $(call BuildPackage,freeradius2-democerts))
-$(eval $(call BuildPlugin,freeradius2-mod-chap,rlm_chap,modules/chap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-detail,rlm_detail,modules/detail,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap,rlm_eap,eap.conf))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-gtc,rlm_eap_gtc,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-md5,rlm_eap_md5,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-mschapv2,rlm_eap_mschapv2,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-peap,rlm_eap_peap,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-tls,rlm_eap_tls,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-ttls,rlm_eap_ttls,))
-$(eval $(call BuildPlugin,freeradius2-mod-exec,rlm_exec,modules/exec modules/echo ,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-attr-rewrite,rlm_attr_rewrite,modules/attr_rewrite,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-files,rlm_files,acct_users preproxy_users users modules/files,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-passwd,rlm_passwd,modules/passwd,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-mschap,rlm_mschap,modules/mschap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,))
-$(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,))
-$(eval $(call BuildPlugin,freeradius2-mod-sqllog,rlm_sql_log,))
-$(eval $(call BuildPlugin,freeradius2-mod-radutmp,rlm_radutmp,modules/radutmp modules/sradutmp,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-logintime,rlm_logintime,modules/logintime,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-expr,rlm_expr,modules/expr,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-attr-filter,rlm_attr_filter,modules/attr_filter attrs attrs.access_reject attrs.accounting_response attrs.pre-proxy,modules,,))
-$(eval $(call BuildPlugin,freeradius2-mod-expiration,rlm_expiration,modules/expiration,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-always,rlm_always,modules/always,modules,))
-$(eval $(call BuildPackage,freeradius2-utils))
diff --git a/trunk/package/feeds/packages/freeradius2/files/radiusd.init b/trunk/package/feeds/packages/freeradius2/files/radiusd.init
deleted file mode 100644
index 27f75c6e..00000000
--- a/trunk/package/feeds/packages/freeradius2/files/radiusd.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
-
-DEFAULT=/etc/default/radiusd
-LOG_D=/var/log
-RUN_D=/var/run
-PID_F=$RUN_D/radiusd.pid
-RADACCT_D=/var/db/radacct
-IPADDR=$(ifconfig br-lan | sed -n 's/.*dr:\(.*\)Bc.*/\1/p')
-
-start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	mkdir -p $LOG_D
-	mkdir -p $RUN_D
-	mkdir -p $RADACCT_D
-	radiusd -i $IPADDR -p 1812,1813 $OPTIONS
-}
-
-stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
diff --git a/trunk/package/feeds/packages/freeradius2/patches/001-fix-makefile.patch b/trunk/package/feeds/packages/freeradius2/patches/001-fix-makefile.patch
deleted file mode 100644
index 2daaec82..00000000
--- a/trunk/package/feeds/packages/freeradius2/patches/001-fix-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Make.inc.in
-+++ b/Make.inc.in
-@@ -5,6 +5,7 @@
- #
- 
- # Location of files.
-+SHELL		= @SHELL@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- sysconfdir	= @sysconfdir@
diff --git a/trunk/package/feeds/packages/freeradius2/patches/002-config.patch b/trunk/package/feeds/packages/freeradius2/patches/002-config.patch
deleted file mode 100644
index 8794345f..00000000
--- a/trunk/package/feeds/packages/freeradius2/patches/002-config.patch
+++ /dev/null
@@ -1,588 +0,0 @@
---- a/raddb/dictionary.in
-+++ b/raddb/dictionary.in
-@@ -11,7 +11,7 @@
- #
- #	The filename given here should be an absolute path. 
- #
--$INCLUDE	@prefix@/share/freeradius/dictionary
-+$INCLUDE	@prefix@/share/freeradius2/dictionary
- 
- #
- #	Place additional attributes or $INCLUDEs here.  They will
---- a/raddb/eap.conf
-+++ b/raddb/eap.conf
-@@ -27,7 +27,7 @@
- 		#  then that EAP type takes precedence over the
- 		#  default type configured here.
- 		#
--		default_eap_type = md5
-+		default_eap_type = peap
- 
- 		#  A list is maintained to correlate EAP-Response
- 		#  packets with EAP-Request packets.  After a
-@@ -72,8 +72,8 @@
- 		#  for wireless connections.  It is insecure, and does
- 		#  not provide for dynamic WEP keys.
- 		#
--		md5 {
--		}
-+#		md5 {
-+#		}
- 
- 		# Cisco LEAP
- 		#
-@@ -87,8 +87,8 @@
- 		#  User-Password, or the NT-Password attributes.
- 		#  'System' authentication is impossible with LEAP.
- 		#
--		leap {
--		}
-+#		leap {
-+#		}
- 
- 		#  Generic Token Card.
- 		#
-@@ -101,7 +101,7 @@
- 		#  the users password will go over the wire in plain-text,
- 		#  for anyone to see.
- 		#
--		gtc {
-+#		gtc {
- 			#  The default challenge, which many clients
- 			#  ignore..
- 			#challenge = "Password: "
-@@ -118,8 +118,8 @@
- 			#  configured for the request, and do the
- 			#  authentication itself.
- 			#
--			auth_type = PAP
--		}
-+#			auth_type = PAP
-+#		}
- 
- 		## EAP-TLS
- 		#
-@@ -215,7 +215,7 @@
- 			#  In these cases, fragment size should be
- 			#  1024 or less.
- 			#
--		#	fragment_size = 1024
-+			fragment_size = 1024
- 
- 			#  include_length is a flag which is
- 			#  by default set to yes If set to
-@@ -225,7 +225,7 @@
- 			#  message is included ONLY in the
- 			#  First packet of a fragment series.
- 			#
--		#	include_length = yes
-+			include_length = yes
- 
- 			#  Check the Certificate Revocation List
- 			#
-@@ -297,7 +297,7 @@
- 			# for the server to print out an error message,
- 			# and refuse to start.
- 			#
--			make_cert_command = "${certdir}/bootstrap"
-+		#	make_cert_command = "${certdir}/bootstrap"
- 
- 			#
- 			#  Elliptical cryptography configuration
-@@ -332,7 +332,7 @@
- 			#  You probably also want "use_tunneled_reply = yes"
- 			#  when using fast session resumption.
- 			#
--			cache {
-+		#	cache {
- 			      #
- 			      #  Enable it.  The default is "no".
- 			      #  Deleting the entire "cache" subsection
-@@ -348,14 +348,14 @@
- 			      #  enable resumption for just one user
- 			      #  by setting the above attribute to "yes".
- 			      #
--			      enable = no
-+		#	      enable = no
- 
- 			      #
- 			      #  Lifetime of the cached entries, in hours.
- 			      #  The sessions will be deleted after this
- 			      #  time.
- 			      #
--			      lifetime = 24 # hours
-+		#	      lifetime = 24 # hours
- 
- 			      #
- 			      #  The maximum number of entries in the
-@@ -364,8 +364,8 @@
- 			      #  This could be set to the number of users
- 			      #  who are logged in... which can be a LOT.
- 			      #
--			      max_entries = 255
--			}
-+		#	      max_entries = 255
-+		#	}
- 
- 			#
- 			#  As of version 2.1.10, client certificates can be
-@@ -503,7 +503,7 @@
- 		#
- 		#  in the control items for a request.
- 		#
--		ttls {
-+#		ttls {
- 			#  The tunneled EAP session needs a default
- 			#  EAP type which is separate from the one for
- 			#  the non-tunneled EAP module.  Inside of the
-@@ -511,7 +511,7 @@
- 			#  If the request does not contain an EAP
- 			#  conversation, then this configuration entry
- 			#  is ignored.
--			default_eap_type = md5
-+#			default_eap_type = mschapv2
- 
- 			#  The tunneled authentication request does
- 			#  not usually contain useful attributes
-@@ -527,7 +527,7 @@
- 			#  is copied to the tunneled request.
- 			#
- 			# allowed values: {no, yes}
--			copy_request_to_tunnel = no
-+#			copy_request_to_tunnel = yes
- 
- 			#  The reply attributes sent to the NAS are
- 			#  usually based on the name of the user
-@@ -540,7 +540,7 @@
- 			#  the tunneled request.
- 			#
- 			# allowed values: {no, yes}
--			use_tunneled_reply = no
-+#			use_tunneled_reply = no
- 
- 			#
- 			#  The inner tunneled request can be sent
-@@ -552,13 +552,13 @@
- 			#  the virtual server that processed the
- 			#  outer requests.
- 			#
--			virtual_server = "inner-tunnel"
-+#			virtual_server = "inner-tunnel"
- 
- 			#  This has the same meaning as the
- 			#  same field in the "tls" module, above.
- 			#  The default value here is "yes".
- 		#	include_length = yes
--		}
-+#		}
- 
- 		##################################################
- 		#
-@@ -627,14 +627,14 @@
- 
- 			#  the PEAP module also has these configuration
- 			#  items, which are the same as for TTLS.
--			copy_request_to_tunnel = no
--			use_tunneled_reply = no
-+			copy_request_to_tunnel = yes
-+			use_tunneled_reply = yes
- 
- 			#  When the tunneled session is proxied, the
- 			#  home server may not understand EAP-MSCHAP-V2.
- 			#  Set this entry to "no" to proxy the tunneled
- 			#  EAP-MSCHAP-V2 as normal MSCHAPv2.
--		#	proxy_tunneled_request_as_eap = yes
-+			proxy_tunneled_request_as_eap = no
- 
- 			#
- 			#  The inner tunneled request can be sent
-@@ -646,7 +646,8 @@
- 			#  the virtual server that processed the
- 			#  outer requests.
- 			#
--			virtual_server = "inner-tunnel"
-+		#	virtual_server = "inner-tunnel"
-+			EAP-TLS-Require-Client-Cert = no
- 
- 			# This option enables support for MS-SoH
- 			# see doc/SoH.txt for more info.
---- a/raddb/modules/counter
-+++ b/raddb/modules/counter
-@@ -69,7 +69,7 @@
- #  'check-name' attribute.
- #
- counter daily {
--	filename = ${db_dir}/db.daily
-+	filename = ${radacctdir}/db.daily
- 	key = User-Name
- 	count-attribute = Acct-Session-Time
- 	reset = daily
---- a/raddb/modules/pap
-+++ b/raddb/modules/pap
-@@ -18,5 +18,5 @@
- #
- #  http://www.openldap.org/faq/data/cache/347.html
- pap {
--	auto_header = no
-+	auto_header = yes
- }
---- a/raddb/modules/radutmp
-+++ b/raddb/modules/radutmp
-@@ -12,7 +12,7 @@ radutmp {
- 	#  Where the file is stored.  It's not a log file,
- 	#  so it doesn't need rotating.
- 	#
--	filename = ${logdir}/radutmp
-+	filename = ${radacctdir}/radutmp
- 
- 	#  The field in the packet to key on for the
- 	#  'user' name,  If you have other fields which you want
---- a/raddb/modules/sradutmp
-+++ b/raddb/modules/sradutmp
-@@ -10,7 +10,7 @@
- # then name "sradutmp" to identify it later in the "accounting"
- # section.
- radutmp sradutmp {
--	filename = ${logdir}/sradutmp
-+	filename = ${radacctdir}/sradutmp
- 	perm = 0644
- 	callerid = "no"
- }
---- a/raddb/radiusd.conf.in
-+++ b/raddb/radiusd.conf.in
-@@ -66,7 +66,7 @@ name = radiusd
- 
- #  Location of config and logfiles.
- confdir = ${raddbdir}
--run_dir = ${localstatedir}/run/${name}
-+run_dir = ${localstatedir}/run
- 
- # Should likely be ${localstatedir}/lib/radiusd
- db_dir = ${raddbdir}
-@@ -323,7 +323,7 @@ listen {
- 	#  If your system does not support this feature, you will
- 	#  get an error if you try to use it.
- 	#
--#	interface = eth0
-+	interface = br-lan
- 
- 	#  Per-socket lists of clients.  This is a very useful feature.
- 	#
-@@ -350,7 +350,7 @@ listen {
- #	ipv6addr = ::
- 	port = 0
- 	type = acct
--#	interface = eth0
-+	interface = br-lan
- #	clients = per_socket_clients
- }
- 
-@@ -584,8 +584,8 @@ security {
- #
- #  allowed values: {no, yes}
- #
--proxy_requests  = yes
--$INCLUDE proxy.conf
-+proxy_requests  = no
-+#$INCLUDE proxy.conf
- 
- 
- # CLIENTS CONFIGURATION
-@@ -782,7 +782,7 @@ instantiate {
- 	#  The entire command line (and output) must fit into 253 bytes.
- 	#
- 	#  e.g. Framed-Pool = `%{exec:/bin/echo foo}`
--	exec
-+#	exec
- 
- 	#
- 	#  The expression module doesn't do authorization,
-@@ -799,15 +799,15 @@ instantiate {
- 	#  other xlat functions such as md5, sha1 and lc.
- 	#
- 	#  We do not recommend removing it's listing here.
--	expr
-+#	expr
- 
- 	#
- 	# We add the counter module here so that it registers
- 	# the check-name attribute before any module which sets
- 	# it
- #	daily
--	expiration
--	logintime
-+#	expiration
-+#	logintime
- 
- 	# subsections here can be thought of as "virtual" modules.
- 	#
-@@ -831,7 +831,7 @@ instantiate {
- #	to multiple times.
- #
- ######################################################################
--$INCLUDE policy.conf
-+#$INCLUDE policy.conf
- 
- ######################################################################
- #
-@@ -841,9 +841,9 @@ $INCLUDE policy.conf
- #	match the regular expression: /[a-zA-Z0-9_.]+/
- #
- #	It allows you to define new virtual servers simply by placing
--#	a file into the raddb/sites-enabled/ directory.
-+#	a file into the /etc/freeradius2/sites/ directory.
- #
--$INCLUDE sites-enabled/
-+$INCLUDE sites/
- 
- ######################################################################
- #
-@@ -851,7 +851,7 @@ $INCLUDE sites-enabled/
- #	"authenticate {}", "accounting {}", have been moved to the
- #	the file:
- #
--#		raddb/sites-available/default
-+#		/etc/freeradius2/sites/default
- #
- #	This is the "default" virtual server that has the same
- #	configuration as in version 1.0.x and 1.1.x.  The default
---- a/raddb/sites-available/default
-+++ b/raddb/sites-available/default
-@@ -85,7 +85,7 @@ authorize {
- 	#
- 	#  It takes care of processing the 'raddb/hints' and the
- 	#  'raddb/huntgroups' files.
--	preprocess
-+#	preprocess
- 
- 	#
- 	#  If you want to have a log of authentication requests,
-@@ -96,7 +96,7 @@ authorize {
- 	#
- 	#  The chap module will set 'Auth-Type := CHAP' if we are
- 	#  handling a CHAP request and Auth-Type has not already been set
--	chap
-+#	chap
- 
- 	#
- 	#  If the users are logging in with an MS-CHAP-Challenge
-@@ -104,13 +104,13 @@ authorize {
- 	#  the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP'
- 	#  to the request, which will cause the server to then use
- 	#  the mschap module for authentication.
--	mschap
-+#	mschap
- 
- 	#
- 	#  If you have a Cisco SIP server authenticating against
- 	#  FreeRADIUS, uncomment the following line, and the 'digest'
- 	#  line in the 'authenticate' section.
--	digest
-+#	digest
- 
- 	#
- 	#  The WiMAX specification says that the Calling-Station-Id
-@@ -133,7 +133,7 @@ authorize {
- 	#  Otherwise, when the first style of realm doesn't match,
- 	#  the other styles won't be checked.
- 	#
--	suffix
-+#	suffix
- #	ntdomain
- 
- 	#
-@@ -195,8 +195,8 @@ authorize {
- 	# Use the checkval module
- #	checkval
- 
--	expiration
--	logintime
-+#	expiration
-+#	logintime
- 
- 	#
- 	#  If no other module has claimed responsibility for
-@@ -277,7 +277,7 @@ authenticate {
- 	#  If you have a Cisco SIP server authenticating against
- 	#  FreeRADIUS, uncomment the following line, and the 'digest'
- 	#  line in the 'authorize' section.
--	digest
-+#	digest
- 
- 	#
- 	#  Pluggable Authentication Modules.
-@@ -294,7 +294,7 @@ authenticate {
- 	#  be used for authentication ONLY for compatibility with legacy
- 	#  FreeRADIUS configurations.
- 	#
--	unix
-+#	unix
- 
- 	# Uncomment it if you want to use ldap for authentication
- 	#
-@@ -330,8 +330,8 @@ authenticate {
- #
- #  Pre-accounting.  Decide which accounting type to use.
- #
--preacct {
--	preprocess
-+#preacct {
-+#	preprocess
- 
- 	#
- 	#  Session start times are *implied* in RADIUS.
-@@ -354,7 +354,7 @@ preacct {
- 	#
- 	#  Ensure that we have a semi-unique identifier for every
- 	#  request, and many NAS boxes are broken.
--	acct_unique
-+#	acct_unique
- 
- 	#
- 	#  Look for IPASS-style 'realm/', and if not found, look for
-@@ -364,13 +364,13 @@ preacct {
- 	#  Accounting requests are generally proxied to the same
- 	#  home server as authentication requests.
- #	IPASS
--	suffix
-+#	suffix
- #	ntdomain
- 
- 	#
- 	#  Read the 'acct_users' file
--	files
--}
-+#	files
-+#}
- 
- #
- #  Accounting.  Log the accounting data.
-@@ -380,7 +380,7 @@ accounting {
- 	#  Create a 'detail'ed log of the packets.
- 	#  Note that accounting requests which are proxied
- 	#  are also logged in the detail file.
--	detail
-+#	detail
- #	daily
- 
- 	#  Update the wtmp file
-@@ -432,7 +432,7 @@ accounting {
- 	exec
- 
- 	#  Filter attributes from the accounting response.
--	attr_filter.accounting_response
-+	#attr_filter.accounting_response
- 
- 	#
- 	#  See "Autz-Type Status-Server" for how this works.
-@@ -458,7 +458,7 @@ session {
- #  Post-Authentication
- #  Once we KNOW that the user has been authenticated, there are
- #  additional steps we can take.
--post-auth {
-+#post-auth {
- 	#  Get an address from the IP Pool.
- #	main_pool
- 
-@@ -488,7 +488,7 @@ post-auth {
- #	ldap
- 
- 	# For Exec-Program and Exec-Program-Wait
--	exec
-+#	exec
- 
- 	#
- 	#  Calculate the various WiMAX keys.  In order for this to work,
-@@ -572,12 +572,12 @@ post-auth {
- 	#  Add the ldap module name (or instance) if you have set 
- 	#  'edir_account_policy_check = yes' in the ldap module configuration
- 	#
--	Post-Auth-Type REJECT {
--		# log failed authentications in SQL, too.
-+#	Post-Auth-Type REJECT {
-+#		# log failed authentications in SQL, too.
- #		sql
--		attr_filter.access_reject
--	}
--}
-+#		attr_filter.access_reject
-+#	}
-+#}
- 
- #
- #  When the server decides to proxy a request to a home server,
-@@ -587,7 +587,7 @@ post-auth {
- #
- #  Only a few modules currently have this method.
- #
--pre-proxy {
-+#pre-proxy {
- #	attr_rewrite
- 
- 	#  Uncomment the following line if you want to change attributes
-@@ -603,14 +603,14 @@ pre-proxy {
- 	#  server, un-comment the following line, and the
- 	#  'detail pre_proxy_log' section, above.
- #	pre_proxy_log
--}
-+#}
- 
- #
- #  When the server receives a reply to a request it proxied
- #  to a home server, the request may be massaged here, in the
- #  post-proxy stage.
- #
--post-proxy {
-+#post-proxy {
- 
- 	#  If you want to have a log of replies from a home server,
- 	#  un-comment the following line, and the 'detail post_proxy_log'
-@@ -634,7 +634,7 @@ post-proxy {
- 	#  hidden inside of the EAP packet, and the end server will
- 	#  reject the EAP request.
- 	#
--	eap
-+#	eap
- 
- 	#
- 	#  If the server tries to proxy a request and fails, then the
-@@ -656,5 +656,5 @@ post-proxy {
- #	Post-Proxy-Type Fail {
- #			detail
- #	}
--}
-+#}
- 
---- a/raddb/users
-+++ b/raddb/users
-@@ -169,22 +169,22 @@
- #	by the terminal server in which case there may not be a "P" suffix.
- #	The terminal server sends "Framed-Protocol = PPP" for auto PPP.
- #
--DEFAULT	Framed-Protocol == PPP
--	Framed-Protocol = PPP,
--	Framed-Compression = Van-Jacobson-TCP-IP
-+#DEFAULT	Framed-Protocol == PPP
-+#	Framed-Protocol = PPP,
-+#	Framed-Compression = Van-Jacobson-TCP-IP
- 
- #
- # Default for CSLIP: dynamic IP address, SLIP mode, VJ-compression.
- #
--DEFAULT	Hint == "CSLIP"
--	Framed-Protocol = SLIP,
--	Framed-Compression = Van-Jacobson-TCP-IP
-+#DEFAULT	Hint == "CSLIP"
-+#	Framed-Protocol = SLIP,
-+#	Framed-Compression = Van-Jacobson-TCP-IP
- 
- #
- # Default for SLIP: dynamic IP address, SLIP mode.
- #
--DEFAULT	Hint == "SLIP"
--	Framed-Protocol = SLIP
-+#DEFAULT	Hint == "SLIP"
-+#	Framed-Protocol = SLIP
- 
- #
- # Last default: rlogin to our main server.
diff --git a/trunk/package/feeds/packages/freeradius2/patches/004-ldap_configure.patch b/trunk/package/feeds/packages/freeradius2/patches/004-ldap_configure.patch
deleted file mode 100644
index 7f3e2401..00000000
--- a/trunk/package/feeds/packages/freeradius2/patches/004-ldap_configure.patch
+++ /dev/null
@@ -1,4253 +0,0 @@
---- a/src/modules/rlm_ldap/configure
-+++ b/src/modules/rlm_ldap/configure
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # From configure.in Revision.
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61.
-+# Generated by GNU Autoconf 2.63.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -16,7 +16,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -38,17 +38,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-   else
--    PATH_SEPARATOR=:
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-   fi
--  rm -f conf$$.sh
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
- fi
- 
- # Support unset when possible.
-@@ -64,8 +92,6 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -88,7 +114,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -101,17 +127,10 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -133,7 +152,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -159,7 +178,7 @@ else
-   as_have_required=no
- fi
- 
--  if test $as_have_required = yes && 	 (eval ":
-+  if test $as_have_required = yes &&	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
-@@ -241,7 +260,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -262,7 +281,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -342,10 +361,10 @@ fi
- 
-       if test "x$CONFIG_SHELL" != x; then
-   for as_var in BASH_ENV ENV
--        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--        done
--        export CONFIG_SHELL
--        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+	done
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
- 
-@@ -414,9 +433,10 @@ fi
- 
- test \$exitcode = 0") || {
-   echo No shell found that supports shell functions.
--  echo Please tell autoconf@gnu.org about your system,
--  echo including any error possibly output before this
--  echo message
-+  echo Please tell bug-autoconf@gnu.org about your system,
-+  echo including any error possibly output before this message.
-+  echo This can help us improve future autoconf versions.
-+  echo Configuration will now proceed without shell functions.
- }
- 
- 
-@@ -452,7 +472,7 @@ test \$exitcode = 0") || {
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -480,7 +500,6 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -493,19 +512,22 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -530,10 +552,10 @@ else
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -578,57 +600,65 @@ PACKAGE_STRING=
- PACKAGE_BUGREPORT=
- 
- ac_unique_file="rlm_ldap.c"
--ac_subst_vars='SHELL
--PATH_SEPARATOR
--PACKAGE_NAME
--PACKAGE_TARNAME
--PACKAGE_VERSION
--PACKAGE_STRING
--PACKAGE_BUGREPORT
--exec_prefix
--prefix
--program_transform_name
--bindir
--sbindir
--libexecdir
--datarootdir
--datadir
--sysconfdir
--sharedstatedir
--localstatedir
--includedir
--oldincludedir
--docdir
--infodir
--htmldir
--dvidir
--pdfdir
--psdir
--libdir
--localedir
--mandir
--DEFS
--ECHO_C
--ECHO_N
--ECHO_T
--LIBS
--build_alias
--host_alias
--target_alias
--CC
--CFLAGS
--LDFLAGS
--CPPFLAGS
--ac_ct_CC
--EXEEXT
--OBJEXT
--edir
--ldap_ldflags
--ldap_cflags
--targetname
-+ac_subst_vars='LTLIBOBJS
- LIBOBJS
--LTLIBOBJS'
-+targetname
-+ldap_cflags
-+ldap_ldflags
-+edir
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
- ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+with_rlm_ldap_lib_dir
-+with_rlm_ldap_include_dir
-+enable_shared
-+with_threads
-+with_edir
-+'
-       ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -642,6 +672,8 @@ CPPFLAGS'
- # Initialize some variables set by options.
- ac_init_help=
- ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
- # The variables have the same names as the options, with
- # dashes changed to underlines.
- cache_file=/dev/null
-@@ -740,13 +772,21 @@ do
-     datarootdir=$ac_optarg ;;
- 
-   -disable-* | --disable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=no ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
- 
-   -docdir | --docdir | --docdi | --doc | --do)
-     ac_prev=docdir ;;
-@@ -759,13 +799,21 @@ do
-     dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=\$ac_optarg ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -956,22 +1004,38 @@ do
-     ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=\$ac_optarg ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
- 
-   -without-* | --without-*)
--    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=no ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -991,7 +1055,7 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -1000,16 +1064,16 @@ Try \`$0 --help' for more information."
-     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-     # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-@@ -1018,22 +1082,38 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { echo "$as_me: error: missing argument to $ac_option" >&2
-+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute directory names.
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-+   { (exit 1); exit 1; }; } ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- 		libdir localedir mandir
- do
-   eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; }
- done
- 
-@@ -1048,7 +1128,7 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-@@ -1064,10 +1144,10 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  { echo "$as_me: error: Working directory cannot be determined" >&2
-+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-    { (exit 1); exit 1; }; }
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-    { (exit 1); exit 1; }; }
- 
- 
-@@ -1075,12 +1155,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
-   # Try the directory containing this script, then the parent directory.
--  ac_confdir=`$as_dirname -- "$0" ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$0" : 'X\(//\)[^/]' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$0" |
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -1107,12 +1187,12 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
- 	pwd)`
- # When building in place, set srcdir=.
-@@ -1161,9 +1241,9 @@ Configuration:
- 
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--			  [$ac_default_prefix]
-+                          [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--			  [PREFIX]
-+                          [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1173,25 +1253,25 @@ for instance \`--prefix=\$HOME'.
- For better control, use the options below.
- 
- Fine tuning of the installation directories:
--  --bindir=DIR           user executables [EPREFIX/bin]
--  --sbindir=DIR          system admin executables [EPREFIX/sbin]
--  --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
--  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
--  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
--  --libdir=DIR           object code libraries [EPREFIX/lib]
--  --includedir=DIR       C header files [PREFIX/include]
--  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
--  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
--  --infodir=DIR          info documentation [DATAROOTDIR/info]
--  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
--  --mandir=DIR           man documentation [DATAROOTDIR/man]
--  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
--  --htmldir=DIR          html documentation [DOCDIR]
--  --dvidir=DIR           dvi documentation [DOCDIR]
--  --pdfdir=DIR           pdf documentation [DOCDIR]
--  --psdir=DIR            ps documentation [DOCDIR]
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1203,6 +1283,7 @@ if test -n "$ac_init_help"; then
-   cat <<\_ACEOF
- 
- Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-@@ -1234,15 +1315,17 @@ fi
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d "$ac_dir" || continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-     ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-   case $ac_top_builddir_sub in
-   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1278,7 +1361,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
-       echo &&
-       $SHELL "$ac_srcdir/configure" --help=recursive
-     else
--      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi || ac_status=$?
-     cd "$ac_pwd" || { ac_status=$?; break; }
-   done
-@@ -1288,10 +1371,10 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.61
-+generated by GNU Autoconf 2.63
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1302,7 +1385,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1338,7 +1421,7 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
-+  $as_echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
- 
-@@ -1373,7 +1456,7 @@ do
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
-     *\'*)
--      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -1425,11 +1508,12 @@ _ASBOX
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -1459,9 +1543,9 @@ _ASBOX
-     do
-       eval ac_val=\$$ac_var
-       case $ac_val in
--      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
--      echo "$ac_var='\''$ac_val'\''"
-+      $as_echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-@@ -1476,9 +1560,9 @@ _ASBOX
-       do
- 	eval ac_val=\$$ac_var
- 	case $ac_val in
--	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- 	esac
--	echo "$ac_var='\''$ac_val'\''"
-+	$as_echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1494,8 +1578,8 @@ _ASBOX
-       echo
-     fi
-     test "$ac_signal" != 0 &&
--      echo "$as_me: caught signal $ac_signal"
--    echo "$as_me: exit $exit_status"
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-   } >&5
-   rm -f core *.core core.conftest.* &&
-     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -1537,21 +1621,24 @@ _ACEOF
- 
- 
- # Let the site file select an alternate cache file if it wants to.
--# Prefer explicitly selected file to automatically selected ones.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  set x "$CONFIG_SITE"
-+  ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
--  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
- else
--  set x "$ac_default_prefix/share/config.site" \
--	"$ac_default_prefix/etc/config.site"
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--shift
--for ac_site_file
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-+  test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--echo "$as_me: loading site script $ac_site_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-   fi
-@@ -1561,16 +1648,16 @@ if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-       *)                      . "./$cache_file";;
-     esac
-   fi
- else
--  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
--echo "$as_me: creating cache $cache_file" >&6;}
-+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
- 
-@@ -1584,29 +1671,38 @@ for ac_var in $ac_precious_vars; do
-   eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
--echo "$as_me:   former value:  $ac_old_val" >&2;}
--	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
--echo "$as_me:   current value: $ac_new_val" >&2;}
--	ac_cache_corrupted=:
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1616,10 +1712,12 @@ echo "$as_me:   current value: $ac_new_v
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -1662,10 +1760,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1678,7 +1776,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1689,11 +1787,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1702,10 +1800,10 @@ if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1718,7 +1816,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1729,11 +1827,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_CC" = x; then
-@@ -1741,12 +1839,8 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -1759,10 +1853,10 @@ if test -z "$CC"; then
-           if test -n "$ac_tool_prefix"; then
-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1775,7 +1869,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1786,11 +1880,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1799,10 +1893,10 @@ fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1820,7 +1914,7 @@ do
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1843,11 +1937,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1858,10 +1952,10 @@ if test -z "$CC"; then
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1874,7 +1968,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1885,11 +1979,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1902,10 +1996,10 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1918,7 +2012,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1929,11 +2023,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1945,12 +2039,8 @@ done
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -1960,44 +2050,50 @@ fi
- fi
- 
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
-+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -2016,27 +2112,22 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--#
--# List of possible output files, starting from the most likely.
--# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
--# only as a last resort.  b.out is created by i960 compilers.
--ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
--#
--# The IRIX 6 linker writes into existing files which may not be
--# executable, retaining their permissions.  Remove them first so a
--# subsequent execution test works.
-+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
- ac_rmfiles=
- for ac_file in $ac_files
- do
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-   esac
- done
-@@ -2047,10 +2138,11 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -2061,7 +2153,7 @@ for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
-@@ -2088,25 +2180,27 @@ else
-   ac_file=''
- fi
- 
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
- See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
-+$as_echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-@@ -2115,49 +2209,53 @@ if test "$cross_compiling" != yes; then
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
-+$as_echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
-     fi
-   fi
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
--{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
- 
--{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -2166,31 +2264,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	  break;;
-     * ) break;;
-   esac
- done
- else
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2213,40 +2313,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
- done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2272,20 +2375,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -2295,15 +2399,19 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
--GCC=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-@@ -2330,20 +2438,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-@@ -2368,20 +2477,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -2407,20 +2517,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -2435,8 +2546,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2452,10 +2563,10 @@ else
-     CFLAGS=
-   fi
- fi
--{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -2526,20 +2637,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -2555,15 +2667,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-   xno)
--    { echo "$as_me:$LINENO: result: unsupported" >&5
--echo "${ECHO_T}unsupported" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
- 
-@@ -2581,8 +2693,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "${with_rlm_ldap_lib_dir+set}" = set; then
-   withval=$with_rlm_ldap_lib_dir;  case "$withval" in
- 	    no)
--		{ { echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
--echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
-+$as_echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	    yes)
-@@ -2601,8 +2713,8 @@ fi
- if test "${with_rlm_ldap_include_dir+set}" = set; then
-   withval=$with_rlm_ldap_include_dir;  case "$withval" in
- 	    no)
--		{ { echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
--echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
-+$as_echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	    yes)
-@@ -2641,8 +2753,8 @@ fi
- 
- 
- 				if test "x$enable_shared" = "xno"; then
--		{ echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
--echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
-+$as_echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
- 	fi
- 
- 		rlm_ldap_with_threads=yes
-@@ -2661,10 +2773,10 @@ fi
- 
- 
- 			if test "x$rlm_ldap_with_threads" = "xyes"; then
--	    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
-@@ -2696,39 +2808,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_pthread_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-    LIBS="-lpthread $LIBS"
- else
--  { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
--echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
-+$as_echo_n "checking for pthread_create in -lc_r... " >&6; }
- if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc_r  $LIBS"
-@@ -2761,33 +2877,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_c_r_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_c_r_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; }
--if test $ac_cv_lib_c_r_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
-+$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
-+if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then
-    LIBS="-lc_r $LIBS"
- else
-    rlm_ldap_with_threads="no"
-@@ -2799,14 +2919,12 @@ fi
- 
- 	fi
- 
--				smart_try_dir=$rlm_ldap_lib_dir
--	if test "x$rlm_ldap_with_threads" = "xyes"; then
- 
- 
--sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
--sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
--{ echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
--echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for sasl_encode in -lsasl" >&5
-+$as_echo_n "checking for sasl_encode in -lsasl... " >&6; }
- 
- old_LIBS="$LIBS"
- smart_lib=
-@@ -2814,18 +2932,18 @@ smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    LIBS="-L$try -lldap_r $old_LIBS"
-+    LIBS="-L$try -lsasl $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2836,26 +2954,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -2866,18 +2988,18 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" = "x"; then
--  LIBS="-lldap_r $old_LIBS"
-+  LIBS="-lsasl $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2888,26 +3010,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LIBS="$old_LIBS"
-@@ -2918,7 +3044,7 @@ if test "x$smart_lib" = "x"; then
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap_r${libltdl_cv_shlibext}
-+  file=libsasl${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -2945,7 +3071,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap_r.a
-+  file=libsasl.a
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -2970,18 +3096,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- 
-   for try in $smart_lib_dir /usr/local/lib /opt/lib; do
--    LIBS="-L$try -lldap_r $old_LIBS"
-+    LIBS="-L$try -lsasl $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2992,26 +3118,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3022,26 +3152,22 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-   LIBS="$smart_lib $old_LIBS"
-   SMART_LIBS="$smart_lib $SMART_LIBS"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--	    if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
--		fail="$fail libldap_r"
--	    fi
--	else
- 
- 
--sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
--sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
--{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
--echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
-+$as_echo_n "checking for ber_init in -llber... " >&6; }
- 
- old_LIBS="$LIBS"
- smart_lib=
-@@ -3049,18 +3175,18 @@ smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    LIBS="-L$try -lldap $old_LIBS"
-+    LIBS="-L$try -llber $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3071,26 +3197,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3101,18 +3231,18 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" = "x"; then
--  LIBS="-lldap $old_LIBS"
-+  LIBS="-llber $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3123,26 +3253,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LIBS="$old_LIBS"
-@@ -3153,7 +3287,7 @@ if test "x$smart_lib" = "x"; then
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap${libltdl_cv_shlibext}
-+  file=liblber${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3180,7 +3314,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap.a
-+  file=liblber.a
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3205,18 +3339,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- 
-   for try in $smart_lib_dir /usr/local/lib /opt/lib; do
--    LIBS="-L$try -lldap $old_LIBS"
-+    LIBS="-L$try -llber $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3227,26 +3361,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3257,136 +3395,145 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-   LIBS="$smart_lib $old_LIBS"
-   SMART_LIBS="$smart_lib $SMART_LIBS"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--	    if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
--		fail="$fail libldap"
--	    fi
--	fi
--
- 
--	smart_try_dir=$rlm_ldap_include_dir
-+				smart_try_dir=$rlm_ldap_lib_dir
-+	if test "x$rlm_ldap_with_threads" = "xyes"; then
- 
- 
--ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
--{ echo "$as_me:$LINENO: checking for ldap.h" >&5
--echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
-+$as_echo_n "checking for ldap_init in -lldap_r... " >&6; }
- 
--old_CFLAGS="$CFLAGS"
--smart_include=
--smart_include_dir=
-+old_LIBS="$LIBS"
-+smart_lib=
-+smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    CFLAGS="$old_CFLAGS -I$try"
-+    LIBS="-L$try -lldap_r $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--		    #include <ldap.h>
-+extern char ldap_init();
- int
- main ()
- {
-- int a = 1;
-+ ldap_init()
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  smart_include="-I$try"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap_r"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	smart_include=
-+
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--    if test "x$smart_include" != "x"; then
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-       break;
-     fi
-   done
--  CFLAGS="$old_CFLAGS"
-+  LIBS="$old_LIBS"
- fi
- 
--if test "x$smart_include" = "x"; then
-+if test "x$smart_lib" = "x"; then
-+  LIBS="-lldap_r $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--		  #include <ldap.h>
-+extern char ldap_init();
- int
- main ()
- {
-- int a = 1;
-+ ldap_init()
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  smart_include=" "
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lldap_r"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	smart_include=
-+
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$old_LIBS"
- fi
- 
--if test "x$smart_include" = "x"; then
-+if test "x$smart_lib" = "x"; then
- 
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=ldap.h
-+  file=libldap_r${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3400,19 +3547,505 @@ if test "x$LOCATE" != "x"; then
-       continue
-     fi
- 
--                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-     if test "x$already" = "x"; then
-       DIRS="$DIRS $dir"
-     fi
-   done
- fi
- 
--eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
- 
- 
--  for try in $smart_include_dir /usr/local/include /opt/include; do
--    CFLAGS="$old_CFLAGS -I$try"
--    cat >conftest.$ac_ext <<_ACEOF
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap_r.a
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
-+    LIBS="-L$try -lldap_r $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap_r"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" != "x"; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-+  LIBS="$smart_lib $old_LIBS"
-+  SMART_LIBS="$smart_lib $SMART_LIBS"
-+else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+	    if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
-+		fail="$fail libldap_r"
-+	    fi
-+	else
-+
-+
-+sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
-+$as_echo_n "checking for ldap_init in -lldap... " >&6; }
-+
-+old_LIBS="$LIBS"
-+smart_lib=
-+smart_lib_dir=
-+
-+if test "x$smart_try_dir" != "x"; then
-+  for try in $smart_try_dir; do
-+    LIBS="-L$try -lldap $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" = "x"; then
-+  LIBS="-lldap $old_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" = "x"; then
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap${libltdl_cv_shlibext}
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap.a
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
-+    LIBS="-L$try -lldap $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" != "x"; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-+  LIBS="$smart_lib $old_LIBS"
-+  SMART_LIBS="$smart_lib $SMART_LIBS"
-+else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+	    if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
-+		fail="$fail libldap"
-+	    fi
-+	fi
-+
-+
-+	smart_try_dir=$rlm_ldap_include_dir
-+
-+
-+ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
-+$as_echo_n "checking for ldap.h... " >&6; }
-+
-+old_CFLAGS="$CFLAGS"
-+smart_include=
-+smart_include_dir=
-+
-+if test "x$smart_try_dir" != "x"; then
-+  for try in $smart_try_dir; do
-+    CFLAGS="$old_CFLAGS -I$try"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+		    #include <ldap.h>
-+int
-+main ()
-+{
-+ int a = 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  smart_include="-I$try"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	smart_include=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    if test "x$smart_include" != "x"; then
-+      break;
-+    fi
-+  done
-+  CFLAGS="$old_CFLAGS"
-+fi
-+
-+if test "x$smart_include" = "x"; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+		  #include <ldap.h>
-+int
-+main ()
-+{
-+ int a = 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  smart_include=" "
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	smart_include=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+if test "x$smart_include" = "x"; then
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=ldap.h
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
-+
-+
-+  for try in $smart_include_dir /usr/local/include /opt/include; do
-+    CFLAGS="$old_CFLAGS -I$try"
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3434,20 +4067,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   smart_include="-I$try"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	smart_include=
-@@ -3462,14 +4096,14 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_include" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_header_$ac_safe=yes"
-   CFLAGS="$old_CFLAGS $smart_include"
-   SMART_CFLAGS="$SMART_CFLAGS $smart_include"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 	if test "$ac_cv_header_ldap_h" != "yes"; then
-@@ -3478,10 +4112,10 @@ fi
- 
- 
- 	if test "x$fail" = "x"; then
--	    { echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
--echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
-+$as_echo_n "checking for ldap_start_tls_s... " >&6; }
- if test "${ac_cv_func_ldap_start_tls_s+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3534,39 +4168,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_start_tls_s=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_start_tls_s=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6; }
--if test $ac_cv_func_ldap_start_tls_s = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
-+$as_echo "$ac_cv_func_ldap_start_tls_s" >&6; }
-+if test "x$ac_cv_func_ldap_start_tls_s" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_START_TLS"
- fi
- 
--	    { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
--echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5
-+$as_echo_n "checking for ldap_initialize... " >&6; }
- if test "${ac_cv_func_ldap_initialize+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3619,39 +4257,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_initialize=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_initialize=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6; }
--if test $ac_cv_func_ldap_initialize = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
-+$as_echo "$ac_cv_func_ldap_initialize" >&6; }
-+if test "x$ac_cv_func_ldap_initialize" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INITIALIZE"
- fi
- 
--	    { echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
--echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
-+$as_echo_n "checking for ldap_int_tls_config... " >&6; }
- if test "${ac_cv_func_ldap_int_tls_config+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3704,32 +4346,36 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_int_tls_config=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_int_tls_config=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6; }
--if test $ac_cv_func_ldap_int_tls_config = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
-+$as_echo "$ac_cv_func_ldap_int_tls_config" >&6; }
-+if test "x$ac_cv_func_ldap_int_tls_config" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INT_TLS_CONFIG"
- fi
- 
-@@ -3738,11 +4384,11 @@ fi
- 
- for ac_func in ldap_set_rebind_proc
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3795,44 +4441,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
- done
- 
--        { echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
--echo $ECHO_N "checking whether ldap_set_rebind_proc takes 3 arguments... $ECHO_C" >&6; }
-+        { $as_echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
-+$as_echo_n "checking whether ldap_set_rebind_proc takes 3 arguments... " >&6; }
- if test "${ac_cv_ldap_set_rebind_proc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
-         cat >conftest.$ac_ext <<_ACEOF
-@@ -3858,20 +4511,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_ldap_set_rebind_proc=3
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_ldap_set_rebind_proc=2
-@@ -3879,8 +4533,8 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5
--echo "${ECHO_T}$ac_cv_ldap_set_rebind_proc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5
-+$as_echo "$ac_cv_ldap_set_rebind_proc" >&6; }
- 	fi
- 
- 	targetname=rlm_ldap
-@@ -3891,21 +4545,21 @@ fi
- 
- if test x"$fail" != x""; then
- 	if test x"${enable_strict_dependencies}" = x"yes"; then
--		{ { echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
--echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
-+$as_echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
-    { (exit 1); exit 1; }; }
- 	else
--		{ echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
--echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
--		{ echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
--echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
-+$as_echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
-+$as_echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
- 		if test x"$headersuggestion" != x; then
--			{ echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
--echo "$as_me: WARNING: $headersuggestion" >&2;}
-+			{ $as_echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
-+$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
- 		fi
- 		if test x"$libsuggestion" != x; then
--			{ echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
--echo "$as_me: WARNING: $libsuggestion" >&2;}
-+			{ $as_echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
-+$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
- 		fi
- 		targetname=""
- 	fi
-@@ -3966,11 +4620,12 @@ _ACEOF
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -4003,12 +4658,12 @@ echo "$as_me: WARNING: Cache variable $a
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -4025,6 +4680,12 @@ test "x$exec_prefix" = xNONE && exec_pre
- # take arguments), then branch to the quote section.  Otherwise,
- # look for a macro that doesn't take arguments.
- ac_script='
-+:mline
-+/\\$/{
-+ N
-+ s,\\\n,,
-+ b mline
-+}
- t clear
- :clear
- s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-@@ -4054,7 +4715,7 @@ ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
--  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-   #    will be set to the directory where LIBOBJS objects are built.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -4067,11 +4728,12 @@ LTLIBOBJS=$ac_ltlibobjs
- 
- 
- : ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
-+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -4084,7 +4746,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
-@@ -4094,7 +4756,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -4116,17 +4778,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-   else
--    PATH_SEPARATOR=:
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-   fi
--  rm -f conf$$.sh
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
- fi
- 
- # Support unset when possible.
-@@ -4142,8 +4832,6 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -4166,7 +4854,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -4179,17 +4867,10 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -4211,7 +4892,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -4262,7 +4943,7 @@ $as_unset CDPATH
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -4290,7 +4971,6 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -4303,19 +4983,22 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -4340,10 +5023,10 @@ else
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -4366,7 +5049,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -4379,26 +5062,33 @@ on `(hostname || uname -n) 2>/dev/null |
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<_ACEOF
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
- config_files="$ac_config_files"
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
- 
--Usage: $0 [OPTIONS] [FILE]...
-+Usage: $0 [OPTION]... [FILE]...
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
--  -q, --quiet      do not print progress messages
-+  -q, --quiet, --silent
-+                   do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
--  --file=FILE[:TEMPLATE]
--		   instantiate the configuration file FILE
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
- 
- Configuration files:
- $config_files
-@@ -4406,23 +5096,23 @@ $config_files
- Report bugs to <bug-autoconf@gnu.org>."
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.61,
--  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.63,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2006 Free Software Foundation, Inc.
-+Copyright (C) 2008 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
- ac_pwd='$ac_pwd'
- srcdir='$srcdir'
-+test -n "\$AWK" || AWK=awk
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
- ac_need_defaults=:
- while test $# != 0
- do
-@@ -4444,21 +5134,24 @@ do
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
--    echo "$ac_cs_version"; exit ;;
-+    $as_echo "$ac_cs_version"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
--    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-     ac_need_defaults=false;;
-   --he | --h |  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit ;;
-+    $as_echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { echo "$as_me: error: unrecognized option: $1
-+  -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
-@@ -4477,30 +5170,32 @@ if $ac_cs_silent; then
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  CONFIG_SHELL=$SHELL
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-   export CONFIG_SHELL
--  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  exec "\$@"
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- exec 5>>config.log
- {
-   echo
-   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
- ## Running $as_me. ##
- _ASBOX
--  echo "$ac_log"
-+  $as_echo "$ac_log"
- } >&5
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- 
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -4508,8 +5203,8 @@ do
-   case $ac_config_target in
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- 
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
-@@ -4548,114 +5243,143 @@ $debug ||
-   (umask 077 && mkdir "$tmp")
- } ||
- {
--   echo "$me: cannot create a temporary directory in ." >&2
-+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--#
--# Set up the sed scripts for CONFIG_FILES section.
--#
--
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
- if test -n "$CONFIG_FILES"; then
- 
--_ACEOF
- 
-+ac_cr='
'
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
- 
- 
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--SHELL!$SHELL$ac_delim
--PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
--PACKAGE_NAME!$PACKAGE_NAME$ac_delim
--PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
--PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
--PACKAGE_STRING!$PACKAGE_STRING$ac_delim
--PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
--exec_prefix!$exec_prefix$ac_delim
--prefix!$prefix$ac_delim
--program_transform_name!$program_transform_name$ac_delim
--bindir!$bindir$ac_delim
--sbindir!$sbindir$ac_delim
--libexecdir!$libexecdir$ac_delim
--datarootdir!$datarootdir$ac_delim
--datadir!$datadir$ac_delim
--sysconfdir!$sysconfdir$ac_delim
--sharedstatedir!$sharedstatedir$ac_delim
--localstatedir!$localstatedir$ac_delim
--includedir!$includedir$ac_delim
--oldincludedir!$oldincludedir$ac_delim
--docdir!$docdir$ac_delim
--infodir!$infodir$ac_delim
--htmldir!$htmldir$ac_delim
--dvidir!$dvidir$ac_delim
--pdfdir!$pdfdir$ac_delim
--psdir!$psdir$ac_delim
--libdir!$libdir$ac_delim
--localedir!$localedir$ac_delim
--mandir!$mandir$ac_delim
--DEFS!$DEFS$ac_delim
--ECHO_C!$ECHO_C$ac_delim
--ECHO_N!$ECHO_N$ac_delim
--ECHO_T!$ECHO_T$ac_delim
--LIBS!$LIBS$ac_delim
--build_alias!$build_alias$ac_delim
--host_alias!$host_alias$ac_delim
--target_alias!$target_alias$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--ac_ct_CC!$ac_ct_CC$ac_delim
--EXEEXT!$EXEEXT$ac_delim
--OBJEXT!$OBJEXT$ac_delim
--edir!$edir$ac_delim
--ldap_ldflags!$ldap_ldflags$ac_delim
--ldap_cflags!$ldap_cflags$ac_delim
--targetname!$targetname$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
-+  . ./conf$$subs.sh ||
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
- done
-+rm -f conf$$subs.sh
- 
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\).*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\).*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
- 
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+
-+  print line
-+}
-+
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-+   { (exit 1); exit 1; }; }
-+_ACEOF
- 
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-@@ -4672,19 +5396,21 @@ s/^[^=]*=[	 ]*$//
- }'
- fi
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- fi # test -n "$CONFIG_FILES"
- 
- 
--for ac_tag in  :F $CONFIG_FILES
-+eval set X "  :F $CONFIG_FILES      "
-+shift
-+for ac_tag
- do
-   case $ac_tag in
-   :[FHLC]) ac_mode=$ac_tag; continue;;
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
--echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-    { (exit 1); exit 1; }; };;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -4713,26 +5439,38 @@ echo "$as_me: error: Invalid tag $ac_tag
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
-       esac
--      ac_file_inputs="$ac_file_inputs $ac_f"
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      ac_file_inputs="$ac_file_inputs '$ac_f'"
-     done
- 
-     # Let's still pretend it is `configure' which instantiates (i.e., don't
-     # use $as_me), people would be surprised to read:
-     #    /* config.h.  Generated by config.status.  */
--    configure_input="Generated from "`IFS=:
--	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-     if test x"$ac_file" != x-; then
-       configure_input="$ac_file.  $configure_input"
--      { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-     fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
- 
-     case $ac_tag in
--    *:-:* | *:-) cat >"$tmp/stdin";;
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-     esac
-     ;;
-   esac
-@@ -4742,7 +5480,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
- 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$ac_file" |
-+$as_echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -4768,7 +5506,7 @@ echo X"$ac_file" |
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -4777,7 +5515,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$as_dir" |
-+$as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -4798,17 +5536,17 @@ echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-   ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-   case $ac_top_builddir_sub in
-   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -4844,12 +5582,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
- 
--case `sed -n '/datarootdir/ {
-+ac_sed_dataroot='
-+/datarootdir/ {
-   p
-   q
- }
-@@ -4858,13 +5597,14 @@ case `sed -n '/datarootdir/ {
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--' $ac_file_inputs` in
-+'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
--  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-   ac_datarootdir_hack='
-   s&@datadir@&$datadir&g
-   s&@docdir@&$docdir&g
-@@ -4878,15 +5618,16 @@ _ACEOF
- # Neutralize VPATH when `$srcdir' = `.'.
- # Shell code in configure.ac might set extrasub.
- # FIXME: do we really want to maintain this feature?
--cat >>$CONFIG_STATUS <<_ACEOF
--  sed "$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s&@configure_input@&$configure_input&;t t
-+s|@configure_input@|$ac_sed_conf_input|;t t
- s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
- s&@srcdir@&$ac_srcdir&;t t
- s&@abs_srcdir@&$ac_abs_srcdir&;t t
- s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -4895,21 +5636,28 @@ s&@builddir@&$ac_builddir&;t t
- s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
--  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&5
--echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&2;}
- 
-   rm -f "$tmp/stdin"
-   case $ac_file in
--  -) cat "$tmp/out"; rm -f "$tmp/out";;
--  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
--  esac
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
-  ;;
- 
- 
-@@ -4924,6 +5672,11 @@ _ACEOF
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
- 
-+test $ac_write_fail = 0 ||
-+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+
- 
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -4945,5 +5698,9 @@ if test "$no_create" != yes; then
-   # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
- fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
- 
- 
---- a/src/modules/rlm_ldap/configure.in
-+++ b/src/modules/rlm_ldap/configure.in
-@@ -87,6 +87,9 @@ if test x$with_[]modname != xno; then
- 			 )
- 	fi
- 
-+	FR_SMART_CHECK_LIB(sasl, sasl_encode)
-+	FR_SMART_CHECK_LIB(lber, ber_init)
-+
- 	dnl Try only "-lldap_r" or "-lldap"
- 	dnl Static linking will probably not work, but nobody ever
- 	dnl complained about it.
diff --git a/trunk/package/feeds/packages/freeradius2/patches/008-honor_ccpflags.patch b/trunk/package/feeds/packages/freeradius2/patches/008-honor_ccpflags.patch
deleted file mode 100644
index 086e7172..00000000
--- a/trunk/package/feeds/packages/freeradius2/patches/008-honor_ccpflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/modules/rules.mak
-+++ b/src/modules/rules.mak
-@@ -63,10 +63,10 @@ $(LT_OBJS): $(SERVER_HEADERS)
- #
- #######################################################################
- %.lo: %.c
--	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(RLM_CFLAGS) -c $<
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $<
- 
- %.lo: %.cpp
--	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CFLAGS) $(RLM_CFLAGS) -c $<
-+	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $<
- 
- ifneq ($(TARGET),)
- #######################################################################
diff --git a/trunk/package/feeds/packages/freeradius2/patches/010-disbale-openssl-check.patch b/trunk/package/feeds/packages/freeradius2/patches/010-disbale-openssl-check.patch
deleted file mode 100644
index c254912d..00000000
--- a/trunk/package/feeds/packages/freeradius2/patches/010-disbale-openssl-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -796,35 +796,6 @@ if test "x$WITH_OPENSSL" = xyes; then
-     OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5"
-   fi
- 
--  dnl #
--  dnl #  Now check that the header versions match the library
--  dnl #
--  AC_MSG_CHECKING([OpenSSL library and header version consistency])
--  AC_RUN_IFELSE(
--    [AC_LANG_PROGRAM(
--      [[
--        #include <stdio.h>
--        #include <openssl/opensslv.h>
--        #include <openssl/crypto.h>
--      ]],
--      [[
--        if (SSLeay() == OPENSSL_VERSION_NUMBER) {
--          return 0;
--        } else {
--          printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER);
--          return 1;
--        }
--      ]]
--    )],
--    [
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--      AC_MSG_FAILURE([OpenSSL library version does not match header version])
--    ]
--  )
--
-   if test "x$OPENSSL_LIBS" = x; then
-     LIBS=$old_LIBS
-     LDFLAGS="$old_LDFLAGS"
diff --git a/trunk/package/feeds/packages/freetype/Makefile b/trunk/package/feeds/packages/freetype/Makefile
deleted file mode 100644
index feeab48b..00000000
--- a/trunk/package/feeds/packages/freetype/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=freetype
-PKG_VERSION:=2.5.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/freetype
-PKG_MD5SUM:=2a7a314927011d5030903179cf183be0
-
-PKG_LICENSE:=FTL GPL-2.0 MIT ZLIB
-PKG_LICENSE_FILES:=docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT src/bdf/README src/pcf/README src/gzip/zlib.h
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_LIBTOOL_PATHS:=builds/unix
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libfreetype
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A free, high-quality and portable font engine
-  URL:=http://www.freetype.org/
-  DEPENDS:=+zlib +libbz2
-endef
-
-define Package/libfreetype/description
- The FreeType project is a team of volunteers who develop free,
- portable and high-quality software solutions for digital typography.
- They specifically target embedded systems and focus on bringing small,
- efficient and ubiquitous products.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-bzip2=yes \
-	--with-zlib=yes \
-	--with-png=no \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(2)/bin/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/
-
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",g' \
-		 $(2)/bin/freetype-config
-	$(SED) \
-		's,/usr/include,$$$${prefix}/include,g' \
-		 $(1)/usr/lib/pkgconfig/freetype2.pc
-	$(SED) \
-		's,/usr/lib,$$$${exec_prefix}/lib,g' \
-		 $(1)/usr/lib/pkgconfig/freetype2.pc
-endef
-
-
-define Package/libfreetype/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libfreetype))
diff --git a/trunk/package/feeds/packages/fswebcam/Makefile b/trunk/package/feeds/packages/fswebcam/Makefile
deleted file mode 100644
index 5a5f3b52..00000000
--- a/trunk/package/feeds/packages/fswebcam/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fswebcam
-PKG_VERSION:=20140113
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.firestorm.cx/fswebcam/files \
-	http://www.sanslogic.co.uk/fswebcam/files
-PKG_MD5SUM:=1bfdb21904e816f100370ec8f4df986b
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENCE
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fswebcam
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=fswebcam
-  URL:=http://www.sanslogic.co.uk/fswebcam/
-  DEPENDS:=+libgd
-endef
-
-define Package/fswebcam/description
-  fswebcam is a neat and simple webcam app. It captures images from a V4L1/V4L2 compatible
-  device or file, averages them to reduce noise and draws a caption using the GD Graphics
-  Library which also handles compressing the image to PNG or JPEG. The resulting image
-  is saved to a file or sent to stdio where it can be piped to something like ncftpput or scp.
-endef
-
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-define Package/fswebcam/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fswebcam $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,fswebcam))
diff --git a/trunk/package/feeds/packages/fwknop/Makefile b/trunk/package/feeds/packages/fwknop/Makefile
deleted file mode 100644
index df16e15f..00000000
--- a/trunk/package/feeds/packages/fwknop/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2011-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fwknop
-PKG_VERSION:=2.6.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
-PKG_MD5SUM:=1ae000a499bf604a2aeef4d0a7a178c8
-PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
-PKG_LICENSE:=GPLv2
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fwknop/Default
-  TITLE:=FireWall KNock OPerator
-  URL:=http://www.cipherdyne.org/fwknop/
-endef
-
-define Package/fwknop/Default/description
-  Fwknop implements an authorization scheme known as Single Packet Authorization
-  (SPA) for Linux systems running iptables.  This mechanism requires only a
-  single encrypted and non-replayed packet to communicate various pieces of
-  information including desired access through an iptables policy. The main
-  application of this program is to use iptables in a default-drop stance to
-  protect services such as SSH with an additional layer of security in order to
-  make the exploitation of vulnerabilities (both 0-day and unpatched code) much
-  more difficult.
-endef
-
-define Package/fwknopd
-  $(call Package/fwknop/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= Daemon
-  DEPENDS:=+iptables +libfko +libpcap
-endef
-
-define Package/fwknopd/description
-  $(call Package/fwknop/Default/description)
-  This package contains the fwknop daemon.
-endef
-
-define Package/fwknopd/conffiles
-/etc/fwknop/access.conf
-/etc/fwknop/fwknopd.conf
-endef
-
-define Package/fwknop
-  $(call Package/fwknop/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= Client
-  DEPENDS:=+libfko
-endef
-
-define Package/fwknop/description
-  $(call Package/fwknop/Default/description)
-  This package contains the fwknop client.
-endef
-
-define Package/libfko
-  $(call Package/fwknop/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=Firewall
-  TITLE+= Library
-endef
-
-define Package/libfko/description
-  $(call Package/fwknop/Default/description)
-  This package contains the libfko shared library.
-endef
-
-CONFIGURE_ARGS += \
-	--without-gpgme \
-	--with-iptables=/usr/sbin/iptables
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/fko.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.{a,la,so*} $(1)/usr/lib/
-endef
-
-define Package/fwknopd/install
-	$(INSTALL_DIR) $(1)/etc/fwknop
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/fwknop/{access,fwknopd}.conf \
-		$(1)/etc/fwknop/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/extras/fwknop.init.openwrt \
-		$(1)/etc/init.d/fwknopd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/
-endef
-
-define Package/fwknop/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/
-endef
-
-define Package/libfko/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,fwknopd))
-$(eval $(call BuildPackage,fwknop))
-$(eval $(call BuildPackage,libfko))
diff --git a/trunk/package/feeds/packages/fwknop/patches/001-fix_config.patch b/trunk/package/feeds/packages/fwknop/patches/001-fix_config.patch
deleted file mode 100644
index 8e5e5908..00000000
--- a/trunk/package/feeds/packages/fwknop/patches/001-fix_config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/server/fwknopd.conf.inst
-+++ b/server/fwknopd.conf.inst
-@@ -402,8 +402,13 @@
- # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is
- # enabled.
- #
--#IPT_FORWARD_ACCESS      ACCEPT, filter, FORWARD, 1, FWKNOP_FORWARD, 1;
--#IPT_DNAT_ACCESS         DNAT, nat, PREROUTING, 1, FWKNOP_PREROUTING, 1;
-+
-+# These two lines are changed specifically for Openwrt, due to
-+# different naming conventions. IPT_FORWARD is still disabled
-+# by default, and must be enabled earlier in this file to be used.
-+
-+IPT_FORWARD_ACCESS      ACCEPT, filter, zone_wan_forward, 1, FWKNOP_FORWARD, 1;
-+IPT_DNAT_ACCESS         DNAT, nat, zone_wan_prerouting, 1, FWKNOP_PREROUTING, 1;
- 
- # The IPT_SNAT_ACCESS variable is not used unless both ENABLE_IPT_SNAT and
- # ENABLE_IPT_FORWARDING are enabled.  Also, the external static IP must be
diff --git a/trunk/package/feeds/packages/fwknop/patches/002-fix_init.patch b/trunk/package/feeds/packages/fwknop/patches/002-fix_init.patch
deleted file mode 100644
index 6370c8e6..00000000
--- a/trunk/package/feeds/packages/fwknop/patches/002-fix_init.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/extras/openwrt/package/fwknop/files/fwknopd.init
-+++ b/extras/openwrt/package/fwknop/files/fwknopd.init
-@@ -11,12 +11,12 @@ FWKNOPD_BIN=/usr/sbin/fwknopd
- 
- start()
- {
--	$FWKNOPD_BIN
-+	service_start $FWKNOPD_BIN
- }
- 
- stop()
- {
--	$FWKNOPD_BIN -K
-+	service_stop $FWKNOPD_BIN -K
- }
- 
- restart()
diff --git a/trunk/package/feeds/packages/gammu/Makefile b/trunk/package/feeds/packages/gammu/Makefile
deleted file mode 100644
index 6b19c9dc..00000000
--- a/trunk/package/feeds/packages/gammu/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#		2014-2015 Vitaly Protsko
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gammu
-PKG_VERSION:=1.34.0
-PKG_RELEASE:=3
-
-PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MD5SUM:=5bc2508389d9b291ca0b8d4f210d0012
-PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
-PKG_LICENCE:=GPL-2.0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/gammu
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=Cell phone/modem SMS and control tool
-	URL:=http://dl.cihar.com/gammu/releases/
-	DEPENDS:=+libpthread +libcurl +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
-	DEPENDS+=+PACKAGE_python:python +PACKAGE_bluez-libs:bluez-libs
-	DEPENDS+=+PACKAGE_libmysqlclient:libmysqlclient +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq
-	DEPENDS+=+PACKAGE_libusb-1.0:libusb-1.0
-endef
-
-CMAKE_OPTIONS += -DWITH_LibDBI:BOOL=OFF
-
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/gammu $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP)    $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/
-endef
-
-define Package/gammu/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu-{smsd,smsd-inject,smsd-monitor} $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu
-	$(INSTALL_BIN) ./files/gammu.init $(1)/etc/init.d/gammu
-endef
-
-define Package/gammu/conffiles
-/etc/config/gammu
-endef
-
-$(eval $(call BuildPackage,gammu))
diff --git a/trunk/package/feeds/packages/gammu/files/gammu b/trunk/package/feeds/packages/gammu/files/gammu
deleted file mode 100644
index d05fb255..00000000
--- a/trunk/package/feeds/packages/gammu/files/gammu
+++ /dev/null
@@ -1,5 +0,0 @@
-config daemon default
-	option enabled		0
-	option device		/dev/ttyUSB0
-	option connection	at
-	option logfile		syslog
diff --git a/trunk/package/feeds/packages/gammu/files/gammu.init b/trunk/package/feeds/packages/gammu/files/gammu.init
deleted file mode 100755
index 6a391d4a..00000000
--- a/trunk/package/feeds/packages/gammu/files/gammu.init
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 villy@sft.ru
-
-START=98
-
-USE_PROCD=1
-PROG=/usr/bin/gammu-smsd
-CONFPFX=/var/gammu
-
-start_instance() {
-	local conf="$1"
-	local item
-	local conffile="$CONFPFX-$conf.conf"
-
-	config_get_bool item "$conf" enabled 0
-	[ $item = 0 ] && return
-
-	echo -e "; dont edit. instead look into /etc/config/gammu\n[gammu]\n" > $conffile
-
-	config_get item "$conf" device
-	[ -z "$item" ] && return
-	echo "device = $item" >> $conffile
-
-	config_get item "$conf" connection
-	[ -z "$item" ] && return
-	echo "connection = $item" >> $conffile
-
-	config_get item "$conf" logfile
-	[ -z "$item" ] && item=syslog
-	echo "logfile = $item" >> $conffile
-
-	echo -e "\n[smsd]\nphoneid = $conf\nservice = files\nlogfile = $item" >> $conffile
-	echo -e "checkbattery = 0\nhangupcalls = 1" >> $conffile
-
-	config_get item "$conf" pin
-	[ -n "$item" ] && echo "pin = $item" >> $conffile
-
-	config_get item "$conf" phonecode
-	[ -n "$item" ] && echo "phonecode = $item" >> $conffile
-
-	config_get item "$conf" send
-	[ -n "$item" ] && echo "send = $item" >> $conffile
-
-	config_get item "$conf" receive
-	[ -n "$item" ] && echo "receive = $item" >> $conffile
-
-	config_get item "$conf" timeout
-	[ -n "$item" ] && echo "commtimeout = $item" >> $conffile
-
-	config_get item "$conf" sleep
-	[ -n "$item" ] && echo "loopsleep = $item" >> $conffile
-
-	config_get item "$conf" report
-	[ -n "$item" ] && echo "deliveryreport = $item" >> $conffile
-
-	config_get item "$conf" onreceive
-	[ -n "$item" ] && echo "runonreceive = $item" >> $conffile
-
-	config_get item "$conf" onerror
-	[ -n "$item" ] && echo "runonfailure = $item" >> $conffile
-
-	config_get item "$conf" spool
-	[ -z "$item" ] && item=/var/sms
-	[ ! -d $item ] && {
-	  mkdir $item
-	  mkdir $item/inbox
-	  mkdir $item/outbox
-	  mkdir $item/sent
-	  mkdir $item/error
-	}
-	echo -e "inboxpath = $item/inbox/\noutboxpath = $item/outbox/" >> $conffile
-	echo -e "sentsmspath = $item/sent/\nerrorsmspath = $item/error/" >> $conffile
-
-	config_get item "$conf" allow
-	[ -n "$item" ] && {
-	  local data
-	  local allowfile=$CONFPFX-$conf.allow
-	  for data in $item ; do
-	    echo $data >> $allowfile
-	  done
-
-	  echo "includenumbersfile = $allowfile" >> $conffile
-	}
-
-	config_get item "$conf" deny
-	[ -n "$item" ] && {
-	  local data
-	  local denyfile=$CONFPFX-$conf.deny
-	  for data in $item ; do
-	    echo $data >> $denyfile
-	  done
-
-	  echo "excludenumbersfile = $denyfile" >> $conffile
-	}
-
-	procd_open_instance
-
-	config_get_bool item "$conf" respawn 0
-	[ $item != 0 ] && procd_set_param respawn
-
-	procd_set_param command $PROG --config=$conffile
-
-	config_get item "$conf" pidfile
-	[ -n "$item" ] && procd_append_param command --pid=$item
-
-	procd_close_instance
-}
-
-start_service() {
-	config_load gammu
-	config_foreach start_instance daemon
-}
-
-service_triggers() {
-	procd_add_reload_trigger "gammu"
-}
diff --git a/trunk/package/feeds/packages/gammu/patches/001-iconv-disabling-option.patch b/trunk/package/feeds/packages/gammu/patches/001-iconv-disabling-option.patch
deleted file mode 100644
index 91abfe75..00000000
--- a/trunk/package/feeds/packages/gammu/patches/001-iconv-disabling-option.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/cmake/FindIconv.cmake
-+++ b/cmake/FindIconv.cmake
-@@ -34,9 +34,9 @@ string(REGEX REPLACE "(.*)/include/?" "\
- 
- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib)
-  
--IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-+IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-    SET(ICONV_FOUND TRUE) 
--ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-+ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
- 
- set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
---- a/configure
-+++ b/configure
-@@ -31,6 +31,7 @@ Usage: ./configure [options]
- --enable-backup     enable backup support
- --enable-win32      enable mingw crosscomilation
- --enable-protection enable compile time protections
-+--disable-iconv     disable iconv support
- --with-python=<path> path to Python interpreter
- --without-gnapplet  disable installation of gnapplet
- --without-completion disable installation of bash completion script
-@@ -57,6 +58,7 @@ CMAKE_PROTECTION=
- CMAKE_PYTHON=
- CMAKE_GNAP=
- CMAKE_COMPLETE=
-+CMAKE_ICONV=
- 
- # process command line
- while [ "$#" -gt 0 ] ; do
-@@ -94,6 +96,12 @@ while [ "$#" -gt 0 ] ; do
-         --disable-protection)
-             CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF"
-             ;;
-+        --enable-iconv)
-+            CMAKE_ICONV="-DDISABLE_ICONV=OFF"
-+            ;;
-+        --disable-iconv)
-+            CMAKE_ICONV="-DDISABLE_ICONV=ON"
-+            ;;
-         --enable-debug)
-             CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug"
-             ;;
-@@ -142,4 +150,4 @@ fi
- cd "$BUILD_DIR"
- 
- # invoke cmake to do configuration
--cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE
-+cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
diff --git a/trunk/package/feeds/packages/gammu/patches/002-no-fstack-protector.patch b/trunk/package/feeds/packages/gammu/patches/002-no-fstack-protector.patch
deleted file mode 100644
index ec0badf2..00000000
--- a/trunk/package/feeds/packages/gammu/patches/002-no-fstack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -537,8 +537,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
-         #    MACRO_TUNE_LINKER("-pie")
-         # These do not work on Windows right now
-         if (NOT WIN32)
--            # Stack protector
--            MACRO_TUNE_COMPILER("-fstack-protector")
-             # Mark code read only
-             MACRO_TUNE_LINKER("-Wl,-zrelro")
-         endif (NOT WIN32)
diff --git a/trunk/package/feeds/packages/gammu/patches/003-cmake-cross-toolchain.patch b/trunk/package/feeds/packages/gammu/patches/003-cmake-cross-toolchain.patch
deleted file mode 100644
index cfacf112..00000000
--- a/trunk/package/feeds/packages/gammu/patches/003-cmake-cross-toolchain.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- /dev/null
-+++ b/cmake/Toolchain-cross.cmake
-@@ -0,0 +1,5 @@
-+# search for programs in the build host directories
-+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-+# for libraries and headers in the target directories
-+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
---- a/configure
-+++ b/configure
-@@ -25,6 +25,7 @@ Usage: ./configure [options]
- 
- --help|-h           shows this help
- --prefix=<path>     installation prefix
-+--cross-root=<path> cross-compilation prefix
- --enable-shared     enables shared build
- --enable-debug      enables debug build
- --enable-tiger      enables Mac OS X 10.4 (Tiger) build
-@@ -50,6 +51,7 @@ SOURCE_DIR=`pwd`
- 
- # cmake parameters
- CMAKE_PREFIX=
-+CMAKE_ROOT=
- CMAKE_SHARED=
- CMAKE_DEBUG=
- CMAKE_BACKUP=
-@@ -69,6 +71,10 @@ while [ "$#" -gt 0 ] ; do
-         --prefix=*)
-             CMAKE_PREFIX="-DCMAKE_INSTALL_PREFIX=${1##--prefix=}"
-             ;;
-+        --cross-root=*)
-+            CMAKE_ROOT="-DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/Toolchain-cross.cmake"
-+            echo "SET(CMAKE_FIND_ROOT_PATH ${1##--cross-root=})" >> $SOURCE_DIR/cmake/Toolchain-cross.cmake
-+            ;;
-         --with-python=*)
-             CMAKE_PYTHON="-DBUILD_PYTHON=${1##--with-python=}"
-             ;;
-@@ -150,4 +156,4 @@ fi
- cd "$BUILD_DIR"
- 
- # invoke cmake to do configuration
--cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
-+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
diff --git a/trunk/package/feeds/packages/gammu/patches/004-cmake_libdbi_optional.patch b/trunk/package/feeds/packages/gammu/patches/004-cmake_libdbi_optional.patch
deleted file mode 100644
index c1e67284..00000000
--- a/trunk/package/feeds/packages/gammu/patches/004-cmake_libdbi_optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -36,6 +36,7 @@ Usage: ./configure [options]
- --with-python=<path> path to Python interpreter
- --without-gnapplet  disable installation of gnapplet
- --without-completion disable installation of bash completion script
-+--without-libdbi	disable libdbi support
- 
- All enable params have their disable counterparts.
- 
-@@ -61,6 +62,7 @@ CMAKE_PYTHON=
- CMAKE_GNAP=
- CMAKE_COMPLETE=
- CMAKE_ICONV=
-+CMAKE_LIBDBI=
- 
- # process command line
- while [ "$#" -gt 0 ] ; do
-@@ -120,6 +122,9 @@ while [ "$#" -gt 0 ] ; do
-         --without-completion)
-             CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF"
-             ;;
-+        --without-libdbi)
-+            CMAKE_LIBDBI="-DWITH_LibDBI=OFF"
-+            ;;
-         --build=*)
-             ;;
-         --disable-dependency-tracking)
-@@ -156,4 +161,4 @@ fi
- cd "$BUILD_DIR"
- 
- # invoke cmake to do configuration
--cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
-+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV $CMAKE_LIBDBI
diff --git a/trunk/package/feeds/packages/gammu/patches/010-utils-shell-fix.patch b/trunk/package/feeds/packages/gammu/patches/010-utils-shell-fix.patch
deleted file mode 100644
index d1b3ec35..00000000
--- a/trunk/package/feeds/packages/gammu/patches/010-utils-shell-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/utils/gammu-config
-+++ b/utils/gammu-config
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # Gammu configuration generator
- # Copyright (C) 2003 - 2009 Michal Cihar <michal@cihar.com>
- # vim: expandtab sw=4 ts=4 sts=4:
---- a/utils/jadmaker
-+++ b/utils/jadmaker
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # JAD file generator
- # Copyright © 2008 - 2009 Michal Čihař <michal@cihar.com>
- # vim: expandtab sw=4 ts=4 sts=4:
diff --git a/trunk/package/feeds/packages/gcc/Makefile b/trunk/package/feeds/packages/gcc/Makefile
deleted file mode 100644
index 9cdde88d..00000000
--- a/trunk/package/feeds/packages/gcc/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gcc
-PKG_VERSION:=4.8.3
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \
-     http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \
-    ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=7c60f24fab389f77af203d2516ee110f
-PKG_INSTALL:=1
-PKG_FIXUP:=libtool
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LANGUAGES:="c,c++"
-BUGURL=https://dev.openwrt.org/
-PKGVERSION=OpenWrt GCC $(PKG_VERSION)
-
-# not using sstrip here as this fucks up the .so's somehow
-STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip
-RSTRIP:= \
-       NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \
-       STRIP="$(STRIP)" \
-       STRIP_KMOD="$(STRIP) --strip-debug" \
-       $(SCRIPT_DIR)/rstrip.sh
-
-
-define Package/gcc
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=gcc
-  MAINTAINER:=Christian Beier <cb@shoutrlabs.com>
-  DEPENDS:= +binutils +libstdcpp
-endef
-
-define Package/gcc/description
-	build a native toolchain for compiling on target
-endef
-
-
-define Build/Prepare
-	$(PKG_UNPACK)
-# 	we have to download additional stuff before patching
-	(cd $(PKG_BUILD_DIR) && ./contrib/download_prerequisites)
-	$(Build/Patch)
-endef
-
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		SHELL="$(BASH)" \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(PKG_BUILD_DIR)/configure \
-			$(CONFIGURE_ARGS) \
-			--build=$(GNU_HOST_NAME) \
-			--host=$(REAL_GNU_TARGET_NAME) \
-			--target=$(REAL_GNU_TARGET_NAME) \
-			--enable-languages=$(TARGET_LANGUAGES) \
-			--with-bugurl=$(BUGURL) \
-			--with-pkgversion="$(PKGVERSION)" \
-			--enable-shared \
-			--disable-__cxa_atexit \
-			--enable-target-optspace \
-			--with-gnu-ld \
-			--disable-nls \
-			--disable-libmudflap \
-			--disable-multilib \
-			--disable-libgomp \
-			--disable-libquadmath \
-			--disable-libssp \
-			--disable-decimal-float \
-			--disable-libstdcxx-pch \
-			--with-host-libstdcxx=-lstdc++ \
-			--prefix=/usr \
-			--libexecdir=/usr/lib \
-			$(SOFT_FLOAT_CONFIG_OPTION) \
-			$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
-			$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \
-			--with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \
-	);
-endef
-
-define Build/Compile
-	export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
-			DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install
-endef
-
-define Package/gcc/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
-	cp -ar $(PKG_INSTALL_DIR)/usr/include $(1)/usr
-	cp -a $(PKG_INSTALL_DIR)/usr/bin/{$(REAL_GNU_TARGET_NAME)-{g++,gcc},cpp,gcov} $(1)/usr/bin
-	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/c++
-	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/g++
-	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++
-	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/gcc
-	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION)
-	cp -ar $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib
-	$(RM) $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/*.a
-	cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
-	cp -a $(TOOLCHAIN_DIR)/lib/*.{o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
-	cp -a $(TOOLCHAIN_DIR)/lib/*nonshared*.a  $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
-	grep "GROUP.*-lgcc" $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/libgcc_s.so && cp -a $(PKG_INSTALL_DIR)/usr/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/libgcc.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/ ; true
-endef
-
-$(eval $(call BuildPackage,gcc))
diff --git a/trunk/package/feeds/packages/gcc/README b/trunk/package/feeds/packages/gcc/README
deleted file mode 100644
index 58db4740..00000000
--- a/trunk/package/feeds/packages/gcc/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Native GCC that runs on target.
-
-To save disk space, this GCC only supports dynamic linking on the target box,
-there are no static libraries shipped except libgcc.a on those architectures
-that need it.
-
-For now, this was only tested on arm (EABI) and mips targets. Others to be
-done...
-
-   Christian Beier <cb@shoutrlabs.com>
diff --git a/trunk/package/feeds/packages/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch b/trunk/package/feeds/packages/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
deleted file mode 100644
index 84729605..00000000
--- a/trunk/package/feeds/packages/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/gcc/real.h b/gcc/real.h
-index 2ff84f6..fbb4b0e 100644
---- a/gcc/real.h
-+++ b/gcc/real.h
-@@ -72,8 +72,10 @@ struct GTY(()) real_value {
-    + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */
- 
- /* Verify the guess.  */
-+#ifndef __LP64__
- extern char test_real_width
-   [sizeof(REAL_VALUE_TYPE) <= REAL_WIDTH*sizeof(HOST_WIDE_INT) ? 1 : -1];
-+#endif
- 
- /* Calculate the format for CONST_DOUBLE.  We need as many slots as
-    are necessary to overlay a REAL_VALUE_TYPE on them.  This could be
diff --git a/trunk/package/feeds/packages/gcc/patches/003-mpfr-longlong-mips.patch b/trunk/package/feeds/packages/gcc/patches/003-mpfr-longlong-mips.patch
deleted file mode 100644
index 0ab9fe50..00000000
--- a/trunk/package/feeds/packages/gcc/patches/003-mpfr-longlong-mips.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
---- -a/mpfr-2.4.2/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
-+++ -b/mpfr-2.4.2/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
-@@ -1011,7 +1011,15 @@
- #endif /* __m88000__ */
- 
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UDItype _r;							\
-+    _r = (UDItype) u * v;						\
-+    (w1) = _r >> 32;							\
-+    (w0) = (USItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-@@ -1024,7 +1032,16 @@
- #endif /* __mips */
- 
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UTItype _r;							\
-+    _r = (UTItype) u * v;						\
-+    (w1) = _r >> 64;							\
-+    (w0) = (UDItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
diff --git a/trunk/package/feeds/packages/gcc/patches/010-documentation.patch b/trunk/package/feeds/packages/gcc/patches/010-documentation.patch
deleted file mode 100644
index 3f604ee4..00000000
--- a/trunk/package/feeds/packages/gcc/patches/010-documentation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -4326,18 +4326,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
- doc/gccint.info: $(TEXI_GCCINT_FILES)
- doc/cppinternals.info: $(TEXI_CPPINT_FILES)
- 
--doc/%.info: %.texi
--	if [ x$(BUILD_INFO) = xinfo ]; then \
--		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
--			-I $(gcc_docdir)/include -o $@ $<; \
--	fi
-+doc/%.info:
- 
- # Duplicate entry to handle renaming of gccinstall.info
--doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
--	if [ x$(BUILD_INFO) = xinfo ]; then \
--		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
--			-I $(gcc_docdir)/include -o $@ $<; \
--	fi
-+doc/gccinstall.info:
- 
- doc/cpp.dvi: $(TEXI_CPP_FILES)
- doc/gcc.dvi: $(TEXI_GCC_FILES)
diff --git a/trunk/package/feeds/packages/gcc/patches/020-disable-check-for-sys-sdt-h.patch b/trunk/package/feeds/packages/gcc/patches/020-disable-check-for-sys-sdt-h.patch
deleted file mode 100644
index afc5cfdc..00000000
--- a/trunk/package/feeds/packages/gcc/patches/020-disable-check-for-sys-sdt-h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/gcc/configure b/gcc/configure
-index 3793681..bcda752 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h
- 
- fi
- 
--# Test for <sys/sdt.h> on the target.
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
--$as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
--have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
--  have_sys_sdt_h=yes
--
--$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
--$as_echo "$have_sys_sdt_h" >&6; }
- 
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 3ee1d67..e321218 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
- 	    [Define if your target C library provides stack protector support])
- fi
- 
--# Test for <sys/sdt.h> on the target.
--GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
--AC_MSG_CHECKING(sys/sdt.h in the target C library)
--have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
--  have_sys_sdt_h=yes
--  AC_DEFINE(HAVE_SYS_SDT_H, 1,
--            [Define if your target C library provides sys/sdt.h])
--fi
--AC_MSG_RESULT($have_sys_sdt_h)
- 
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
diff --git a/trunk/package/feeds/packages/gcc/patches/100-uclibc-conf.patch b/trunk/package/feeds/packages/gcc/patches/100-uclibc-conf.patch
deleted file mode 100644
index ff9ad94f..00000000
--- a/trunk/package/feeds/packages/gcc/patches/100-uclibc-conf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
---- a/libjava/classpath/ltconfig
-+++ b/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/trunk/package/feeds/packages/gcc/patches/200-musl.patch b/trunk/package/feeds/packages/gcc/patches/200-musl.patch
deleted file mode 100644
index 2e6df47e..00000000
--- a/trunk/package/feeds/packages/gcc/patches/200-musl.patch
+++ /dev/null
@@ -1,321 +0,0 @@
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -549,7 +549,7 @@ case ${target} in
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # Common parts for widely ported systems.
- case ${target} in
-@@ -652,6 +652,9 @@ case ${target} in
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,10 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* musl has no "classic" (i.e. broken) mode */
-+#undef  MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI
- 
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Determine whether the entire c99 runtime
-    is present in the runtime library.  */
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@ Use GNU C library
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -18,3 +18,5 @@ along with GCC; see the file COPYING3.
- <http://www.gnu.org/licenses/>.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -364,17 +364,21 @@ extern int dot_symbols;
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- 
- #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -789,15 +789,18 @@ extern int fixuplabelno;
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@ case "${host_os}" in
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@ case "${host_os}" in
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -27,6 +27,9 @@ along with GCC; see the file COPYING3.
- #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
---- a/gcc/config/sparc/linux64.h       2013-09-10 10:02:45.663973856 +0100
-+++ b/gcc/config/sparc/linux64.h       2013-09-10 10:03:17.871972435 +0100
-@@ -104,6 +104,9 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
- 
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
-+
- #ifdef SPARC_BI_ARCH
- 
- #undef SUBTARGET_EXTRA_SPECS
-
diff --git a/trunk/package/feeds/packages/gcc/patches/800-arm_v5te_no_ldrd_strd.patch b/trunk/package/feeds/packages/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
deleted file mode 100644
index ae4f6516..00000000
--- a/trunk/package/feeds/packages/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gcc/config/arm/arm.h
-+++ b/gcc/config/arm/arm.h
-@@ -271,7 +271,7 @@ extern void (*arm_lang_output_object_att
- /* Thumb-1 only.  */
- #define TARGET_THUMB1_ONLY		(TARGET_THUMB1 && !arm_arch_notm)
- 
--#define TARGET_LDRD			(arm_arch5e && ARM_DOUBLEWORD_ALIGN \
-+#define TARGET_LDRD			(arm_arch6 && ARM_DOUBLEWORD_ALIGN \
-                                          && !TARGET_THUMB1)
- 
- /* The following two macros concern the ability to execute coprocessor
diff --git a/trunk/package/feeds/packages/gcc/patches/810-arm-softfloat-libgcc.patch b/trunk/package/feeds/packages/gcc/patches/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 33cf8add..00000000
--- a/trunk/package/feeds/packages/gcc/patches/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,10 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -55,8 +55,6 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
--
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} \
diff --git a/trunk/package/feeds/packages/gcc/patches/820-libgcc_pic.patch b/trunk/package/feeds/packages/gcc/patches/820-libgcc_pic.patch
deleted file mode 100644
index 7a0ac735..00000000
--- a/trunk/package/feeds/packages/gcc/patches/820-libgcc_pic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -865,11 +865,12 @@ $(libgcov-objects): %$(objext): $(srcdir
- 
- # Static libraries.
- libgcc.a: $(libgcc-objects)
-+libgcc_pic.a: $(libgcc-s-objects)
- libgcov.a: $(libgcov-objects)
- libunwind.a: $(libunwind-objects)
- libgcc_eh.a: $(libgcc-eh-objects)
- 
--libgcc.a libgcov.a libunwind.a libgcc_eh.a:
-+libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
- 	-rm -f $@
- 
- 	objects="$(objects)";					\
-@@ -891,7 +892,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
- endif
- 
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -1058,6 +1059,10 @@ install-shared:
- 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
- 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
- 
-+	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
-+	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
-+	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
-+
- 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/package/feeds/packages/gcc/patches/830-arm_unbreak_armv4t.patch b/trunk/package/feeds/packages/gcc/patches/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a5..00000000
--- a/trunk/package/feeds/packages/gcc/patches/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/trunk/package/feeds/packages/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch b/trunk/package/feeds/packages/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
deleted file mode 100644
index e938905a..00000000
--- a/trunk/package/feeds/packages/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -81,10 +81,15 @@
- #undef  MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
- 
-+/* For armv4 we pass --fix-v4bx to linker to support EABI */
-+#undef TARGET_FIX_V4BX_SPEC
-+#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
-+  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
--#define LINK_SPEC BE8_LINK_SPEC						\
-+#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
-   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
- 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
- 
diff --git a/trunk/package/feeds/packages/gcc/patches/850-use_shared_libgcc.patch b/trunk/package/feeds/packages/gcc/patches/850-use_shared_libgcc.patch
deleted file mode 100644
index 2c7369fc..00000000
--- a/trunk/package/feeds/packages/gcc/patches/850-use_shared_libgcc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -114,10 +114,6 @@
- #define ENDFILE_SPEC \
-   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
- 
--/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
--   do not use -lfloat.  */
--#undef LIBGCC_SPEC
--
- /* Clear the instruction cache from `beg' to `end'.  This is
-    implemented in lib1funcs.S, so ensure an error if this definition
-    is used.  */
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -51,6 +51,10 @@ see the files COPYING3 and COPYING.RUNTI
- 	builtin_assert ("system=posix");			\
-     } while (0)
- 
-+#ifndef LIBGCC_SPEC
-+#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
-+#endif
-+
- /* Determine which dynamic linker to use depending on whether GLIBC or
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
---- a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -132,5 +132,5 @@ function output(lib) {
-   else if (inherit[lib])
-     printf("} %s;\n", inherit[lib]);
-   else
--    printf ("\n  local:\n\t*;\n};\n");
-+    printf ("\n\t*;\n};\n");
- }
---- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -61,6 +61,9 @@
- #undef  CPLUSPLUS_CPP_SPEC
- #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
- 
-+#undef LIBGCC_SPEC
-+#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
-+
- #undef  LINK_SHLIB_SPEC
- #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
- 
diff --git a/trunk/package/feeds/packages/gcc/patches/860-uclibc_use_eh_frame.patch b/trunk/package/feeds/packages/gcc/patches/860-uclibc_use_eh_frame.patch
deleted file mode 100644
index 0464bd7d..00000000
--- a/trunk/package/feeds/packages/gcc/patches/860-uclibc_use_eh_frame.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -100,15 +100,20 @@ call_ ## FUNC (void)					\
- #if defined(OBJECT_FORMAT_ELF) \
-     && !defined(OBJECT_FORMAT_FLAT) \
-     && defined(HAVE_LD_EH_FRAME_HDR) \
--    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
--    && defined(__GLIBC__) && __GLIBC__ >= 2
-+    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O)
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-    But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
--# if !defined(__UCLIBC__) \
--     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
--     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
--#  define USE_PT_GNU_EH_FRAME
-+# if defined(__UCLIBC__)
-+#  if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \
-+       (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33))
-+#   define USE_PT_GNU_EH_FRAME
-+#  endif
-+# elif defined(__GLIBC__)
-+#  if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+       || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+#   define USE_PT_GNU_EH_FRAME
-+#  endif
- # endif
- #endif
- 
diff --git a/trunk/package/feeds/packages/gcc/patches/870-ppc_no_crtsavres.patch b/trunk/package/feeds/packages/gcc/patches/870-ppc_no_crtsavres.patch
deleted file mode 100644
index d8c460a9..00000000
--- a/trunk/package/feeds/packages/gcc/patches/870-ppc_no_crtsavres.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gcc/config/rs6000/rs6000.c
-+++ b/gcc/config/rs6000/rs6000.c
-@@ -17653,7 +17653,7 @@ rs6000_savres_strategy (rs6000_stack_t *
-   /* Define cutoff for using out-of-line functions to save registers.  */
-   if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
-     {
--      if (!optimize_size)
-+      if (1)
- 	{
- 	  strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS;
- 	  strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS;
diff --git a/trunk/package/feeds/packages/gcc/patches/880-no_java_section.patch b/trunk/package/feeds/packages/gcc/patches/880-no_java_section.patch
deleted file mode 100644
index def6c9f4..00000000
--- a/trunk/package/feeds/packages/gcc/patches/880-no_java_section.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gcc/defaults.h
-+++ b/gcc/defaults.h
-@@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI
- /* If we have named section and we support weak symbols, then use the
-    .jcr section for recording java classes which need to be registered
-    at program start-up time.  */
--#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
-+#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
- #ifndef JCR_SECTION_NAME
- #define JCR_SECTION_NAME ".jcr"
- #endif
diff --git a/trunk/package/feeds/packages/gcc/patches/900-bad-mips16-crt.patch b/trunk/package/feeds/packages/gcc/patches/900-bad-mips16-crt.patch
deleted file mode 100644
index dd6e9dc8..00000000
--- a/trunk/package/feeds/packages/gcc/patches/900-bad-mips16-crt.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/libgcc/config/mips/t-mips16
-+++ b/libgcc/config/mips/t-mips16
-@@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16
- 
- # Version these symbols if building libgcc.so.
- SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
-+
-+CRTSTUFF_T_CFLAGS += -mno-mips16
-+CRTSTUFF_T_CFLAGS_S += -mno-mips16
diff --git a/trunk/package/feeds/packages/gcc/patches/910-mbsd_multi.patch b/trunk/package/feeds/packages/gcc/patches/910-mbsd_multi.patch
deleted file mode 100644
index d04dc7d9..00000000
--- a/trunk/package/feeds/packages/gcc/patches/910-mbsd_multi.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-
-	This patch brings over a few features from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-	* -Werror-maybe-reset
-	  Has the effect of -Wno-error if GCC_NO_WERROR is
-	  set and not '0', a no-operation otherwise. This is
-	  to be able to use -Werror in "make" but prevent
-	  GNU autoconf generated configure scripts from
-	  freaking out.
-	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
-	  the default for -O2/-Os, because they trigger gcc bugs
-	  and can delete code with security implications.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-family/c-opts.c
-+++ b/gcc/c-family/c-opts.c
-@@ -104,6 +104,9 @@ static size_t include_cursor;
- /* Whether any standard preincluded header has been preincluded.  */
- static bool done_preinclude;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
- static void set_std_cxx11 (int);
-@@ -383,6 +386,9 @@ c_common_handle_option (size_t scode, co
-       cpp_opts->warn_endif_labels = value;
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      break;
-+
-     case OPT_Winvalid_pch:
-       cpp_opts->warn_invalid_pch = value;
-       break;
-@@ -491,6 +497,12 @@ c_common_handle_option (size_t scode, co
-       flag_no_builtin = !value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+        honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fconstant_string_class_:
-       constant_string_class_name = arg;
-       break;
-@@ -1027,6 +1039,47 @@ c_common_init (void)
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in lenient mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        warning (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in strict mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        error ("someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+        return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+        inform (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -379,6 +379,10 @@ Werror-implicit-function-declaration
- C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
- This switch is deprecated; use -Werror=implicit-function-declaration instead
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -949,6 +953,9 @@ C++ ObjC++ Optimization Alias(fexception
- fhonor-std
- C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -541,6 +541,10 @@ Werror=
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Var(extra_warnings) Warning
- Print extra (possibly unwanted) warnings
-@@ -1242,6 +1246,9 @@ fguess-branch-probability
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -468,8 +468,6 @@ static const struct default_options defa
-     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
- #endif
-     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
-@@ -488,6 +486,8 @@ static const struct default_options defa
-     { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, NULL, 1 },
- 
-     /* -O3 optimizations.  */
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     /* Inlining of functions reducing size is a good idea with -Os
-@@ -1423,6 +1423,17 @@ common_handle_option (struct gcc_options
- 			       opts, opts_set, loc, dc);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+        char *ev = getenv ("GCC_NO_WERROR");
-+        if ((ev != NULL) && (*ev != '0'))
-+          warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       opts->x_larger_than_size = value;
-       opts->x_warn_larger_than = value != -1;
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
-@@ -163,6 +163,11 @@ in older programs.  This warning is on b
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
- -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
---Wno-endif-labels -Werror  -Werror=* @gol
-+-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
- -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
- -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
- -Wformat-security  -Wformat-y2k @gol
-@@ -4808,6 +4808,22 @@ This option is only supported for C and
- @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -6919,7 +6935,7 @@ so, the first branch is redirected to ei
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
---- a/gcc/java/jvspec.c
-+++ b/gcc/java/jvspec.c
-@@ -626,6 +626,7 @@ lang_specific_pre_link (void)
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
diff --git a/trunk/package/feeds/packages/gcc/patches/920-specs_nonfatal_getenv.patch b/trunk/package/feeds/packages/gcc/patches/920-specs_nonfatal_getenv.patch
deleted file mode 100644
index 4baa9669..00000000
--- a/trunk/package/feeds/packages/gcc/patches/920-specs_nonfatal_getenv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -8003,7 +8003,10 @@ getenv_spec_function (int argc, const ch
- 
-   value = getenv (argv[0]);
-   if (!value)
--    fatal_error ("environment variable %qs not defined", argv[0]);
-+    {
-+      warning (0, "environment variable %qs not defined", argv[0]);
-+      value = "";
-+    }
- 
-   /* We have to escape every character of the environment variable so
-      they are not interpreted as active spec characters.  A
diff --git a/trunk/package/feeds/packages/gdbm/Makefile b/trunk/package/feeds/packages/gdbm/Makefile
deleted file mode 100644
index 21ecfb2d..00000000
--- a/trunk/package/feeds/packages/gdbm/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gdbm
-PKG_VERSION:=1.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/gdbm
-PKG_MD5SUM:=72c832680cf0999caedbe5b265c8c1bd
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_FIXUP:=autoreconf gettext-version
-PKG_REMOVE_FILES:=Makefile compat/Makefile doc/Makefile export/Makefile src/Makefile tests/Makefile
-PKG_BUILD_PARALLEL:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgdbm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU database manager
-  URL:=http://www.gnu.org/software/gdbm/
-endef
-
-define Package/libgdbm/description
-  GNU database manager library
-  GNU dbm is a set of database routines that use extendible hashing and
-  works similar to the standard UNIX dbm routines.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		BINOWN=`id -u` \
-		BINGRP=`id -g` \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libgdbm/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgdbm))
diff --git a/trunk/package/feeds/packages/git/Makefile b/trunk/package/feeds/packages/git/Makefile
deleted file mode 100644
index 429d8e69..00000000
--- a/trunk/package/feeds/packages/git/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=git
-PKG_VERSION:=2.3.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_MD5SUM:=be8c0bbb0c5ee6ab7cdcffd2c9375fe6
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/git/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Version Control Systems
-  DEPENDS:=+libopenssl +libpthread +librt
-  TITLE:=The fast version control system
-  URL:=http://git-scm.com
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/git
-$(call Package/git/Default)
-  DEPENDS:=+libopenssl +libpthread +librt
-  TITLE:=The fast version control system
-endef
-
-define Package/git/description
- Git is a free & open source, distributed version control system
- designed to handle everything from small to very large projects
- with speed and efficiency.
-endef
-
-define Package/git-http
-$(call Package/git/Default)
-  DEPENDS:=git +libcurl +ca-certificates
-  TITLE:=Git HTTP commands
-endef
-
-define Package/git-http/description
-$(call Package/git/description)
-
- This package allows git push/fetch over http(s) and ftp(s)
-endef
-
-MAKE_FLAGS := \
-	CC="$(TARGET_CC)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	NO_EXPAT="YesPlease" \
-	NO_MKSTEMPS="YesPlease" \
-	NO_GETTEXT="YesPlease" \
-	NO_UNIX_SOCKETS="YesPlease" \
-	NO_IPV6="YesPlease" \
-	NO_ICONV="YesPlease" \
-	NO_NSEC="YesPlease" \
-	NO_PERL="YesPlease" \
-	NO_PYTHON="YesPlease" \
-	NO_TCLTK="YesPlease" \
-	NO_INSTALL_HARDLINKS="yes" \
-
-CONFIGURE_ARGS += \
-	--without-iconv \
-
-define Build/Configure
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		configure
-
-	$(call Build/Configure/Default,)
-endef
-
-define Package/git/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/git   $(1)/usr/bin
-	$(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib/git-core
-	( cd $(PKG_INSTALL_DIR); $(TAR) \
-		--exclude=usr/lib/git-core/git-http-backend \
-		--exclude=usr/lib/git-core/git-http-fetch \
-		--exclude=usr/lib/git-core/git-remote-ftp \
-		--exclude=usr/lib/git-core/git-remote-ftps \
-		--exclude=usr/lib/git-core/git-remote-http \
-		--exclude=usr/lib/git-core/git-remote-https \
-		-cf - \
-		usr/lib/git-core \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/git-http/install
-	$(INSTALL_DIR) $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-http-backend $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-http-fetch $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-remote-ftp $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-remote-ftps $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-remote-http $(1)/usr/lib/git-core
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/git-core/git-remote-https $(1)/usr/lib/git-core
-endef
-
-$(eval $(call BuildPackage,git))
-$(eval $(call BuildPackage,git-http))
diff --git a/trunk/package/feeds/packages/git/patches/100-convert_builtin.patch b/trunk/package/feeds/packages/git/patches/100-convert_builtin.patch
deleted file mode 100644
index 05a3f3f3..00000000
--- a/trunk/package/feeds/packages/git/patches/100-convert_builtin.patch
+++ /dev/null
@@ -1,219 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -538,16 +538,7 @@ EXTRA_PROGRAMS =
- # ... and all the rest that could be moved out of bindir to gitexecdir
- PROGRAMS += $(EXTRA_PROGRAMS)
- 
--PROGRAM_OBJS += credential-store.o
--PROGRAM_OBJS += daemon.o
--PROGRAM_OBJS += fast-import.o
- PROGRAM_OBJS += http-backend.o
--PROGRAM_OBJS += imap-send.o
--PROGRAM_OBJS += sh-i18n--envsubst.o
--PROGRAM_OBJS += shell.o
--PROGRAM_OBJS += show-index.o
--PROGRAM_OBJS += upload-pack.o
--PROGRAM_OBJS += remote-testsvn.o
- 
- # Binary suffix, set to .exe for Windows builds
- X =
-@@ -896,6 +887,11 @@ BUILTIN_OBJS += builtin/verify-commit.o
- BUILTIN_OBJS += builtin/verify-pack.o
- BUILTIN_OBJS += builtin/verify-tag.o
- BUILTIN_OBJS += builtin/write-tree.o
-+BUILTIN_OBJS += builtin/daemon.o
-+BUILTIN_OBJS += builtin/fast-import.o
-+BUILTIN_OBJS += builtin/imap-send.o
-+BUILTIN_OBJS += builtin/shell.o
-+BUILTIN_OBJS += builtin/upload-pack.o
- 
- GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
- EXTLIBS =
-@@ -1070,7 +1066,7 @@ endif
- EXTLIBS += -lz
- 
- ifndef NO_OPENSSL
--	OPENSSL_LIBSSL = -lssl
-+	EXTLIBS += -lssl
- 	ifdef OPENSSLDIR
- 		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
- 		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-@@ -1933,10 +1929,6 @@ endif
- git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
- 
--git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
--	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
--		$(LIBS) $(IMAP_SEND_LDFLAGS)
--
- git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(LIBS) $(CURL_LIBCURL)
-@@ -2254,10 +2246,11 @@ endif
- 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
- 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
- 	{ test "$$bindir/" = "$$execdir/" || \
--	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
-+	  for p in $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- 		$(RM) "$$execdir/$$p" && \
- 		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
- 		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
-+		ln -s git "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
- 	  done; \
- 	} && \
---- a/builtin.h
-+++ b/builtin.h
-@@ -138,5 +138,10 @@ extern int cmd_verify_pack(int argc, con
- extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
- extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
- extern int cmd_replace(int argc, const char **argv, const char *prefix);
-+extern int cmd_daemon(int argc, char **argv, const char *prefix);
-+extern int cmd_fast_import(int argc, char **argv, const char *prefix);
-+extern int cmd_imap_send(int argc, char **argv, const char *prefix);
-+extern int cmd_shell(int argc, char **argv, const char *prefix);
-+extern int cmd_upload_pack(int argc, char **argv, const char *prefix);
- 
- #endif
---- /dev/null
-+++ b/builtin/daemon.c
-@@ -0,0 +1 @@
-+#include "../daemon.c"
---- /dev/null
-+++ b/builtin/fast-import.c
-@@ -0,0 +1 @@
-+#include "../fast-import.c"
---- /dev/null
-+++ b/builtin/imap-send.c
-@@ -0,0 +1 @@
-+#include "../imap-send.c"
---- /dev/null
-+++ b/builtin/shell.c
-@@ -0,0 +1 @@
-+#include "../shell.c"
---- /dev/null
-+++ b/builtin/upload-pack.c
-@@ -0,0 +1 @@
-+#include "../upload-pack.c"
---- a/daemon.c
-+++ b/daemon.c
-@@ -1193,7 +1193,7 @@ static int serve(struct string_list *lis
- 	return service_loop(&socklist);
- }
- 
--int main(int argc, char **argv)
-+int cmd_daemon(int argc, char **argv, const char *prefix)
- {
- 	int listen_port = 0;
- 	struct string_list listen_addr = STRING_LIST_INIT_NODUP;
-@@ -1389,12 +1389,13 @@ int main(int argc, char **argv)
- 		store_pid(pid_file);
- 
- 	/* prepare argv for serving-processes */
--	cld_argv = xmalloc(sizeof (char *) * (argc + 2));
--	cld_argv[0] = argv[0];	/* git-daemon */
--	cld_argv[1] = "--serve";
-+	cld_argv = xmalloc(sizeof (char *) * (argc + 3));
-+	cld_argv[0] = "git";
-+	cld_argv[1] = argv[0];	/* daemon */
-+	cld_argv[2] = "--serve";
- 	for (i = 1; i < argc; ++i)
--		cld_argv[i+1] = argv[i];
--	cld_argv[argc+1] = NULL;
-+		cld_argv[i+2] = argv[i];
-+	cld_argv[argc+2] = NULL;
- 
- 	return serve(&listen_addr, listen_port, cred);
- }
---- a/fast-import.c
-+++ b/fast-import.c
-@@ -3354,7 +3354,7 @@ static void parse_argv(void)
- 		read_marks();
- }
- 
--int main(int argc, char **argv)
-+int cmd_fast_import(int argc, char **argv, const char *prefix)
- {
- 	unsigned int i;
- 
---- a/git.c
-+++ b/git.c
-@@ -309,11 +309,11 @@ static int handle_alias(int *argcp, cons
- 
- struct cmd_struct {
- 	const char *cmd;
--	int (*fn)(int, const char **, const char *);
-+	int (*fn)(int, char **, const char *);
- 	int option;
- };
- 
--static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
-+static int run_builtin(struct cmd_struct *p, int argc, char **argv)
- {
- 	int status, help;
- 	struct stat st;
-@@ -393,6 +393,7 @@ static struct cmd_struct commands[] = {
- 	{ "config", cmd_config, RUN_SETUP_GENTLY },
- 	{ "count-objects", cmd_count_objects, RUN_SETUP },
- 	{ "credential", cmd_credential, RUN_SETUP_GENTLY },
-+	{ "daemon", cmd_daemon },
- 	{ "describe", cmd_describe, RUN_SETUP },
- 	{ "diff", cmd_diff },
- 	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
-@@ -411,6 +412,7 @@ static struct cmd_struct commands[] = {
- 	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
- 	{ "hash-object", cmd_hash_object },
- 	{ "help", cmd_help },
-+	{ "imap-send", cmd_imap_send },
- 	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
- 	{ "init", cmd_init_db, NO_SETUP },
- 	{ "init-db", cmd_init_db, NO_SETUP },
-@@ -459,6 +461,7 @@ static struct cmd_struct commands[] = {
- 	{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
- 	{ "rm", cmd_rm, RUN_SETUP },
- 	{ "send-pack", cmd_send_pack, RUN_SETUP },
-+	{ "shell", cmd_shell },
- 	{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
- 	{ "show", cmd_show, RUN_SETUP },
- 	{ "show-branch", cmd_show_branch, RUN_SETUP },
-@@ -475,6 +478,7 @@ static struct cmd_struct commands[] = {
- 	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
- 	{ "upload-archive", cmd_upload_archive },
- 	{ "upload-archive--writer", cmd_upload_archive_writer },
-+	{ "upload-pack", cmd_upload_pack },
- 	{ "var", cmd_var, RUN_SETUP_GENTLY },
- 	{ "verify-commit", cmd_verify_commit, RUN_SETUP },
- 	{ "verify-pack", cmd_verify_pack },
---- a/imap-send.c
-+++ b/imap-send.c
-@@ -1484,7 +1484,7 @@ static int curl_append_msgs_to_imap(stru
- }
- #endif
- 
--int main(int argc, char **argv)
-+int cmd_imap_send(int argc, char **argv, const char *prefix)
- {
- 	struct strbuf all_msgs = STRBUF_INIT;
- 	int total;
---- a/shell.c
-+++ b/shell.c
-@@ -138,7 +138,7 @@ static struct commands {
- 	{ NULL },
- };
- 
--int main(int argc, char **argv)
-+int cmd_shell(int argc, char **argv, const char *prefix)
- {
- 	char *prog;
- 	const char **user_argv;
---- a/upload-pack.c
-+++ b/upload-pack.c
-@@ -793,7 +793,7 @@ static int upload_pack_config(const char
- 	return parse_hide_refs_config(var, value, "uploadpack");
- }
- 
--int main(int argc, char **argv)
-+int cmd_upload_pack(int argc, char **argv, const char *prefix)
- {
- 	char *dir;
- 	int i;
diff --git a/trunk/package/feeds/packages/git/patches/200-disable_fasthash.patch b/trunk/package/feeds/packages/git/patches/200-disable_fasthash.patch
deleted file mode 100644
index 91f255f8..00000000
--- a/trunk/package/feeds/packages/git/patches/200-disable_fasthash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -17,9 +17,6 @@ endif
- # because maintaining the nesting to match is a pain.  If
- # we had "elif" things would have been much nicer...
- 
--ifeq ($(uname_M),x86_64)
--	XDL_FAST_HASH = YesPlease
--endif
- ifeq ($(uname_S),OSF1)
- 	# Need this for u_short definitions et al
- 	BASIC_CFLAGS += -D_OSF_SOURCE
diff --git a/trunk/package/feeds/packages/git/patches/300-configure_for_crosscompiling b/trunk/package/feeds/packages/git/patches/300-configure_for_crosscompiling
deleted file mode 100644
index 0ccfaecd..00000000
--- a/trunk/package/feeds/packages/git/patches/300-configure_for_crosscompiling
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -844,7 +844,8 @@ AC_RUN_IFELSE(
- 		FILE *f = fopen(".", "r");
- 		return f && fread(&c, 1, 1, f)]])],
- 	[ac_cv_fread_reads_directories=no],
--	[ac_cv_fread_reads_directories=yes])
-+	[ac_cv_fread_reads_directories=yes],
-+	[ac_cv_fread_reads_directories=no])
- ])
- if test $ac_cv_fread_reads_directories = yes; then
- 	FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -878,7 +879,8 @@ AC_RUN_IFELSE(
- 		  if (snprintf(buf, 3, "%s", "12345") != 5
- 		      || strcmp(buf, "12")) return 1]])],
- 	[ac_cv_snprintf_returns_bogus=no],
--	[ac_cv_snprintf_returns_bogus=yes])
-+	[ac_cv_snprintf_returns_bogus=yes],
-+	[ac_cv_snprintf_returns_bogus=no])
- ])
- if test $ac_cv_snprintf_returns_bogus = yes; then
- 	SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
-@@ -901,7 +903,8 @@ yippeeyeswehaveit
- #endif
- ]),
- 	[ac_cv_sane_mode_bits=yes],
--	[ac_cv_sane_mode_bits=no])
-+	[ac_cv_sane_mode_bits=no],
-+	[ac_cv_sane_mode_bits=yes])
- ])
- if test $ac_cv_sane_mode_bits = yes; then
- 	NEEDS_MODE_TRANSLATION=
diff --git a/trunk/package/feeds/packages/git/patches/400-imapsend_without_curl.patch b/trunk/package/feeds/packages/git/patches/400-imapsend_without_curl.patch
deleted file mode 100644
index 44ceb013..00000000
--- a/trunk/package/feeds/packages/git/patches/400-imapsend_without_curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1039,7 +1039,7 @@ else
- 	endif
- 	curl_check := $(shell (echo 072200; curl-config --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
- 	ifeq "$(curl_check)" "072200"
--		USE_CURL_FOR_IMAP_SEND = YesPlease
-+#		USE_CURL_FOR_IMAP_SEND = YesPlease
- 	endif
- 	ifdef USE_CURL_FOR_IMAP_SEND
- 		BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
diff --git a/trunk/package/feeds/packages/glib2/Makefile b/trunk/package/feeds/packages/glib2/Makefile
deleted file mode 100644
index 5b516a2c..00000000
--- a/trunk/package/feeds/packages/glib2/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=glib2
-PKG_VERSION:=2.43.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
-PKG_SOURCE_URL:=@GNOME/glib/2.43
-PKG_MD5SUM:=2f28879252c660a65aa3139ec499776b
-
-PKG_BUILD_DEPENDS:=glib2/host libpthread zlib libintl libffi
-HOST_BUILD_DEPENDS:=libintl/host libiconv/host libffi/host
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-PKG_FIXUP:=autoreconf
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/glib2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr
-  TITLE:=glib 2.0
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.gtk.org/
-endef
-
-define Package/glib2/description
-  The GLib library of C routines
-endef
-
-HOST_CONFIGURE_ARGS += \
-	--disable-selinux
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--enable-debug=no \
-	--disable-selinux \
-	--disable-fam \
-	$(if $(ICONV_FULL),--with-libiconv=gnu)
-
-CONFIGURE_VARS += \
-	glib_cv_stack_grows=no \
-	glib_cv_uscore=no \
-	ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \
-	ac_cv_func_mmap_fixed_mapped=yes \
-	ac_cv_func_posix_getpwuid_r=yes \
-	ac_cv_func_posix_getgrgid_r=yes
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/glib-2.0 \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/glib-2.0/include/*.h \
-		$(1)/usr/include/glib-2.0/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/gio-unix-2.0 \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/glib-2.0 \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig
-
-	$(INSTALL_DIR) $(2)/share/aclocal/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4  \
-		$(2)/share/aclocal/
-endef
-
-define Package/glib2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,glib2))
diff --git a/trunk/package/feeds/packages/glib2/patches/001-automake-compat.patch b/trunk/package/feeds/packages/glib2/patches/001-automake-compat.patch
deleted file mode 100644
index 8f8ce37a..00000000
--- a/trunk/package/feeds/packages/glib2/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtk-doc.make
-+++ b/gtk-doc.make
-@@ -267,7 +267,7 @@ uninstall-local:
- #
- # Require gtk-doc when making dist
- #
--if HAVE_GTK_DOC
-+if ENABLE_GTK_DOC
- dist-check-gtkdoc: docs
- else
- dist-check-gtkdoc:
diff --git a/trunk/package/feeds/packages/glib2/patches/100-fix-gio-linking.patch b/trunk/package/feeds/packages/glib2/patches/100-fix-gio-linking.patch
deleted file mode 100644
index b88859b1..00000000
--- a/trunk/package/feeds/packages/glib2/patches/100-fix-gio-linking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -700,6 +700,7 @@ bin_PROGRAMS = gio-querymodules glib-com
- 
- glib_compile_resources_LDADD = libgio-2.0.la 		\
- 	$(top_builddir)/gobject/libgobject-2.0.la	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
- 	$(top_builddir)/glib/libglib-2.0.la 		\
- 	$(NULL)
- 
diff --git a/trunk/package/feeds/packages/gnupg/Makefile b/trunk/package/feeds/packages/gnupg/Makefile
deleted file mode 100644
index c96fbc3a..00000000
--- a/trunk/package/feeds/packages/gnupg/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gnupg
-PKG_VERSION:=1.4.19
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
-	ftp://ftp.gnupg.org/gcrypt/gnupg
-PKG_MD5SUM:=3af4ab5b3113b3e28d3551ecf9600785
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gnupg
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+zlib +libncurses +libreadline
-  TITLE:=GNU privacy guard - a free PGP replacement
-  URL:=http://www.gnupg.org/
-endef
-
-define Package/gnupg/description
- GnuPG is GNU's tool for secure communication and data storage.
- It can be used to encrypt data and to create digital signatures.
- It includes an advanced key management facility and is compliant
- with the proposed OpenPGP Internet standard as described in RFC2440.
- .
- GnuPG does not use any patented algorithms so it cannot be compatible
- with PGP2 because it uses IDEA (which is patented worldwide).
-endef
-
-CONFIGURE_ARGS += \
-	--disable-rpath \
-	--disable-asm \
-	--disable-gnupg-iconv \
-	--disable-card-support \
-	--disable-agent-support \
-	--disable-bzip2 \
-	--disable-exec \
-	--disable-ldap \
-	--disable-hkp \
-	--disable-finger \
-	--disable-ftp \
-	--disable-dns-srv \
-	--enable-fake-curl \
-	--disable-regex \
-
-MAKE_FLAGS += \
-	SUBDIRS="m4 intl zlib util mpi cipher tools g10 keyserver ${checks}" \
-
-define Package/gnupg/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,gnupg))
diff --git a/trunk/package/feeds/packages/gnutls/Config.in b/trunk/package/feeds/packages/gnutls/Config.in
deleted file mode 100644
index 59ca00f8..00000000
--- a/trunk/package/feeds/packages/gnutls/Config.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# gnutls avanced configuration
-
-menu "Configuration"
-	depends on PACKAGE_libgnutls
-
-config GNUTLS_DTLS_SRTP
-	bool "enable DTLS SRTP support"
-	default y
-
-config GNUTLS_ALPN
-	bool "enable ALPN support"
-	default y
-
-config GNUTLS_OCSP
-	bool "enable ocsp support"
-	default y
-
-config GNUTLS_CRYPTODEV
-	bool "enable /dev/crypto support"
-	select PACKAGE_kmod-cryptodev
-	default n
-
-config GNUTLS_HEARTBEAT
-	bool "enable DTLS heartbeat support"
-	default y
-
-config GNUTLS_OPENPGP
-	bool "enable OPENPGP authentication support"
-	default n
-
-config GNUTLS_SRP
-	bool "enable SRP authentication support"
-	default n
-
-config GNUTLS_PSK
-	bool "enable PSK authentication support"
-	default y
-
-config GNUTLS_ANON
-	bool "enable anonymous authentication support"
-	default y
-
-config GNUTLS_PKCS11
-	bool "enable smart card (PKCS11) support"
-	select GNUTLS_EXT_LIBTASN1
-	default n
-
-config GNUTLS_EXT_LIBTASN1
-	bool "use external libtasn1"
-	default n
-
-endmenu
diff --git a/trunk/package/feeds/packages/gnutls/Makefile b/trunk/package/feeds/packages/gnutls/Makefile
deleted file mode 100644
index 965f08f1..00000000
--- a/trunk/package/feeds/packages/gnutls/Makefile
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Copyright (C) 2005-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gnutls
-PKG_VERSION:=3.3.14
-PKG_RELEASE:=1
-PKG_USE_MIPS16:=0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3
-PKG_MD5SUM:=7f4465f8c564cf9cb8f5cb38b909f7ca
-PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
-
-PKG_INSTALL:=1
-PKG_LIBTOOL_PATHS:=. lib
-PKG_CHECK_FORMAT_SECURITY:=0
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_GNUTLS_ALPN \
-	CONFIG_GNUTLS_ANON \
-	CONFIG_GNUTLS_CRYPTODEV \
-	CONFIG_GNUTLS_DTLS_SRTP \
-	CONFIG_GNUTLS_EXT_LIBTASN1 \
-	CONFIG_GNUTLS_HEARTBEAT \
-	CONFIG_GNUTLS_OCSP \
-	CONFIG_GNUTLS_OPENPGP \
-	CONFIG_GNUTLS_PKCS11 \
-	CONFIG_GNUTLS_PSK \
-	CONFIG_GNUTLS_SRP \
-	CONFIG_LIBNETTLE_MINI \
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/gnutls/Default
-  SUBMENU:=SSL
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU TLS
-  URL:=http://www.gnutls.org/
-endef
-
-define Package/gnutls/Default/description
- GnuTLS is a secure communications library implementing the SSL, TLS
- and DTLS protocols and technologies around them. It provides a simple
- C language application programming interface (API) to access the secure
- communications protocols as well as APIs to parse and write X.509, PKCS12,
- OpenPGP and other required structures. It is aimed to be portable and
- efficient with focus on security and interoperability.
-endef
-
-
-define Package/certtool
-$(call Package/gnutls/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= (certool utility)
-  DEPENDS+= +libgnutls
-endef
-
-define Package/certtool/description
-$(call Package/gnutls/Default/description)
- This package contains the GnuTLS certtool utility.
-endef
-
-
-define Package/gnutls-utils
-$(call Package/gnutls/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= (utilities)
-  DEPENDS+= +libgnutls
-endef
-
-define Package/gnutls-utils/description
-$(call Package/gnutls/Default/description)
- This package contains the GnuTLS gnutls-cli, gnutls-serv, psktool,
- and srptool utilities.
-endef
-
-define Package/libgnutls/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/libgnutls
-$(call Package/gnutls/Default)
-  TITLE+= (library)
-  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit
-endef
-
-define Package/libgnutls/description
-$(call Package/gnutls/Default/description)
- This package contains the GnuTLS shared library, needed by other programs.
-endef
-
-
-define Package/libgnutls-openssl
-$(call Package/gnutls/Default)
-  TITLE+= (OpenSSL compat library)
-  DEPENDS+= +libgnutls
-endef
-
-define Package/libgnutls-openssl/description
-$(call Package/gnutls/Default/description)
- This package contains the GnuTLS OpenSSL compatibility layer shared library.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--disable-libdane \
-	--disable-guile \
-	--disable-nls \
-	--without-zlib \
-	--enable-local-libopts \
-	--disable-doc \
-	--disable-tests \
-	--disable-rsa-export \
-	--with-default-trust-store-dir=/etc/ssl/certs/ \
-	--disable-crywrap \
-	--with-librt-prefix="$(STAGING_DIR)/"
-
-ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
-CONFIGURE_ARGS += --with-included-libtasn1
-endif
-
-ifneq ($(CONFIG_GNUTLS_PKCS11),y)
-CONFIGURE_ARGS += --without-p11-kit
-endif
-
-ifeq ($(CONFIG_LIBNETTLE_MINI),y)
-CONFIGURE_ARGS += --with-nettle-mini
-endif
-
-ifneq ($(CONFIG_GNUTLS_DTLS_SRTP),y)
-CONFIGURE_ARGS += --disable-dtls-srtp-support
-endif
-
-ifneq ($(CONFIG_GNUTLS_ALPN),y)
-CONFIGURE_ARGS += --disable-alpn-support
-endif
-
-ifneq ($(CONFIG_GNUTLS_HEARTBEAT),y)
-CONFIGURE_ARGS += --disable-heartbeat-support
-endif
-
-ifneq ($(CONFIG_GNUTLS_SRP),y)
-CONFIGURE_ARGS += --disable-srp-authentication
-endif
-
-ifneq ($(CONFIG_GNUTLS_PSK),y)
-CONFIGURE_ARGS += --disable-psk-authentication
-endif
-
-ifneq ($(CONFIG_GNUTLS_OPENPGP),y)
-CONFIGURE_ARGS += --disable-openpgp-authentication
-endif
-
-ifneq ($(CONFIG_GNUTLS_ANON),y)
-CONFIGURE_ARGS += --disable-anon-authentication
-endif
-
-ifneq ($(CONFIG_GNUTLS_OCSP),y)
-CONFIGURE_ARGS += --disable-ocsp
-endif
-
-ifeq ($(CONFIG_GNUTLS_CRYPTODEV),y)
-CONFIGURE_ARGS += --enable-cryptodev
-endif
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/gnutls \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-openssl}.{a,so*} \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/certtool/conffiles
-/etc/gnutls/certtool.cfg
-endef
-
-define Package/certtool/install
-	$(INSTALL_DIR) $(1)/etc/gnutls
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
-endef
-
-
-define Package/gnutls-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-ifeq ($(CONFIG_GNUTLS_OCSP),y)
-ifeq ($(CONFIG_GNUTLS_ANON),y)
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} \
-		$(1)/usr/bin/
-endif
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/ocsptool \
-		$(1)/usr/bin/
-endif
-ifeq ($(CONFIG_GNUTLS_SRP),y)
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/srptool \
-		$(1)/usr/bin/
-endif
-ifeq ($(CONFIG_GNUTLS_PSK),y)
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/psktool \
-		$(1)/usr/bin/
-endif
-ifeq ($(CONFIG_GNUTLS_PKCS11),y)
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/p11tool \
-		$(1)/usr/bin/
-endif
-endef
-
-
-define Package/libgnutls/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls.so.* $(1)/usr/lib/
-endef
-
-
-define Package/libgnutls-openssl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,certtool))
-$(eval $(call BuildPackage,gnutls-utils))
-$(eval $(call BuildPackage,libgnutls))
-$(eval $(call BuildPackage,libgnutls-openssl))
diff --git a/trunk/package/feeds/packages/gnutls/patches/001-ai-idn-remove.patch b/trunk/package/feeds/packages/gnutls/patches/001-ai-idn-remove.patch
deleted file mode 100644
index 9acf756a..00000000
--- a/trunk/package/feeds/packages/gnutls/patches/001-ai-idn-remove.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/socket.c b/src/socket.c
-index 82c6252..e2feda9 100644
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -241,10 +241,6 @@ socket_open(socket_st * hd, const char *hostname, const char *service,
- 	/* get server name */
- 	memset(&hints, 0, sizeof(hints));
- 
--#ifdef AI_IDN
--	hints.ai_flags = AI_IDN|AI_IDN_ALLOW_UNASSIGNED;
--#endif
--
- 	hints.ai_socktype = udp ? SOCK_DGRAM : SOCK_STREAM;
- 	if ((err = getaddrinfo(hostname, service, &hints, &res))) {
- 		fprintf(stderr, "Cannot resolve %s:%s: %s\n", hostname,
diff --git a/trunk/package/feeds/packages/gperf/Makefile b/trunk/package/feeds/packages/gperf/Makefile
deleted file mode 100644
index 4cdd470f..00000000
--- a/trunk/package/feeds/packages/gperf/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gperf
-PKG_VERSION:=3.0.4
-PKG_RELEASE:=1
-PKG_MD5SUM:=c1f1db32fb6598d6a93e6e88796a8632
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/gperf
-PKG_HOST_ONLY=1
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gperf
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU gperf
-  BUILDONLY:=1
-  URL:=http://www.gnu.org/software/gperf
-endef
-
-define Package/gperf/description
- GNU gperf is a perfect hash function generator. For a given list of strings, it
- produces a hash function and hash table, in form of C or C++ code, for looking 
- up a value depending on the input string. The hash function is perfect, which 
- means that the hash table has no collisions, and the hash table lookup needs a
- single string comparison only.
-endef
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,gperf))
diff --git a/trunk/package/feeds/packages/grep/Makefile b/trunk/package/feeds/packages/grep/Makefile
deleted file mode 100644
index c4703bc5..00000000
--- a/trunk/package/feeds/packages/grep/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=grep
-PKG_VERSION:=2.21
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/grep
-PKG_MD5SUM:=43c48064d6409862b8a850db83c8038a
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=--std=gnu99
-
-define Package/grep
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=grep search utility - full version
-  DEPENDS:=+libpcre
-  URL:=http://www.gnu.org/software/grep/
-endef
-
-define Package/grep/description
-The grep command searches one or more input files for lines
-containing a match to a specified pattern. By default, grep
-prints the matching lines.
-endef
-
-define Package/grep/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/grep $(1)/usr/bin/grep
-endef
-
-define Package/grep/postinst
-#!/bin/sh
-[ -L "$${IPKG_INSTROOT}/bin/grep" ] && rm -f "$${IPKG_INSTROOT}/bin/grep"
-exit 0
-endef
-
-define Package/grep/prerm
-$${IPKG_INSTROOT}/bin/busybox grep -h 2>&1 | grep -q BusyBox && \
-ln -sf busybox $${IPKG_INSTROOT}/bin/grep
-exit 0
-endef
-
-$(eval $(call BuildPackage,grep))
diff --git a/trunk/package/feeds/packages/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch b/trunk/package/feeds/packages/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
deleted file mode 100644
index df70359a..00000000
--- a/trunk/package/feeds/packages/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/kwset.c b/src/kwset.c
-index 4003c8d..376f7c3 100644
---- a/src/kwset.c
-+++ b/src/kwset.c
-@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
-                     if (! tp)
-                       return -1;
-                     tp++;
-+                    if (ep <= tp)
-+                      break;
-                   }
-               }
-           }
---
-cgit v0.9.0.2
diff --git a/trunk/package/feeds/packages/gst1-libav/Config.in b/trunk/package/feeds/packages/gst1-libav/Config.in
deleted file mode 100644
index b394d7dd..00000000
--- a/trunk/package/feeds/packages/gst1-libav/Config.in
+++ /dev/null
@@ -1,279 +0,0 @@
-menu "Select GStreamer libav configuration options"
-	depends on PACKAGE_gst1-libav
-
-config GST1_LIBAV_IPV6
-	bool "Enable IPv6"
-	default IPV6
-
-config GST1_LIBAV_PATENTED
-	bool "Include patented codecs and technologies"
-	default BUILD_PATENTED
-
-config GET_LIBAV_COMMON_AV_SUPPORT
-	bool "Include support for common audio/video decoders"
-	default y
-	select GST1_LIBAV_DECODER_aac if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_ac3 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_h264 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_atrac3 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_jpegls
-	select GST1_LIBAV_DECODER_mp3 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_mpeg1video
-	select GST1_LIBAV_DECODER_mpeg2video if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_mpeg4 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_mpeg4aac if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_mpegvideo
-	select GST1_LIBAV_DECODER_pcm_s16be
-	select GST1_LIBAV_DECODER_pcm_s16le
-	select GST1_LIBAV_DECODER_vorbis
-	select GST1_LIBAV_DECODER_wmav1 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_wmav2 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_png
-	select GST1_LIBAV_PARSER_aac if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_PARSER_h264 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_PARSER_mpegaudio
-	select GST1_LIBAV_PARSER_mpegvideo
-	select GST1_LIBAV_PARSER_mpeg4video
-	select GST1_LIBAV_DEMUXER_ac3
-	select GST1_LIBAV_DEMUXER_h264 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DEMUXER_mp3 if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DEMUXER_mpegvideo if GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DEMUXER_ogg
-
-comment "Encoders ---"
-
-config GST1_LIBAV_ENCODER_ac3
-	bool "AC3"
-	depends on GST1_LIBAV_PATENTED
-	select GST1_LIBAV_PARSER_ac3
-
-config GST1_LIBAV_ENCODER_jpegls
-	bool "JPEG-LS"
-
-config GST1_LIBAV_ENCODER_mpeg1video
-	bool "MPEG-1 Video"
-
-config GST1_LIBAV_ENCODER_mpeg2video
-	bool "MPEG-2 Video"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_ENCODER_mpeg4
-	bool "MPEG-4"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_ENCODER_pcm_s16be
-	bool "PCM signed 16-bit big-endian"
-
-config GST1_LIBAV_ENCODER_pcm_s16le
-	bool "PCM signed 16-bit little-endian"
-
-config GST1_LIBAV_ENCODER_png
-	bool "PNG"
-	select GST1_LIBAV_ENCODER_zlib
-
-config GST1_LIBAV_ENCODER_vorbis
-	bool "Vorbis"
-
-config GST1_LIBAV_ENCODER_zlib
-	bool "Zlib"
-
-comment "Decoders ---"
-
-config GST1_LIBAV_DECODER_aac
-	bool "AAC (Advanced Audio Coding)"
-	depends on GST1_LIBAV_PATENTED
-	select GST1_LIBAV_PARSER_aac
-
-config GST1_LIBAV_DECODER_ac3
-	bool "AC3"
-	depends on GST1_LIBAV_PATENTED
-	select GST1_LIBAV_PARSER_ac3
-
-config GST1_LIBAV_DECODER_atrac3
-	bool "ATRAC3"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_gif
-	bool "GIF"
-
-config GST1_LIBAV_DECODER_h264
-	bool "H.264"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_jpegls
-	bool "JPEG-LS"
-
-config GST1_LIBAV_DECODER_mp2
-	bool "MP2 (MPEG Audio Layer 2)"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_mp3
-	bool "MP3 (MPEG Audio Layer 2)"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_mpegvideo
-	bool "MPEG Video"
-
-config GST1_LIBAV_DECODER_mpeg1video
-	bool "MPEG-1 Video"
-
-config GST1_LIBAV_DECODER_mpeg2video
-	bool "MPEG-2 Video"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_mpeg4
-	bool "MPEG-4"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_mpeg4aac
-	bool "MPEG-4 (AAC)"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_pcm_s16be
-	bool "PCM signed 16-bit big-endian"
-
-config GST1_LIBAV_DECODER_pcm_s16le
-	bool "PCM signed 16-bit little-endian"
-
-config GST1_LIBAV_DECODER_png
-	bool "PNG"
-	select GST1_LIBAV_DECODER_zlib
-
-config GST1_LIBAV_DECODER_vorbis
-	bool "Vorbis"
-
-config GST1_LIBAV_DECODER_wmav1
-	bool "WMAv1"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_wmav2
-	bool "WMAv2"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DECODER_zlib
-	bool "Zlib"
-
-comment "Muxers ---"
-
-config GST1_LIBAV_MUXER_ac3
-	bool "AC3"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_MUXER_ffm
-	bool "FFM (ffserver live feed)"
-
-config GST1_LIBAV_MUXER_h264
-	bool "H.264"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_MUXER_mp3
-	bool "MP3 (MPEG Audio Layer 3)"
-
-config GST1_LIBAV_MUXER_mp4
-	bool "MP4"
-
-config GST1_LIBAV_MUXER_mpeg1video
-	bool "MPEG-1 Video"
-
-config GST1_LIBAV_MUXER_mpeg2video
-	bool "MPEG-2 Video"
-
-config GST1_LIBAV_MUXER_mpegts
-	bool "MPEG-2 (TS)"
-
-config GST1_LIBAV_MUXER_ogg
-	bool "Ogg"
-
-config GST1_LIBAV_MUXER_oss
-	bool "OSS (Open Sound System playback)"
-
-config GST1_LIBAV_MUXER_rtp
-	bool "RTP"
-
-comment "Demuxers ---"
-
-config GST1_LIBAV_DEMUXER_ac3
-	bool "AC3"
-
-config GST1_LIBAV_DEMUXER_ffm
-	bool "FFM (ffserver live feed)"
-
-config GST1_LIBAV_DEMUXER_h264
-	bool "H.264"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_DEMUXER_mp3
-	bool "MP3 (MPEG Audio Layer 3)"
-
-config GST1_LIBAV_DEMUXER_mpegvideo
-	bool "MPEG Video"
-
-config GST1_LIBAV_DEMUXER_mpegps
-	bool "MPEG-2 (PS)"
-
-config GST1_LIBAV_DEMUXER_mpegts
-	bool "MPEG-2 (TS)"
-
-config GST1_LIBAV_DEMUXER_ogg
-	bool "Ogg"
-
-config GST1_LIBAV_DEMUXER_rm
-	bool "RM"
-	help
-	  RealMedia format demuxer
-
-config GST1_LIBAV_DEMUXER_rtsp
-	bool "RTSP"
-	select GST1_LIBAV_DEMUXER_rm
-	select GST1_LIBAV_DEMUXER_sdp
-
-config GST1_LIBAV_DEMUXER_sdp
-	bool "SDP"
-	select GST1_LIBAV_DEMUXER_mpegts
-
-comment "Parsers ---"
-
-config GST1_LIBAV_PARSER_aac
-	bool "AAC (Advanced Audio Coding)"
-	depends on GST1_LIBAV_PATENTED
-
-config GST1_LIBAV_PARSER_ac3
-	bool "AC3"
-
-config GST1_LIBAV_PARSER_h264
-	bool "H.264"
-	depends on GST1_LIBAV_PATENTED
-	select GST1_LIBAV_DECODER_h264
-
-config GST1_LIBAV_PARSER_mpegaudio
-	bool "MPEG Audio"
-
-config GST1_LIBAV_PARSER_mpegvideo
-	bool "MPEG Video"
-
-config GST1_LIBAV_PARSER_mpeg4video
-	bool "MPEG-4 Video"
-
-comment "Protocols ---"
-
-config GST1_LIBAV_PROTOCOL_file
-	bool "file:"
-
-config GST1_LIBAV_PROTOCOL_http
-	bool "http:"
-
-config GST1_LIBAV_PROTOCOL_pipe
-	bool "pipe:"
-
-config GST1_LIBAV_PROTOCOL_rtp
-	bool "rtp:"
-	select GST1_LIBAV_PROTOCOL_udp
-
-config GST1_LIBAV_PROTOCOL_tcp
-	bool "tcp:"
-
-config GST1_LIBAV_PROTOCOL_udp
-	bool "udp:"
-
-endmenu
-
diff --git a/trunk/package/feeds/packages/gst1-libav/Makefile b/trunk/package/feeds/packages/gst1-libav/Makefile
deleted file mode 100644
index 3137e000..00000000
--- a/trunk/package/feeds/packages/gst1-libav/Makefile
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gst1-libav
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-libav
-PKG_MD5SUM:=f4922a46adbcbe7bd01331ff5dc7979d
-
-PKG_LICENSE:=GPL-2.0 LGPL-2.0
-PKG_LICENSE_FILES:=COPYING COPYING.LIB
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_USE_MIPS16:=0
-
-GST_VERSION:=1.0
-
-LIBAV_ENCODERS:= \
-	ac3 \
-	jpegls \
-	mpeg1video \
-	mpeg2video \
-	mpeg4 \
-	pcm_s16be \
-	pcm_s16le \
-	png \
-	vorbis \
-	zlib \
-
-LIBAV_DECODERS:= \
-	aac \
-	ac3 \
-	atrac3 \
-	gif \
-	h264 \
-	jpegls \
-	mp2 \
-	mp3 \
-	mpeg1video \
-	mpeg2video \
-	mpeg4 \
-	mpeg4aac \
-	mpegvideo \
-	pcm_s16be \
-	pcm_s16le \
-	png \
-	vorbis \
-	wmav1 \
-	wmav2 \
-	zlib \
-
-LIBAV_MUXERS:= \
-	ac3 \
-	ffm \
-	h264 \
-	mp3 \
-	mp4 \
-	mpeg1video \
-	mpeg2video \
-	mpegts \
-	ogg \
-	oss \
-	rtp \
-
-LIBAV_DEMUXERS:= \
-	ac3 \
-	ffm \
-	h264 \
-	mp3 \
-	mpegps \
-	mpegts \
-	mpegvideo \
-	ogg \
-	rm \
-	rtsp \
-	sdp \
-	v4l2 \
-
-LIBAV_PARSERS:= \
-	aac \
-	ac3 \
-	h264 \
-	mpegaudio \
-	mpegvideo \
-	mpeg4video \
-
-LIBAV_PROTOCOLS:= \
-	file http pipe rtp tcp udp
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_GST1_LIBAV_ENCODER_%,$(LIBAV_ENCODERS)) \
-	$(patsubst %,CONFIG_GST1_LIBAV_DECODER_%,$(LIBAV_DECODERS)) \
-	$(patsubst %,CONFIG_GST1_LIBAV_MUXER_%,$(LIBAV_DEMUXERS)) \
-	$(patsubst %,CONFIG_GST1_LIBAV_DEMUXER_%,$(LIBAV_DEMUXERS)) \
-	$(patsubst %,CONFIG_GST1_LIBAV_PARSER_%,$(LIBAV_PARSERS)) \
-	$(patsubst %,CONFIG_GST1_LIBAV_PROTOCOL_%,$(LIBAV_PROTOCOLS))
-
-PKG_BUILD_DEPENDS:= libgstreamer1 gstreamer1-plugins-base
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gst1-libav
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=GStreamer Libav plugin
-  URL:=http://www.gstreamer.net/modules/gst-libav.html
-  DEPENDS:= +libgstreamer1 +gstreamer1-plugins-base \
-	    +gst1-mod-alsa +libgst1audio +libgst1pbutils +libgst1video \
-	    +libbz2
-endef
-
-define Package/gst1-libav/description
-  GStreamer with libav bindings using internal Libav
-endef
-
-define Package/gst1-libav/config
-  source "$(SOURCE)/Config.in"
-endef
-
-FILTER_CONFIG= \
-	$(foreach c, $(3), \
-		$(if $(CONFIG_GST1_LIBAV_$(1)_$(c)),--enable-$(2)='$(c)') \
-	)
-
-LIBAV_CONFIGURE_ENCODERS:=$(call FILTER_CONFIG,ENCODER,encoder,$(LIBAV_ENCODERS))
-LIBAV_CONFIGURE_DECODERS:=$(call FILTER_CONFIG,DECODER,decoder,$(LIBAV_DECODERS))
-LIBAV_CONFIGURE_MUXERS:=$(call FILTER_CONFIG,MUXER,muxer,$(LIBAV_MUXERS))
-LIBAV_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(LIBAV_DEMUXERS))
-LIBAV_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(LIBAV_PARSERS))
-LIBAV_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(LIBAV_PROTOCOLS))
-
-CONFIGURE_ARGS += \
-	--without-system-libav \
-	--with-libav-extra-configure="--target-os=linux \
-	--disable-bsfs \
-	--disable-programs \
-	--disable-devices \
-	--disable-encoders \
-	$(LIBAV_CONFIGURE_ENCODERS) \
-	--disable-decoders \
-	$(LIBAV_CONFIGURE_DECODERS) \
-	--disable-muxers \
-	$(LIBAV_CONFIGURE_MUXERS) \
-	--disable-demuxers \
-	$(LIBAV_CONFIGURE_DEMUXERS) \
-	--disable-parsers \
-	$(LIBAV_CONFIGURE_PARSERS) \
-	--disable-protocols \
-	$(LIBAV_CONFIGURE_PROTOCOLS) \
-	--disable-asm \
-	--disable-altivec \
-	--disable-amd3dnow \
-	--disable-amd3dnowext \
-	--disable-mmx \
-	--disable-mmxext \
-	--disable-sse \
-	--disable-sse2 \
-	--disable-sse3 \
-	--disable-ssse3 \
-	--disable-sse4 \
-	--disable-sse42 \
-	--disable-avx \
-	--disable-xop \
-	--disable-fma3 \
-	--disable-fma4 \
-	--disable-avx2 \
-	--disable-vfp \
-	--disable-neon \
-	--disable-inline-asm \
-	--disable-yasm"
-
-# XXX: trick to force use of embedded Libav headers
-TARGET_CFLAGS += $(TARGET_CPPFLAGS)
-TARGET_CPPFLAGS :=
-
-TARGET_LDFLAGS += $(FPIC)
-
-define Build/Prepare
-$(call Build/Prepare/Default)
-endef
-
-define Package/gst1-libav/install
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-                ./usr/lib/gstreamer-$(GST_VERSION)/libgstlibav.so* \
-                $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-        )
-endef
-
-$(eval $(call BuildPackage,gst1-libav))
diff --git a/trunk/package/feeds/packages/gst1-plugins-base/Makefile b/trunk/package/feeds/packages/gst1-plugins-base/Makefile
deleted file mode 100644
index 6f7cda5d..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-base/Makefile
+++ /dev/null
@@ -1,289 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gst1-plugins-base
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=LGPLv2 GPLv2
-PKG_LICENSE_FILES:=COPYING.LIB COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
-PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/
-PKG_MD5SUM:=357165af625c0ca353ab47c5d843920e
-
-PKG_BUILD_DEPENDS:= libgstreamer1
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_PACKAGE_gst1-mod-alsa \
-	CONFIG_PACKAGE_gst1-mod-app \
-	CONFIG_PACKAGE_gst1-mod-audioconvert \
-	CONFIG_PACKAGE_gst1-mod-audiorate \
-	CONFIG_PACKAGE_gst1-mod-audioresample \
-	CONFIG_PACKAGE_gst1-mod-audiotestsrc \
-	CONFIG_PACKAGE_gst1-mod-gio \
-	CONFIG_PACKAGE_gst1-mod-ogg \
-	CONFIG_PACKAGE_gst1-mod-tcp \
-	CONFIG_PACKAGE_gst1-mod-theora \
-	CONFIG_PACKAGE_gst1-mod-videoconvert \
-	CONFIG_PACKAGE_gst1-mod-videotestsrc \
-	CONFIG_PACKAGE_gst1-mod-volume \
-	CONFIG_PACKAGE_gst1-mod-vorbis \
-	CONFIG_PACKAGE_libgst1app \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-GST_BASE_LIBS:=
-GST_BASE_MODULES:=
-
-define Package/gstreamer1-base/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= +libgstreamer1 $(ICONV_DEPENDS)
-endef
-
-define Package/gstreamer1-base/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst1-plugins-base
-$(call Package/gstreamer1-base/Default)
-  TITLE+= plugins collection (base)
-  DEPENDS+= $(GST_DEPENDS)
-  HIDDEN:=1
-endef
-
-define Package/gts1-plugins-base/description
-$(call Package/gstreamer1-base/description/Default)
- .
- This meta package contains only dependencies to the other libraries and
- plugins from the base plugins collection.
-endef
-
-define Package/gstreamer1-plugins-base
-  $(call Package/gstreamer1-base/Default)
-  TITLE+= plugins collection (base)
-  DEPENDS:=+ALL:gst1-plugins-base +gstreamer1-libs
-endef
-
-define Package/gstreamer1-plugins-base/config
-    menu "Select GStreamer base modules and libraries"
-      depends on PACKAGE_gstreamer1-plugins-base
-
-
-    config gst1-plugins-base-all
-      bool "Include all GStreamer base plugins"
-      select PACKAGE_gst1-plugins-base
-
-    comment "Modules"
-
-   $(foreach mod,$(GST_BASE_MODULES), \
-    config PACKAGE_gst1-mod-$(mod)
-      prompt "GStreamer $(mod) module"
-
-   )
-
-    comment "Libraries"
-
-   $(foreach lib,$(GST_BASE_LIBS), \
-    config PACKAGE_libgst1$(lib)
-      prompt "GStreamer $(lib) library"
-
-   )
-
-  endmenu
-
-endef
-
-GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),--enable,--disable)-%,$(1))
-
-GST_VERSION:=1.0
-
-CONFIGURE_ARGS += \
-	--disable-debug \
-	--disable-examples \
-	\
-	$(call GST_COND_SELECT,alsa) \
-	$(call GST_COND_SELECT,app) \
-	$(call GST_COND_SELECT,audioconvert) \
-	$(call GST_COND_SELECT,audiorate) \
-	$(call GST_COND_SELECT,audioresample) \
-	$(call GST_COND_SELECT,audiotestsrc) \
-	--disable-cdparanoia \
-	--disable-freetypetest \
-	$(call GST_COND_SELECT,gio) \
-	--disable-libvisual \
-	$(call GST_COND_SELECT,ogg) \
-	--disable-pango \
-	--disable-subparse \
-	$(call GST_COND_SELECT,tcp) \
-	$(call GST_COND_SELECT,theora) \
-	$(call GST_COND_SELECT,videorate) \
-	$(call GST_COND_SELECT,videoscale) \
-	$(call GST_COND_SELECT,videoconvert) \
-	$(call GST_COND_SELECT,videotestsrc) \
-	$(call GST_COND_SELECT,volume) \
-	$(call GST_COND_SELECT,vorbis) \
-	--disable-x \
-	--disable-xshm \
-	--disable-xvideo \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-	\
-	--with-audioresample-format=int \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/include/gstreamer-$(GST_VERSION)/* \
-		$(1)/usr/include/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst*-$(GST_VERSION).{la,so*} \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/pkgconfig/gstreamer*-$(GST_VERSION).pc \
-		$(1)/usr/lib/pkgconfig/ \
-	)
-endef
-
-
-define Package/gst1-plugins-base/install
-  true
-endef
-
-define Package/gstreamer1-plugins-base/install
-  true
-endef
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other packages
-define GstBuildLibrary
-
-  GST_DEPENDS += +libgst1$(1)
-
-  GST_BASE_LIBS+= $(1)
-
-  define Package/libgst1$(1)
-    $(call Package/gstreamer1-base/Default)
-    TITLE+= $(2) library (base)
-    DEPENDS+= $$(foreach p,$(3),+libgst1$$(p)) $(4)
-    HIDDEN:=1
-  endef
-
-  define Package/libgst1$(1)/description
-   $(call Package/gstreamer1-base/description/Default)
-   .
-   This package contains the GStreamer $(2) library.
-  endef
-
-  define Package/libgst1$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
-		$$(1)/usr/lib/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,libgst1$(1)))
-endef
-
-$(eval $(call GstBuildLibrary,allocators,allocators,,))
-$(eval $(call GstBuildLibrary,app,app,,))
-$(eval $(call GstBuildLibrary,audio,audio,tag,))
-$(eval $(call GstBuildLibrary,fft,FFT,,))
-$(eval $(call GstBuildLibrary,pbutils,utils,audio tag video,))
-$(eval $(call GstBuildLibrary,riff,RIFF media,audio tag,,))
-$(eval $(call GstBuildLibrary,rtp,RTP,,))
-$(eval $(call GstBuildLibrary,rtsp,RTSP,,))
-$(eval $(call GstBuildLibrary,sdp,SDP,,))
-$(eval $(call GstBuildLibrary,tag,tag support,,))
-$(eval $(call GstBuildLibrary,video,video,,))
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst1-mod-$(1)
-
-  GST_BASE_MODULES+= $(1)
-
-  define Package/gst1-mod-$(1)
-    $(call Package/gstreamer1-base/Default)
-    TITLE+= $(2) plugin (base)
-    DEPENDS+= $$(foreach p,$(3),+libgst1$$(p)) $$(foreach p,$(4),+gst1-mod-$$(p)) $(5)
-    HIDDEN:=1
-  endef
-
-  define Package/gst1-mod-$(1)/description
-   $(call Package/gstreamer1-base/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst1-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst1-mod-$(1)))
-endef
-
-$(eval $(call GstBuildPlugin,alsa,ALSA,audio tag,,+alsa-lib))
-$(eval $(call GstBuildPlugin,app,app,app,,))
-$(eval $(call GstBuildPlugin,audioconvert,audio format conversion,audio,,))
-$(eval $(call GstBuildPlugin,audiorate,audio rate adjusting,audio tag,,))
-$(eval $(call GstBuildPlugin,audioresample,audio resampling,audio tag,,))
-$(eval $(call GstBuildPlugin,audiotestsrc,audio test,audio tag controller,,))
-$(eval $(call GstBuildPlugin,playback,media decoder (v2),pbutils,,))
-$(eval $(call GstBuildPlugin,gio,GIO,,,))
-$(eval $(call GstBuildPlugin,ogg,Ogg,riff tag pbutils video,,+libogg))
-$(eval $(call GstBuildPlugin,tcp,TCP,,,))
-$(eval $(call GstBuildPlugin,theora,Theora,tag video,,+libogg +libtheora))
-$(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,audio pbutils tag video,,))
-$(eval $(call GstBuildPlugin,videoconvert,video format conversion,video,,))
-$(eval $(call GstBuildPlugin,videorate,Adjusts video frames,video,,))
-$(eval $(call GstBuildPlugin,videoscale,Resizes video,video,,))
-$(eval $(call GstBuildPlugin,videotestsrc,video test,video,,+liboil))
-$(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil))
-$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis))
-
-$(eval $(call BuildPackage,gstreamer1-plugins-base))
-$(eval $(call BuildPackage,gst1-plugins-base))
diff --git a/trunk/package/feeds/packages/gst1-plugins-base/patches/001-no_docs.patch b/trunk/package/feeds/packages/gst1-plugins-base/patches/001-no_docs.patch
deleted file mode 100644
index 0044ceca..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-base/patches/001-no_docs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,14 +12,12 @@ SUBDIRS = 			\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
- 	tests 			\
--	docs			\
- 	po 			\
- 	common 			\
- 	m4
- 
- DIST_SUBDIRS = 			\
- 	pkgconfig		\
--	docs			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -539,14 +539,12 @@ SUBDIRS = \
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
- 	tests 			\
--	docs			\
- 	po 			\
- 	common 			\
- 	m4
- 
- DIST_SUBDIRS = \
- 	pkgconfig		\
--	docs			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
diff --git a/trunk/package/feeds/packages/gst1-plugins-base/patches/002-no_tests.patch b/trunk/package/feeds/packages/gst1-plugins-base/patches/002-no_tests.patch
deleted file mode 100644
index 3e8c93d4..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-base/patches/002-no_tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,6 @@ SUBDIRS = 			\
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
-@@ -21,7 +20,6 @@ DIST_SUBDIRS = 			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -538,7 +538,6 @@ SUBDIRS = \
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
-@@ -548,7 +547,6 @@ DIST_SUBDIRS = \
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	tests 			\
- 	po 			\
- 	common 			\
- 	m4
diff --git a/trunk/package/feeds/packages/gst1-plugins-base/patches/003-no_translations.patch b/trunk/package/feeds/packages/gst1-plugins-base/patches/003-no_translations.patch
deleted file mode 100644
index 894c8da9..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-base/patches/003-no_translations.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -918,7 +918,6 @@ docs/design/Makefile
- docs/libs/Makefile
- docs/plugins/Makefile
- docs/version.entities
--po/Makefile.in
- common/Makefile
- common/m4/Makefile
- m4/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,6 @@ SUBDIRS = 			\
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
-@@ -20,7 +19,6 @@ DIST_SUBDIRS = 			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -538,7 +538,6 @@ SUBDIRS = \
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
-@@ -547,7 +546,6 @@ DIST_SUBDIRS = \
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--	po 			\
- 	common 			\
- 	m4
- 
diff --git a/trunk/package/feeds/packages/gst1-plugins-good/Makefile b/trunk/package/feeds/packages/gst1-plugins-good/Makefile
deleted file mode 100644
index f52d82fc..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-good/Makefile
+++ /dev/null
@@ -1,236 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gst1-plugins-good
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
-PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/
-PKG_MD5SUM:=eaf1a6daf73749bc423feac301d60038
-
-PKG_BUILD_DEPENDS:= libgstreamer1 gstreamer1-plugins-base
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-GST_GOOD_MODULES:=
-
-define Package/gstreamer1-good/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= +libgstreamer1 $(ICONV_DEPENDS)
-endef
-
-define Package/gstreamer1-good/description/Default
- GStreamer open source multimedia framework
-endef
-
-
-define Package/gst1-plugins-good
-$(call Package/gstreamer1-good/Default)
-  TITLE+= plugins collection (good)
-  DEPENDS+= $(GST_DEPENDS)
-  HIDDEN:=1
-endef
-
-define Package/gst1-plugins-good/description
-$(call Package/gstreamer1-good/description/Default)
- .
- This meta package contains only dependencies to the other plugins from
- the good plugins collection.
-endef
-
-
-define Package/gstreamer1-plugins-good
-  $(call Package/gstreamer1-good/Default)
-  TITLE+= plugins collection (good)
-  DEPENDS:=+ALL:gst1-plugins-good +gstreamer1-plugins-base
-endef
-
-define Package/gstreamer1-plugins-good/config
-    menu "Select GStreamer good modules"
-      depends on PACKAGE_gstreamer1-plugins-good
-
-
-    config gst1-plugins-good-all
-      bool "Include all GStreamer good plugins"
-      select PACKAGE_gst1-plugins-good
-
-    comment "Modules"
-
-   $(foreach mod,$(GST_GOOD_MODULES), \
-    config PACKAGE_gst1-mod-$(mod)
-      prompt "GStreamer $(mod) module"
-
-   )
-
-  endmenu
-
-endef
-
-GST_VERSION:=1.0
-
-CONFIGURE_ARGS += \
-	--disable-debug \
-	--disable-examples \
-	\
-	--disable-aalib \
-	--disable-annodex \
-	--disable-bz2 \
-	--disable-cairo \
-	--disable-directsound \
-	--disable-dv1394 \
-	--disable-esd \
-	--disable-gconf \
-	--disable-gconftool \
-	--disable-gdk_pixbuf \
-	--disable-hal \
-	--disable-libcaca \
-	--disable-libdv \
-	--disable-osx_audio \
-	--disable-osx_video \
-	--disable-pulse \
-	--disable-qtdemux \
-	--disable-rtspmanager \
-	--disable-shout2 \
-	--disable-sunaudio \
-	--disable-wavpack \
-	--disable-x \
-	--disable-xshm \
-	--disable-xvideo \
-	--disable-y4m \
-	--disable-zlib \
-	\
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
-
-define Package/gst1-plugins-good/install
-	/bin/true
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other gstreamer plugins (short name)
-# 5: dependencies on other packages
-define GstBuildPlugin
-
-  GST_DEPENDS += +gst1-mod-$(1)
-
-  GST_GOOD_MODULES+= $(1)
-
-  define Package/gst1-mod-$(1)
-    $(call Package/gstreamer1-good/Default)
-    TITLE+= $(2) plugin (good)
-    DEPENDS+= $$(foreach p,$(3),+libgst1$$(p)) $$(foreach p,$(4),+gst1-mod-$$(p)) $(5)
-    HIDDEN:=1
-  endef
-
-  define Package/gst1-mod-$(1)/description
-   $(call Package/gstreamer1-good/description/Default)
-   .
-   This package contains the GStreamer $(2) plugin.
-  endef
-
-  define Package/gst1-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst$(1).so* \
-		$$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,gst1-mod-$(1)))
-endef
-
-#$(eval $(call GstBuildPlugin,1394,IEEE 1394 support,,,))
-$(eval $(call GstBuildPlugin,alaw,alaw codec,audio,,))
-$(eval $(call GstBuildPlugin,alpha,alpha support,video,,))
-$(eval $(call GstBuildPlugin,alphacolor,alphacolor support,video,,))
-$(eval $(call GstBuildPlugin,apetag,apetag support,audio pbutils tag video,,))
-$(eval $(call GstBuildPlugin,audiofx,audio effects,audio fft controller,,))
-$(eval $(call GstBuildPlugin,audioparsers,audioparsers,audio tag pbutils,,))
-$(eval $(call GstBuildPlugin,auparse,auparse,audio tag pbutils,,))
-$(eval $(call GstBuildPlugin,autodetect,format auto-detection,,,))
-$(eval $(call GstBuildPlugin,avi,avi support,audio riff tag video,,))
-$(eval $(call GstBuildPlugin,cutter,audio cutter,audio,,))
-$(eval $(call GstBuildPlugin,debug,debugging,,,))
-$(eval $(call GstBuildPlugin,deinterlace,deinterlace support,video,,))
-$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,))
-#$(eval $(call GstBuildPlugin,dv,dv support,audio tag video,,))
-$(eval $(call GstBuildPlugin,effectv,effectvsupport,video,,))
-$(eval $(call GstBuildPlugin,equalizer,audio equalizer,audio controller,,))
-$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac))
-$(eval $(call GstBuildPlugin,flv,flv codec,audio pbutils tag video,,))
-$(eval $(call GstBuildPlugin,flxdec,flx codec,,,))
-#$(eval $(call GstBuildPlugin,gdkpixbuf,gdkpixbuf support,video,,))
-$(eval $(call GstBuildPlugin,goom2k1,goom support,,,))
-$(eval $(call GstBuildPlugin,goom,goom support,,,))
-$(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,))
-$(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,))
-$(eval $(call GstBuildPlugin,imagefreeze,imagefreeze support,,,))
-$(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,))
-$(eval $(call GstBuildPlugin,isomp4,isomp4 support,audio pbutils riff rtp tag video,,))
-#$(eval $(call GstBuildPlugin,jack,jack support,audio,,))
-$(eval $(call GstBuildPlugin,jpeg,jpeg support,video,,+libjpeg))
-$(eval $(call GstBuildPlugin,level,audio level,audio,,))
-$(eval $(call GstBuildPlugin,matroska,matroska support,audio pbutils riff tag video,,))
-$(eval $(call GstBuildPlugin,mulaw,mulaw support,audio,,))
-$(eval $(call GstBuildPlugin,multifile,multiple files access,video,,))
-$(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,))
-$(eval $(call GstBuildPlugin,navigationtest,navigationtest support,video,,))
-$(eval $(call GstBuildPlugin,oss4audio,OSS 4 audio support,audio tag,,))
-$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio,,))
-$(eval $(call GstBuildPlugin,png,png support,video,,+libpng))
-#$(eval $(call GstBuildPlugin,pulse,pulse support,audio pbutils tag video,,))
-$(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,))
-$(eval $(call GstBuildPlugin,rtpmanager,RTP manager,audio net rtp tag pbutils video,,))
-$(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils video,,))
-$(eval $(call GstBuildPlugin,rtsp,RTSP,net rtp rtsp sdp,,))
-$(eval $(call GstBuildPlugin,shapewipe,shapewipe support,video,,))
-#$(eval $(call GstBuildPlugin,shout2,shout2 support,,,))
-$(eval $(call GstBuildPlugin,smpte,smpte support,video,,))
-$(eval $(call GstBuildPlugin,souphttpsrc,soup input,audio tag,,+libsoup))
-$(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,))
-#$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,))
-#$(eval $(call GstBuildPlugin,sty4menc,sty4menc support,video,,))
-#$(eval $(call GstBuildPlugin,taglib,taglib support,tag,,))
-$(eval $(call GstBuildPlugin,udp,UDP,net,,))
-$(eval $(call GstBuildPlugin,video4linux2,video4linux2 support,video allocators,,+libv4l))
-$(eval $(call GstBuildPlugin,videobox,videobox support,video,,))
-$(eval $(call GstBuildPlugin,videocrop,videocrop support,video,,))
-$(eval $(call GstBuildPlugin,videofilter,videofilter support,video,,))
-$(eval $(call GstBuildPlugin,videomixer,videomixer support,video,,))
-$(eval $(call GstBuildPlugin,vpx,vpx support,tag video,,+libvpx))
-$(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,))
-#$(eval $(call GstBuildPlugin,wavpack,Wav packer,audio riff tag,,))
-$(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,))
-#$(eval $(call GstBuildPlugin,ximagesrc,ximagesrc support,video,,))
-
-$(eval $(call BuildPackage,gstreamer1-plugins-good))
-$(eval $(call BuildPackage,gst1-plugins-good))
diff --git a/trunk/package/feeds/packages/gst1-plugins-good/patches/001-no_docs.patch b/trunk/package/feeds/packages/gst1-plugins-good/patches/001-no_docs.patch
deleted file mode 100644
index 21c10c3b..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-good/patches/001-no_docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
- 	tests			\
--	docs			\
- 	po			\
- 	common			\
- 	m4			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -571,7 +571,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
- 	tests			\
--	docs			\
- 	po			\
- 	common			\
- 	m4			\
diff --git a/trunk/package/feeds/packages/gst1-plugins-good/patches/002-no_tests.patch b/trunk/package/feeds/packages/gst1-plugins-good/patches/002-no_tests.patch
deleted file mode 100644
index ed922c53..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-good/patches/002-no_tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
--	tests			\
- 	po			\
- 	common			\
- 	m4			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -570,7 +570,6 @@ top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
--	tests			\
- 	po			\
- 	common			\
- 	m4			\
diff --git a/trunk/package/feeds/packages/gst1-plugins-good/patches/003-no_translations.patch b/trunk/package/feeds/packages/gst1-plugins-good/patches/003-no_translations.patch
deleted file mode 100644
index 16d1b7e0..00000000
--- a/trunk/package/feeds/packages/gst1-plugins-good/patches/003-no_translations.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1083,7 +1083,6 @@ sys/sunaudio/Makefile
- sys/v4l2/Makefile
- sys/waveform/Makefile
- sys/ximage/Makefile
--po/Makefile.in
- tests/Makefile
- tests/check/Makefile
- tests/examples/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
--	po			\
- 	common			\
- 	m4			\
- 	pkgconfig
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -570,7 +570,6 @@ top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- ALWAYS_SUBDIRS = \
- 	gst sys ext 		\
--	po			\
- 	common			\
- 	m4			\
- 	pkgconfig
diff --git a/trunk/package/feeds/packages/gstreamer1/Makefile b/trunk/package/feeds/packages/gstreamer1/Makefile
deleted file mode 100644
index 0ab4629f..00000000
--- a/trunk/package/feeds/packages/gstreamer1/Makefile
+++ /dev/null
@@ -1,231 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gstreamer1
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
-PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/
-PKG_MD5SUM:=88a9289c64a4950ebb4f544980234289
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/gstreamer1/Default
-  CATEGORY:=Multimedia
-  SECTION:=multimedia
-  TITLE:=GStreamer
-  URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= $(ICONV_DEPENDS) $(INTL_DEPENDS)
-endef
-
-define Package/gstreamer1/description/Default
- GStreamer open source multimedia framework
-endef
-
-GSTREAMER_CORE_LIBS:= \
-	libgstreamer1 \
-	libgst1check \
-	libgst1controller \
-	libgst1net
-
-define Package/gstreamer1
-  $(call Package/gstreamer1/Default)
-  TITLE+= (All libraries)
-  DEPENDS:= $(foreach lib,$(GSTREAMER_CORE_LIBS),+$(lib))
-  HIDDEN:=1
-endef
-
-define Package/gstreamer1-libs/description
- $(call Package/gstreamer1/description/Default)
- .
- This meta package contains only dependencies on the other GStreamer
- componenents.
-endef
-
-define Package/gstreamer1-libs
-  $(call Package/gstreamer1/Default)
-  TITLE+= core libraries
-  DEPENDS+=+ALL:gstreamer1
-endef
-
-define Package/gstreamer1-libs/config
-    menu "Select GStreamer libraries"
-      depends on PACKAGE_gstreamer1-libs
-
-    config gstreamer1-all
-      bool "Include all GStreamer1 core libraries"
-      select PACKAGE_gstreamer1
-
-    comment "Libraries"
-
-   $(foreach lib,$(GSTREAMER_CORE_LIBS), \
-    config PACKAGE_$(lib)
-      prompt "GStreamer core library $(lib)"
-
-   )
-
-  endmenu
-
-endef
-
-define Package/gstreamer1-utils
-  $(call Package/gstreamer1/Default)
-  TITLE+= utilities
-  DEPENDS+= +libgstreamer1 +gstreamer1-libs
-endef
-
-define Package/gstreamer1-utils/description
- $(call Package/gstreamer1/description/Default)
- .
- This package contains the GStreamer utilities.
-endef
-
-define Package/libgstreamer1
-  $(call Package/gstreamer1/Default)
-  TITLE+= library (core)
-  DEPENDS+= +glib2 +libpthread +libxml2
-  HIDDEN:=1
-endef
-
-define Package/libgstreamer1/description
- $(call Package/gstreamer1/description/Default)
- .
- This package contains the GStreamer core library.
-endef
-  
-
-GST_VERSION:=1.0
-
-CONFIGURE_ARGS += \
-	--enable-static \
-	--disable-examples \
-	--disable-tests \
-	--disable-valgrind \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/include/gstreamer-$(GST_VERSION)/* \
-		$(1)/usr/include/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/pkgconfig/gstreamer*-$(GST_VERSION).pc \
-		$(1)/usr/lib/pkgconfig/ \
-	)
-	$(INSTALL_DIR) $(2)/share/aclocal
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/share/aclocal/* \
-		$(2)/share/aclocal/ \
-	)
-endef
-
-define Package/gstreamer1/install
-  true
-endef
-
-define Package/gstreamer1-libs/install
-  true
-endef
-
-define Package/gstreamer1-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/bin/gst-launch* \
-		./usr/bin/gst-inspect* \
-		./usr/bin/gst-typefind* \
-		$(1)/usr/bin/ \
-	)
-endef
-
-define Package/libgstreamer1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgstbase-$(GST_VERSION).so.* \
-		./usr/lib/libgstreamer-$(GST_VERSION).so.* \
-		$(1)/usr/lib/ \
-	)
-	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \
-		$(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
-	)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/gstreamer-$(GST_VERSION)/gst-plugin-scanner \
-		       $(1)/usr/lib/gstreamer-$(GST_VERSION)
-endef
-
-
-# 1: short name
-# 2: description
-# 3: dependencies on other gstreamer libraries (short name)
-# 4: dependencies on other packages
-define GstBuildLibrary
-
-  define Package/libgst1$(1)
-    $(call Package/gstreamer1/Default)
-    TITLE+= $(2) library (core)
-    DEPENDS+= +libgstreamer1 $$(foreach p,$(3),+libgst1$$(p)) $(4)
-    HIDDEN:=1
-  endef
-
-  define Package/libgst1$(1)/description
-   $(call Package/gstreamer1/description/Default)
-   .
-   This package contains the GStreamer $(2) library.
-  endef
-
-  define Package/libgst1$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(CP) \
-		./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
-		$$(1)/usr/lib/ \
-	)
-  endef
-
-  $$(eval $$(call BuildPackage,libgst1$(1)))
-endef
-
-$(eval $(call GstBuildLibrary,check,check unit testing))
-$(eval $(call GstBuildLibrary,controller,dynamic parameter control))
-$(eval $(call GstBuildLibrary,net,network classes))
-
-$(eval $(call BuildPackage,libgstreamer1))
-$(eval $(call BuildPackage,gstreamer1-libs))
-$(eval $(call BuildPackage,gstreamer1-utils))
-$(eval $(call BuildPackage,gstreamer1))
diff --git a/trunk/package/feeds/packages/gstreamer1/patches/001-no_docs.patch b/trunk/package/feeds/packages/gstreamer1/patches/001-no_docs.patch
deleted file mode 100644
index fb0e034f..00000000
--- a/trunk/package/feeds/packages/gstreamer1/patches/001-no_docs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP
- 
- SUBDIRS = pkgconfig \
- 	gst libs plugins tests \
--	docs \
- 	po \
- 	m4 \
- 	common
-@@ -20,7 +19,6 @@ endif
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -554,13 +554,12 @@ top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
--SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common \
-+SUBDIRS = pkgconfig gst libs plugins tests po m4 common \
- 	$(am__append_1)
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools tests \
--	docs \
- 	po \
- 	m4 \
- 	common
diff --git a/trunk/package/feeds/packages/gstreamer1/patches/002-no_tests.patch b/trunk/package/feeds/packages/gstreamer1/patches/002-no_tests.patch
deleted file mode 100644
index 384dd0ad..00000000
--- a/trunk/package/feeds/packages/gstreamer1/patches/002-no_tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
- 
- SUBDIRS = pkgconfig \
--	gst libs plugins tests \
-+	gst libs plugins \
- 	po \
- 	m4 \
- 	common
-@@ -18,7 +18,7 @@ endif
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -554,12 +554,12 @@ top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
--SUBDIRS = pkgconfig gst libs plugins tests po m4 common \
-+SUBDIRS = pkgconfig gst libs plugins po m4 common \
- 	$(am__append_1)
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
--	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	po \
- 	m4 \
- 	common
diff --git a/trunk/package/feeds/packages/gstreamer1/patches/003-no_translations.patch b/trunk/package/feeds/packages/gstreamer1/patches/003-no_translations.patch
deleted file mode 100644
index 7e918dd7..00000000
--- a/trunk/package/feeds/packages/gstreamer1/patches/003-no_translations.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,7 +780,6 @@ libs/gst/helpers/Makefile
- libs/gst/net/Makefile
- plugins/Makefile
- plugins/elements/Makefile
--po/Makefile.in
- tests/Makefile
- tests/benchmarks/Makefile
- tests/check/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP
- 
- SUBDIRS = pkgconfig \
- 	gst libs plugins \
--	po \
- 	m4 \
- 	common
- 
-@@ -19,7 +18,6 @@ endif
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -554,13 +554,12 @@ top_srcdir = @top_srcdir@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
--SUBDIRS = pkgconfig gst libs plugins po m4 common \
-+SUBDIRS = pkgconfig gst libs plugins m4 common \
- 	$(am__append_1)
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
--	po \
- 	m4 \
- 	common
- 
diff --git a/trunk/package/feeds/packages/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch b/trunk/package/feeds/packages/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch
deleted file mode 100644
index 603e57c1..00000000
--- a/trunk/package/feeds/packages/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gst/gstplugin.c
-+++ b/gst/gstplugin.c
-@@ -723,15 +723,8 @@ gst_plugin_load_file (const gchar * file
-     goto return_error;
-   }
- 
--  flags = G_MODULE_BIND_LOCAL;
--  /* libgstpython.so is the gst-python plugin loader. It needs to be loaded with
--   * G_MODULE_BIND_LAZY.
--   *
--   * Ideally there should be a generic way for plugins to specify that they
--   * need to be loaded with _LAZY.
--   * */
--  if (strstr (filename, "libgstpython"))
--    flags |= G_MODULE_BIND_LAZY;
-+  // No need to resolve all bindings until referenced
-+  flags = G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY;
- 
-   module = g_module_open (filename, flags);
-   if (module == NULL) {
diff --git a/trunk/package/feeds/packages/hamlib/Makefile b/trunk/package/feeds/packages/hamlib/Makefile
deleted file mode 100644
index dec78f64..00000000
--- a/trunk/package/feeds/packages/hamlib/Makefile
+++ /dev/null
@@ -1,529 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hamlib
-PKG_VERSION:=1.2.15.3
-PKG_RELEASE:=3
-PKG_MD5SUM:=3cad8987e995a00e5e9d360e2be0eb43
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/hamlib
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/hamlib/Default
-  TITLE:=Ham Radio Control
-  URL:=http://hamlib.sourceforge.net
-endef
-
-define Package/hamlib/Default/description
-  Ham Radio Control Libraries is a development effort to provide a consistent
-  interface for programmers wanting to incorporate radio control in their
-  programs.
-endef
-
-define Package/hamlib
-  $(call Package/hamlib/Default)
-  TITLE+= utilities
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpthread +libhamlib
-endef
-
-define Package/hamlib/description
-  $(call Package/hamlib/Default/description)
-
-  This package contains the utilities and daemons.
-endef
-
-define Package/libhamlib/Default
-  $(call Package/hamlib/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= shared library
-endef
-
-define Package/libhamlib
-  $(call Package/libhamlib/Default)
-  DEPENDS:=+libusb-1.0 +libltdl
-  MENU:=1
-endef
-
-define Package/libhamlib/description
-  $(call Package/hamlib/Default/description)
-
-  This package contains the hamlib shared library.
-endef
-
-define Package/hamlib-adat
-  $(call Package/libhamlib/Default)
-  TITLE:= for ADAT
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-alinco
-  $(call Package/libhamlib/Default)
-  TITLE:= for Alinco
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-amsat
-  $(call Package/libhamlib/Default)
-  TITLE:= for AMSAT
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-aor
-  $(call Package/libhamlib/Default)
-  TITLE:= for AOR
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-ars
-  $(call Package/libhamlib/Default)
-  TITLE:= for ARS
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-celestron
-  $(call Package/libhamlib/Default)
-  TITLE:= for Celestron
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-drake
-  $(call Package/libhamlib/Default)
-  TITLE:= for Drake
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-dummy
-  $(call Package/libhamlib/Default)
-  TITLE:= for dummy
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-easycomm
-  $(call Package/libhamlib/Default)
-  TITLE:= for EasyComm
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-flexradio
-  $(call Package/libhamlib/Default)
-  TITLE:= for FlexRadio
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-fodtrack
-  $(call Package/libhamlib/Default)
-  TITLE:= for FodTrack
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-gs232a
-  $(call Package/libhamlib/Default)
-  TITLE:= for GS-232A
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-heathkit
-  $(call Package/libhamlib/Default)
-  TITLE:= for Heathkit
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-icom
-  $(call Package/libhamlib/Default)
-  TITLE:= for ICOM
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-jrc
-  $(call Package/libhamlib/Default)
-  TITLE:= for JRC
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-kachina
-  $(call Package/libhamlib/Default)
-  TITLE:= for Kachina
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-kenwood
-  $(call Package/libhamlib/Default)
-  TITLE:= for Kenwood
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-kit
-  $(call Package/libhamlib/Default)
-  TITLE:= for kits
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-lowe
-  $(call Package/libhamlib/Default)
-  TITLE:= for Lowe
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-m2
-  $(call Package/libhamlib/Default)
-  TITLE:= for M2
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-pcr
-  $(call Package/libhamlib/Default)
-  TITLE:= for PCR
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-prm80
-  $(call Package/libhamlib/Default)
-  TITLE:= for PRM80
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-racal
-  $(call Package/libhamlib/Default)
-  TITLE:= for Racal
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-rft
-  $(call Package/libhamlib/Default)
-  TITLE:= for RFT
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-rotorez
-  $(call Package/libhamlib/Default)
-  TITLE:= for Rotor-EZ
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-rs
-  $(call Package/libhamlib/Default)
-  TITLE:= for R&S
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-sartek
-  $(call Package/libhamlib/Default)
-  TITLE:= for SARtek
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-skanti
-  $(call Package/libhamlib/Default)
-  TITLE:= for Skanti
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-spid
-  $(call Package/libhamlib/Default)
-  TITLE:= for SPID
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-tapr
-  $(call Package/libhamlib/Default)
-  TITLE:= for TAPR
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-tentec
-  $(call Package/libhamlib/Default)
-  TITLE:= for TenTec
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-ts7400
-  $(call Package/libhamlib/Default)
-  TITLE:= for TS-7400
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-tuner
-  $(call Package/libhamlib/Default)
-  TITLE:= for Video for Linux tuner
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-uniden
-  $(call Package/libhamlib/Default)
-  TITLE:= for Uniden
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-wj
-  $(call Package/libhamlib/Default)
-  TITLE:= for Watkins - Johnson
-  DEPENDS:=libhamlib
-endef
-
-define Package/hamlib-yaesu
-  $(call Package/libhamlib/Default)
-  TITLE:= for Yaesu
-  DEPENDS:=libhamlib
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/hamlib/*.h $(1)/usr/include/hamlib
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhamlib.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/hamlib.pc $(1)/usr/lib/pkgconfig/
-endef
-
-CONFIGURE_ARGS+= \
-	--without-cxx-binding \
-	--without-winradio \
-	--without-rpc-backends \
-	--with-pic \
-
-define Package/hamlib/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{rig,rot}* $(1)/usr/bin/
-endef
-
-define Package/libhamlib/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhamlib.so* $(1)/usr/lib/
-endef
-
-define Package/hamlib-adat/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-adat.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-alinco/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-alinco.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-amsat/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-amsat.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-aor/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-aor.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-ars/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-ars.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-celestron/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-celestron.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-drake/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-drake.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-dummy/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-dummy.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-easycomm/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-easycomm.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-flexradio/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-flexradio.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-fodtrack/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-fodtrack.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-gs232a/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-gs232a.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-heathkit/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-heathkit.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-icom/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-icom.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-jrc/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-jrc.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-kachina/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-kachina.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-kenwood/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-kenwood.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-kit/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-kit.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-lowe/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-lowe.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-m2/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-m2.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-pcr/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-pcr.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-prm80/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-prm80.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-racal/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-racal.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-rft/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-rft.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-rotorez/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-rotorez.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-rs/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-rs.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-sartek/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-sartek.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-skanti/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-skanti.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-spid/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-spid.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-tapr/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-tapr.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-tentec/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-tentec.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-ts7400/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-ts7400.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-tuner/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-tuner.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-uniden/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-uniden.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-wj/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-wj.so* $(1)/usr/lib/hamlib
-endef
-
-define Package/hamlib-yaesu/install
-	$(INSTALL_DIR) $(1)/usr/lib/hamlib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/hamlib/hamlib-yaesu.so* $(1)/usr/lib/hamlib
-endef
-
-$(eval $(call BuildPackage,hamlib))
-$(eval $(call BuildPackage,libhamlib))
-$(eval $(call BuildPackage,hamlib-adat))
-$(eval $(call BuildPackage,hamlib-alinco))
-$(eval $(call BuildPackage,hamlib-amsat))
-$(eval $(call BuildPackage,hamlib-aor))
-$(eval $(call BuildPackage,hamlib-ars))
-$(eval $(call BuildPackage,hamlib-celestron))
-$(eval $(call BuildPackage,hamlib-drake))
-$(eval $(call BuildPackage,hamlib-dummy))
-$(eval $(call BuildPackage,hamlib-easycomm))
-$(eval $(call BuildPackage,hamlib-flexradio))
-$(eval $(call BuildPackage,hamlib-fodtrack))
-$(eval $(call BuildPackage,hamlib-gs232a))
-$(eval $(call BuildPackage,hamlib-heathkit))
-$(eval $(call BuildPackage,hamlib-icom))
-$(eval $(call BuildPackage,hamlib-jrc))
-$(eval $(call BuildPackage,hamlib-kachina))
-$(eval $(call BuildPackage,hamlib-kenwood))
-$(eval $(call BuildPackage,hamlib-kit))
-$(eval $(call BuildPackage,hamlib-lowe))
-$(eval $(call BuildPackage,hamlib-m2))
-$(eval $(call BuildPackage,hamlib-pcr))
-$(eval $(call BuildPackage,hamlib-prm80))
-$(eval $(call BuildPackage,hamlib-racal))
-$(eval $(call BuildPackage,hamlib-rft))
-$(eval $(call BuildPackage,hamlib-rotorez))
-$(eval $(call BuildPackage,hamlib-rs))
-$(eval $(call BuildPackage,hamlib-sartek))
-$(eval $(call BuildPackage,hamlib-skanti))
-$(eval $(call BuildPackage,hamlib-spid))
-$(eval $(call BuildPackage,hamlib-tapr))
-$(eval $(call BuildPackage,hamlib-tentec))
-$(eval $(call BuildPackage,hamlib-ts7400))
-$(eval $(call BuildPackage,hamlib-tuner))
-$(eval $(call BuildPackage,hamlib-uniden))
-$(eval $(call BuildPackage,hamlib-wj))
-$(eval $(call BuildPackage,hamlib-yaesu))
-
diff --git a/trunk/package/feeds/packages/hamlib/patches/100-override-autoconf-detection.patch b/trunk/package/feeds/packages/hamlib/patches/100-override-autoconf-detection.patch
deleted file mode 100644
index 284cc3b4..00000000
--- a/trunk/package/feeds/packages/hamlib/patches/100-override-autoconf-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: hamlib-1.2.15.3/configure.ac
-===================================================================
---- hamlib-1.2.15.3.orig/configure.ac	2012-11-01 22:27:27.000000000 +0100
-+++ hamlib-1.2.15.3/configure.ac	2014-06-15 09:34:25.557966205 +0200
-@@ -234,12 +234,12 @@
- 		"You need a C99 compliant C compiler that supports struct/array intializers."
- 		"Have you considered GCC lately?.")]);
- 
--dnl libxml2 required rigmem xml support
--PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
--	[AC_DEFINE(HAVE_XML2,[1],[Define if libxml2 is available])],
--	[AC_MSG_WARN([libxml-2.0 pkg-config not found, XML support will be disabled])])
-+#dnl libxml2 required rigmem xml support
-+#PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
-+#	[AC_DEFINE(HAVE_XML2,[1],[Define if libxml2 is available])],
-+#	[AC_MSG_WARN([libxml-2.0 pkg-config not found, XML support will be disabled])])
- AC_SUBST(LIBXML2_LIBS)
- AC_SUBST(LIBXML2_CFLAGS)
- 
- dnl Check if libgd-dev is installed, so we can enable rigmatrix
- 
-@@ -406,7 +406,7 @@
- AM_CONDITIONAL(HAVE_USRP, test x"${cf_with_usrp}" = "xyes")
- 
- 
--PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, ,
-+PKG_CHECK_MODULES(LIBUSB, libusb >= 1.0, ,
- 		  [AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])])
- CFLAGS="${CFLAGS} ${LIBUSB_CFLAGS}"
- CXXFLAGS="${CXXFLAGS} ${LIBUSB_CFLAGS}"
diff --git a/trunk/package/feeds/packages/haproxy/Makefile b/trunk/package/feeds/packages/haproxy/Makefile
deleted file mode 100644
index 38ce8fd5..00000000
--- a/trunk/package/feeds/packages/haproxy/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Copyright (C) 2010-2013 OpenWrt.org
-# Copyright (C) 2009-2014 Thomas Heil <heil@terminal-consulting.de>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haproxy
-PKG_VERSION:=1.5.11
-PKG_RELEASE:=02
-PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=5500a79d0d2b238d4a1e9749bd0c2cb2
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haproxy/Default
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer
-  URL:=http://haproxy.1wt.eu/
-endef
-
-define Package/haproxy/Default/conffiles
-/etc/haproxy.cfg
-endef
-
-define Package/haproxy/Default/description
- Open source Reliable, High Performance TCP/HTTP Load Balancer.
-endef
-
-define Package/haproxy
-  DEPENDS+= +libpcre +libltdl +zlib +libpthread +libopenssl
-  TITLE+= (with SSL support)
-  VARIANT:=ssl
-$(call Package/haproxy/Default)
-endef
-
-define Package/haproxy/conffiles
-$(call Package/haproxy/Default/conffiles)
-endef
-
-define Package/haproxy/description
-$(call Package/haproxy/Default/description)
- This package is built with SSL support.
-endef
-
-define Package/haproxy-nossl
-  TITLE+= (without SSL support)
-  VARIANT:=nossl
-  DEPENDS+= +libpcre +libltdl +zlib +libpthread
-  TITLE+= (with SSL support)
-$(call Package/haproxy/Default)
-endef
-
-define Package/haproxy-nossl/conffiles
-$(call Package/haproxy/Default/conffiles)
-endef
-
-define Package/haproxy-nossl/description
-$(call Package/haproxy/Default/description)
- This package is built without SSL support.
-endef
-
-ifeq ($(CONFIG_avr32),y)
-  LINUX_TARGET:=linux26
-else
-  LINUX_TARGET:=linux2628
-endif
-
-ifeq ($(BUILD_VARIANT),ssl)
-	USE_OPENSSL=USE_OPENSSL=1
-else
-	USE_OPENSSL=
-endif
-
-define Build/Compile
-	$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		PCREDIR="$(STAGING_DIR)/usr/include" \
-		SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
-		USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 $(USE_OPENSSL) \
-		USE_ZLIB=yes USE_PCRE=1 \
-		VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
-		install
-
-	$(MAKE) -C $(PKG_BUILD_DIR)/contrib/halog \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
-		halog
-endef
-
-define Package/haproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/haproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
-	$(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/net/90-haproxy
-endef
-
-Package/haproxy-nossl/install = $(Package/haproxy/install)
-
-define Package/halog
-	MENU:=1
-	$(call Package/haproxy/Default)
-	TITLE+= halog
-	DEPENDS:=haproxy
-endef
-
-define Package/halog/description
-	HAProxy Log Analyzer
-endef
-
-define Package/halog/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,haproxy-nossl))
-$(eval $(call BuildPackage,haproxy))
-$(eval $(call BuildPackage,halog))
diff --git a/trunk/package/feeds/packages/haproxy/files/haproxy.cfg b/trunk/package/feeds/packages/haproxy/files/haproxy.cfg
deleted file mode 100644
index a54f5f5d..00000000
--- a/trunk/package/feeds/packages/haproxy/files/haproxy.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
-# Example configuration file for HAProxy 1.3, refer to the url below for
-# a full documentation and examples for configuration:
-# http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
-
-
-# Global parameters
-global
-
-	# Log events to a remote syslog server at given address using the
-	# specified facility and verbosity level. Multiple log options 
-	# are allowed.
-	#log 10.0.0.1 daemon info
-
-	# Specifiy the maximum number of allowed connections.
-	maxconn 32000
-
-	# Raise the ulimit for the maximum allowed number of open socket
-	# descriptors per process. This is usually at least twice the
-	# number of allowed connections (maxconn * 2 + nb_servers + 1) .
-	ulimit-n 65535
-
-	# Drop privileges (setuid, setgid), default is "root" on OpenWrt.
-	uid 0
-	gid 0
-
-	# Perform chroot into the specified directory.
-	#chroot /var/run/haproxy/
-
-	# Daemonize on startup
-	daemon
-
-	nosplice
-	# Enable debugging
-	#debug
-
-	# Spawn given number of processes and distribute load among them,
-	# used for multi-core environments or to circumvent per-process
-	# limits like number of open file descriptors. Default is 1.
-	#nbproc 2
-
-
-# Example HTTP proxy listener
-listen my_http_proxy
-
-	# Bind to port 81 and 444 on all interfaces (0.0.0.0)
-	bind :81,:444
-
-	# We're proxying HTTP here...
-	mode http
-
-	# Simple HTTP round robin over two servers using the specified
-	# source ip 192.168.1.1 .
-	balance roundrobin
-	server server01 192.168.1.10:80 source 192.168.1.1
-	server server02 192.168.1.20:80 source 192.168.1.1
-
-	# Serve an internal statistics page on /stats:
-	stats enable
-	stats uri /stats
-
-	# Enable HTTP basic auth for the statistics:
-	stats realm HA_Stats
-	stats auth username:password
-
-
-# Example SMTP proxy listener
-listen my_smtp_proxy
-
-	# Disable this instance without commenting out the section.
-	disabled
-
-	# Bind to port 26 and 588 on localhost
-	bind 127.0.0.1:26,127.0.0.1:588
-
-	# This is a TCP proxy
-	mode tcp
-
-	# Round robin load balancing over two servers on port 123 forcing
-	# the address 192.168.1.1 and port 25 as source.
-	balance roundrobin
-  #use next line for transparent proxy, so the servers can see the 
-  #original ip-address and remove source keyword in server definition
-  #source 0.0.0.0 usesrc clientip
-	server server01 192.168.1.10:123 source 192.168.1.1:25
-	server server02 192.168.1.20:123 source 192.168.1.1:25
-	
-
-# Special health check listener for integration with external load
-# balancers.
-listen local_health_check
-
-	# Listen on port 60000
-	bind :60000
-
-	# This is a health check
-	mode health
-
-	# Enable HTTP-style responses: "HTTP/1.0 200 OK"
-	# else just print "OK".
-	#option httpchk
diff --git a/trunk/package/feeds/packages/haproxy/files/haproxy.hotplug b/trunk/package/feeds/packages/haproxy/files/haproxy.hotplug
deleted file mode 100644
index d14b5bf3..00000000
--- a/trunk/package/feeds/packages/haproxy/files/haproxy.hotplug
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$ACTION" = add ]; then
-
-	/etc/init.d/haproxy enabled && \
-		/etc/init.d/haproxy start
-fi
-
diff --git a/trunk/package/feeds/packages/haproxy/files/haproxy.init b/trunk/package/feeds/packages/haproxy/files/haproxy.init
deleted file mode 100644
index edda9a3a..00000000
--- a/trunk/package/feeds/packages/haproxy/files/haproxy.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2010 OpenWrt.org
-
-START=99
-STOP=80
-
-SERVICE_USE_PID=1
-
-HAPROXY_BIN="/usr/sbin/haproxy"
-HAPROXY_CONFIG="/etc/haproxy.cfg"
-HAPROXY_PID="/var/run/haproxy.pid"
-
-start() {
-	service_start $HAPROXY_BIN -q -D -f "$HAPROXY_CONFIG" -p "$HAPROXY_PID"
-}
-
-stop() {
-	kill -9 $(cat $HAPROXY_PID | tr "\n" " ")
-	service_stop $HAPROXY_BIN
-}
-
-reload() {
-	$HAPROXY_BIN -D -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID | tr "\n" " ")	
-	#$HAPROXY_BIN -D -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID)
-}
diff --git a/trunk/package/feeds/packages/haproxy/patches/0001-BUG-MINOR-pattern-error-message-missing.patch b/trunk/package/feeds/packages/haproxy/patches/0001-BUG-MINOR-pattern-error-message-missing.patch
deleted file mode 100644
index 91b5be6d..00000000
--- a/trunk/package/feeds/packages/haproxy/patches/0001-BUG-MINOR-pattern-error-message-missing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001
-From: Thierry FOURNIER <tfournier@exceliance.fr>
-Date: Fri, 6 Feb 2015 17:50:55 +0100
-Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing
-
-This patch must be backported in 1.5 version.
-(cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69)
----
- src/pattern.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/pattern.c b/src/pattern.c
-index 208e33a..a6fc52d 100644
---- a/src/pattern.c
-+++ b/src/pattern.c
-@@ -989,8 +989,10 @@ int pat_idx_list_ptr(struct pattern_expr *expr, struct pattern *pat, char **err)
- 
- 	/* allocate pattern */
- 	patl = calloc(1, sizeof(*patl));
--	if (!patl)
-+	if (!patl) {
-+		memprintf(err, "out of memory while indexing pattern");
- 		return 0;
-+	}
- 
- 	/* duplicate pattern */
- 	memcpy(&patl->pat, pat, sizeof(*pat));
--- 
-2.0.4
-
diff --git a/trunk/package/feeds/packages/haproxy/patches/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch b/trunk/package/feeds/packages/haproxy/patches/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch
deleted file mode 100644
index 2a0b7cf5..00000000
--- a/trunk/package/feeds/packages/haproxy/patches/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 623401b983185c1e0f6507e96557de3bc46fd41b Mon Sep 17 00:00:00 2001
-From: Thierry FOURNIER <tfournier@exceliance.fr>
-Date: Fri, 6 Feb 2015 17:53:54 +0100
-Subject: [PATCH 2/2] BUG/MEDIUM: pattern: some entries are not deleted with
- case insensitive match
-
-ACL or map entries are not deleted with the command "del acl" or "del map"
-if the case insentive flag is set.
-
-This is because the the case insensitive string are stored in a list and the
-default delete function associated with string looks in a tree. I add a check
-of the case insensitive flag and execute the delete function for lists if it
-is set.
-
-This patch must be backported in 1.5 version.
-(cherry picked from commit 73bc285be194f443dc7eab9c949e87e1dbe8f70c)
----
- src/pattern.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/pattern.c b/src/pattern.c
-index a6fc52d..b19ffe2 100644
---- a/src/pattern.c
-+++ b/src/pattern.c
-@@ -1308,6 +1308,10 @@ void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref)
- 	struct ebmb_node *node, *next_node;
- 	struct pattern_tree *elt;
- 
-+	/* If the flag PAT_F_IGNORE_CASE is set, we cannot use trees */
-+	if (expr->mflags & PAT_MF_IGNORE_CASE)
-+		return pat_del_list_ptr(expr, ref);
-+
- 	/* browse each node of the tree. */
- 	for (node = ebmb_first(&expr->pattern_tree), next_node = node ? ebmb_next(node) : NULL;
- 	     node;
--- 
-2.0.4
-
diff --git a/trunk/package/feeds/packages/haserl/Config.in b/trunk/package/feeds/packages/haserl/Config.in
deleted file mode 100644
index e5fb90db..00000000
--- a/trunk/package/feeds/packages/haserl/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-if PACKAGE_haserl
-
-	config HASERL_with_lua
-		bool
-		default n
-
-	comment "Lua support"
-
-	config HASERL_shell_luac
-		bool
-		prompt "Support --shell=luac"
-		select HASERL_with_lua
-		default n
-		help
-			haserl(1):
-			The luac "shell" is a precompiled lua chunk, so interactive
-			editing and testing of scripts is not possible. However,
-			haserl can be compiled with luac support only, and this
-			allows lua support even in a small memory environment. All
-			haserl lua features listed above are still available. (If
-			luac is the only shell built into haserl, the
-			haserl.loadfile is disabled, as the haserl parser is not
-			compiled in.)
-
-	config HASERL_shell_lua
-		bool
-		prompt "Support --shell=lua"
-		select HASERL_with_lua
-		default n
-		help
-			haserl(1):
-			If compiled with lua support, --shell=lua will enable lua as the
-			script language instead of bash shell.
-
-endif
diff --git a/trunk/package/feeds/packages/haserl/Makefile b/trunk/package/feeds/packages/haserl/Makefile
deleted file mode 100644
index 1d58625e..00000000
--- a/trunk/package/feeds/packages/haserl/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haserl
-PKG_VERSION:=0.9.35
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/haserl
-PKG_MD5SUM:=918f0b4f6cec0b438c8b5c78f2989010
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_HASERL_with_lua \
-	CONFIG_HASERL_shell_luac \
-	CONFIG_HASERL_shell_lua \
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haserl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=A CGI wrapper to embed shell scripts in HTML documents
-  URL:=http://haserl.sourceforge.net/
-  MENU:=1
-  DEPENDS:= +HASERL_with_lua:liblua
-endef
-
-define Package/haserl/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_HASERL_with_lua),y)
-	CONFIGURE_ARGS+=--with-lua
-	TARGET_LDFLAGS += -ldl
-endif
-ifneq ($(CONFIG_HASERL_shell_lua),y)
-	CONFIGURE_ARGS+=--disable-luashell
-endif
-ifneq ($(CONFIG_HASERL_shell_luac),y)
-	CONFIGURE_ARGS+=--disable-luacshell
-endif
-
-define Package/haserl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haserl $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,haserl))
diff --git a/trunk/package/feeds/packages/haserl/patches/100-replace-lua2c-with-sed.patch b/trunk/package/feeds/packages/haserl/patches/100-replace-lua2c-with-sed.patch
deleted file mode 100644
index 4626a028..00000000
--- a/trunk/package/feeds/packages/haserl/patches/100-replace-lua2c-with-sed.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 31d45f7..d249f67 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -86,7 +86,6 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
- @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
- @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
- bin_PROGRAMS = haserl$(EXEEXT)
-@@ -124,9 +123,6 @@ am__DEPENDENCIES_1 =
- haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
- haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--lua2c_SOURCES = lua2c.c
--lua2c_OBJECTS = lua2c.$(OBJEXT)
--lua2c_LDADD = $(LDADD)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -159,8 +155,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
- am__v_CCLD_1 = 
--SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES) lua2c.c
--DIST_SOURCES = $(am__haserl_SOURCES_DIST) lua2c.c
-+SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES)
-+DIST_SOURCES = $(am__haserl_SOURCES_DIST)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -284,7 +280,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--EXTRA_DIST = haserl_lualib.lua lua2c.c
-+EXTRA_DIST = haserl_lualib.lua
- 
- # Not strictly required, but we explicitly do not distribute the generated inc file
- nodist_haserl_SOURCES = haserl_lualib.inc
-@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE
- 	@rm -f haserl$(EXEEXT)
- 	$(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
- 
--@USE_LUA_FALSE@lua2c$(EXEEXT): $(lua2c_OBJECTS) $(lua2c_DEPENDENCIES) $(EXTRA_lua2c_DEPENDENCIES) 
--@USE_LUA_FALSE@	@rm -f lua2c$(EXEEXT)
--@USE_LUA_FALSE@	$(AM_V_CCLD)$(LINK) $(lua2c_OBJECTS) $(lua2c_LDADD) $(LIBS)
--
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
-@@ -416,7 +408,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua2c.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -770,17 +761,13 @@ uninstall-am: uninstall-binPROGRAMS
- .PRECIOUS: Makefile
- 
- 
--# lua2c_LIBS ?= -llua -ldl -lm
--@USE_LUA_TRUE@lua2c_LDFLAGS ?= -Wl,-E
--@USE_LUA_TRUE@lua2c:	lua2c.c
--@USE_LUA_TRUE@	$(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
--@USE_LUA_TRUE@		-o $@ $^ $(LIBS) $(LUA_LIBS)
- 
--@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
--@USE_LUA_TRUE@	if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
-+@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua
-+@USE_LUA_TRUE@	if ! sed -re '/--\[\[/,/\]\]--/d; s/[[:space:]]*--.*//g; s/^[[:space:]]*//g; /^$$/d; s/ (=+) /\1/g; s/,[[:space:]]*/,/g; s/ ([()])/\1/g; s/key/k/g; s/value/v/g; s/^/"/; s/$$/\\n"/' haserl_lualib.lua >$@.tmp; then \
- @USE_LUA_TRUE@		rm $@; \
- @USE_LUA_TRUE@		exit 1 ;\
- @USE_LUA_TRUE@	fi
-+@USE_LUA_TRUE@	{ echo "static const char haserl_lualib[] = "; cat $@.tmp; echo ";"; rm $@.tmp; } >$@
- 
- @USE_LUA_TRUE@h_lua_common.c : haserl_lualib.inc
- 
diff --git a/trunk/package/feeds/packages/haserl/patches/101-adjust-script-size.patch b/trunk/package/feeds/packages/haserl/patches/101-adjust-script-size.patch
deleted file mode 100644
index a4b7d9a4..00000000
--- a/trunk/package/feeds/packages/haserl/patches/101-adjust-script-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/h_lua_common.c	2013-09-20 23:35:19.000000000 +0300
-+++ b/src/h_lua_common.c	2014-05-03 19:27:43.000000000 +0300
-@@ -79,7 +79,7 @@
- 
-   /* and load our haserl library */
-   if (luaL_loadbuffer
--      (lua_vm, (const char *) &haserl_lualib, sizeof (haserl_lualib),
-+      (lua_vm, (const char *) haserl_lualib, sizeof(haserl_lualib)-1,
-        "luascript.lua") || lua_pcall (lua_vm, 0, 0, 0))
-     {
-       die_with_message (NULL, NULL,
diff --git a/trunk/package/feeds/packages/haveged/Makefile b/trunk/package/feeds/packages/haveged/Makefile
deleted file mode 100644
index f0203847..00000000
--- a/trunk/package/feeds/packages/haveged/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haveged
-PKG_VERSION:=1.9.1
-PKG_RELEASE:=5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.issihosts.com/$(PKG_NAME) \
-	http://pkgs.fedoraproject.org/repo/pkgs/haveged/haveged-1.9.1.tar.gz/015ff58cd10607db0e0de60aeca2f5f8/
-PKG_MD5SUM:=015ff58cd10607db0e0de60aeca2f5f8
-PKG_LICENSE:=GPLv3
-
-PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haveged/template
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Feeds the kernel entropy pool by timing CPU loops.
-  URL:=http://www.issihosts.com/haveged/
-endef
-
-define Package/haveged
-  $(call Package/haveged/template)
-  DEPENDS:=+libhavege
-endef
-
-define Package/libhavege
-  $(call Package/haveged/template)
-  TITLE:=Library for haveged
-endef
-
-CONFIGURE_ARGS+= \
-      --enable-daemon=yes \
-      --enable-threads=no \
-      --enable-olt=no
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/havege.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libhavege.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/haveged/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/haveged.init $(1)/etc/init.d/haveged
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/haveged $(1)/usr/sbin/
-endef
-
-define Package/libhavege/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libhavege.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,haveged))
-$(eval $(call BuildPackage,libhavege))
diff --git a/trunk/package/feeds/packages/haveged/files/haveged.init b/trunk/package/feeds/packages/haveged/files/haveged.init
deleted file mode 100644
index 113d64f7..00000000
--- a/trunk/package/feeds/packages/haveged/files/haveged.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
-
-START=13
-
-HAVEGED_THRESHOLD=1024
-HAVEGED_DCACHE=32
-HAVEGED_ICACHE=32
-
-start() {
-	service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1
-}
-
-stop() {
-	service_stop /usr/sbin/haveged
-}
diff --git a/trunk/package/feeds/packages/hd-idle/Makefile b/trunk/package/feeds/packages/hd-idle/Makefile
deleted file mode 100644
index aa222846..00000000
--- a/trunk/package/feeds/packages/hd-idle/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hd-idle
-PKG_VERSION:=1.04
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Lim Guo Wei <limguowei@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=41e52e669fc59fa82ee0c2bcce1336d3
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/hd-idle
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Another idle-daemon for attached hard drives
-  SUBMENU:=disc
-  URL:=http://hd-idle.sourceforge.net/
-endef
-
-define Package/hd-idle/description
-       hd-idle is a utility program for spinning-down external disks after a period of idle time.
-endef
-
-define Build/Compile
-	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME).c
-endef
-
-define Package/hd-idle/conffiles
-/etc/config/hd-idle
-endef
-
-define Package/hd-idle/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,hd-idle))
diff --git a/trunk/package/feeds/packages/hd-idle/files/hd-idle.config b/trunk/package/feeds/packages/hd-idle/files/hd-idle.config
deleted file mode 100644
index dbbd358b..00000000
--- a/trunk/package/feeds/packages/hd-idle/files/hd-idle.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config 'hd-idle'
-	option 'disk' 'sda'
-	option 'enabled' '0'
-	option 'idle_time_unit' 'minutes'
-	option 'idle_time_interval' '10'
diff --git a/trunk/package/feeds/packages/hd-idle/files/hd-idle.init b/trunk/package/feeds/packages/hd-idle/files/hd-idle.init
deleted file mode 100644
index b8ce5cf0..00000000
--- a/trunk/package/feeds/packages/hd-idle/files/hd-idle.init
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=50
-
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get_bool _val "$section" "$option" '0'
-	[ "$_val" -gt 0 ] && append args "$3"
-}
-
-append_string() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get _val "$section" "$option"
-	[ -n "$_val" ] && append args "$3 $_val"
-}
-
-compute_seconds() {
-	local interval="$1"
-	local unit="$2"
-
-	if [ -z "$interval" ]
-	then
-		interval=10
-	fi
-
-	if [ -z "$unit" ]
-	then
-		unit="minutes"
-	fi
-
-	# compute interval in seconds
-	case "$unit" in
-		"days" )
-			interval_seconds=$(($interval*60*60*24))
-			;;
-		"hours" )
-			interval_seconds=$(($interval*60*60))
-			;;
-		"minutes" )
-			interval_seconds=$(($interval*60))
-			;;
-		"seconds" )
-			interval_seconds=$interval
-			;;
-		* )
-			# default is minutes
-			interval_seconds=$(($interval*60))
-			;;
-	esac
-
-	echo $interval_seconds
-}
-
-start_service() {
-	local section="$1"
-	args=""
-	config_get "interval" "$section" "idle_time_interval"
-	config_get "unit" "$section" "idle_time_unit"
-	append_string "$section" "disk" "-a"
-	config_get_bool "enabled" "$section" "enabled" '1'
-	[ "$enabled" -gt 0 ] || return 1
-	service_start /usr/bin/hd-idle $args -i "$(compute_seconds $interval $unit)"
-}
-
-start() {
-	config_load "hd-idle"
-	config_foreach start_service "hd-idle"
-}
-
-stop() {
-	service_stop /usr/bin/hd-idle
-}
diff --git a/trunk/package/feeds/packages/hdparm/Makefile b/trunk/package/feeds/packages/hdparm/Makefile
deleted file mode 100644
index 8841213e..00000000
--- a/trunk/package/feeds/packages/hdparm/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hdparm
-PKG_VERSION:=9.45
-PKG_RELEASE:=1
-PKG_USE_MIPS16:=0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=1c75d0751a44928b6c4bc81fb16d7fe8
-PKG_MAINTAINER:=Richard Kunze <richard.kunze@web.de>
-PKG_LICENSE:=BSD-Style Open Source License
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-D_GNU_SOURCE
-
-define Package/hdparm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=disc
-  TITLE:=Hard disk drive configuration utilitity
-  URL:=http://sourceforge.net/projects/hdparm/
-endef
-
-define Package/hdparm/description
- get/set SATA/IDE device parameters
-endef
-
-define Package/hdparm/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin
-endef
-
-$(eval $(call BuildPackage,hdparm))
diff --git a/trunk/package/feeds/packages/hdparm/patches/001-fix-includes.patch b/trunk/package/feeds/packages/hdparm/patches/001-fix-includes.patch
deleted file mode 100644
index 44343fb3..00000000
--- a/trunk/package/feeds/packages/hdparm/patches/001-fix-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hdparm.h
-+++ b/hdparm.h
-@@ -2,6 +2,7 @@
- 
- //#undef __KERNEL_STRICT_NAMES
- #include <linux/types.h>
-+#include <sys/types.h>
- 
- #if !defined(__GNUC__) && !defined(__attribute__)
- #define __attribute__(x)
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <limits.h>
- #include <dirent.h>
- #include <sys/stat.h>
- #include <linux/types.h>
diff --git a/trunk/package/feeds/packages/hfsprogs/Makefile b/trunk/package/feeds/packages/hfsprogs/Makefile
deleted file mode 100644
index 9c44a355..00000000
--- a/trunk/package/feeds/packages/hfsprogs/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hfsprogs
-PKG_VERSION:=332.25
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://archive.ubuntu.com/ubuntu/pool/universe/h/$(PKG_NAME)
-PKG_BUILD_DIR:=$(BUILD_DIR)/diskdev_cmds-$(PKG_VERSION)
-PKG_MD5SUM:=261c3de5ec0dcf5244e3f60d79c1d6f1
-PKG_LICENSE:=APSL 2.0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/hfsprogs/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  DEPENDS:=+libopenssl
-endef
-
-define Package/hfsfsck
-  $(call Package/hfsprogs/Default)
-  TITLE:=fsck (fsck.hfs) utility from hfsprogs
-endef
-
-define Package/mkhfs
-  $(call Package/hfsprogs/Default)
-  TITLE:=mkfs (mkfs.hfs) utility from hfsprogs
-endef
-
-define Package/hfsfsck/description
-	Utilities to create and check HFS/HFS+ filesystems.
-	(fsck.hfs and fsck.hfsplus for checking integrity of HFS/HFS+ volumes)
-endef
-
-define Package/mkhfs/description
-	Utilities to create and check HFS/HFS+ filesystems.
-	(mkfs.hfs and mkfs.hfsplus for creating HFS/HFS+ volumes)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		-f Makefile.lnx \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS+="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1" \
-		all
-endef
-
-define Package/hfsfsck/install
-	$(INSTALL_DIR) $(1)/lib/functions/fsck
-	$(INSTALL_DATA) ./files/hfsfsck.sh $(1)/lib/functions/fsck/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fsck_hfs.tproj/fsck_hfs	$(1)/usr/sbin/fsck.hfsplus
-	(cd $(1)/usr/sbin; ln -sf fsck.hfsplus fsck.hfs;)
-endef
-
-define Package/mkhfs/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/newfs_hfs.tproj/newfs_hfs $(1)/usr/sbin/mkfs.hfsplus
-	(cd $(1)/usr/sbin; ln -sf mkfs.hfsplus mkfs.hfs;)
-endef
-
-$(eval $(call BuildPackage,hfsfsck))
-$(eval $(call BuildPackage,mkhfs))
diff --git a/trunk/package/feeds/packages/hfsprogs/files/hfsfsck.sh b/trunk/package/feeds/packages/hfsprogs/files/hfsfsck.sh
deleted file mode 100644
index 8bcd2c1f..00000000
--- a/trunk/package/feeds/packages/hfsprogs/files/hfsfsck.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright 2015 OpenWrt.org
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-fsck_hfsfsck() {
-	hfsfsck "$device" 2>&1 | logger -t "fstab: hfsfsck ($device)"
-	local status="$?"
-	case "$status" in
-		0) ;; #success
-		4) reboot;;
-		8) echo "hfsfsck ($device): Warning! Uncorrected errors."| logger -t fstab
-			return 1
-			;;
-		*) echo "hfsfsck ($device): Error $status. Check not complete."| logger -t fstab;;
-	esac
-	return 0
-}
-
-fsck_hfs() {
-	fsck_hfsfsck "$@"
-}
-
-fsck_hfsplus() {
-	fsck_hfsfsck "$@"
-}
-
-append libmount_known_fsck "hfs"
-append libmount_known_fsck "hfsplus"
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0001-Create-short-Makefiles-for-Debian.patch b/trunk/package/feeds/packages/hfsprogs/patches/0001-Create-short-Makefiles-for-Debian.patch
deleted file mode 100644
index a8c41936..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0001-Create-short-Makefiles-for-Debian.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Create short Makefiles for Debian
-
-Create short Makefiles for compiling just the necessary parts for a
-Debian-based (and possibly other distributions) HFS+ filesystem
-utilities.
----
- Makefile.lnx                       |  8 ++++++++
- fsck_hfs.tproj/Makefile.lnx        | 16 ++++++++++++++++
- fsck_hfs.tproj/dfalib/Makefile.lnx | 15 +++++++++++++++
- newfs_hfs.tproj/Makefile.lnx       | 12 ++++++++++++
- 4 files changed, 51 insertions(+)
- create mode 100644 Makefile.lnx
- create mode 100644 fsck_hfs.tproj/Makefile.lnx
- create mode 100644 fsck_hfs.tproj/dfalib/Makefile.lnx
- create mode 100644 newfs_hfs.tproj/Makefile.lnx
-
-diff --git a/Makefile.lnx b/Makefile.lnx
-new file mode 100644
-index 0000000..687d1e7
---- /dev/null
-+++ b/Makefile.lnx
-@@ -0,0 +1,8 @@
-+CC := gcc
-+CFLAGS += -I$(PWD)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1
-+SUBDIRS := newfs_hfs.tproj fsck_hfs.tproj
-+
-+all clean:
-+	for d in $(SUBDIRS); do $(MAKE) -C $$d -f Makefile.lnx $@; done
-+
-+export CC CFLAGS
-diff --git a/fsck_hfs.tproj/Makefile.lnx b/fsck_hfs.tproj/Makefile.lnx
-new file mode 100644
-index 0000000..977d7e8
---- /dev/null
-+++ b/fsck_hfs.tproj/Makefile.lnx
-@@ -0,0 +1,16 @@
-+CFILES = fsck_hfs.c strings.c utilities.c cache.c fsck_debug.c
-+OFILES = $(CFILES:.c=.o)
-+
-+all: fsck_hfs
-+
-+fsck_hfs: $(OFILES) dfalib/libdfa.a
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) dfalib/libdfa.a
-+
-+dfalib/libdfa.a: FORCE
-+	$(MAKE) -C dfalib -f Makefile.lnx CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" libdfa.a
-+
-+clean:
-+	$(RM) fsck_hfs $(OFILES)
-+	$(MAKE) -C dfalib -f Makefile.lnx clean
-+
-+.PHONY : FORCE clean
-diff --git a/fsck_hfs.tproj/dfalib/Makefile.lnx b/fsck_hfs.tproj/dfalib/Makefile.lnx
-new file mode 100644
-index 0000000..8c07196
---- /dev/null
-+++ b/fsck_hfs.tproj/dfalib/Makefile.lnx
-@@ -0,0 +1,15 @@
-+CFILES = hfs_endian.c BlockCache.c\
-+         BTree.c BTreeAllocate.c BTreeMiscOps.c \
-+         BTreeNodeOps.c BTreeScanner.c BTreeTreeOps.c\
-+         CatalogCheck.c HardLinkCheck.c\
-+         SBTree.c SControl.c SVerify1.c SVerify2.c\
-+         SRepair.c SRebuildCatalogBTree.c\
-+         SUtils.c SKeyCompare.c SDevice.c SExtents.c SAllocate.c\
-+         SCatalog.c SStubs.c VolumeBitmapCheck.c
-+OFILES = $(CFILES:.c=.o)
-+
-+libdfa.a: $(OFILES)
-+	ar rc $@ $?
-+
-+clean:
-+	$(RM) $(OFILES) libdfa.a
-diff --git a/newfs_hfs.tproj/Makefile.lnx b/newfs_hfs.tproj/Makefile.lnx
-new file mode 100644
-index 0000000..58e6700
---- /dev/null
-+++ b/newfs_hfs.tproj/Makefile.lnx
-@@ -0,0 +1,12 @@
-+CFILES = hfs_endian.c makehfs.c newfs_hfs.c
-+OFILES = $(CFILES:.c=.o)
-+
-+all: newfs_hfs
-+
-+newfs_hfs: $(OFILES)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) -lcrypto
-+
-+clean:
-+	$(RM) newfs_hfs $(OFILES)
-+
-+.PHONY : FORCE clean
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0002-Add-exclude-Darwin-specific-code.patch b/trunk/package/feeds/packages/hfsprogs/patches/0002-Add-exclude-Darwin-specific-code.patch
deleted file mode 100644
index 0046c364..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0002-Add-exclude-Darwin-specific-code.patch
+++ /dev/null
@@ -1,1407 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Add/exclude Darwin-specific code
-
-Modify some of the files so that they can be compiled without the
-Apple owned frameworks in a Debian system (and possibly others).
----
- fsck_hfs.tproj/cache.c              |   4 ++
- fsck_hfs.tproj/dfalib/BTree.c       |   2 +
- fsck_hfs.tproj/dfalib/BlockCache.c  |   3 +
- fsck_hfs.tproj/dfalib/SBTree.c      |   2 +
- fsck_hfs.tproj/dfalib/SDevice.c     |  92 ++++++++++++++++++++---------
- fsck_hfs.tproj/dfalib/SKeyCompare.c |   2 +
- fsck_hfs.tproj/dfalib/SRepair.c     |   2 +
- fsck_hfs.tproj/dfalib/SRuntime.h    |   7 ++-
- fsck_hfs.tproj/dfalib/SUtils.c      |   5 +-
- fsck_hfs.tproj/dfalib/SVerify2.c    |   7 +++
- fsck_hfs.tproj/dfalib/Scavenger.h   |  11 +++-
- fsck_hfs.tproj/dfalib/hfs_endian.c  |   4 ++
- fsck_hfs.tproj/dfalib/hfs_endian.h  |   7 ++-
- fsck_hfs.tproj/fsck_hfs.c           |  61 +++++++++++++++----
- fsck_hfs.tproj/utilities.c          |   8 ++-
- include/missing.h                   | 115 ++++++++++++++++++++++++++++++++++++
- newfs_hfs.tproj/hfs_endian.c        |   5 ++
- newfs_hfs.tproj/hfs_endian.h        |   5 ++
- newfs_hfs.tproj/makehfs.c           |  72 ++++++++++++++++------
- newfs_hfs.tproj/newfs_hfs.c         |  74 ++++++++++++++++++++---
- newfs_hfs.tproj/newfs_hfs.h         |  26 ++++----
- 21 files changed, 429 insertions(+), 85 deletions(-)
- create mode 100644 include/missing.h
-
-diff --git a/fsck_hfs.tproj/cache.c b/fsck_hfs.tproj/cache.c
-index be46195..527088a 100644
---- a/fsck_hfs.tproj/cache.c
-+++ b/fsck_hfs.tproj/cache.c
-@@ -26,7 +26,11 @@
- #include <stdlib.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-+#if LINUX
-+#include "missing.h"
-+#else
- #include <sys/types.h>
-+#endif /* __LINUX__ */
- #include <sys/uio.h>
- #include <unistd.h>
- #include <string.h>
-diff --git a/fsck_hfs.tproj/dfalib/BTree.c b/fsck_hfs.tproj/dfalib/BTree.c
-index edd8301..7ad9fe0 100644
---- a/fsck_hfs.tproj/dfalib/BTree.c
-+++ b/fsck_hfs.tproj/dfalib/BTree.c
-@@ -1705,7 +1705,9 @@ OSStatus	BTGetInformation	(SFCB					*filePtr,
- 								 UInt16					 version,
- 								 BTreeInfoRec			*info )
- {
-+#if !LINUX
- #pragma unused (version)
-+#endif
- 
- 	BTreeControlBlockPtr	btreePtr;
- 
-diff --git a/fsck_hfs.tproj/dfalib/BlockCache.c b/fsck_hfs.tproj/dfalib/BlockCache.c
-index 1bb952f..e3a28a2 100644
---- a/fsck_hfs.tproj/dfalib/BlockCache.c
-+++ b/fsck_hfs.tproj/dfalib/BlockCache.c
-@@ -20,6 +20,9 @@
-  * @APPLE_LICENSE_HEADER_END@
-  */
- 
-+#if LINUX
-+#include "missing.h"
-+#endif
- #include "SRuntime.h"
- #include "Scavenger.h"
- #include "../cache.h"
-diff --git a/fsck_hfs.tproj/dfalib/SBTree.c b/fsck_hfs.tproj/dfalib/SBTree.c
-index 2fbcd1d..cd81b13 100644
---- a/fsck_hfs.tproj/dfalib/SBTree.c
-+++ b/fsck_hfs.tproj/dfalib/SBTree.c
-@@ -322,7 +322,9 @@ ErrorExit:
- OSStatus
- SetEndOfForkProc ( SFCB *filePtr, FSSize minEOF, FSSize maxEOF )
- {
-+#if !LINUX
- #pragma unused (maxEOF)
-+#endif
- 
- 	OSStatus	result;
- 	UInt32		actualSectorsAdded;
-diff --git a/fsck_hfs.tproj/dfalib/SDevice.c b/fsck_hfs.tproj/dfalib/SDevice.c
-index bf6f61c..9a46023 100644
---- a/fsck_hfs.tproj/dfalib/SDevice.c
-+++ b/fsck_hfs.tproj/dfalib/SDevice.c
-@@ -2,7 +2,7 @@
-  * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
-  *
-  * @APPLE_LICENSE_HEADER_START@
-- * 
-+ *
-  * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
-  * Reserved.  This file contains Original Code and/or Modifications of
-  * Original Code as defined in and that are subject to the Apple Public
-@@ -10,7 +10,7 @@
-  * except in compliance with the License.  Please obtain a copy of the
-  * License at http://www.apple.com/publicsource and read it before using
-  * this file.
-- * 
-+ *
-  * The Original Code and all software distributed under the License are
-  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-@@ -18,7 +18,7 @@
-  * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-  * License for the specific language governing rights and limitations
-  * under the License."
-- * 
-+ *
-  * @APPLE_LICENSE_HEADER_END@
-  */
- #include "SRuntime.h"
-@@ -28,33 +28,71 @@
- #include <unistd.h>
- #include <errno.h>
- #include <sys/ioctl.h>
--
-+#if LINUX
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#else
- #include <IOKit/storage/IOMediaBSDClient.h>
--
-+#endif /* LINUX */
- #else
--
- #include <Files.h>
- #include <Device.h>
- #include <Disks.h>
- 
- #endif
- 
--
- OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- {
- #if BSD
- 	UInt64 devBlockCount = 0;
- 	int devBlockSize = 0;
-+#if LINUX
-+	struct stat stbuf;
-+
-+	devBlockSize = 512;
- 
-+#ifndef BLKGETSIZE
-+#define BLKGETSIZE              _IO(0x12,96)
-+#endif
-+#ifndef BLKGETSIZE64
-+#define BLKGETSIZE64            _IOR(0x12,114,size_t)
-+#endif
-+	if (fstat(driveRefNum, &stbuf) < 0){
-+		printf("Error: %s\n", strerror(errno));
-+		return(-1);
-+	}
-+
-+        if (S_ISREG(stbuf.st_mode)) {
-+                devBlockCount = stbuf.st_size / 512;
-+        }
-+        else if (S_ISBLK(stbuf.st_mode)) {
-+                unsigned long size;
-+                u_int64_t size64;
-+                if (!ioctl(driveRefNum, BLKGETSIZE64, &size64))
-+                        devBlockCount = size64 / 512;
-+                else if (!ioctl(driveRefNum, BLKGETSIZE, &size))
-+                        devBlockCount = size;
-+                else{
-+                        printf("Error: %s\n", strerror(errno));
-+			return(-1);
-+		}
-+
-+        }
-+        else{
-+                printf("Device is not a block device");
-+		return(-1);
-+	}
-+#elif BSD
- 	if (ioctl(driveRefNum, DKIOCGETBLOCKCOUNT, &devBlockCount) < 0) {
- 		printf("ioctl(DKIOCGETBLOCKCOUNT) for fd %d: %s\n", driveRefNum, strerror(errno));
- 		return (-1);
- 	}
--	
-+
- 	if (ioctl(driveRefNum, DKIOCGETBLOCKSIZE, &devBlockSize) < 0) {
- 		printf("ioctl(DKIOCGETBLOCKSIZE) for fd %d: %s\n", driveRefNum, strerror(errno));
- 		return (-1);
- 	}
-+#endif /* BSD */
- 
- 	if (devBlockSize != 512) {
- 		*numBlocks = (devBlockCount * (UInt64)devBlockSize) / 512;
-@@ -70,24 +108,24 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 	{
- 		/* return format list status code */
- 		kFmtLstCode = 6,
--		
-+
- 		/* reference number of .SONY driver */
- 		kSonyRefNum = 0xfffb,
--		
-+
- 		/* values returned by DriveStatus in DrvSts.twoSideFmt */
- 		kSingleSided = 0,
- 		kDoubleSided = -1,
- 		kSingleSidedSize = 800,		/* 400K */
- 		kDoubleSidedSize = 1600,	/* 800K */
--		
-+
- 		/* values in DrvQEl.qType */
- 		kWordDrvSiz = 0,
- 		kLongDrvSiz = 1,
--		
-+
- 		/* more than enough formatListRecords */
- 		kMaxFormatListRecs = 16
- 	};
--	
-+
- 	ParamBlockRec	pb;
- 	FormatListRec	formatListRecords[kMaxFormatListRecs];
- 	DrvSts			status;
-@@ -95,22 +133,22 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 	OSErr			result;
- 	unsigned long	blocks			= 0;
- 
--	
-+
- 	/* Attempt to get the drive's format list. */
- 	/* (see the Technical Note "What Your Sony Drives For You") */
--	
-+
- 	pb.cntrlParam.ioVRefNum = driveQElementPtr->dQDrive;
- 	pb.cntrlParam.ioCRefNum = driveQElementPtr->dQRefNum;
- 	pb.cntrlParam.csCode = kFmtLstCode;
- 	pb.cntrlParam.csParam[0] = kMaxFormatListRecs;
- 	*(long *)&pb.cntrlParam.csParam[1] = (long)&formatListRecords[0];
--	
-+
- 	result = PBStatusSync(&pb);
--	
-+
- 	if ( result == noErr )
- 	{
- 		/* The drive supports ReturnFormatList status call. */
--		
-+
- 		/* Get the current disk's size. */
- 		for( formatListRecIndex = 0;
- 			 formatListRecIndex < pb.cntrlParam.csParam[0];
-@@ -131,7 +169,7 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 	else if ( driveQElementPtr->dQRefNum == (short)kSonyRefNum )
- 	{
- 		/* The drive is a non-SuperDrive floppy which only supports 400K and 800K disks */
--		
-+
- 		result = DriveStatus(driveQElementPtr->dQDrive, &status);
- 		if ( result == noErr )
- 		{
-@@ -140,11 +178,11 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 				case kSingleSided:
- 					blocks = kSingleSidedSize;
- 					break;
--					
-+
- 				case kDoubleSided:
- 					blocks = kDoubleSidedSize;
- 					break;
--					
-+
- 				default:		//	This should never happen
- 					result = paramErr;
- 					break;
-@@ -155,20 +193,20 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 	{
- 		/* The drive is not a floppy and it doesn't support ReturnFormatList */
- 		/* so use the dQDrvSz field(s) */
--		
-+
- 		result = noErr;	/* reset result */
--		
-+
- 		switch ( driveQElementPtr->qType )
- 		{
- 			case kWordDrvSiz:
- 				blocks = driveQElementPtr->dQDrvSz;
- 				break;
--				
-+
- 			case kLongDrvSiz:
- 				blocks = ((unsigned long)driveQElementPtr->dQDrvSz2 << 16) +
- 						 driveQElementPtr->dQDrvSz;
- 				break;
--				
-+
- 			default:		//	This should never happen
- 				result = paramErr;
- 				break;
-@@ -177,7 +215,7 @@ OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
- 
- 	*numBlocks = blocks;
- 	*blockSize = 512;
--	
-+
- 	return( result );
- #endif
- }
-@@ -188,7 +226,7 @@ OSErr DeviceRead(int device, int drive, void* buffer, SInt64 offset, UInt32 reqB
- #if BSD
- 	off_t seek_off;
- 	ssize_t	nbytes;
--	
-+
- 	*actBytes = 0;
- 
- 	seek_off = lseek(device, offset, SEEK_SET);
-diff --git a/fsck_hfs.tproj/dfalib/SKeyCompare.c b/fsck_hfs.tproj/dfalib/SKeyCompare.c
-index 46e145f..18d99c5 100644
---- a/fsck_hfs.tproj/dfalib/SKeyCompare.c
-+++ b/fsck_hfs.tproj/dfalib/SKeyCompare.c
-@@ -454,7 +454,9 @@ SInt32 CompareExtentKeysPlus( const HFSPlusExtentKey *searchKey, const HFSPlusEx
-  * The name portion of the key is compared using a 16-bit binary comparison. 
-  * This is called from the b-tree code.
-  */
-+#if !LINUX
- __private_extern__
-+#endif
- SInt32
- CompareAttributeKeys(const AttributeKey *searchKey, const AttributeKey *trialKey)
- {
-diff --git a/fsck_hfs.tproj/dfalib/SRepair.c b/fsck_hfs.tproj/dfalib/SRepair.c
-index 01c1a10..8eb759c 100644
---- a/fsck_hfs.tproj/dfalib/SRepair.c
-+++ b/fsck_hfs.tproj/dfalib/SRepair.c
-@@ -1617,7 +1617,9 @@ Output:
- 
- static	OSErr	FixWrapperExtents( SGlobPtr GPtr, RepairOrderPtr p )
- {
-+#if !LINUX
- #pragma unused (p)
-+#endif
- 
- 	OSErr						err;
- 	HFSMasterDirectoryBlock		*mdb;
-diff --git a/fsck_hfs.tproj/dfalib/SRuntime.h b/fsck_hfs.tproj/dfalib/SRuntime.h
-index 646917b..770e3ef 100644
---- a/fsck_hfs.tproj/dfalib/SRuntime.h
-+++ b/fsck_hfs.tproj/dfalib/SRuntime.h
-@@ -27,8 +27,11 @@
- #define __SRUNTIME__
- 
- #if BSD
--
-+#if LINUX
-+#include "missing.h"
-+#else
- #include <sys/types.h>
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-@@ -91,10 +94,12 @@ typedef const unsigned char *	ConstStr255Param;
- 
- typedef u_int32_t	HFSCatalogNodeID;
- 
-+#if !LINUX
- enum {
- 	false		= 0,
- 	true		= 1
- };
-+#endif
- 
- /* OS error codes */
- enum {
-diff --git a/fsck_hfs.tproj/dfalib/SUtils.c b/fsck_hfs.tproj/dfalib/SUtils.c
-index 72035f0..6e9253e 100644
---- a/fsck_hfs.tproj/dfalib/SUtils.c
-+++ b/fsck_hfs.tproj/dfalib/SUtils.c
-@@ -380,7 +380,8 @@ void	InvalidateCalculatedVolumeBitMap( SGlobPtr GPtr )
- //				GPtr->realVCB			Real in-memory vcb
- //------------------------------------------------------------------------------
- 
--#if !BSD	
-+#if BSD
-+#if !LINUX
- OSErr GetVolumeFeatures( SGlobPtr GPtr )
- {
- 	OSErr					err;
-@@ -418,7 +419,7 @@ OSErr GetVolumeFeatures( SGlobPtr GPtr )
- 	return( noErr );
- }
- #endif
--
-+#endif
- 
- 
- /*-------------------------------------------------------------------------------
-diff --git a/fsck_hfs.tproj/dfalib/SVerify2.c b/fsck_hfs.tproj/dfalib/SVerify2.c
-index 6a47935..c68f3d8 100644
---- a/fsck_hfs.tproj/dfalib/SVerify2.c
-+++ b/fsck_hfs.tproj/dfalib/SVerify2.c
-@@ -32,7 +32,9 @@
- */
- 
- #include <sys/ioctl.h>
-+#if !LINUX
- #include <sys/disk.h>
-+#endif
- 
- #include "BTree.h"
- #include "BTreePrivate.h"
-@@ -1354,8 +1356,13 @@ OSErr CompareVolumeHeader( SGlobPtr GPtr, HFSPlusVolumeHeader *volumeHeader )
- 	 * clump size for read-only media is irrelevant we skip the clump size 
- 	 * check to avoid non useful warnings. 
- 	 */
-+#if LINUX
-+	// FIXME
-+	isWriteable = 1;
-+#else
- 	isWriteable = 0;
- 	ioctl( GPtr->DrvNum, DKIOCISWRITABLE, &isWriteable );
-+#endif
- 	if ( isWriteable != 0 && 
- 		 volumeHeader->catalogFile.clumpSize != vcb->vcbCatalogFile->fcbClumpSize ) {
- 		PrintError(GPtr, E_InvalidClumpSize, 0);
-diff --git a/fsck_hfs.tproj/dfalib/Scavenger.h b/fsck_hfs.tproj/dfalib/Scavenger.h
-index cf53970..edb3a80 100644
---- a/fsck_hfs.tproj/dfalib/Scavenger.h
-+++ b/fsck_hfs.tproj/dfalib/Scavenger.h
-@@ -37,11 +37,16 @@
- #include "../fsck_debug.h"
- 
- #include <assert.h>
-+#if LINUX
-+#define XATTR_MAXNAMELEN 127
-+#include <limits.h>
-+#else
- #include <sys/xattr.h>
- #include <sys/acl.h>
- #include <sys/kauth.h>
--#include <sys/errno.h>
- #include <sys/syslimits.h>
-+#endif
-+#include <sys/errno.h>
- 
- #ifdef __cplusplus
- extern	"C" {
-@@ -1465,4 +1470,8 @@ extern int 	AllocateContigBitmapBits (SVCB *vcb, UInt32 numBlocks, UInt32 *actua
- };
- #endif
- 
-+/* #if LINUX
-+#undef XATTR_MAXNAMELEN
-+#endif */
-+
- #endif /* __SCAVENGER__ */
-diff --git a/fsck_hfs.tproj/dfalib/hfs_endian.c b/fsck_hfs.tproj/dfalib/hfs_endian.c
-index 7fa5385..69500c1 100755
---- a/fsck_hfs.tproj/dfalib/hfs_endian.c
-+++ b/fsck_hfs.tproj/dfalib/hfs_endian.c
-@@ -31,7 +31,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#if LINUX
-+#include "missing.h"
-+#else
- #include <architecture/byte_order.h>
-+#endif
- #include <hfs/hfs_format.h>
- 
- #include "Scavenger.h"
-diff --git a/fsck_hfs.tproj/dfalib/hfs_endian.h b/fsck_hfs.tproj/dfalib/hfs_endian.h
-index 52d0c3a..0763d9d 100755
---- a/fsck_hfs.tproj/dfalib/hfs_endian.h
-+++ b/fsck_hfs.tproj/dfalib/hfs_endian.h
-@@ -27,9 +27,14 @@
-  *
-  * This file prototypes endian swapping routines for the HFS/HFS Plus
-  * volume format.
-- */
-+*/
- #include <hfs/hfs_format.h>
-+#if LINUX
-+#include <endian.h>
-+#include <byteswap.h>
-+#else
- #include <architecture/byte_order.h>
-+#endif
- #include "SRuntime.h"
- 
- /*********************/
-diff --git a/fsck_hfs.tproj/fsck_hfs.c b/fsck_hfs.tproj/fsck_hfs.c
-index 90532fd..f1a18bd 100644
---- a/fsck_hfs.tproj/fsck_hfs.c
-+++ b/fsck_hfs.tproj/fsck_hfs.c
-@@ -24,10 +24,14 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
-+#if !LINUX
- #include <sys/ucred.h>
-+#endif
- #include <sys/mount.h>
- #include <sys/ioctl.h>
-+#if !LINUX
- #include <sys/disk.h>
-+#endif
- 
- #include <hfs/hfs_mount.h>
- 
-@@ -195,8 +199,12 @@ main(argc, argv)
- 	if (guiControl)
- 		debug = 0; /* debugging is for command line only */
- 
-+#if LINUX
-+// FIXME
-+#else
- 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
- 		(void)signal(SIGINT, catch);
-+#endif
- 
- 	if (argc < 1) {
- 		(void) fprintf(stderr, "%s: missing special-device\n", progname);
-@@ -218,7 +226,9 @@ checkfilesys(char * filesys)
- 	int chkLev, repLev, logLev;
- 	int blockDevice_fd, canWrite;
- 	char *unraw, *mntonname;
-+#if !LINUX
- 	struct statfs *fsinfo;
-+#endif
- 	int fs_fd=-1;  // fd to the root-dir of the fs we're checking (only w/lfag == 1)
- 
- 	flags = 0;
-@@ -227,7 +237,9 @@ checkfilesys(char * filesys)
- 	canWrite = 0;
- 	unraw = NULL;
- 	mntonname = NULL;
--
-+#if LINUX
-+	// FIXME
-+#else
- 	if (lflag) {
- 		result = getmntinfo(&fsinfo, MNT_NOWAIT);
- 
-@@ -257,10 +269,10 @@ checkfilesys(char * filesys)
- 		    }
- 		}
- 	}
--
-+#endif
- 	if (debug && preen)
- 		pwarn("starting\n");
--	
-+
- 	if (setup( filesys, &blockDevice_fd, &canWrite ) == 0) {
- 		if (preen)
- 			pfatal("CAN'T CHECK FILE SYSTEM.");
-@@ -278,7 +290,7 @@ checkfilesys(char * filesys)
- 	repLev = kMajorRepairs;
- 	logLev = kVerboseLog;
- 
--	if (yflag)	
-+	if (yflag)
- 		repLev = kMajorRepairs;
- 
- 	if (quick) {
-@@ -298,16 +310,16 @@ checkfilesys(char * filesys)
- 
- 	if (nflag)
- 		repLev = kNeverRepair;
--		
-+
- 	if ( rebuildCatalogBtree ) {
- 		chkLev = kPartialCheck;
- 		repLev = kForceRepairs;  // this will force rebuild of catalog B-Tree file
- 	}
--		
-+
- 	/*
- 	 * go check HFS volume...
- 	 */
--	result = CheckHFS(	fsreadfd, fswritefd, chkLev, repLev, logLev, 
-+	result = CheckHFS(	fsreadfd, fswritefd, chkLev, repLev, logLev,
- 						guiControl, lostAndFoundMode, canWrite, &fsmodified );
- 	if (!hotroot) {
- 		ckfini(1);
-@@ -330,6 +342,9 @@ checkfilesys(char * filesys)
- 			}
- 		}
- 	} else {
-+#if LINUX
-+	// FIXME
-+#else
- 		struct statfs stfs_buf;
- 		/*
- 		 * Check to see if root is mounted read-write.
-@@ -339,19 +354,25 @@ checkfilesys(char * filesys)
- 		else
- 			flags = 0;
- 		ckfini(flags & MNT_RDONLY);
-+#endif
- 	}
- 
- 	/* XXX free any allocated memory here */
- 
- 	if (hotroot && fsmodified) {
-+#if !LINUX
- 		struct hfs_mount_args args;
-+#endif
- 		/*
- 		 * We modified the root.  Do a mount update on
- 		 * it, unless it is read-write, so we can continue.
- 		 */
- 		if (!preen)
- 			printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
--		if (flags & MNT_RDONLY) {		
-+#if LINUX
-+		// FIXME
-+#else
-+		if (flags & MNT_RDONLY) {
- 			bzero(&args, sizeof(args));
- 			flags |= MNT_UPDATE | MNT_RELOAD;
- 			if (mount("hfs", "/", flags, &args) == 0) {
-@@ -359,6 +380,7 @@ checkfilesys(char * filesys)
- 				goto ExitThisRoutine;
- 			}
- 		}
-+#endif
- 		if (!preen)
- 			printf("\n***** REBOOT NOW *****\n");
- 		sync();
-@@ -367,7 +389,7 @@ checkfilesys(char * filesys)
- 	}
- 
- 	result = (result == 0) ? 0 : EEXIT;
--	
-+
- ExitThisRoutine:
- 	if (lflag) {
- 	    fcntl(fs_fd, F_THAW_FS, NULL);
-@@ -401,16 +423,18 @@ setup( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
- 	fswritefd = -1;
- 	*blockDevice_fdPtr = -1;
- 	*canWritePtr = 0;
--	
-+
- 	if (stat(dev, &statb) < 0) {
- 		printf("Can't stat %s: %s\n", dev, strerror(errno));
- 		return (0);
- 	}
-+#if !LINUX
- 	if ((statb.st_mode & S_IFMT) != S_IFCHR) {
- 		pfatal("%s is not a character device", dev);
- 		if (reply("CONTINUE") == 0)
- 			return (0);
- 	}
-+#endif
- 	if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
- 		printf("Can't open %s: %s\n", dev, strerror(errno));
- 		return (0);
-@@ -419,7 +443,7 @@ setup( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
- 	/* attempt to get write access to the block device and if not check if volume is */
- 	/* mounted read-only.  */
- 	getWriteAccess( dev, blockDevice_fdPtr, canWritePtr );
--	
-+
- 	if (preen == 0 && !guiControl)
- 		printf("** %s", dev);
- 	if (nflag || (fswritefd = open(dev, O_WRONLY)) < 0) {
-@@ -433,10 +457,14 @@ setup( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
- 		printf("\n");
- 
- 	/* Get device block size to initialize cache */
-+#if LINUX
-+	devBlockSize = 512;
-+#else
- 	if (ioctl(fsreadfd, DKIOCGETBLOCKSIZE, &devBlockSize) < 0) {
- 		pfatal ("Can't get device block size\n");
- 		return (0);
- 	}
-+#endif
- 
- 	 /* calculate the cache block size and total blocks */
- 	if (CalculateCacheSize(userCacheSize, &cacheBlockSize, &cacheTotalBlocks, debug) != 0) {
-@@ -463,11 +491,15 @@ setup( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
- 
- static void getWriteAccess( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
- {
-+#if !LINUX
- 	int					i;
- 	int					myMountsCount;
-+#endif
- 	void *				myPtr;
- 	char *				myCharPtr;
-+#if !LINUX
- 	struct statfs *		myBufPtr;
-+#endif
- 	void *				myNamePtr;
- 
- 	myPtr = NULL;
-@@ -490,6 +522,9 @@ static void getWriteAccess( char *dev, int *blockDevice_fdPtr, int *canWritePtr
- 	}
- 	
- 	// get count of mounts then get the info for each 
-+#if LINUX
-+	// FIXME
-+#else
- 	myMountsCount = getfsstat( NULL, 0, MNT_NOWAIT );
- 	if ( myMountsCount < 0 )
- 		goto ExitThisRoutine;
-@@ -513,8 +548,8 @@ static void getWriteAccess( char *dev, int *blockDevice_fdPtr, int *canWritePtr
- 		}
- 		myBufPtr++;
- 	}
--	*canWritePtr = 1;  // single user will get us here, f_mntfromname is not /dev/diskXXXX 
--	
-+#endif
-+	*canWritePtr = 1;  // single user will get us here, f_mntfromname is not /dev/diskXXXX
- ExitThisRoutine:
- 	if ( myPtr != NULL )
- 		free( myPtr );
-diff --git a/fsck_hfs.tproj/utilities.c b/fsck_hfs.tproj/utilities.c
-index ee41bef..8e1cd77 100644
---- a/fsck_hfs.tproj/utilities.c
-+++ b/fsck_hfs.tproj/utilities.c
-@@ -183,12 +183,14 @@ retry:
- 			printf("Can't stat %s\n", raw);
- 			return (origname);
- 		}
-+#if !LINUX
- 		if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
- 			return (raw);
- 		} else {
- 			printf("%s is not a character device\n", raw);
- 			return (origname);
- 		}
-+#endif
- 	} else if ((stblock.st_mode & S_IFMT) == S_IFCHR && !retried) {
- 		newname = unrawname(newname);
- 		retried++;
-@@ -214,7 +216,11 @@ rawname(char *name)
- 	*dp = 0;
- 	(void)strcpy(rawbuf, name);
- 	*dp = '/';
--	(void)strcat(rawbuf, "/r");
-+#if LINUX
-+	(void)strcat(rawbuf, "/");
-+#else
-+	(void)strcat(rawbuf,"/r");
-+#endif
- 	(void)strcat(rawbuf, &dp[1]);
- 
- 	return (rawbuf);
-diff --git a/include/missing.h b/include/missing.h
-new file mode 100644
-index 0000000..0a859c4
---- /dev/null
-+++ b/include/missing.h
-@@ -0,0 +1,114 @@
-+#ifndef _MISSING_H_
-+#define _MISSING_H_
-+
-+#include <endian.h>
-+#include <byteswap.h>
-+#include <errno.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+#define MAXBSIZE		(256 * 4096)
-+
-+#ifndef true
-+#define true			1
-+#endif
-+#ifndef false
-+#define false			0
-+#endif
-+
-+/* Mac types */
-+
-+/* 8 Bit */
-+#ifndef UInt8
-+#define UInt8			uint8_t
-+#endif
-+#ifndef u_int8_t
-+#define u_int8_t		UInt8
-+#endif
-+#ifndef SInt8
-+#define SInt8			int8_t
-+#endif
-+
-+/* 16 Bit */
-+#ifndef UInt16
-+#define UInt16			uint16_t
-+#endif
-+#ifndef u_int16_t
-+#define u_int16_t		UInt16
-+#endif
-+#ifndef SInt16
-+#define SInt16			int16_t
-+#endif
-+
-+/* 32 Bit */
-+#ifndef UInt32
-+#define UInt32			uint32_t
-+#endif
-+#ifndef u_int32_t
-+#define u_int32_t		UInt32
-+#endif
-+#ifndef SInt32
-+#define SInt32			int32_t
-+#endif
-+
-+/* 64 Bit */
-+#ifndef UInt64
-+#define UInt64			uint64_t
-+#endif
-+#ifndef u_int64_t
-+#define u_int64_t		UInt64
-+#endif
-+#ifndef SInt64
-+#define SInt64			int64_t
-+#endif
-+
-+#define UniChar			u_int16_t
-+#define Boolean			u_int8_t
-+
-+#define UF_NODUMP	0x00000001
-+
-+/* syslimits.h */
-+#define NAME_MAX	255
-+
-+/* Byteswap stuff */
-+#define NXSwapHostLongToBig(x)		cpu_to_be64(x)
-+#define NXSwapBigShortToHost(x) 	be16_to_cpu(x)
-+#define OSSwapBigToHostInt16(x)		be16_to_cpu(x)
-+#define NXSwapBigLongToHost(x)		be32_to_cpu(x)
-+#define OSSwapBigToHostInt32(x)		be32_to_cpu(x)
-+#define NXSwapBigLongLongToHost(x) 	be64_to_cpu(x)
-+#define OSSwapBigToHostInt64(x)		be64_to_cpu(x)
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+/* Big Endian Swaps */
-+#ifndef be16_to_cpu
-+#define be16_to_cpu(x) bswap_16(x)
-+#endif
-+#ifndef be32_to_cpu
-+#define be32_to_cpu(x) bswap_32(x)
-+#endif
-+#ifndef be64_to_cpu
-+#define be64_to_cpu(x) bswap_64(x)
-+#endif
-+#ifndef cpu_to_be64
-+#define cpu_to_be64(x) bswap_64(x)
-+#endif
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+/* Big endian doesn't swap */
-+#ifndef be16_to_cpu
-+#define be16_to_cpu(x)	(x)
-+#endif
-+#ifndef be32_to_cpu
-+#define be32_to_cpu(x)	(x)
-+#endif
-+#ifndef be64_to_cpu
-+#define be64_to_cpu(x)	(x)
-+#endif
-+#ifndef cpu_to_be64
-+#define cpu_to_be64(x) 	(x)
-+#endif
-+#endif
-+
-+#define KAUTH_FILESEC_XATTR "com.apple.system.Security"
-+
-+#endif
-diff --git a/newfs_hfs.tproj/hfs_endian.c b/newfs_hfs.tproj/hfs_endian.c
-index 117b7f8..fdf7353 100644
---- a/newfs_hfs.tproj/hfs_endian.c
-+++ b/newfs_hfs.tproj/hfs_endian.c
-@@ -30,7 +30,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#if LINUX
-+#include "missing.h"
-+#else
- #include <architecture/byte_order.h>
-+#endif
-+
- #include <hfs/hfs_format.h>
- 
- #include "hfs_endian.h"
-diff --git a/newfs_hfs.tproj/hfs_endian.h b/newfs_hfs.tproj/hfs_endian.h
-index 8d9d01d..5c7ff57 100644
---- a/newfs_hfs.tproj/hfs_endian.h
-+++ b/newfs_hfs.tproj/hfs_endian.h
-@@ -29,7 +29,12 @@
-  * volume format.
-  */
- #include <hfs/hfs_format.h>
-+#if LINUX
-+#include <endian.h>
-+#include <byteswap.h>
-+#else
- #include <architecture/byte_order.h>
-+#endif
- 
- /*********************/
- /* BIG ENDIAN Macros */
-diff --git a/newfs_hfs.tproj/makehfs.c b/newfs_hfs.tproj/makehfs.c
-index 085222f..7609779 100644
---- a/newfs_hfs.tproj/makehfs.c
-+++ b/newfs_hfs.tproj/makehfs.c
-@@ -31,10 +31,16 @@
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#if LINUX
-+#include <time.h>
-+#include "missing.h"
-+#endif
- #include <sys/errno.h>
- #include <sys/stat.h>
- #include <sys/sysctl.h>
-+#if !LINUX
- #include <sys/vmmeter.h>
-+#endif
- 
- #include <err.h>
- #include <errno.h>
-@@ -47,13 +53,14 @@
- 
- #include <openssl/sha.h>
- 
-+#if !LINUX
- #include <architecture/byte_order.h>
- 
- #include <CoreFoundation/CFString.h>
- #include <CoreFoundation/CFStringEncodingExt.h>
- 
- extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *buffer, CFIndex maxBufLen);
--
-+#endif
- 
- #include <hfs/hfs_format.h>
- #include <hfs/hfs_mount.h>
-@@ -129,7 +136,9 @@ static UInt32 Largest __P((UInt32 a, UInt32 b, UInt32 c, UInt32 d ));
- static void MarkBitInAllocationBuffer __P((HFSPlusVolumeHeader *header,
- 		UInt32 allocationBlock, void* sectorBuffer, UInt32 *sector));
- 
-+#if !LINUX
- static UInt32 GetDefaultEncoding();
-+#endif
- 
- static UInt32 UTCToLocal __P((UInt32 utcTime));
- 
-@@ -158,11 +167,14 @@ void SETOFFSET (void *buffer, UInt16 btNodeSize, SInt16 recOffset, SInt16 vecOff
- 
- #define ROUNDUP(x, u)	(((x) % (u) == 0) ? (x) : ((x)/(u) + 1) * (u))
- 
--#define ENCODING_TO_BIT(e)                               \
-+#if LINUX
-+#define ENCODING_TO_BIT(e)       (e)
-+#else
-+#define ENCODING_TO_BIT(e)
-           ((e) < 48 ? (e) :                              \
-           ((e) == kCFStringEncodingMacUkrainian ? 48 :   \
-           ((e) == kCFStringEncodingMacFarsi ? 49 : 0)))
--
-+#endif
- /*
-  * make_hfs
-  *	
-@@ -528,6 +540,7 @@ InitMDB(hfsparams_t *defaults, UInt32 driveBlocks, HFS_MDB *mdbp)
- 	 * Map UTF-8 input into a Mac encoding.
- 	 * On conversion errors "untitled" is used as a fallback.
- 	 */
-+#if !LINUX
- 	{
- 		UniChar unibuf[kHFSMaxVolumeNameChars];
- 		CFStringRef cfstr;
-@@ -553,7 +566,11 @@ InitMDB(hfsparams_t *defaults, UInt32 driveBlocks, HFS_MDB *mdbp)
- 		bcopy(&mdbp->drVN[1], defaults->volumeName, mdbp->drVN[0]);
- 		defaults->volumeName[mdbp->drVN[0]] = '\0';
- 	}
-+#endif
- 	/* Save the encoding hint in the Finder Info (field 4). */
-+	mdbp->drVN[0] = strlen(defaults->volumeName);
-+	bcopy(defaults->volumeName,&mdbp->drVN[1],mdbp->drVN[0]);
-+
- 	mdbp->drFndrInfo[4] = SET_HFS_TEXT_ENCODING(defaults->encodingHint);
- 
- 	mdbp->drWrCnt = kWriteSeqNum;
-@@ -1100,9 +1117,11 @@ InitCatalogRoot_HFSPlus(const hfsparams_t *dp, const HFSPlusVolumeHeader *header
- 	UInt16					nodeSize;
- 	SInt16					offset;
- 	UInt32					unicodeBytes;
-+#if !LINUX
- 	UInt8 canonicalName[256];
- 	CFStringRef cfstr;
- 	Boolean	cfOK;
-+#endif
- 	int index = 0;
- 
- 	nodeSize = dp->catalogNodeSize;
-@@ -1122,7 +1141,9 @@ InitCatalogRoot_HFSPlus(const hfsparams_t *dp, const HFSPlusVolumeHeader *header
- 	 * First record is always the root directory...
- 	 */
- 	ckp = (HFSPlusCatalogKey *)((UInt8 *)buffer + offset);
--	
-+#if LINUX
-+	ConvertUTF8toUnicode(dp->volumeName, sizeof(ckp->nodeName.unicode), ckp->nodeName.unicode, &ckp->nodeName.length);
-+#else
- 	/* Use CFString functions to get a HFSPlus Canonical name */
- 	cfstr = CFStringCreateWithCString(kCFAllocatorDefault, (char *)dp->volumeName, kCFStringEncodingUTF8);
- 	cfOK = _CFStringGetFileSystemRepresentation(cfstr, canonicalName, sizeof(canonicalName));
-@@ -1139,6 +1160,7 @@ InitCatalogRoot_HFSPlus(const hfsparams_t *dp, const HFSPlusVolumeHeader *header
- 		      dp->volumeName, kDefaultVolumeNameStr);
- 	}
- 	CFRelease(cfstr);
-+#endif
- 	ckp->nodeName.length = SWAP_BE16 (ckp->nodeName.length);
- 
- 	unicodeBytes = sizeof(UniChar) * SWAP_BE16 (ckp->nodeName.length);
-@@ -1821,15 +1843,15 @@ WriteBuffer(const DriveInfo *driveInfo, UInt64 startingSector, UInt32 byteCount,
- 	off_t sector;
- 
- 	if ((byteCount % driveInfo->sectorSize) != 0)
--		errx(1, "WriteBuffer: byte count %ld is not sector size multiple", byteCount);
-+		errx(1, "WriteBuffer: byte count %i is not sector size multiple", byteCount);
- 
- 	sector = driveInfo->sectorOffset + startingSector;
- 
- 	if (lseek(driveInfo->fd, sector * driveInfo->sectorSize, SEEK_SET) < 0)
--		err(1, "seek (sector %qd)", sector);
-+		err(1, "seek (sector %lld)", sector);
- 
- 	if (write(driveInfo->fd, buffer, byteCount) != byteCount)
--		err(1, "write (sector %qd, %ld bytes)", sector, byteCount);
-+		err(1, "write (sector %lld, %i bytes)", sector, byteCount);
- }
- 
- 
-@@ -1913,7 +1935,7 @@ DivideAndRoundUp(UInt32 numerator, UInt32 denominator)
- 	return quotient;
- }
- 
--
-+#if !LINUX
- #define __kCFUserEncodingFileName ("/.CFUserTextEncoding")
- 
- static UInt32
-@@ -1939,7 +1961,7 @@ GetDefaultEncoding()
-     }
-     return 0;
- }
--
-+#endif
- 
- static int
- ConvertUTF8toUnicode(const UInt8* source, UInt32 bufsize, UniChar* unibuf,
-@@ -2006,6 +2028,9 @@ ConvertUTF8toUnicode(const UInt8* source, UInt32 bufsize, UniChar* unibuf,
- static int
- getencodinghint(unsigned char *name)
- {
-+#if LINUX
-+	return(0);
-+#else
-         int mib[3];
-         size_t buflen = sizeof(int);
-         struct vfsconf vfc;
-@@ -2023,7 +2048,8 @@ getencodinghint(unsigned char *name)
- 	return (hint);
- error:
- 	hint = GetDefaultEncoding();
--	return (hint);
-+	return (0);
-+#endif
- }
- 
- 
-@@ -2034,12 +2060,14 @@ void GenerateVolumeUUID(VolumeUUID *newVolumeID) {
- 	unsigned char digest[20];
- 	time_t now;
- 	clock_t uptime;
--	int mib[2];
--	int sysdata;
--	char sysctlstring[128];
- 	size_t datalen;
- 	double sysloadavg[3];
-+#if !LINUX
-+	int sysdata;
-+	int mib[2];
-+	char sysctlstring[128];
- 	struct vmtotal sysvmtotal;
-+#endif
- 	
- 	do {
- 		/* Initialize the SHA-1 context for processing: */
-@@ -2052,52 +2080,58 @@ void GenerateVolumeUUID(VolumeUUID *newVolumeID) {
- 		SHA1_Update(&context, &uptime, sizeof(uptime));
- 		
- 		/* The kernel's boot time: */
-+#if !LINUX
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_BOOTTIME;
- 		datalen = sizeof(sysdata);
- 		sysctl(mib, 2, &sysdata, &datalen, NULL, 0);
- 		SHA1_Update(&context, &sysdata, datalen);
--		
-+#endif
- 		/* The system's host id: */
-+#if !LINUX
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_HOSTID;
- 		datalen = sizeof(sysdata);
- 		sysctl(mib, 2, &sysdata, &datalen, NULL, 0);
- 		SHA1_Update(&context, &sysdata, datalen);
--
-+#endif
- 		/* The system's host name: */
-+#if !LINUX
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_HOSTNAME;
- 		datalen = sizeof(sysctlstring);
- 		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
- 		SHA1_Update(&context, sysctlstring, datalen);
--
-+#endif
- 		/* The running kernel's OS release string: */
-+#if !LINUX
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_OSRELEASE;
- 		datalen = sizeof(sysctlstring);
- 		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
- 		SHA1_Update(&context, sysctlstring, datalen);
--
-+#endif
- 		/* The running kernel's version string: */
-+#if !LINUX
- 		mib[0] = CTL_KERN;
- 		mib[1] = KERN_VERSION;
- 		datalen = sizeof(sysctlstring);
- 		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
- 		SHA1_Update(&context, sysctlstring, datalen);
--
-+#endif
- 		/* The system's load average: */
- 		datalen = sizeof(sysloadavg);
- 		getloadavg(sysloadavg, 3);
- 		SHA1_Update(&context, &sysloadavg, datalen);
- 
- 		/* The system's VM statistics: */
-+#if !LINUX
- 		mib[0] = CTL_VM;
- 		mib[1] = VM_METER;
- 		datalen = sizeof(sysvmtotal);
- 		sysctl(mib, 2, &sysvmtotal, &datalen, NULL, 0);
- 		SHA1_Update(&context, &sysvmtotal, datalen);
--
-+#endif
- 		/* The current GMT (26 ASCII characters): */
- 		time(&now);
- 		strncpy(randomInputBuffer, asctime(gmtime(&now)), 26);	/* "Mon Mar 27 13:46:26 2000" */
-diff --git a/newfs_hfs.tproj/newfs_hfs.c b/newfs_hfs.tproj/newfs_hfs.c
-index c4176a9..bf2ed21 100644
---- a/newfs_hfs.tproj/newfs_hfs.c
-+++ b/newfs_hfs.tproj/newfs_hfs.c
-@@ -38,8 +38,13 @@
- #include <sys/mount.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-+#if LINUX
-+#include <time.h>
-+#endif
- 
-+#if !LINUX
- #include <IOKit/storage/IOMediaBSDClient.h>
-+#endif
- 
- #include <hfs/hfs_format.h>
- #include "newfs_hfs.h"
-@@ -73,7 +78,9 @@ static void usage __P((void));
- 
- char	*progname;
- char	gVolumeName[kHFSPlusMaxFileNameChars + 1] = {kDefaultVolumeNameStr};
-+#if !LINUX
- char	rawdevice[MAXPATHLEN];
-+#endif
- char	blkdevice[MAXPATHLEN];
- UInt32	gBlockSize = 0;
- UInt32	gNextCNID = kHFSFirstUserCatalogNodeID;
-@@ -158,8 +165,10 @@ main(argc, argv)
- 	extern int optind;
- 	int ch;
- 	int forceHFS;
-+#if !LINUX
- 	char *cp, *special;
- 	struct statfs *mp;
-+#endif
- 	int n;
- 	
- 	if ((progname = strrchr(*argv, '/')))
-@@ -260,16 +269,19 @@ main(argc, argv)
- 			usage();
- 		}
- 
--	argc -= optind;
--	argv += optind;
-+		argc -= optind;
-+		argv += optind;
- 
--	if (gPartitionSize != 0) {
--		if (argc != 0)
--			usage();
--	} else {
--		if (argc != 1)
--			usage();
-+		if (gPartitionSize != 0) {
-+			if (argc != 0)
-+				usage();
-+		} else {
-+			if (argc != 1)
-+				usage();
- 
-+#if LINUX
-+		(void) sprintf(blkdevice, "%s", argv[0]);
-+#else
- 		special = argv[0];
- 		cp = strrchr(special, '/');
- 		if (cp != 0)
-@@ -278,6 +290,7 @@ main(argc, argv)
- 			special++;
- 		(void) sprintf(rawdevice, "%sr%s", _PATH_DEV, special);
- 		(void) sprintf(blkdevice, "%s%s", _PATH_DEV, special);
-+#endif
- 	}
- 
- 	if (forceHFS && gJournaled) {
-@@ -301,6 +314,9 @@ main(argc, argv)
- 		/*
- 		 * Check if target device is aready mounted
- 		 */
-+#if LINUX
-+	// FIXME
-+#else
- 		n = getmntinfo(&mp, MNT_NOWAIT);
- 		if (n == 0)
- 			fatal("%s: getmntinfo: %s", blkdevice, strerror(errno));
-@@ -310,15 +326,20 @@ main(argc, argv)
- 				fatal("%s is mounted on %s", blkdevice, mp->f_mntonname);
- 			++mp;
- 		}
-+#endif
- 	}
- 
--	if (hfs_newfs(rawdevice, forceHFS, true) < 0) {
-+	if (hfs_newfs(blkdevice, forceHFS, true) < 0) {
-+#if LINUX
-+		err(1, NULL);
-+#else
- 		/* On ENXIO error use the block device (to get de-blocking) */
- 		if (errno == ENXIO) {
- 			if (hfs_newfs(blkdevice, forceHFS, false) < 0)
- 				err(1, NULL);
- 		} else
- 			err(1, NULL);
-+#endif
- 	}
- 
- 	exit(0);
-@@ -506,7 +527,9 @@ hfs_newfs(char *device, int forceHFS, int isRaw)
- 	int fso = 0;
- 	int retval = 0;
- 	hfsparams_t defaults = {0};
-+#if !LINUX
- 	u_int64_t maxSectorsPerIO;
-+#endif
- 
- 	if (gPartitionSize) {
- 			dip.sectorSize = kBytesPerSector;
-@@ -526,6 +549,34 @@ hfs_newfs(char *device, int forceHFS, int isRaw)
- 	
- 		if (fstat( fso, &stbuf) < 0)
- 			fatal("%s: %s", device, strerror(errno));
-+#if LINUX
-+		dip.sectorSize = 512;
-+		dip.sectorsPerIO = 256;
-+
-+#	ifndef	BLKGETSIZE
-+#	define	BLKGETSIZE		_IO(0x12,96)
-+#	endif
-+
-+#	ifndef	BLKGETSIZE64
-+#	define BLKGETSIZE64		_IOR(0x12,114,size_t)
-+#	endif
-+
-+		if (S_ISREG(stbuf.st_mode)) {
-+		        dip.totalSectors = stbuf.st_size / 512;
-+	        }
-+		else if (S_ISBLK(stbuf.st_mode)) {
-+	                unsigned long size;
-+	                u_int64_t size64;
-+			if (!ioctl(fso, BLKGETSIZE64, &size64))
-+				dip.totalSectors = size64 / 512;
-+			else if (!ioctl(fso, BLKGETSIZE, &size))
-+				dip.totalSectors = size;
-+			else
-+				fatal("%s: %s", device, strerror(errno));
-+		}
-+		else
-+			fatal("%s: is not a block device", device);
-+#else
- 	
- 		if (ioctl(fso, DKIOCGETBLOCKCOUNT, &dip.totalSectors) < 0)
- 			fatal("%s: %s", device, strerror(errno));
-@@ -537,11 +588,14 @@ hfs_newfs(char *device, int forceHFS, int isRaw)
- 			dip.sectorsPerIO = (128 * 1024) / dip.sectorSize;  /* use 128K as default */
- 		else
- 			dip.sectorsPerIO = MIN(maxSectorsPerIO, (1024 * 1024) / dip.sectorSize);
-+#endif
-+
- 		/*
- 		 * The make_hfs code currentlydoes 512 byte sized I/O.
- 		 * If the sector size is bigger than 512, start over
- 		 * using the block device (to get de-blocking).
- 		 */       
-+#if !LINUX
- 		if (dip.sectorSize != kBytesPerSector) {
- 			if (isRaw) {
- 				close(fso);
-@@ -556,7 +610,9 @@ hfs_newfs(char *device, int forceHFS, int isRaw)
- 				dip.sectorSize = kBytesPerSector;
- 			}
- 		}
-+#endif
- 	}
-+
- 	dip.sectorOffset = 0;
- 	time(&createtime);
- 
-diff --git a/newfs_hfs.tproj/newfs_hfs.h b/newfs_hfs.tproj/newfs_hfs.h
-index 968ff10..5680a34 100644
---- a/newfs_hfs.tproj/newfs_hfs.h
-+++ b/newfs_hfs.tproj/newfs_hfs.h
-@@ -19,8 +19,12 @@
-  * 
-  * @APPLE_LICENSE_HEADER_END@
-  */
-- 
-+
-+#if LINUX
-+#include "missing.h"
-+#else
- #include <CoreFoundation/CFBase.h>
-+#endif
- 
- /*
-  * Mac OS Finder flags
-@@ -122,33 +126,33 @@ enum {
- #define kDTDF_FileID	16
- #define kDTDF_Name	"Desktop DF"
- #define kDTDF_Chars	10
--#define kDTDF_Type	'DTFL'
--#define kDTDF_Creator	'DMGR'
-+#define kDTDF_Type	0x4454464C /* 'DTFL' */
-+#define kDTDF_Creator	0x444D4752 /* 'DMGR' */
- 
- #define kDTDB_FileID	17
- #define kDTDB_Name	"Desktop DB"
- #define kDTDB_Chars	10
--#define kDTDB_Type	'BTFL'
--#define kDTDB_Creator	'DMGR'
-+#define kDTDB_Type	0x4254464C /* 'BTFL' */
-+#define kDTDB_Creator	0x444D4752 /* 'DMGR' */
- #define kDTDB_Size	1024
- 
- #define kReadMe_FileID	18
- #define kReadMe_Name	"ReadMe"
- #define kReadMe_Chars	6
--#define kReadMe_Type	'ttro'
--#define kReadMe_Creator	'ttxt'
-+#define kReadMe_Type	0x7474726F /* 'ttro' */
-+#define kReadMe_Creator	0x74747974 /* 'ttxt' */
- 
- #define kFinder_FileID	19
- #define kFinder_Name	"Finder"
- #define kFinder_Chars	6
--#define kFinder_Type	'FNDR'
--#define kFinder_Creator	'MACS'
-+#define kFinder_Type	0x464E4452 /* 'FNDR' */
-+#define kFinder_Creator	0x4D414353 /* 'MACS' */
- 
- #define kSystem_FileID	20
- #define kSystem_Name	"System"
- #define kSystem_Chars	6
--#define kSystem_Type	'zsys'
--#define kSystem_Creator	'MACS'
-+#define kSystem_Type	0x7A737973 /* 'zsys' */
-+#define kSystem_Creator	0x4D414353 /* 'MACS' */
- 
- 
- 
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0003-Add-helper-include-files-absent-from-the-upstream-pa.patch b/trunk/package/feeds/packages/hfsprogs/patches/0003-Add-helper-include-files-absent-from-the-upstream-pa.patch
deleted file mode 100644
index 003f8440..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0003-Add-helper-include-files-absent-from-the-upstream-pa.patch
+++ /dev/null
@@ -1,1024 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Add helper include files absent from the upstream package
-
-Add some include files from an Apple system that contain the definition of
-the data structures used by the programs that manipulate the filesystems.
----
- include/bitstring.h        | 164 +++++++++++
- include/hfs/hfs_format.h   | 689 +++++++++++++++++++++++++++++++++++++++++++++
- include/hfs/hfs_mount.h    |  78 +++++
- include/sys/appleapiopts.h |  52 ++++
- 4 files changed, 983 insertions(+)
- create mode 100644 include/bitstring.h
- create mode 100644 include/hfs/hfs_format.h
- create mode 100644 include/hfs/hfs_mount.h
- create mode 100644 include/sys/appleapiopts.h
-
-diff --git a/include/bitstring.h b/include/bitstring.h
-new file mode 100644
-index 0000000..fbecfbe
---- /dev/null
-+++ b/include/bitstring.h
-@@ -0,0 +1,164 @@
-+/*
-+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ *
-+ * The contents of this file constitute Original Code as defined in and
-+ * are subject to the Apple Public Source License Version 1.1 (the
-+ * "License").  You may not use this file except in compliance with the
-+ * License.  Please obtain a copy of the License at
-+ * http://www.apple.com/publicsource and read it before using this file.
-+ *
-+ * This Original Code and all software distributed under the License are
-+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-+ * License for the specific language governing rights and limitations
-+ * under the License.
-+ *
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
-+/*
-+ * Copyright (c) 1989, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Paul Vixie.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	@(#)bitstring.h	8.1 (Berkeley) 7/19/93
-+ */
-+
-+#ifndef _BITSTRING_H_
-+#define	_BITSTRING_H_
-+
-+typedef	unsigned char bitstr_t;
-+
-+/* internal macros */
-+				/* byte of the bitstring bit is in */
-+#define	_bit_byte(bit) \
-+	((bit) >> 3)
-+
-+				/* mask for the bit within its byte */
-+#define	_bit_mask(bit) \
-+	(1 << ((bit)&0x7))
-+
-+/* external macros */
-+				/* bytes in a bitstring of nbits bits */
-+#define	bitstr_size(nbits) \
-+	((((nbits) - 1) >> 3) + 1)
-+
-+				/* allocate a bitstring */
-+#define	bit_alloc(nbits) \
-+	(bitstr_t *)calloc(1, \
-+	    (unsigned int)bitstr_size(nbits) * sizeof(bitstr_t))
-+
-+				/* allocate a bitstring on the stack */
-+#define	bit_decl(name, nbits) \
-+	(name)[bitstr_size(nbits)]
-+
-+				/* is bit N of bitstring name set? */
-+#define	bit_test(name, bit) \
-+	((name)[_bit_byte(bit)] & _bit_mask(bit))
-+
-+				/* set bit N of bitstring name */
-+#define	bit_set(name, bit) \
-+	(name)[_bit_byte(bit)] |= _bit_mask(bit)
-+
-+				/* clear bit N of bitstring name */
-+#define	bit_clear(name, bit) \
-+	(name)[_bit_byte(bit)] &= ~_bit_mask(bit)
-+
-+				/* clear bits start ... stop in bitstring */
-+#define	bit_nclear(name, start, stop) { \
-+	register bitstr_t *_name = name; \
-+	register int _start = start, _stop = stop; \
-+	register int _startbyte = _bit_byte(_start); \
-+	register int _stopbyte = _bit_byte(_stop); \
-+	if (_startbyte == _stopbyte) { \
-+		_name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \
-+				      (0xff << ((_stop&0x7) + 1))); \
-+	} else { \
-+		_name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \
-+		while (++_startbyte < _stopbyte) \
-+			_name[_startbyte] = 0; \
-+		_name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
-+	} \
-+}
-+
-+				/* set bits start ... stop in bitstring */
-+#define	bit_nset(name, start, stop) { \
-+	register bitstr_t *_name = name; \
-+	register int _start = start, _stop = stop; \
-+	register int _startbyte = _bit_byte(_start); \
-+	register int _stopbyte = _bit_byte(_stop); \
-+	if (_startbyte == _stopbyte) { \
-+		_name[_startbyte] |= ((0xff << (_start&0x7)) & \
-+				    (0xff >> (7 - (_stop&0x7)))); \
-+	} else { \
-+		_name[_startbyte] |= 0xff << ((_start)&0x7); \
-+		while (++_startbyte < _stopbyte) \
-+	    		_name[_startbyte] = 0xff; \
-+		_name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
-+	} \
-+}
-+
-+				/* find first bit clear in name */
-+#define	bit_ffc(name, nbits, value) { \
-+	register bitstr_t *_name = name; \
-+	register int _byte, _nbits = nbits; \
-+	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
-+	for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-+		if (_name[_byte] != 0xff) { \
-+			_value = _byte << 3; \
-+			for (_stopbyte = _name[_byte]; (_stopbyte&0x1); \
-+			    ++_value, _stopbyte >>= 1); \
-+			break; \
-+		} \
-+	*(value) = _value; \
-+}
-+
-+				/* find first bit set in name */
-+#define	bit_ffs(name, nbits, value) { \
-+	register bitstr_t *_name = name; \
-+	register int _byte, _nbits = nbits; \
-+	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
-+	for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-+		if (_name[_byte]) { \
-+			_value = _byte << 3; \
-+			for (_stopbyte = _name[_byte]; !(_stopbyte&0x1); \
-+			    ++_value, _stopbyte >>= 1); \
-+			break; \
-+		} \
-+	*(value) = _value; \
-+}
-+
-+#endif /* !_BITSTRING_H_ */
-diff --git a/include/hfs/hfs_format.h b/include/hfs/hfs_format.h
-new file mode 100644
-index 0000000..d820329
---- /dev/null
-+++ b/include/hfs/hfs_format.h
-@@ -0,0 +1,689 @@
-+/*
-+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ *
-+ * The contents of this file constitute Original Code as defined in and
-+ * are subject to the Apple Public Source License Version 1.1 (the
-+ * "License").  You may not use this file except in compliance with the
-+ * License.  Please obtain a copy of the License at
-+ * http://www.apple.com/publicsource and read it before using this file.
-+ *
-+ * This Original Code and all software distributed under the License are
-+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-+ * License for the specific language governing rights and limitations
-+ * under the License.
-+ *
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
-+#ifndef __HFS_FORMAT__
-+#define __HFS_FORMAT__
-+
-+#include "missing.h"
-+
-+#include <sys/appleapiopts.h>
-+
-+/*
-+ * hfs_format.c
-+ *
-+ * This file describes the on-disk format for HFS and HFS Plus volumes.
-+ * The HFS Plus volume format is desciibed in detail in Apple Technote 1150.
-+ *
-+ * http://developer.apple.com/technotes/tn/tn1150.html
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* some on-disk hfs structures have 68K alignment (misaligned) */
-+
-+#define PACKED_S	__attribute__((packed))
-+
-+/* Signatures used to differentiate between HFS and HFS Plus volumes */
-+enum {
-+	kHFSSigWord		= 0x4244,	/* 'BD' in ASCII */
-+	kHFSPlusSigWord		= 0x482B,	/* 'H+' in ASCII */
-+	kHFSXSigWord		= 0x4858,	/* 'HX' in ASCII */
-+
-+	kHFSPlusVersion		= 0x0004,	/* 'H+' volumes are version 4 only */
-+	kHFSXVersion		= 0x0005,	/* 'HX' volumes start with version 5 */
-+
-+	kHFSPlusMountVersion	= 0x31302E30,	/* '10.0' for Mac OS X */
-+	kHFSJMountVersion	= 0x4846534a,	/* 'HFSJ' for journaled HFS+ on OS X */
-+	kFSKMountVersion	= 0x46534b21	/* 'FSK!' for failed journal replay */
-+}PACKED_S;
-+
-+
-+#if 1
-+/*
-+ * Mac OS X has a special directory for linked and unlinked files (HFS Plus only).
-+ * This directory and its contents are never exported from the filesystem under
-+ * Mac OS X.
-+ *
-+ * To make this folder name sort last,  it has embedded null prefix.
-+ * (0xC0, 0x80 in UTF-8)
-+ */
-+#define HFSPLUSMETADATAFOLDER  "\xC0\x80\xC0\x80\xC0\x80\xC0\x80HFS+ Private Data"
-+
-+/*
-+ * Files in the HFS Private Data folder have one of the following prefixes
-+ * followed by a decimal number (no leading zeros).  For indirect nodes this
-+ * number is a 32 bit random number.  For unlinked (deleted) files that are
-+ * still open, the number is the file ID for that file.
-+ *
-+ * e.g.  iNode7182000 and temp3296
-+ */
-+#define HFS_INODE_PREFIX	"iNode"
-+#define HFS_DELETE_PREFIX	"temp"
-+
-+#endif /* __APPLE_API_PRIVATE */
-+
-+/*
-+ * Indirect link files (hard links) have the following type/creator.
-+ */
-+enum {
-+	kHardLinkFileType = 0x686C6E6B,  /* 'hlnk' */
-+	kHFSPlusCreator   = 0x6866732B   /* 'hfs+' */
-+}PACKED_S;
-+
-+
-+#ifndef _HFSUNISTR255_DEFINED_
-+#define _HFSUNISTR255_DEFINED_
-+/* Unicode strings are used for HFS Plus file and folder names */
-+struct HFSUniStr255 {
-+	u_int16_t	length;		/* number of unicode characters */
-+	u_int16_t	unicode[255];	/* unicode characters */
-+} PACKED_S;
-+typedef struct HFSUniStr255 HFSUniStr255;
-+typedef const HFSUniStr255 *ConstHFSUniStr255Param;
-+#endif /* _HFSUNISTR255_DEFINED_ */
-+
-+enum {
-+	kHFSMaxVolumeNameChars		= 27,
-+	kHFSMaxFileNameChars		= 31,
-+	kHFSPlusMaxFileNameChars	= 255
-+}PACKED_S;
-+
-+
-+/* Extent overflow file data structures */
-+
-+/* HFS Extent key */
-+struct HFSExtentKey {
-+	u_int8_t 	keyLength;	/* length of key, excluding this field */
-+	u_int8_t 	forkType;	/* 0 = data fork, FF = resource fork */
-+	u_int32_t 	fileID;		/* file ID */
-+	u_int16_t 	startBlock;	/* first file allocation block number in this extent */
-+}PACKED_S;
-+typedef struct HFSExtentKey HFSExtentKey;
-+
-+/* HFS Plus Extent key */
-+struct HFSPlusExtentKey {
-+	u_int16_t 	keyLength;		/* length of key, excluding this field */
-+	u_int8_t 	forkType;		/* 0 = data fork, FF = resource fork */
-+	u_int8_t 	pad;			/* make the other fields align on 32-bit boundary */
-+	u_int32_t 	fileID;			/* file ID */
-+	u_int32_t 	startBlock;		/* first file allocation block number in this extent */
-+}PACKED_S;
-+typedef struct HFSPlusExtentKey HFSPlusExtentKey;
-+
-+/* Number of extent descriptors per extent record */
-+enum {
-+	kHFSExtentDensity	= 3,
-+	kHFSPlusExtentDensity	= 8
-+}PACKED_S;
-+
-+/* HFS extent descriptor */
-+struct HFSExtentDescriptor {
-+	u_int16_t 	startBlock;		/* first allocation block */
-+	u_int16_t 	blockCount;		/* number of allocation blocks */
-+}PACKED_S;
-+typedef struct HFSExtentDescriptor HFSExtentDescriptor;
-+
-+/* HFS Plus extent descriptor */
-+struct HFSPlusExtentDescriptor {
-+	u_int32_t 	startBlock;		/* first allocation block */
-+	u_int32_t 	blockCount;		/* number of allocation blocks */
-+}PACKED_S;
-+typedef struct HFSPlusExtentDescriptor HFSPlusExtentDescriptor;
-+
-+/* HFS extent record */
-+typedef HFSExtentDescriptor HFSExtentRecord[3];
-+
-+/* HFS Plus extent record */
-+typedef HFSPlusExtentDescriptor HFSPlusExtentRecord[8];
-+
-+
-+/* Finder information */
-+struct FndrFileInfo {
-+	u_int32_t 	fdType;		/* file type */
-+	u_int32_t 	fdCreator;	/* file creator */
-+	u_int16_t 	fdFlags;	/* Finder flags */
-+	struct {
-+	    int16_t	v;		/* file's location */
-+	    int16_t	h;
-+	} PACKED_S fdLocation;
-+	int16_t 	opaque;
-+}PACKED_S;
-+typedef struct FndrFileInfo FndrFileInfo;
-+
-+struct FndrDirInfo {
-+	struct {			/* folder's window rectangle */
-+	    int16_t	top;
-+	    int16_t	left;
-+	    int16_t	bottom;
-+	    int16_t	right;
-+	}PACKED_S frRect;
-+	unsigned short 	frFlags;	/* Finder flags */
-+	struct {
-+	    u_int16_t	v;		/* folder's location */
-+	    u_int16_t	h;
-+	}PACKED_S frLocation;
-+	int16_t 	opaque;
-+}PACKED_S;
-+typedef struct FndrDirInfo FndrDirInfo;
-+
-+struct FndrOpaqueInfo {
-+	int8_t opaque[16];
-+}PACKED_S;
-+typedef struct FndrOpaqueInfo FndrOpaqueInfo;
-+
-+
-+/* HFS Plus Fork data info - 80 bytes */
-+struct HFSPlusForkData {
-+	u_int64_t 		logicalSize;	/* fork's logical size in bytes */
-+	u_int32_t 		clumpSize;	/* fork's clump size in bytes */
-+	u_int32_t 		totalBlocks;	/* total blocks used by this fork */
-+	HFSPlusExtentRecord 	extents;	/* initial set of extents */
-+}PACKED_S;
-+typedef struct HFSPlusForkData HFSPlusForkData;
-+
-+
-+/* Mac OS X has 16 bytes worth of "BSD" info.
-+ *
-+ * Note:  Mac OS 9 implementations and applications
-+ * should preserve, but not change, this information.
-+ */
-+struct HFSPlusBSDInfo {
-+	u_int32_t 	ownerID;	/* user or group ID of file/folder owner */
-+	u_int32_t 	groupID;	/* additional user of group ID */
-+	u_int8_t 	adminFlags;	/* super-user changeable flags */
-+	u_int8_t 	ownerFlags;	/* owner changeable flags */
-+	u_int16_t 	fileMode;	/* file type and permission bits */
-+	union {
-+	    u_int32_t	iNodeNum;	/* indirect node number (hard links only) */
-+	    u_int32_t	linkCount;	/* links that refer to this indirect node */
-+	    u_int32_t	rawDevice;	/* special file device (FBLK and FCHR only) */
-+	}PACKED_S special;
-+}PACKED_S;
-+typedef struct HFSPlusBSDInfo HFSPlusBSDInfo;
-+
-+
-+/* Catalog file data structures */
-+
-+enum {
-+	kHFSRootParentID		= 1,	/* Parent ID of the root folder */
-+	kHFSRootFolderID		= 2,	/* Folder ID of the root folder */
-+	kHFSExtentsFileID		= 3,	/* File ID of the extents file */
-+	kHFSCatalogFileID		= 4,	/* File ID of the catalog file */
-+	kHFSBadBlockFileID		= 5,	/* File ID of the bad allocation block file */
-+	kHFSAllocationFileID		= 6,	/* File ID of the allocation file (HFS Plus only) */
-+	kHFSStartupFileID		= 7,	/* File ID of the startup file (HFS Plus only) */
-+	kHFSAttributesFileID		= 8,	/* File ID of the attribute file (HFS Plus only) */
-+	kHFSRepairCatalogFileID		= 14,	/* Used when rebuilding Catalog B-tree */
-+	kHFSBogusExtentFileID		= 15,	/* Used for exchanging extents in extents file */
-+	kHFSFirstUserCatalogNodeID	= 16
-+}PACKED_S;
-+
-+/* HFS catalog key */
-+struct HFSCatalogKey {
-+	u_int8_t 	keyLength;		/* key length (in bytes) */
-+	u_int8_t 	reserved;		/* reserved (set to zero) */
-+	u_int32_t 	parentID;		/* parent folder ID */
-+	u_int8_t 	nodeName[kHFSMaxFileNameChars + 1]; /* catalog node name */
-+}PACKED_S;
-+typedef struct HFSCatalogKey HFSCatalogKey;
-+
-+/* HFS Plus catalog key */
-+struct HFSPlusCatalogKey {
-+	u_int16_t 		keyLength;	/* key length (in bytes) */
-+	u_int32_t 		parentID;	/* parent folder ID */
-+	HFSUniStr255 		nodeName;	/* catalog node name */
-+}PACKED_S;
-+typedef struct HFSPlusCatalogKey HFSPlusCatalogKey;
-+
-+/* Catalog record types */
-+enum {
-+	/* HFS Catalog Records */
-+	kHFSFolderRecord		= 0x0100,	/* Folder record */
-+	kHFSFileRecord			= 0x0200,	/* File record */
-+	kHFSFolderThreadRecord		= 0x0300,	/* Folder thread record */
-+	kHFSFileThreadRecord		= 0x0400,	/* File thread record */
-+
-+	/* HFS Plus Catalog Records */
-+	kHFSPlusFolderRecord		= 1,		/* Folder record */
-+	kHFSPlusFileRecord		= 2,		/* File record */
-+	kHFSPlusFolderThreadRecord	= 3,		/* Folder thread record */
-+	kHFSPlusFileThreadRecord	= 4		/* File thread record */
-+}PACKED_S;
-+
-+
-+/* Catalog file record flags */
-+enum {
-+	kHFSFileLockedBit	= 0x0000,	/* file is locked and cannot be written to */
-+	kHFSFileLockedMask	= 0x0001,
-+
-+	kHFSThreadExistsBit	= 0x0001,	/* a file thread record exists for this file */
-+	kHFSThreadExistsMask	= 0x0002,
-+
-+	kHFSHasAttributesBit	= 0x0002,	/* object has extended attributes */
-+	kHFSHasAttributesMask	= 0x0004,
-+
-+	kHFSHasSecurityBit	= 0x0003,	/* object has security data (ACLs) */
-+	kHFSHasSecurityMask	= 0x0008
-+}PACKED_S;
-+
-+
-+/* HFS catalog folder record - 70 bytes */
-+struct HFSCatalogFolder {
-+	int16_t 		recordType;		/* == kHFSFolderRecord */
-+	u_int16_t 		flags;			/* folder flags */
-+	u_int16_t 		valence;		/* folder valence */
-+	u_int32_t		folderID;		/* folder ID */
-+	u_int32_t 		createDate;		/* date and time of creation */
-+	u_int32_t 		modifyDate;		/* date and time of last modification */
-+	u_int32_t 		backupDate;		/* date and time of last backup */
-+	FndrDirInfo 		userInfo;		/* Finder information */
-+	FndrOpaqueInfo		finderInfo;		/* additional Finder information */
-+	u_int32_t 		reserved[4];		/* reserved - initialized as zero */
-+}PACKED_S;
-+typedef struct HFSCatalogFolder HFSCatalogFolder;
-+
-+/* HFS Plus catalog folder record - 88 bytes */
-+struct HFSPlusCatalogFolder {
-+	int16_t 		recordType;		/* == kHFSPlusFolderRecord */
-+	u_int16_t 		flags;			/* file flags */
-+	u_int32_t 		valence;		/* folder's valence (limited to 2^16 in Mac OS) */
-+	u_int32_t 		folderID;		/* folder ID */
-+	u_int32_t 		createDate;		/* date and time of creation */
-+	u_int32_t 		contentModDate;		/* date and time of last content modification */
-+	u_int32_t 		attributeModDate;	/* date and time of last attribute modification */
-+	u_int32_t 		accessDate;		/* date and time of last access (MacOS X only) */
-+	u_int32_t 		backupDate;		/* date and time of last backup */
-+	HFSPlusBSDInfo		bsdInfo;		/* permissions (for MacOS X) */
-+	FndrDirInfo 		userInfo;		/* Finder information */
-+	FndrOpaqueInfo	 	finderInfo;		/* additional Finder information */
-+	u_int32_t 		textEncoding;		/* hint for name conversions */
-+	u_int32_t 		attrBlocks;		/* cached count of attribute data blocks */
-+}PACKED_S;
-+typedef struct HFSPlusCatalogFolder HFSPlusCatalogFolder;
-+
-+/* HFS catalog file record - 102 bytes */
-+struct HFSCatalogFile {
-+	int16_t 		recordType;		/* == kHFSFileRecord */
-+	u_int8_t 		flags;			/* file flags */
-+	int8_t 			fileType;		/* file type (unused ?) */
-+	FndrFileInfo 		userInfo;		/* Finder information */
-+	u_int32_t 		fileID;			/* file ID */
-+	u_int16_t 		dataStartBlock;		/* not used - set to zero */
-+	int32_t 		dataLogicalSize;	/* logical EOF of data fork */
-+	int32_t 		dataPhysicalSize;	/* physical EOF of data fork */
-+	u_int16_t		rsrcStartBlock;		/* not used - set to zero */
-+	int32_t			rsrcLogicalSize;	/* logical EOF of resource fork */
-+	int32_t			rsrcPhysicalSize;	/* physical EOF of resource fork */
-+	u_int32_t		createDate;		/* date and time of creation */
-+	u_int32_t		modifyDate;		/* date and time of last modification */
-+	u_int32_t		backupDate;		/* date and time of last backup */
-+	FndrOpaqueInfo		finderInfo;		/* additional Finder information */
-+	u_int16_t		clumpSize;		/* file clump size (not used) */
-+	HFSExtentRecord		dataExtents;		/* first data fork extent record */
-+	HFSExtentRecord		rsrcExtents;		/* first resource fork extent record */
-+	u_int32_t		reserved;		/* reserved - initialized as zero */
-+}PACKED_S;
-+typedef struct HFSCatalogFile HFSCatalogFile;
-+
-+/* HFS Plus catalog file record - 248 bytes */
-+struct HFSPlusCatalogFile {
-+	int16_t 		recordType;		/* == kHFSPlusFileRecord */
-+	u_int16_t 		flags;			/* file flags */
-+	u_int32_t 		reserved1;		/* reserved - initialized as zero */
-+	u_int32_t 		fileID;			/* file ID */
-+	u_int32_t 		createDate;		/* date and time of creation */
-+	u_int32_t 		contentModDate;		/* date and time of last content modification */
-+	u_int32_t 		attributeModDate;	/* date and time of last attribute modification */
-+	u_int32_t 		accessDate;		/* date and time of last access (MacOS X only) */
-+	u_int32_t 		backupDate;		/* date and time of last backup */
-+	HFSPlusBSDInfo 		bsdInfo;		/* permissions (for MacOS X) */
-+	FndrFileInfo 		userInfo;		/* Finder information */
-+	FndrOpaqueInfo	 	finderInfo;		/* additional Finder information */
-+	u_int32_t 		textEncoding;		/* hint for name conversions */
-+	u_int32_t 		attrBlocks;		/* cached count of attribute data blocks */
-+
-+	/* Note: these start on double long (64 bit) boundry */
-+	HFSPlusForkData 	dataFork;		/* size and block data for data fork */
-+	HFSPlusForkData 	resourceFork;		/* size and block data for resource fork */
-+}PACKED_S;
-+typedef struct HFSPlusCatalogFile HFSPlusCatalogFile;
-+
-+/* HFS catalog thread record - 46 bytes */
-+struct HFSCatalogThread {
-+	int16_t 	recordType;		/* == kHFSFolderThreadRecord or kHFSFileThreadRecord */
-+	int32_t 	reserved[2];		/* reserved - initialized as zero */
-+	u_int32_t 	parentID;		/* parent ID for this catalog node */
-+	u_int8_t 	nodeName[kHFSMaxFileNameChars + 1]; /* name of this catalog node */
-+}PACKED_S;
-+typedef struct HFSCatalogThread HFSCatalogThread;
-+
-+/* HFS Plus catalog thread record -- 264 bytes */
-+struct HFSPlusCatalogThread {
-+	int16_t 	recordType;		/* == kHFSPlusFolderThreadRecord or kHFSPlusFileThreadRecord */
-+	int16_t 	reserved;		/* reserved - initialized as zero */
-+	u_int32_t 	parentID;		/* parent ID for this catalog node */
-+	HFSUniStr255 	nodeName;		/* name of this catalog node (variable length) */
-+}PACKED_S;
-+typedef struct HFSPlusCatalogThread HFSPlusCatalogThread;
-+
-+#ifdef __APPLE_API_UNSTABLE
-+/*
-+  	These are the types of records in the attribute B-tree.  The values were
-+  	chosen so that they wouldn't conflict with the catalog record types.
-+*/
-+enum {
-+	kHFSPlusAttrInlineData	= 0x10,    /* if size <  kAttrOverflowSize */
-+	kHFSPlusAttrForkData	= 0x20,    /* if size >= kAttrOverflowSize */
-+	kHFSPlusAttrExtents	= 0x30     /* overflow extents for large attributes */
-+}PACKED_S;
-+
-+
-+/*
-+  	HFSPlusAttrForkData
-+  	For larger attributes, whose value is stored in allocation blocks.
-+  	If the attribute has more than 8 extents, there will be additonal
-+  	records (of type HFSPlusAttrExtents) for this attribute.
-+*/
-+struct HFSPlusAttrForkData {
-+	u_int32_t 	recordType;		/* == kHFSPlusAttrForkData*/
-+	u_int32_t 	reserved;
-+	HFSPlusForkData theFork;		/* size and first extents of value*/
-+}PACKED_S;
-+typedef struct HFSPlusAttrForkData HFSPlusAttrForkData;
-+
-+/*
-+  	HFSPlusAttrExtents
-+  	This record contains information about overflow extents for large,
-+  	fragmented attributes.
-+*/
-+struct HFSPlusAttrExtents {
-+	u_int32_t 		recordType;	/* == kHFSPlusAttrExtents*/
-+	u_int32_t 		reserved;
-+	HFSPlusExtentRecord	extents;	/* additional extents*/
-+}PACKED_S;
-+typedef struct HFSPlusAttrExtents HFSPlusAttrExtents;
-+
-+/*
-+ * Atrributes B-tree Data Record
-+ *
-+ * For small attributes, whose entire value is stored
-+ * within a single B-tree record.
-+ */
-+struct HFSPlusAttrData {
-+	u_int32_t    recordType;   /* == kHFSPlusAttrInlineData */
-+	u_int32_t    reserved[2];
-+	u_int32_t    attrSize;     /* size of attribute data in bytes */
-+	u_int8_t     attrData[2];  /* variable length */
-+}PACKED_S;
-+typedef struct HFSPlusAttrData HFSPlusAttrData;
-+
-+
-+/* HFSPlusAttrInlineData is obsolete use HFSPlusAttrData instead */
-+struct HFSPlusAttrInlineData {
-+	u_int32_t 	recordType;
-+	u_int32_t 	reserved;
-+	u_int32_t 	logicalSize;
-+	u_int8_t 	userData[2];
-+}PACKED_S;
-+typedef struct HFSPlusAttrInlineData HFSPlusAttrInlineData;
-+
-+
-+/*	A generic Attribute Record*/
-+union HFSPlusAttrRecord {
-+	u_int32_t 		recordType;
-+	HFSPlusAttrInlineData 	inlineData;   /* NOT USED */
-+	HFSPlusAttrData 	attrData;
-+	HFSPlusAttrForkData 	forkData;
-+	HFSPlusAttrExtents 	overflowExtents;
-+}PACKED_S;
-+typedef union HFSPlusAttrRecord HFSPlusAttrRecord;
-+
-+/* Attribute key */
-+enum { kHFSMaxAttrNameLen = 127 };
-+struct HFSPlusAttrKey {
-+	u_int16_t     keyLength;       /* key length (in bytes) */
-+	u_int16_t     pad;	       /* set to zero */
-+	u_int32_t     fileID;          /* file associated with attribute */
-+	u_int32_t     startBlock;      /* first attribue allocation block number for extents */
-+	u_int16_t     attrNameLen;     /* number of unicode characters */
-+	u_int16_t     attrName[127];   /* attribute name (Unicode) */
-+}PACKED_S;
-+typedef struct HFSPlusAttrKey HFSPlusAttrKey;
-+
-+#define kHFSPlusAttrKeyMaximumLength   (sizeof(HFSPlusAttrKey) - sizeof(u_int16_t))
-+#define kHFSPlusAttrKeyMinimumLength   (kHFSPlusAttrKeyMaximumLength - (127 * sizeof(u_int16_t)))
-+
-+#endif /* __APPLE_API_UNSTABLE */
-+
-+
-+/* Key and node lengths */
-+enum {
-+	kHFSPlusExtentKeyMaximumLength = sizeof(HFSPlusExtentKey) - sizeof(u_int16_t),
-+	kHFSExtentKeyMaximumLength	= sizeof(HFSExtentKey) - sizeof(u_int8_t),
-+	kHFSPlusCatalogKeyMaximumLength = sizeof(HFSPlusCatalogKey) - sizeof(u_int16_t),
-+	kHFSPlusCatalogKeyMinimumLength = kHFSPlusCatalogKeyMaximumLength - sizeof(HFSUniStr255) + sizeof(u_int16_t),
-+	kHFSCatalogKeyMaximumLength	= sizeof(HFSCatalogKey) - sizeof(u_int8_t),
-+	kHFSCatalogKeyMinimumLength	= kHFSCatalogKeyMaximumLength - (kHFSMaxFileNameChars + 1) + sizeof(u_int8_t),
-+	kHFSPlusCatalogMinNodeSize	= 4096,
-+	kHFSPlusExtentMinNodeSize	= 512,
-+	kHFSPlusAttrMinNodeSize		= 4096
-+}PACKED_S;
-+
-+/* HFS and HFS Plus volume attribute bits */
-+enum {
-+							/* Bits 0-6 are reserved (always cleared by MountVol call) */
-+	kHFSVolumeHardwareLockBit	= 7,		/* volume is locked by hardware */
-+	kHFSVolumeUnmountedBit		= 8,		/* volume was successfully unmounted */
-+	kHFSVolumeSparedBlocksBit	= 9,		/* volume has bad blocks spared */
-+	kHFSVolumeNoCacheRequiredBit = 10,		/* don't cache volume blocks (i.e. RAM or ROM disk) */
-+	kHFSBootVolumeInconsistentBit = 11,		/* boot volume is inconsistent (System 7.6 and later) */
-+	kHFSCatalogNodeIDsReusedBit = 12,
-+	kHFSVolumeJournaledBit = 13,			/* this volume has a journal on it */
-+	kHFSVolumeInconsistentBit = 14,			/* serious inconsistencies detected at runtime */
-+	kHFSVolumeSoftwareLockBit	= 15,		/* volume is locked by software */
-+
-+	kHFSVolumeHardwareLockMask	= 1 << kHFSVolumeHardwareLockBit,
-+	kHFSVolumeUnmountedMask		= 1 << kHFSVolumeUnmountedBit,
-+	kHFSVolumeSparedBlocksMask	= 1 << kHFSVolumeSparedBlocksBit,
-+	kHFSVolumeNoCacheRequiredMask = 1 << kHFSVolumeNoCacheRequiredBit,
-+	kHFSBootVolumeInconsistentMask = 1 << kHFSBootVolumeInconsistentBit,
-+	kHFSCatalogNodeIDsReusedMask = 1 << kHFSCatalogNodeIDsReusedBit,
-+	kHFSVolumeJournaledMask	= 1 << kHFSVolumeJournaledBit,
-+	kHFSVolumeInconsistentMask = 1 << kHFSVolumeInconsistentBit,
-+	kHFSVolumeSoftwareLockMask	= 1 << kHFSVolumeSoftwareLockBit,
-+	kHFSMDBAttributesMask		= 0x8380
-+}PACKED_S;
-+
-+
-+/* HFS Master Directory Block - 162 bytes */
-+/* Stored at sector #2 (3rd sector) and second-to-last sector. */
-+struct HFSMasterDirectoryBlock {
-+	u_int16_t 		drSigWord;	/* == kHFSSigWord */
-+	u_int32_t 		drCrDate;	/* date and time of volume creation */
-+	u_int32_t 		drLsMod;	/* date and time of last modification */
-+	u_int16_t 		drAtrb;		/* volume attributes */
-+	u_int16_t 		drNmFls;	/* number of files in root folder */
-+	u_int16_t 		drVBMSt;	/* first block of volume bitmap */
-+	u_int16_t 		drAllocPtr;	/* start of next allocation search */
-+	u_int16_t 		drNmAlBlks;	/* number of allocation blocks in volume */
-+	u_int32_t 		drAlBlkSiz;	/* size (in bytes) of allocation blocks */
-+	u_int32_t 		drClpSiz;	/* default clump size */
-+	u_int16_t 		drAlBlSt;	/* first allocation block in volume */
-+	u_int32_t 		drNxtCNID;	/* next unused catalog node ID */
-+	u_int16_t 		drFreeBks;	/* number of unused allocation blocks */
-+	u_int8_t 		drVN[kHFSMaxVolumeNameChars + 1];  /* volume name */
-+	u_int32_t 		drVolBkUp;	/* date and time of last backup */
-+	u_int16_t 		drVSeqNum;	/* volume backup sequence number */
-+	u_int32_t 		drWrCnt;	/* volume write count */
-+	u_int32_t 		drXTClpSiz;	/* clump size for extents overflow file */
-+	u_int32_t 		drCTClpSiz;	/* clump size for catalog file */
-+	u_int16_t 		drNmRtDirs;	/* number of directories in root folder */
-+	u_int32_t 		drFilCnt;	/* number of files in volume */
-+	u_int32_t 		drDirCnt;	/* number of directories in volume */
-+	u_int32_t 		drFndrInfo[8];	/* information used by the Finder */
-+	u_int16_t 		drEmbedSigWord;	/* embedded volume signature (formerly drVCSize) */
-+	HFSExtentDescriptor	drEmbedExtent;	/* embedded volume location and size (formerly drVBMCSize and drCtlCSize) */
-+	u_int32_t		drXTFlSize;	/* size of extents overflow file */
-+	HFSExtentRecord		drXTExtRec;	/* extent record for extents overflow file */
-+	u_int32_t 		drCTFlSize;	/* size of catalog file */
-+	HFSExtentRecord 	drCTExtRec;	/* extent record for catalog file */
-+}PACKED_S;
-+typedef struct HFSMasterDirectoryBlock	HFSMasterDirectoryBlock;
-+
-+
-+#ifdef __APPLE_API_UNSTABLE
-+#define SET_HFS_TEXT_ENCODING(hint)  \
-+	(0x656e6300 | ((hint) & 0xff))
-+#define GET_HFS_TEXT_ENCODING(hint)  \
-+	(((hint) & 0xffffff00) == 0x656e6300 ? (hint) & 0x000000ff : 0xffffffffU)
-+#endif /* __APPLE_API_UNSTABLE */
-+
-+
-+/* HFS Plus Volume Header - 512 bytes */
-+/* Stored at sector #2 (3rd sector) and second-to-last sector. */
-+struct HFSPlusVolumeHeader {
-+	u_int16_t 	signature;		/* == kHFSPlusSigWord */
-+	u_int16_t 	version;		/* == kHFSPlusVersion */
-+	u_int32_t 	attributes;		/* volume attributes */
-+	u_int32_t 	lastMountedVersion;	/* implementation version which last mounted volume */
-+	u_int32_t 	journalInfoBlock;	/* block addr of journal info (if volume is journaled, zero otherwise) */
-+
-+	u_int32_t 	createDate;		/* date and time of volume creation */
-+	u_int32_t 	modifyDate;		/* date and time of last modification */
-+	u_int32_t 	backupDate;		/* date and time of last backup */
-+	u_int32_t 	checkedDate;		/* date and time of last disk check */
-+
-+	u_int32_t 	fileCount;		/* number of files in volume */
-+	u_int32_t 	folderCount;		/* number of directories in volume */
-+
-+	u_int32_t 	blockSize;		/* size (in bytes) of allocation blocks */
-+	u_int32_t 	totalBlocks;		/* number of allocation blocks in volume (includes this header and VBM*/
-+	u_int32_t 	freeBlocks;		/* number of unused allocation blocks */
-+
-+	u_int32_t 	nextAllocation;		/* start of next allocation search */
-+	u_int32_t 	rsrcClumpSize;		/* default resource fork clump size */
-+	u_int32_t 	dataClumpSize;		/* default data fork clump size */
-+	u_int32_t 	nextCatalogID;		/* next unused catalog node ID */
-+
-+	u_int32_t 	writeCount;		/* volume write count */
-+	u_int64_t 	encodingsBitmap;	/* which encodings have been use  on this volume */
-+
-+	u_int8_t 	finderInfo[32];		/* information used by the Finder */
-+
-+	HFSPlusForkData	 allocationFile;	/* allocation bitmap file */
-+	HFSPlusForkData  extentsFile;		/* extents B-tree file */
-+	HFSPlusForkData  catalogFile;		/* catalog B-tree file */
-+	HFSPlusForkData  attributesFile;	/* extended attributes B-tree file */
-+	HFSPlusForkData	 startupFile;		/* boot file (secondary loader) */
-+}PACKED_S;
-+typedef struct HFSPlusVolumeHeader HFSPlusVolumeHeader;
-+
-+
-+/* B-tree structures */
-+
-+enum BTreeKeyLimits{
-+	kMaxKeyLength	= 520
-+}PACKED_S;
-+
-+union BTreeKey{
-+	u_int8_t	length8;
-+	u_int16_t	length16;
-+	u_int8_t	rawData [kMaxKeyLength+2];
-+}PACKED_S;
-+typedef union BTreeKey BTreeKey;
-+
-+/* BTNodeDescriptor -- Every B-tree node starts with these fields. */
-+struct BTNodeDescriptor {
-+	u_int32_t	fLink;			/* next node at this level*/
-+	u_int32_t 	bLink;			/* previous node at this level*/
-+	int8_t 		kind;			/* kind of node (leaf, index, header, map)*/
-+	u_int8_t 	height;			/* zero for header, map; child is one more than parent*/
-+	u_int16_t 	numRecords;		/* number of records in this node*/
-+	u_int16_t 	reserved;		/* reserved - initialized as zero */
-+}PACKED_S;
-+typedef struct BTNodeDescriptor BTNodeDescriptor;
-+
-+/* Constants for BTNodeDescriptor kind */
-+enum {
-+	kBTLeafNode	= -1,
-+	kBTIndexNode	= 0,
-+	kBTHeaderNode	= 1,
-+	kBTMapNode	= 2
-+}PACKED_S;
-+
-+/* BTHeaderRec -- The first record of a B-tree header node */
-+struct BTHeaderRec {
-+	u_int16_t	treeDepth;		/* maximum height (usually leaf nodes) */
-+	u_int32_t 	rootNode;		/* node number of root node */
-+	u_int32_t 	leafRecords;		/* number of leaf records in all leaf nodes */
-+	u_int32_t 	firstLeafNode;		/* node number of first leaf node */
-+	u_int32_t 	lastLeafNode;		/* node number of last leaf node */
-+	u_int16_t 	nodeSize;		/* size of a node, in bytes */
-+	u_int16_t 	maxKeyLength;		/* reserved */
-+	u_int32_t 	totalNodes;		/* total number of nodes in tree */
-+	u_int32_t 	freeNodes;		/* number of unused (free) nodes in tree */
-+	u_int16_t 	reserved1;		/* unused */
-+	u_int32_t 	clumpSize;		/* reserved */
-+	u_int8_t 	btreeType;		/* reserved */
-+	u_int8_t 	keyCompareType;		/* Key string Comparison Type */
-+	u_int32_t 	attributes;		/* persistent attributes about the tree */
-+	u_int32_t 	reserved3[16];		/* reserved */
-+}PACKED_S;
-+typedef struct BTHeaderRec BTHeaderRec;
-+
-+/* Constants for BTHeaderRec attributes */
-+enum {
-+	kBTBadCloseMask		 = 0x00000001,	/* reserved */
-+	kBTBigKeysMask		 = 0x00000002,	/* key length field is 16 bits */
-+	kBTVariableIndexKeysMask = 0x00000004	/* keys in index nodes are variable length */
-+}PACKED_S;
-+
-+
-+/* Catalog Key Name Comparison Type */
-+enum {
-+	kHFSCaseFolding   = 0xCF,  /* case folding (case-insensitive) */
-+	kHFSBinaryCompare = 0xBC  /* binary compare (case-sensitive) */
-+}PACKED_S;
-+
-+/* JournalInfoBlock - Structure that describes where our journal lives */
-+struct JournalInfoBlock {
-+	u_int32_t	flags;
-+    	u_int32_t       device_signature[8];  // signature used to locate our device.
-+	u_int64_t       offset;               // byte offset to the journal on the device
-+	u_int64_t       size;                 // size in bytes of the journal
-+	u_int32_t 	reserved[32];
-+}PACKED_S;
-+typedef struct JournalInfoBlock JournalInfoBlock;
-+
-+enum {
-+    kJIJournalInFSMask          = 0x00000001,
-+    kJIJournalOnOtherDeviceMask = 0x00000002,
-+    kJIJournalNeedInitMask      = 0x00000004
-+}PACKED_S;
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* __HFS_FORMAT__ */
-diff --git a/include/hfs/hfs_mount.h b/include/hfs/hfs_mount.h
-new file mode 100644
-index 0000000..ad729f2
---- /dev/null
-+++ b/include/hfs/hfs_mount.h
-@@ -0,0 +1,78 @@
-+/*
-+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ *
-+ * The contents of this file constitute Original Code as defined in and
-+ * are subject to the Apple Public Source License Version 1.1 (the
-+ * "License").  You may not use this file except in compliance with the
-+ * License.  Please obtain a copy of the License at
-+ * http://www.apple.com/publicsource and read it before using this file.
-+ *
-+ * This Original Code and all software distributed under the License are
-+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-+ * License for the specific language governing rights and limitations
-+ * under the License.
-+ *
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
-+/*
-+ * Copyright (c) 1997-2002 Apple Computer, Inc. All Rights Reserved
-+ *
-+ */
-+
-+#ifndef _HFS_MOUNT_H_
-+#define _HFS_MOUNT_H_
-+
-+#include <sys/appleapiopts.h>
-+
-+#include <sys/mount.h>
-+#include <sys/time.h>
-+
-+/*
-+ * Arguments to mount HFS-based filesystems
-+ */
-+
-+#define OVERRIDE_UNKNOWN_PERMISSIONS 0
-+
-+#define UNKNOWNUID ((uid_t)99)
-+#define UNKNOWNGID ((gid_t)99)
-+#define UNKNOWNPERMISSIONS (S_IRWXU | S_IROTH | S_IXOTH)		/* 705 */
-+
-+#ifdef __APPLE_API_UNSTABLE
-+struct hfs_mount_args {
-+#ifndef KERNEL
-+	char	*fspec;			/* block special device to mount */
-+#endif
-+	uid_t	hfs_uid;		/* uid that owns hfs files (standard HFS only) */
-+	gid_t	hfs_gid;		/* gid that owns hfs files (standard HFS only) */
-+	mode_t	hfs_mask;		/* mask to be applied for hfs perms  (standard HFS only) */
-+	u_int32_t hfs_encoding;		/* encoding for this volume (standard HFS only) */
-+	struct	timezone hfs_timezone;	/* user time zone info (standard HFS only) */
-+	int		flags;			/* mounting flags, see below */
-+	int     journal_tbuffer_size;   /* size in bytes of the journal transaction buffer */
-+	int		journal_flags;          /* flags to pass to journal_open/create */
-+	int		journal_disable;        /* don't use journaling (potentially dangerous) */
-+};
-+
-+#define HFSFSMNT_NOXONFILES	0x1	/* disable execute permissions for files */
-+#define HFSFSMNT_WRAPPER	0x2	/* mount HFS wrapper (if it exists) */
-+#define HFSFSMNT_EXTENDED_ARGS  0x4     /* indicates new fields after "flags" are valid */
-+
-+/*
-+ * Sysctl values for HFS
-+ */
-+#define HFS_ENCODINGBIAS	1	    /* encoding matching CJK bias */
-+#define HFS_EXTEND_FS		2
-+#define HFS_ENCODINGHINT	3	    /* guess encoding for string */
-+#define HFS_ENABLE_JOURNALING   0x082969
-+#define HFS_DISABLE_JOURNALING  0x031272
-+#define HFS_GET_JOURNAL_INFO    0x6a6e6c69
-+#define HFS_SET_PKG_EXTENSIONS  0x121031
-+
-+#endif /* __APPLE_API_UNSTABLE */
-+
-+#endif /* ! _HFS_MOUNT_H_ */
-diff --git a/include/sys/appleapiopts.h b/include/sys/appleapiopts.h
-new file mode 100644
-index 0000000..4d2061f
---- /dev/null
-+++ b/include/sys/appleapiopts.h
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ *
-+ * The contents of this file constitute Original Code as defined in and
-+ * are subject to the Apple Public Source License Version 1.1 (the
-+ * "License").  You may not use this file except in compliance with the
-+ * License.  Please obtain a copy of the License at
-+ * http://www.apple.com/publicsource and read it before using this file.
-+ *
-+ * This Original Code and all software distributed under the License are
-+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-+ * License for the specific language governing rights and limitations
-+ * under the License.
-+ *
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
-+
-+#ifndef __SYS_APPLEAPIOPTS_H__
-+#define __SYS_APPLEAPIOPTS_H__
-+
-+
-+#ifndef __APPLE_API_STANDARD
-+#define __APPLE_API_STANDARD
-+#endif /* __APPLE_API_STANDARD */
-+
-+#ifndef __APPLE_API_STABLE
-+#define __APPLE_API_STABLE
-+#endif /* __APPLE_API_STABLE */
-+
-+#ifndef __APPLE_API_STRICT_CONFORMANCE
-+
-+#ifndef __APPLE_API_EVOLVING
-+#define __APPLE_API_EVOLVING
-+#endif /* __APPLE_API_EVOLVING */
-+
-+#ifndef __APPLE_API_UNSTABLE
-+#define __APPLE_API_UNSTABLE
-+#endif /* __APPLE_API_UNSTABLE */
-+
-+#ifndef __APPLE_API_OBSOLETE
-+#define __APPLE_API_OBSOLETE
-+#endif /* __APPLE_API_OBSOLETE */
-+
-+#endif /* __APPLE_API_STRICT_CONFORMANCE */
-+
-+#endif /* __SYS_APPLEAPIOPTS_H__ */
-+
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0004-Fix-compilation-on-64-bit-arches.patch b/trunk/package/feeds/packages/hfsprogs/patches/0004-Fix-compilation-on-64-bit-arches.patch
deleted file mode 100644
index 57f60110..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0004-Fix-compilation-on-64-bit-arches.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Fix compilation on 64-bit arches
-
----
- fsck_hfs.tproj/dfalib/BTreePrivate.h |  5 ++++-
- fsck_hfs.tproj/dfalib/SControl.c     |  8 ++++----
- fsck_hfs.tproj/dfalib/SVerify1.c     | 14 +++++++-------
- fsck_hfs.tproj/dfalib/hfs_endian.c   |  2 +-
- 4 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/fsck_hfs.tproj/dfalib/BTreePrivate.h b/fsck_hfs.tproj/dfalib/BTreePrivate.h
-index 058c75b..2fc2f28 100644
---- a/fsck_hfs.tproj/dfalib/BTreePrivate.h
-+++ b/fsck_hfs.tproj/dfalib/BTreePrivate.h
-@@ -104,6 +104,9 @@ typedef enum {
- 
- ///////////////////////////////////// Types /////////////////////////////////////
- 
-+// Forward declaration from Scavenger.h
-+struct BTreeExtensionsRec;
-+
- typedef struct BTreeControlBlock {					// fields specific to BTree CBs
- 
- 	UInt8		keyCompareType;   /* Key string Comparison Type */
-@@ -144,7 +147,7 @@ typedef struct BTreeControlBlock {					// fields specific to BTree CBs
- 	UInt32						 numPossibleHints;	// Looks like a formated hint
- 	UInt32						 numValidHints;		// Hint used to find correct record.
- 	
--	UInt32						 refCon;			//	Used by DFA to point to private data.
-+	struct BTreeExtensionsRec			*refCon;			//	Used by DFA to point to private data.
- 	SFCB						*fcbPtr;		// fcb of btree file
- 	
- } BTreeControlBlock, *BTreeControlBlockPtr;
-diff --git a/fsck_hfs.tproj/dfalib/SControl.c b/fsck_hfs.tproj/dfalib/SControl.c
-index 37eb242..4ce9e16 100644
---- a/fsck_hfs.tproj/dfalib/SControl.c
-+++ b/fsck_hfs.tproj/dfalib/SControl.c
-@@ -1034,7 +1034,7 @@ static int ScavTerm( SGlobPtr GPtr )
- 		btcbP = (BTreeControlBlock*)fcbP->fcbBtree;
- 		if ( btcbP != nil)
- 		{
--			if( btcbP->refCon != (UInt32)nil )
-+			if( btcbP->refCon != nil )
- 			{
- 				if(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != nil)
- 				{
-@@ -1043,13 +1043,13 @@ static int ScavTerm( SGlobPtr GPtr )
- 				}
- 				DisposeMemory( (Ptr)btcbP->refCon );
- 				err = MemError();
--				btcbP->refCon = (UInt32)nil;
-+				btcbP->refCon = nil;
- 			}
- 				
- 			fcbP = GPtr->calculatedCatalogFCB;	//	release catalog BTree bit map
- 			btcbP = (BTreeControlBlock*)fcbP->fcbBtree;
- 				
--			if( btcbP->refCon != (UInt32)nil )
-+			if( btcbP->refCon != nil )
- 			{
- 				if(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != nil)
- 				{
-@@ -1058,7 +1058,7 @@ static int ScavTerm( SGlobPtr GPtr )
- 				}
- 				DisposeMemory( (Ptr)btcbP->refCon );
- 				err = MemError();
--				btcbP->refCon = (UInt32)nil;
-+				btcbP->refCon = nil;
- 			}
- 		}
- 	}
-diff --git a/fsck_hfs.tproj/dfalib/SVerify1.c b/fsck_hfs.tproj/dfalib/SVerify1.c
-index c272d4d..a273bf3 100644
---- a/fsck_hfs.tproj/dfalib/SVerify1.c
-+++ b/fsck_hfs.tproj/dfalib/SVerify1.c
-@@ -789,8 +789,8 @@ OSErr	CreateExtentsBTreeControlBlock( SGlobPtr GPtr )
- 	//
- 	//	set up our DFA extended BTCB area.  Will we have enough memory on all HFS+ volumes.
- 	//
--	btcb->refCon = (UInt32) AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == (UInt32) nil ) {
-+	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
-+	if ( btcb->refCon == nil ) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
-@@ -1144,8 +1144,8 @@ OSErr	CreateCatalogBTreeControlBlock( SGlobPtr GPtr )
- 	//	set up our DFA extended BTCB area.  Will we have enough memory on all HFS+ volumes.
- 	//
- 
--	btcb->refCon = (UInt32) AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == (UInt32)nil ) {
-+	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
-+	if ( btcb->refCon == nil ) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
-@@ -1779,8 +1779,8 @@ OSErr	CreateAttributesBTreeControlBlock( SGlobPtr GPtr )
- 	//
- 	//	set up our DFA extended BTCB area.  Will we have enough memory on all HFS+ volumes.
- 	//
--	btcb->refCon = (UInt32) AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == (UInt32)nil ) {
-+	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
-+	if ( btcb->refCon == nil ) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
-@@ -1793,7 +1793,7 @@ OSErr	CreateAttributesBTreeControlBlock( SGlobPtr GPtr )
- 	}
- 	else
- 	{
--		if ( btcb->refCon == (UInt32)nil ) {
-+		if ( btcb->refCon == nil ) {
- 			err = R_NoMem;
- 			goto exit;
- 		}
-diff --git a/fsck_hfs.tproj/dfalib/hfs_endian.c b/fsck_hfs.tproj/dfalib/hfs_endian.c
-index 69500c1..3cc9eb4 100755
---- a/fsck_hfs.tproj/dfalib/hfs_endian.c
-+++ b/fsck_hfs.tproj/dfalib/hfs_endian.c
-@@ -437,7 +437,7 @@ hfs_swap_HFSPlusBTInternalNode (
-     BTNodeDescriptor *srcDesc = src->buffer;
-     UInt16 *srcOffs = (UInt16 *)((char *)src->buffer + (src->blockSize - (srcDesc->numRecords * sizeof (UInt16))));
- 	char *nextRecord;	/*  Points to start of record following current one */
--    UInt32 i;
-+    int i;
-     UInt32 j;
- 
-     if (fileID == kHFSExtentsFileID) {
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0005-Remove-Apple-specific-p-from-strings.patch b/trunk/package/feeds/packages/hfsprogs/patches/0005-Remove-Apple-specific-p-from-strings.patch
deleted file mode 100644
index 318fd603..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0005-Remove-Apple-specific-p-from-strings.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Remove (Apple-specific?) \p from strings
-
-Modify the way that debug messages are sent to the user, by eliminating one
-character of them.
----
- fsck_hfs.tproj/dfalib/BTreeTreeOps.c | 48 ++++++++++++++++++------------------
- fsck_hfs.tproj/dfalib/SBTree.c       | 14 +++++------
- 2 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/fsck_hfs.tproj/dfalib/BTreeTreeOps.c b/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-index b812b14..37fb170 100644
---- a/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-+++ b/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-@@ -223,7 +223,7 @@ OSStatus	SearchTree	(BTreeControlBlockPtr	 btreePtr,
-         //
-         if (curNodeNum == 0)
-         {
--//          Panic("\pSearchTree: curNodeNum is zero!");
-+            Panic("SearchTree: curNodeNum is zero!");
-             err = fsBTInvalidNodeErr;
-             goto ErrorExit;
-         }
-@@ -433,7 +433,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 		M_ExitOnError (err);
- 		
- 		if ( DEBUG_BUILD && updateParent && newRoot )
--			DebugStr("\p InsertLevel: New root from primary key, update from secondary key...");
-+			DebugStr("InsertLevel: New root from primary key, update from secondary key...");
- 	}
- 
- 	//////////////////////// Update Parent(s) ///////////////////////////////
-@@ -448,7 +448,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 		
- 		secondaryKey = nil;
- 		
--		PanicIf ( (level == btreePtr->treeDepth), "\p InsertLevel: unfinished insert!?");
-+		PanicIf ( (level == btreePtr->treeDepth), "InsertLevel: unfinished insert!?");
- 
- 		++level;
- 
-@@ -456,7 +456,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 		index = treePathTable [level].index;
- 		parentNodeNum = treePathTable [level].node;
- 
--		PanicIf ( parentNodeNum == 0, "\p InsertLevel: parent node is zero!?");
-+		PanicIf ( parentNodeNum == 0, "InsertLevel: parent node is zero!?");
- 
- 		err = GetNode (btreePtr, parentNodeNum, &parentNode);	// released as target node in next level up
- 		M_ExitOnError (err);
-@@ -470,7 +470,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 		{
- 			//¥¥Êdebug: check if ptr == targetNodeNum
- 			GetRecordByIndex (btreePtr, parentNode.buffer, index, &keyPtr, &recPtr, &recSize);
--			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "\p InsertLevel: parent ptr doesn't match target node!");
-+			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "InsertLevel: parent ptr doesn't match target node!");
- 			
- 			// need to delete and re-insert this parent key/ptr
- 			// we delete it here and it gets re-inserted in the
-@@ -532,7 +532,7 @@ ErrorExit:
- 	(void) ReleaseNode (btreePtr, targetNode);
- 	(void) ReleaseNode (btreePtr, &siblingNode);
- 
--	Panic ("\p InsertLevel: an error occured!");
-+	Panic ("InsertLevel: an error occured!");
- 
- 	return	err;
- 
-@@ -566,7 +566,7 @@ static OSErr	InsertNode	(BTreeControlBlockPtr	 btreePtr,
- 
- 	*rootSplit = false;
- 	
--	PanicIf ( targetNode->buffer == siblingNode->buffer, "\p InsertNode: targetNode == siblingNode, huh?");
-+	PanicIf ( targetNode->buffer == siblingNode->buffer, "InsertNode: targetNode == siblingNode, huh?");
- 	
- 	leftNodeNum = ((NodeDescPtr) targetNode->buffer)->bLink;
- 	rightNodeNum = ((NodeDescPtr) targetNode->buffer)->fLink;
-@@ -606,7 +606,7 @@ static OSErr	InsertNode	(BTreeControlBlockPtr	 btreePtr,
- 	
- 	if ( leftNodeNum > 0 )
- 	{
--		PanicIf ( siblingNode->buffer != nil, "\p InsertNode: siblingNode already aquired!");
-+		PanicIf ( siblingNode->buffer != nil, "InsertNode: siblingNode already aquired!");
- 
- 		if ( siblingNode->buffer == nil )
- 		{
-@@ -614,7 +614,7 @@ static OSErr	InsertNode	(BTreeControlBlockPtr	 btreePtr,
- 			M_ExitOnError (err);
- 		}
- 
--		PanicIf ( ((NodeDescPtr) siblingNode->buffer)->fLink != nodeNum, "\p InsertNode, RotateLeft: invalid sibling link!" );
-+		PanicIf ( ((NodeDescPtr) siblingNode->buffer)->fLink != nodeNum, "InsertNode, RotateLeft: invalid sibling link!" );
- 
- 		if ( !key->skipRotate )		// are rotates allowed?
- 		{
-@@ -703,7 +703,7 @@ OSStatus	DeleteTree			(BTreeControlBlockPtr		 btreePtr,
- 
- 	targetNodeNum = treePathTable[level].node;
- 	targetNodePtr = targetNode->buffer;
--	PanicIf (targetNodePtr == nil, "\pDeleteTree: targetNode has nil buffer!");
-+	PanicIf (targetNodePtr == nil, "DeleteTree: targetNode has nil buffer!");
- 
- 	DeleteRecord (btreePtr, targetNodePtr, index);
- 		
-@@ -797,7 +797,7 @@ OSStatus	DeleteTree			(BTreeControlBlockPtr		 btreePtr,
- 			 
- 			//¥¥Êdebug: check if ptr == targetNodeNum
- 			GetRecordByIndex (btreePtr, parentNode.buffer, index, &keyPtr, &recPtr, &recSize);
--			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "\p DeleteTree: parent ptr doesn't match targetNodeNum!!");
-+			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, " DeleteTree: parent ptr doesn't match targetNodeNum!!");
- 			
- 			// need to delete and re-insert this parent key/ptr
- 			DeleteRecord (btreePtr, parentNode.buffer, index);
-@@ -1018,7 +1018,7 @@ static OSStatus	RotateLeft		(BTreeControlBlockPtr		 btreePtr,
- 										keyPtr, keyLength, recPtr, recSize);
- 			if ( !didItFit )
- 			{
--				Panic ("\pRotateLeft: InsertKeyRecord (left) returned false!");
-+				Panic ("RotateLeft: InsertKeyRecord (left) returned false!");
- 				err = fsBTBadRotateErr;
- 				goto ErrorExit;
- 			}
-@@ -1031,7 +1031,7 @@ static OSStatus	RotateLeft		(BTreeControlBlockPtr		 btreePtr,
- 			didItFit = RotateRecordLeft (btreePtr, leftNode, rightNode);
- 			if ( !didItFit )
- 			{
--				Panic ("\pRotateLeft: RotateRecordLeft returned false!");
-+				Panic ("RotateLeft: RotateRecordLeft returned false!");
- 				err = fsBTBadRotateErr;
- 				goto ErrorExit;
- 			}
-@@ -1048,7 +1048,7 @@ static OSStatus	RotateLeft		(BTreeControlBlockPtr		 btreePtr,
- 									keyPtr, keyLength, recPtr, recSize);
- 		if ( !didItFit )
- 		{
--			Panic ("\pRotateLeft: InsertKeyRecord (right) returned false!");
-+			Panic ("RotateLeft: InsertKeyRecord (right) returned false!");
- 			err = fsBTBadRotateErr;
- 			goto ErrorExit;
- 		}
-@@ -1117,7 +1117,7 @@ static OSStatus	SplitLeft		(BTreeControlBlockPtr		 btreePtr,
- 	right = rightNode->buffer;
- 	left  = leftNode->buffer;
- 	
--	PanicIf ( right->bLink != 0 && left == 0, "\p SplitLeft: left sibling missing!?" );
-+	PanicIf ( right->bLink != 0 && left == 0, " SplitLeft: left sibling missing!?" );
- 	
- 	//¥¥ type should be kLeafNode or kIndexNode
- 	
-@@ -1240,8 +1240,8 @@ static OSStatus	AddNewRootNode	(BTreeControlBlockPtr	 btreePtr,
- 	Boolean				didItFit;
- 	UInt16				keyLength;	
- 	
--	PanicIf (leftNode == nil, "\pAddNewRootNode: leftNode == nil");
--	PanicIf (rightNode == nil, "\pAddNewRootNode: rightNode == nil");
-+	PanicIf (leftNode == nil, "AddNewRootNode: leftNode == nil");
-+	PanicIf (rightNode == nil, "AddNewRootNode: rightNode == nil");
- 	
- 	
- 	/////////////////////// Initialize New Root Node ////////////////////////////
-@@ -1264,7 +1264,7 @@ static OSStatus	AddNewRootNode	(BTreeControlBlockPtr	 btreePtr,
- 	didItFit = InsertKeyRecord ( btreePtr, rootNode.buffer, 0, keyPtr, keyLength,
- 								 (UInt8 *) &rightNode->bLink, 4 );
- 
--	PanicIf ( !didItFit, "\pAddNewRootNode:InsertKeyRecord failed for left index record");
-+	PanicIf ( !didItFit, "AddNewRootNode:InsertKeyRecord failed for left index record");
- 
- 
- 	//////////////////// Insert Right Node Index Record /////////////////////////
-@@ -1275,7 +1275,7 @@ static OSStatus	AddNewRootNode	(BTreeControlBlockPtr	 btreePtr,
- 	didItFit = InsertKeyRecord ( btreePtr, rootNode.buffer, 1, keyPtr, keyLength,
- 								 (UInt8 *) &leftNode->fLink, 4 );
- 
--	PanicIf ( !didItFit, "\pAddNewRootNode:InsertKeyRecord failed for right index record");
-+	PanicIf ( !didItFit, "AddNewRootNode:InsertKeyRecord failed for right index record");
- 
- 
- #if DEBUG_TREEOPS
-@@ -1355,7 +1355,7 @@ static OSStatus	SplitRight		(BTreeControlBlockPtr		 btreePtr,
- 	}
- 	rightPtr = rightNodePtr->buffer;
- 	
--	PanicIf ( leftPtr->fLink != 0 && rightPtr == 0, "\p SplitRight: right sibling missing!?" );
-+	PanicIf ( leftPtr->fLink != 0 && rightPtr == 0, "SplitRight: right sibling missing!?" );
- 	
- 	//¥¥ type should be kLeafNode or kIndexNode
- 	
-@@ -1557,7 +1557,7 @@ static OSStatus	RotateRight		(BTreeControlBlockPtr		 btreePtr,
- 									keyPtr, keyLength, recPtr, recSize);
- 		if ( !didItFit )
- 		{
--			Panic ("\pRotateRight: InsertKeyRecord (left) returned false!");
-+			Panic ("RotateRight: InsertKeyRecord (left) returned false!");
- 			err = fsBTBadRotateErr;
- 			goto ErrorExit;
- 		}
-@@ -1572,7 +1572,7 @@ static OSStatus	RotateRight		(BTreeControlBlockPtr		 btreePtr,
- 		didItFit = RotateRecordRight( btreePtr, leftNodePtr, rightNodePtr );
- 		if ( !didItFit )
- 		{
--			Panic ("\pRotateRight: RotateRecordRight returned false!");
-+			Panic ("RotateRight: RotateRecordRight returned false!");
- 			err = fsBTBadRotateErr;
- 			goto ErrorExit;
- 		}
-@@ -1583,7 +1583,7 @@ static OSStatus	RotateRight		(BTreeControlBlockPtr		 btreePtr,
- 										keyPtr, keyLength, recPtr, recSize);
- 			if ( !didItFit )
- 			{
--				Panic ("\pRotateRight: InsertKeyRecord (left) returned false!");
-+				Panic ("RotateRight: InsertKeyRecord (left) returned false!");
- 				err = fsBTBadRotateErr;
- 				goto ErrorExit;
- 			}
-@@ -1607,7 +1607,7 @@ static OSStatus	RotateRight		(BTreeControlBlockPtr		 btreePtr,
- 									keyPtr, keyLength, recPtr, recSize);
- 		if ( !didItFit )
- 		{
--			Panic ("\pRotateRight: InsertKeyRecord (right) returned false!");
-+			Panic ("RotateRight: InsertKeyRecord (right) returned false!");
- 			err = fsBTBadRotateErr;
- 			goto ErrorExit;
- 		}
-diff --git a/fsck_hfs.tproj/dfalib/SBTree.c b/fsck_hfs.tproj/dfalib/SBTree.c
-index cd81b13..eeb4e8c 100644
---- a/fsck_hfs.tproj/dfalib/SBTree.c
-+++ b/fsck_hfs.tproj/dfalib/SBTree.c
-@@ -103,7 +103,7 @@ OSErr SearchBTreeRecord(SFCB *fcb, const void* key, UInt32 hint, void* foundKey,
- 			CopyMemory(&resultIterator->key, foundKey, CalcKeySize(btcb, &resultIterator->key));	//¥¥ warning, this could overflow user's buffer!!!
- 
- 		if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, *dataSize) )
--			DebugStr("\pSearchBTreeRecord: bad record?");
-+			DebugStr("SearchBTreeRecord: bad record?");
- 	}
- 
- ErrorExit:
-@@ -211,7 +211,7 @@ OSErr GetBTreeRecord(SFCB *fcb, SInt16 selectionIndex, void* key, void* data, UI
- 		CopyMemory(&iterator->key, key, CalcKeySize(btcb, &iterator->key));	//¥¥ warning, this could overflow user's buffer!!!
- 		
- 		if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, *dataSize) )
--			DebugStr("\pGetBTreeRecord: bad record?");
-+			DebugStr("GetBTreeRecord: bad record?");
- 
- 	}
- 	
-@@ -243,7 +243,7 @@ OSErr InsertBTreeRecord(SFCB *fcb, const void* key, const void* data, UInt16 dat
- 	CopyMemory(key, &iterator.key, CalcKeySize(btcb, (BTreeKey *) key));	//¥¥ should we range check against maxkeylen?
- 
- 	if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, dataSize) )
--		DebugStr("\pInsertBTreeRecord: bad record?");
-+		DebugStr("InsertBTreeRecord: bad record?");
- 
- 	result = BTInsertRecord( fcb, &iterator, &btRecord, dataSize );
- 
-@@ -305,7 +305,7 @@ OSErr ReplaceBTreeRecord(SFCB *fcb, const void* key, UInt32 hint, void *newData,
- 	CopyMemory(key, &iterator.key, CalcKeySize(btcb, (BTreeKey *) key));		//¥¥ should we range check against maxkeylen?
- 
- 	if ( DEBUG_BUILD && !ValidHFSRecord(newData, btcb, dataSize) )
--		DebugStr("\pReplaceBTreeRecord: bad record?");
-+		DebugStr("ReplaceBTreeRecord: bad record?");
- 
- 	result = BTReplaceRecord( fcb, &iterator, &btRecord, dataSize );
- 
-@@ -344,7 +344,7 @@ SetEndOfForkProc ( SFCB *filePtr, FSSize minEOF, FSSize maxEOF )
- 	else
- 	{
- 		if ( DEBUG_BUILD )
--			DebugStr("\pSetEndOfForkProc: minEOF is smaller than current size!");
-+			DebugStr("SetEndOfForkProc: minEOF is smaller than current size!");
- 		return -1;
- 	}
- 
-@@ -370,7 +370,7 @@ SetEndOfForkProc ( SFCB *filePtr, FSSize minEOF, FSSize maxEOF )
- 	//	Make sure we got at least as much space as we needed
- 	//
- 	if (filePtr->fcbLogicalSize < minEOF) {
--		Panic("\pSetEndOfForkProc: disk too full to extend B-tree file");
-+		Panic("SetEndOfForkProc: disk too full to extend B-tree file");
- 		return dskFulErr;
- 	}
- 	
-@@ -442,7 +442,7 @@ static OSErr CheckBTreeKey(const BTreeKey *key, const BTreeControlBlock *btcb)
- 	if ( (keyLen < 6) || (keyLen > btcb->maxKeyLength) )
- 	{
- 		if ( DEBUG_BUILD )
--			DebugStr("\pCheckBTreeKey: bad key length!");
-+			DebugStr("CheckBTreeKey: bad key length!");
- 		return fsBTInvalidKeyLengthErr;
- 	}
- 	
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0006-Adjust-types-for-printing.patch b/trunk/package/feeds/packages/hfsprogs/patches/0006-Adjust-types-for-printing.patch
deleted file mode 100644
index 09efbb6e..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0006-Adjust-types-for-printing.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Adjust types for printing
-
-Try to address the issues of a given integral type having different sizes
-in 32 and 64-bit architectures.
----
- fsck_hfs.tproj/dfalib/SControl.c   | 2 +-
- fsck_hfs.tproj/dfalib/hfs_endian.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fsck_hfs.tproj/dfalib/SControl.c b/fsck_hfs.tproj/dfalib/SControl.c
-index 4ce9e16..8b03ece 100644
---- a/fsck_hfs.tproj/dfalib/SControl.c
-+++ b/fsck_hfs.tproj/dfalib/SControl.c
-@@ -776,7 +776,7 @@ static int ScavSetUp( SGlob *GPtr)
- 		pointer = (ScavStaticStructures *) AllocateClearMemory( sizeof(ScavStaticStructures) );
- 		if ( pointer == nil ) {
- 			if ( GPtr->logLevel >= kDebugLog ) {
--				printf( "\t error %d - could not allocate %ld bytes of memory \n",
-+				printf( "\t error %d - could not allocate %i bytes of memory \n",
- 					R_NoMem, sizeof(ScavStaticStructures) );
- 			}
- 			return( R_NoMem );
-diff --git a/fsck_hfs.tproj/dfalib/hfs_endian.c b/fsck_hfs.tproj/dfalib/hfs_endian.c
-index 3cc9eb4..6ca2ac1 100755
---- a/fsck_hfs.tproj/dfalib/hfs_endian.c
-+++ b/fsck_hfs.tproj/dfalib/hfs_endian.c
-@@ -563,7 +563,7 @@ hfs_swap_HFSPlusBTInternalNode (
-             /* Make sure name length is consistent with key length */
-             if (keyLength < sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
-                 srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0])) {
--				if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%lu\n",
-+				if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%i\n",
- 					srcDesc->numRecords-i, keyLength, sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
-                     srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0]));
- 				WriteError(fcb->fcbVolume->vcbGPtr, E_KeyLen, fcb->fcbFileID, src->blockNum);
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0007-Fix-path-for-HFS-wrapper-block.patch b/trunk/package/feeds/packages/hfsprogs/patches/0007-Fix-path-for-HFS-wrapper-block.patch
deleted file mode 100644
index f92bb228..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0007-Fix-path-for-HFS-wrapper-block.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Fix path for HFS wrapper block
-
-Fix the installation of the HFS wrapper block to be compliant in Linux
-systems (since it is arch independent).
----
- newfs_hfs.tproj/makehfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/newfs_hfs.tproj/makehfs.c b/newfs_hfs.tproj/makehfs.c
-index 7609779..2233ef7 100644
---- a/newfs_hfs.tproj/makehfs.c
-+++ b/newfs_hfs.tproj/makehfs.c
-@@ -70,7 +70,7 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
- #include "readme.h"
- 
- 
--#define HFS_BOOT_DATA	"/usr/share/misc/hfsbootdata"
-+#define HFS_BOOT_DATA	"/usr/share/hfsprogs/hfsbootdata"
- 
- #define HFS_JOURNAL_FILE	".journal"
- #define HFS_JOURNAL_INFO	".journal_info_block"
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0008-Provide-command-line-option-a.patch b/trunk/package/feeds/packages/hfsprogs/patches/0008-Provide-command-line-option-a.patch
deleted file mode 100644
index 366dbbc0..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0008-Provide-command-line-option-a.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Provide command line option -a
-
-Create a new command line option (-a) for the fsck.hfsplus that has the same
-behavior that the -p option has, for greater compatibility with other tools.
----
- fsck_hfs.tproj/fsck_hfs.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/fsck_hfs.tproj/fsck_hfs.c b/fsck_hfs.tproj/fsck_hfs.c
-index f1a18bd..6117698 100644
---- a/fsck_hfs.tproj/fsck_hfs.c
-+++ b/fsck_hfs.tproj/fsck_hfs.c
-@@ -104,7 +104,7 @@ main(argc, argv)
- 	else
- 		progname = *argv;
- 
--	while ((ch = getopt(argc, argv, "c:D:dfglm:npqruy")) != EOF) {
-+	while ((ch = getopt(argc, argv, "c:D:dfglm:napqruy")) != EOF) {
- 		switch (ch) {
- 		case 'c':
- 			/* Cache size to use in fsck_hfs */
-@@ -169,6 +169,7 @@ main(argc, argv)
- 			yflag = 0;
- 			break;
- 
-+		case 'a':
- 		case 'p':
- 			preen++;
- 			break;
-@@ -572,7 +573,7 @@ usage()
- 	(void) fprintf(stderr, "  l = live fsck (lock down and test-only)\n");
- 	(void) fprintf(stderr, "  m arg = octal mode used when creating lost+found directory \n");
- 	(void) fprintf(stderr, "  n = assume a no response \n");
--	(void) fprintf(stderr, "  p = just fix normal inconsistencies \n");
-+	(void) fprintf(stderr, "  p, a = just fix normal inconsistencies \n");
- 	(void) fprintf(stderr, "  q = quick check returns clean, dirty, or failure \n");
- 	(void) fprintf(stderr, "  r = rebuild catalog btree \n");
- 	(void) fprintf(stderr, "  u = usage \n");
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0009-Rename-dprintf-to-dbg_printf.patch b/trunk/package/feeds/packages/hfsprogs/patches/0009-Rename-dprintf-to-dbg_printf.patch
deleted file mode 100644
index 23f85183..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0009-Rename-dprintf-to-dbg_printf.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Rename dprintf to dbg_printf
-
----
- fsck_hfs.tproj/dfalib/SRepair.c  | 18 +++++++++---------
- fsck_hfs.tproj/dfalib/SVerify1.c |  6 +++---
- fsck_hfs.tproj/fsck_debug.c      | 10 +++++-----
- fsck_hfs.tproj/fsck_debug.h      | 10 +++++-----
- 4 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/fsck_hfs.tproj/dfalib/SRepair.c b/fsck_hfs.tproj/dfalib/SRepair.c
-index 8eb759c..89c12d6 100644
---- a/fsck_hfs.tproj/dfalib/SRepair.c
-+++ b/fsck_hfs.tproj/dfalib/SRepair.c
-@@ -1825,13 +1825,13 @@ static OSErr FixAttrSize(SGlobPtr GPtr, RepairOrderPtr p)
- 	result = BTSearchRecord(GPtr->calculatedAttributesFCB, &iterator, 
- 				kInvalidMRUCacheKey, &btRecord, &recSize, &iterator);
- 	if (result) {
--		dprintf (d_error|d_xattr, "%s: Cannot find attribute record (err = %d)\n", __FUNCTION__, result);
-+		dbg_printf (d_error|d_xattr, "%s: Cannot find attribute record (err = %d)\n", __FUNCTION__, result);
- 		goto out;
- 	}
- 
- 	/* We should only get record of type kHFSPlusAttrForkData */
- 	if (record.recordType != kHFSPlusAttrForkData) {
--		dprintf (d_error|d_xattr, "%s: Record found is not attribute fork data\n", __FUNCTION__);
-+		dbg_printf (d_error|d_xattr, "%s: Record found is not attribute fork data\n", __FUNCTION__);
- 		result = btNotFound;
- 		goto out;
- 	}
-@@ -1862,7 +1862,7 @@ static OSErr FixAttrSize(SGlobPtr GPtr, RepairOrderPtr p)
- 		result = BTReplaceRecord(GPtr->calculatedAttributesFCB, &iterator,
- 					&btRecord, recSize);
- 		if (result) {
--			dprintf (d_error|d_xattr, "%s: Cannot replace attribute record (err=%d)\n", __FUNCTION__, result);
-+			dbg_printf (d_error|d_xattr, "%s: Cannot replace attribute record (err=%d)\n", __FUNCTION__, result);
- 			goto out;
- 		}
- 	}
-@@ -2058,7 +2058,7 @@ del_overflow_extents:
- 
- 		/* Delete the extent record */ 
- 		err = DeleteBTreeRecord(GPtr->calculatedExtentsFCB, &extentKey);
--		dprintf (d_info, "%s: Deleting extent overflow for fileID=%u, forkType=%u, startBlock=%u\n", __FUNCTION__, fileID, forkType, foundStartBlock);
-+		dbg_printf (d_info, "%s: Deleting extent overflow for fileID=%u, forkType=%u, startBlock=%u\n", __FUNCTION__, fileID, forkType, foundStartBlock);
- 		if (err) {
- 			goto create_symlink;
- 		}
-@@ -3227,12 +3227,12 @@ static OSErr MoveExtent(SGlobPtr GPtr, ExtentInfo *extentInfo)
- 											  &extentData, &recordSize, &foundExtentIndex);
- 				foundLocation = extentsBTree;
- 				if (err != noErr) {
--					dprintf (d_error|d_overlap, "%s: No matching extent record found in extents btree for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
-+					dbg_printf (d_error|d_overlap, "%s: No matching extent record found in extents btree for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
- 					goto out;
- 				}
- 			} else {
- 				/* No more extents exist for this file */
--				dprintf (d_error|d_overlap, "%s: No matching extent record found for fileID = %d\n", __FUNCTION__, extentInfo->fileID);
-+				dbg_printf (d_error|d_overlap, "%s: No matching extent record found for fileID = %d\n", __FUNCTION__, extentInfo->fileID);
- 				goto out;
- 			}
- 		}
-@@ -3241,7 +3241,7 @@ static OSErr MoveExtent(SGlobPtr GPtr, ExtentInfo *extentInfo)
- 	err = CopyDiskBlocks(GPtr, extentInfo->startBlock, extentInfo->blockCount, 
- 						 extentInfo->newStartBlock);
- 	if (err != noErr) {
--		dprintf (d_error|d_overlap, "%s: Error in copying disk blocks for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
-+		dbg_printf (d_error|d_overlap, "%s: Error in copying disk blocks for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
- 		goto out;
- 	}
- 	
-@@ -3260,7 +3260,7 @@ static OSErr MoveExtent(SGlobPtr GPtr, ExtentInfo *extentInfo)
- 
- 	}
- 	if (err != noErr) {
--		dprintf (d_error|d_overlap, "%s: Error in updating extent record for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
-+		dbg_printf (d_error|d_overlap, "%s: Error in updating extent record for fileID = %d (err=%d)\n", __FUNCTION__, extentInfo->fileID, err);
- 		goto out;
- 	}
- 
-@@ -3491,7 +3491,7 @@ static OSErr SearchExtentInAttributeBT(SGlobPtr GPtr, ExtentInfo *extentInfo,
- 	result = BTSearchRecord(GPtr->calculatedAttributesFCB, &iterator, 
- 				kInvalidMRUCacheKey, &btRecord, recordSize, &iterator);
- 	if (result) {
--		dprintf (d_error|d_overlap, "%s: Error finding attribute record (err=%d) for fileID = %d, attrname = %d\n", __FUNCTION__, result, extentInfo->fileID, extentInfo->attrname);
-+		dbg_printf (d_error|d_overlap, "%s: Error finding attribute record (err=%d) for fileID = %d, attrname = %d\n", __FUNCTION__, result, extentInfo->fileID, extentInfo->attrname);
- 		goto out;	
- 	}
- 	
-diff --git a/fsck_hfs.tproj/dfalib/SVerify1.c b/fsck_hfs.tproj/dfalib/SVerify1.c
-index a273bf3..39bda5c 100644
---- a/fsck_hfs.tproj/dfalib/SVerify1.c
-+++ b/fsck_hfs.tproj/dfalib/SVerify1.c
-@@ -2157,9 +2157,9 @@ CheckAttributeRecord(SGlobPtr GPtr, const HFSPlusAttrKey *key, const HFSPlusAttr
- 	
- 	if (doDelete == true) {
- 		result = DeleteBTreeRecord(GPtr->calculatedAttributesFCB, key);
--		dprintf (d_info|d_xattr, "%s: Deleting attribute %s for fileID %d, type = %d\n", __FUNCTION__, attrname, key->fileID, rec->recordType);
-+		dbg_printf (d_info|d_xattr, "%s: Deleting attribute %s for fileID %d, type = %d\n", __FUNCTION__, attrname, key->fileID, rec->recordType);
- 		if (result) {
--			dprintf (d_error|d_xattr, "%s: Error in deleting record for %s for fileID %d, type = %d\n", __FUNCTION__, attrname, key->fileID, rec->recordType);
-+			dbg_printf (d_error|d_xattr, "%s: Error in deleting record for %s for fileID %d, type = %d\n", __FUNCTION__, attrname, key->fileID, rec->recordType);
- 		}
- 		
- 		/* Set flags to mark header and map dirty */
-@@ -3034,7 +3034,7 @@ OSErr	CheckFileExtents( SGlobPtr GPtr, UInt32 fileNumber, UInt8 forkType,
- 		//	checkout the extent record first
- 		err = ChkExtRec( GPtr, extents, &lastExtentIndex );
- 		if (err != noErr) {
--			dprintf (d_info, "%s: Bad extent for fileID %u in extent %u for startblock %u\n", __FUNCTION__, fileNumber, lastExtentIndex, blockCount);
-+			dbg_printf (d_info, "%s: Bad extent for fileID %u in extent %u for startblock %u\n", __FUNCTION__, fileNumber, lastExtentIndex, blockCount);
- 
- 			/* Stop verification if bad extent is found for system file or EA */
- 			if ((fileNumber < kHFSFirstUserCatalogNodeID) ||
-diff --git a/fsck_hfs.tproj/fsck_debug.c b/fsck_hfs.tproj/fsck_debug.c
-index 1be3fc5..77e8e51 100644
---- a/fsck_hfs.tproj/fsck_debug.c
-+++ b/fsck_hfs.tproj/fsck_debug.c
-@@ -25,18 +25,18 @@
- #include <stdio.h>
- #include <stdarg.h>
- 
--/* Current debug level of fsck_hfs for printing messages via dprintf */
-+/* Current debug level of fsck_hfs for printing messages via dbg_printf */
- unsigned long cur_debug_level;
- 
--/* Function: dprintf
-+/* Function: dbg_printf
-  *
-  * Description: Debug function similar to printf except the first parameter
-- * which indicates the type of message to be printed by dprintf. Based on 
-+ * which indicates the type of message to be printed by dbg_printf. Based on
-  * current debug level and the type of message, the function decides 
-  * whether to print the message or not.
-  *
-  * Each unique message type has a bit assigned to it.  The message type 
-- * passed to dprintf can be one or combination (OR-ed value) of pre-defined 
-+ * passed to dbg_printf can be one or combination (OR-ed value) of pre-defined
-  * debug message types.  Only the messages whose type have one or more similar
-  * bits set in comparison with current global debug level are printed. 
-  *
-@@ -56,7 +56,7 @@ unsigned long cur_debug_level;
-  * Output:
-  *	Nothing
-  */
--void dprintf (unsigned long type, char *fmt, ...) 
-+void dbg_printf (unsigned long type, char *fmt, ...)
- {
- 	if (cur_debug_level & type) {
- 		va_list ap;
-diff --git a/fsck_hfs.tproj/fsck_debug.h b/fsck_hfs.tproj/fsck_debug.h
-index 81e3932..cb1b9be 100644
---- a/fsck_hfs.tproj/fsck_debug.h
-+++ b/fsck_hfs.tproj/fsck_debug.h
-@@ -36,18 +36,18 @@ enum debug_message_type {
- 	d_overlap	=	0x0020 	/* Overlap extents related messages */
- };
- 
--/* Current debug level of fsck_hfs for printing messages via dprintf */
-+/* Current debug level of fsck_hfs for printing messages via dbg_printf */
- extern unsigned long cur_debug_level;
- 
--/* Function: dprintf
-+/* Function: dbg_printf
-  *
-  * Description: Debug function similar to printf except the first parameter
-- * which indicates the type of message to be printed by dprintf. Based on 
-+ * which indicates the type of message to be printed by dbg_printf. Based on
-  * current debug level and the type of message, the function decides 
-  * whether to print the message or not.
-  *
-  * Each unique message type has a bit assigned to it.  The message type 
-- * passed to dprintf can be one or combination (OR-ed value) of pre-defined 
-+ * passed to dbg_printf can be one or combination (OR-ed value) of pre-defined
-  * debug message types.  Only the messages whose type have one or more similar
-  * bits set in comparison with current global debug level are printed. 
-  *
-@@ -67,6 +67,6 @@ extern unsigned long cur_debug_level;
-  * Output:
-  *	Nothing
-  */
--extern void dprintf (unsigned long message_type, char *format, ...);
-+extern void dbg_printf (unsigned long message_type, char *format, ...);
- 
- #endif /* __FSCK_DEBUG__ */
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0010-Rename-custom-macro-nil-with-NULL.patch b/trunk/package/feeds/packages/hfsprogs/patches/0010-Rename-custom-macro-nil-with-NULL.patch
deleted file mode 100644
index 354b4ffc..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0010-Rename-custom-macro-nil-with-NULL.patch
+++ /dev/null
@@ -1,1319 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Rename custom macro nil with NULL
-
----
- fsck_hfs.tproj/dfalib/BTree.c         | 142 +++++++++++++++++-----------------
- fsck_hfs.tproj/dfalib/BTreeAllocate.c |  14 ++--
- fsck_hfs.tproj/dfalib/BTreeMiscOps.c  |  26 +++----
- fsck_hfs.tproj/dfalib/BTreeNodeOps.c  |  30 +++----
- fsck_hfs.tproj/dfalib/BTreeTreeOps.c  |  38 ++++-----
- fsck_hfs.tproj/dfalib/SControl.c      |  56 +++++++-------
- fsck_hfs.tproj/dfalib/SRepair.c       |   6 +-
- fsck_hfs.tproj/dfalib/SUtils.c        |   6 +-
- fsck_hfs.tproj/dfalib/SVerify1.c      |  32 ++++----
- fsck_hfs.tproj/dfalib/SVerify2.c      |   4 +-
- 10 files changed, 177 insertions(+), 177 deletions(-)
-
-diff --git a/fsck_hfs.tproj/dfalib/BTree.c b/fsck_hfs.tproj/dfalib/BTree.c
-index 7ad9fe0..c0c8744 100644
---- a/fsck_hfs.tproj/dfalib/BTree.c
-+++ b/fsck_hfs.tproj/dfalib/BTree.c
-@@ -163,21 +163,21 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- 
- 	////////////////////// Preliminary Error Checking ///////////////////////////
- 
--	headerNode.buffer	= nil;
-+	headerNode.buffer	= NULL;
- 
--	if (pathPtr										== nil)	return  paramErr;
-+	if (pathPtr == NULL)	return  paramErr;
- 
- 	setEndOfForkProc	= pathPtr->agentPtr->agent.setEndOfForkProc;
- 	setBlockSizeProc	= pathPtr->agentPtr->agent.setBlockSizeProc;
- 
--	if (pathPtr->agentPtr->agent.getBlockProc		== nil)	return  E_NoGetBlockProc;
--	if (pathPtr->agentPtr->agent.releaseBlockProc	== nil)	return  E_NoReleaseBlockProc;
--	if (setEndOfForkProc							== nil)	return  E_NoSetEndOfForkProc;
--	if (setBlockSizeProc							== nil)	return  E_NoSetBlockSizeProc;
-+	if (pathPtr->agentPtr->agent.getBlockProc == NULL)	return  E_NoGetBlockProc;
-+	if (pathPtr->agentPtr->agent.releaseBlockProc == NULL)	return  E_NoReleaseBlockProc;
-+	if (setEndOfForkProc == NULL)	return  E_NoSetEndOfForkProc;
-+	if (setBlockSizeProc == NULL)	return  E_NoSetBlockSizeProc;
- 
- 	forkPtr = pathPtr->path.forkPtr;
- 
--	if (forkPtr->fork.btreePtr != nil)						return	fsBTrFileAlreadyOpenErr;
-+	if (forkPtr->fork.btreePtr != NULL) return	fsBTrFileAlreadyOpenErr;
- 
- 	if ((maxKeyLength == 0) ||
- 		(maxKeyLength >  kMaxKeyLength))					return	fsBTInvalidKeyLengthErr;
-@@ -209,7 +209,7 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- 	//////////////////////// Allocate Control Block /////////////////////////////
- 
- 	M_RESIDENT_ALLOCATE_FIXED_CLEAR( &btreePtr, sizeof( BTreeControlBlock ), kFSBTreeControlBlockType );
--	if (btreePtr == nil)
-+	if (btreePtr == NULL)
- 	{
- 		err = memFullErr;
- 		goto ErrorExit;
-@@ -220,7 +220,7 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- 	btreePtr->flags				= 0;
- 	btreePtr->attributes		= 0;
- 	btreePtr->forkPtr			= forkPtr;
--	btreePtr->keyCompareProc	= nil;
-+	btreePtr->keyCompareProc	= NULL;
- 	btreePtr->keyDescPtr		= keyDescPtr;
- 	btreePtr->btreeType			= btreeType;
- 	btreePtr->treeDepth			= 0;
-@@ -282,7 +282,7 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- 
- 	///////////////////// Copy Key Descriptor To Header /////////////////////////
- #if SupportsKeyDescriptors
--	if (keyDescPtr != nil)
-+	if (keyDescPtr != NULL)
- 	{
- 		err = CheckKeyDescriptor (keyDescPtr, maxKeyLength);
- 		M_ExitOnError (err);
-@@ -309,7 +309,7 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- 	err = UpdateHeader (btreePtr);
- 	M_ExitOnError (err);
- 
--	pathPtr->path.forkPtr->fork.btreePtr = nil;
-+	pathPtr->path.forkPtr->fork.btreePtr = NULL;
- 	M_RESIDENT_DEALLOCATE_FIXED( btreePtr, sizeof( BTreeControlBlock ), kFSBTreeControlBlockType );
- 
- 	return	noErr;
-@@ -320,7 +320,7 @@ OSStatus	BTInitialize		(FCB					*filePtr,
- ErrorExit:
- 
- 	(void) ReleaseNode (btreePtr, &headerNode);
--	if (btreePtr != nil)
-+	if (btreePtr != NULL)
- 		M_RESIDENT_DEALLOCATE_FIXED( btreePtr, sizeof( BTreeControlBlock ), kFSBTreeControlBlockType );
- 
- 	return	err;
-@@ -342,7 +342,7 @@ Input:		filePtr				- pointer to file to open as a B-tree
- 			setEndOfForkProc	- pointer to client's SetEOF function
- 
- Result:		noErr				- success
--			paramErr			- required ptr was nil
-+			paramErr			- required ptr was NULL
- 			fsBTInvalidFileErr				-
- 			memFullErr			-
- 			!= noErr			- failure
-@@ -364,16 +364,16 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 
- 	////////////////////// Preliminary Error Checking ///////////////////////////
- 
--	if ( filePtr == nil				||
--		 getBlockProc == nil		||
--		 releaseBlockProc == nil	||
--		 setEndOfForkProc == nil	||
--		 setBlockSizeProc == nil )
-+	if (filePtr == NULL ||
-+		 getBlockProc == NULL ||
-+		 releaseBlockProc == NULL ||
-+		 setEndOfForkProc == NULL ||
-+		 setBlockSizeProc == NULL)
- 	{
- 		return  paramErr;
- 	}
- 
--	if ( filePtr->fcbBtree != nil )			// already has a BTreeCB
-+	if (filePtr->fcbBtree != NULL)			// already has a BTreeCB
- 		return noErr;
- 
- 												// is file large enough to contain header node?
-@@ -384,7 +384,7 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 	//////////////////////// Allocate Control Block /////////////////////////////
- 
- 	btreePtr = (BTreeControlBlock*) AllocateClearMemory( sizeof( BTreeControlBlock ) );
--	if (btreePtr == nil)
-+	if (btreePtr == NULL)
- 	{
- 		Panic ("\pBTOpen: no memory for btreePtr.");
- 		return	memFullErr;
-@@ -397,7 +397,7 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 
- 	/////////////////////////// Read Header Node ////////////////////////////////
- 
--	nodeRec.buffer				= nil;				// so we can call ReleaseNode
-+	nodeRec.buffer				= NULL;				// so we can call ReleaseNode
- 	
- 	btreePtr->fcbPtr			= filePtr;
- 	filePtr->fcbBtree			= (void *) btreePtr;	// attach btree cb to file
-@@ -487,7 +487,7 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 
- 	////////////////////////// Get Key Descriptor ///////////////////////////////
- #if SupportsKeyDescriptors
--	if ( keyCompareProc == nil )		// 	if no key compare proc then get key descriptor
-+	if (keyCompareProc == NULL)		// 	if no key compare proc then get key descriptor
- 	{
- 		err = GetKeyDescriptor (btreePtr, nodeRec.buffer);	//¥¥ it should check amount of memory allocated...
- 		M_ExitOnError (err);
-@@ -499,7 +499,7 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 	else
- #endif
- 	{
--		btreePtr->keyDescPtr = nil;			// clear it so we don't dispose garbage later
-+		btreePtr->keyDescPtr = NULL;			// clear it so we don't dispose garbage later
- 	}
- 
- 	err = ReleaseNode (btreePtr, &nodeRec);
-@@ -528,7 +528,7 @@ OSStatus	BTOpenPath			(SFCB					*filePtr,
- 
- ErrorExit:
- 
--	filePtr->fcbBtree = nil;
-+	filePtr->fcbBtree = NULL;
- 	(void) ReleaseNode (btreePtr, &nodeRec);
- 	DisposeMemory( btreePtr );
- 
-@@ -567,7 +567,7 @@ OSStatus	BTClosePath			(SFCB					*filePtr)
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
- 
--	if (btreePtr == nil)
-+	if (btreePtr == NULL)
- 		return fsBTInvalidFileErr;
- 
- 	////////////////////// Check for other BTree Paths //////////////////////////
-@@ -603,14 +603,14 @@ OSStatus	BTClosePath			(SFCB					*filePtr)
- 	M_ExitOnError (err);
- 
- #if SupportsKeyDescriptors
--	if (btreePtr->keyDescPtr != nil)			// deallocate keyDescriptor, if any
-+	if (btreePtr->keyDescPtr != NULL)			// deallocate keyDescriptor, if any
- 	{
- 		DisposeMemory( btreePtr->keyDescPtr );
- 	}
- #endif
- 
- 	DisposeMemory( btreePtr );
--	filePtr->fcbBtree = nil;
-+	filePtr->fcbBtree = NULL;
- 
- //	LogEndTime(kTraceCloseBTree, noErr);
- 
-@@ -643,7 +643,7 @@ Function:	Search for position in B*Tree indicated by searchKey. If a valid node
- 
- Input:		pathPtr			- pointer to path for BTree file.
- 			searchKey		- pointer to search key to match.
--			hintPtr			- pointer to hint (may be nil)
-+			hintPtr			- pointer to hint (may be NULL)
- 
- Output:		record			- pointer to BufferDescriptor containing record
- 			recordLen		- length of data at recordPtr
-@@ -678,14 +678,14 @@ OSStatus	BTSearchRecord		(SFCB						*filePtr,
- 
- //	LogStartTime(kTraceSearchBTree);
- 
--	if (filePtr == nil)									return	paramErr;
--	if (searchIterator == nil)							return	paramErr;
-+	if (filePtr == NULL)		return	paramErr;
-+	if (searchIterator == NULL)	return	paramErr;
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
--	if (btreePtr == nil)								return	fsBTInvalidFileErr;
-+	if (btreePtr == NULL)		return	fsBTInvalidFileErr;
- 
- #if SupportsKeyDescriptors
--	if (btreePtr->keyCompareProc == nil)		// CheckKey if we using Key Descriptor
-+	if (btreePtr->keyCompareProc == NULL)		// CheckKey if we using Key Descriptor
- 	{
- 		err = CheckKey (&searchIterator->key, btreePtr->keyDescPtr, btreePtr->maxKeyLength);
- 		M_ExitOnError (err);
-@@ -775,9 +775,9 @@ OSStatus	BTSearchRecord		(SFCB						*filePtr,
- 		//¥¥ Should check for errors! Or BlockMove could choke on recordPtr!!!
- 		GetRecordByIndex (btreePtr, node.buffer, index, &keyPtr, &recordPtr, &len);
- 
--		if (recordLen != nil)			*recordLen = len;
-+		if (recordLen != NULL)	*recordLen = len;
- 
--		if (record != nil)
-+		if (record != NULL)
- 		{
- 			ByteCount recordSize;
- 
-@@ -794,7 +794,7 @@ OSStatus	BTSearchRecord		(SFCB						*filePtr,
- 
- 	/////////////////////// Success - Update Iterator ///////////////////////////
- 
--	if (resultIterator != nil)
-+	if (resultIterator != NULL)
- 	{
- 		resultIterator->hint.writeCount	= btreePtr->writeCount;
- 		resultIterator->hint.nodeNum	= nodeNum;
-@@ -825,10 +825,10 @@ OSStatus	BTSearchRecord		(SFCB						*filePtr,
- 
- ErrorExit:
- 
--	if (recordLen != nil)
-+	if (recordLen != NULL)
- 		*recordLen = 0;
- 
--	if (resultIterator != nil)
-+	if (resultIterator != NULL)
- 	{
- 		resultIterator->hint.writeCount	= 0;
- 		resultIterator->hint.nodeNum	= 0;
-@@ -892,18 +892,18 @@ OSStatus	BTIterateRecord		(SFCB						*filePtr,
- 
- 	////////////////////////// Priliminary Checks ///////////////////////////////
- 
--	left.buffer		= nil;
--	right.buffer	= nil;
--	node.buffer		= nil;
-+	left.buffer		= NULL;
-+	right.buffer	= NULL;
-+	node.buffer		= NULL;
- 
- 
--	if (filePtr == nil)
-+	if (filePtr == NULL)
- 	{
- 		return	paramErr;
- 	}
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
--	if (btreePtr == nil)
-+	if (btreePtr == NULL)
- 	{
- 		return	fsBTInvalidFileErr;			//¥¥ handle properly
- 	}
-@@ -968,7 +968,7 @@ OSStatus	BTIterateRecord		(SFCB						*filePtr,
- 		}
- 		else
- 		{
--			if (left.buffer == nil)
-+			if (left.buffer == NULL)
- 			{
- 				nodeNum = ((NodeDescPtr) node.buffer)->bLink;
- 				if ( nodeNum > 0)
-@@ -981,13 +981,13 @@ OSStatus	BTIterateRecord		(SFCB						*filePtr,
- 				}
- 			}
- 			//	Before we stomp on "right", we'd better release it if needed
--			if (right.buffer != nil) {
-+			if (right.buffer != NULL) {
- 				err = ReleaseNode(btreePtr, &right);
- 				M_ExitOnError(err);
- 			}
- 			right		= node;
- 			node		= left;
--			left.buffer	= nil;
-+			left.buffer	= NULL;
- 			index 		= ((NodeDescPtr) node.buffer)->numRecords -1;
- 		}
- 	}
-@@ -1012,7 +1012,7 @@ OSStatus	BTIterateRecord		(SFCB						*filePtr,
- 		}
- 		else
- 		{
--			if (right.buffer == nil)
-+			if (right.buffer == NULL)
- 			{
- 				nodeNum = ((NodeDescPtr) node.buffer)->fLink;
- 				if ( nodeNum > 0)
-@@ -1025,13 +1025,13 @@ OSStatus	BTIterateRecord		(SFCB						*filePtr,
- 				}
- 			}
- 			//	Before we stomp on "left", we'd better release it if needed
--			if (left.buffer != nil) {
-+			if (left.buffer != NULL) {
- 				err = ReleaseNode(btreePtr, &left);
- 				M_ExitOnError(err);
- 			}
- 			left		 = node;
- 			node		 = right;
--			right.buffer = nil;
-+			right.buffer = NULL;
- 			index		 = 0;
- 		}
- 	}
-@@ -1054,9 +1054,9 @@ CopyData:
- 	err = GetRecordByIndex (btreePtr, node.buffer, index, &keyPtr, &recordPtr, &len);
- 	M_ExitOnError (err);
- 
--	if (recordLen != nil)			*recordLen = len;
-+	if (recordLen != NULL)			*recordLen = len;
- 
--	if (record != nil)
-+	if (record != NULL)
- 	{
- 		ByteCount recordSize;
- 
-@@ -1069,7 +1069,7 @@ CopyData:
- 		CopyMemory (recordPtr, record->bufferAddress, len);
- 	}
- 
--	if (iterator != nil)						// first & last do not require iterator
-+	if (iterator != NULL)						// first & last do not require iterator
- 	{
- 		iterator->hint.writeCount	= btreePtr->writeCount;
- 		iterator->hint.nodeNum		= nodeNum;
-@@ -1089,13 +1089,13 @@ CopyData:
- 	err = ReleaseNode (btreePtr, &node);
- 	M_ExitOnError (err);
- 
--	if (left.buffer != nil)
-+	if (left.buffer != NULL)
- 	{
- 		err = ReleaseNode (btreePtr, &left);
- 		M_ExitOnError (err);
- 	}
- 
--	if (right.buffer != nil)
-+	if (right.buffer != NULL)
- 	{
- 		err = ReleaseNode (btreePtr, &right);
- 		M_ExitOnError (err);
-@@ -1113,10 +1113,10 @@ ErrorExit:
- 	(void)	ReleaseNode (btreePtr, &node);
- 	(void)	ReleaseNode (btreePtr, &right);
- 
--	if (recordLen != nil)
-+	if (recordLen != NULL)
- 		*recordLen = 0;
- 
--	if (iterator != nil)
-+	if (iterator != NULL)
- 	{
- 		iterator->hint.writeCount	= 0;
- 		iterator->hint.nodeNum		= 0;
-@@ -1157,7 +1157,7 @@ OSStatus	BTInsertRecord		(SFCB						*filePtr,
- 
- 	////////////////////////// Priliminary Checks ///////////////////////////////
- 
--	nodeRec.buffer = nil;					// so we can call ReleaseNode
-+	nodeRec.buffer = NULL;					// so we can call ReleaseNode
- 
- 	err = CheckInsertParams (filePtr, iterator, record, recordLen);
- 	if (err != noErr)
-@@ -1317,7 +1317,7 @@ OSStatus	BTSetRecord			(SFCB						*filePtr,
- 
- 	////////////////////////// Priliminary Checks ///////////////////////////////
- 
--	nodeRec.buffer = nil;					// so we can call ReleaseNode
-+	nodeRec.buffer = NULL;					// so we can call ReleaseNode
- 
- 	err = CheckInsertParams (filePtr, iterator, record, recordLen);
- 	if (err != noErr)
-@@ -1506,7 +1506,7 @@ OSStatus	BTReplaceRecord		(SFCB						*filePtr,
- 
- 	////////////////////////// Priliminary Checks ///////////////////////////////
- 
--	nodeRec.buffer = nil;					// so we can call ReleaseNode
-+	nodeRec.buffer = NULL;					// so we can call ReleaseNode
- 
- 	err = CheckInsertParams (filePtr, iterator, record, recordLen);
- 	if (err != noErr)
-@@ -1645,20 +1645,20 @@ OSStatus	BTDeleteRecord		(SFCB						*filePtr,
- 
- 	////////////////////////// Priliminary Checks ///////////////////////////////
- 
--	nodeRec.buffer = nil;					// so we can call ReleaseNode
-+	nodeRec.buffer = NULL;					// so we can call ReleaseNode
- 
--	M_ReturnErrorIf (filePtr == nil, 	paramErr);
--	M_ReturnErrorIf (iterator == nil,	paramErr);
-+	M_ReturnErrorIf (filePtr == NULL, 	paramErr);
-+	M_ReturnErrorIf (iterator == NULL,	paramErr);
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
--	if (btreePtr == nil)
-+	if (btreePtr == NULL)
- 	{
- 		err = fsBTInvalidFileErr;
- 		goto ErrorExit;
- 	}
- 
- #if SupportsKeyDescriptors
--	if (btreePtr->keyDescPtr != nil)
-+	if (btreePtr->keyDescPtr != NULL)
- 	{
- 		err = CheckKey (&iterator->key, btreePtr->keyDescPtr, btreePtr->maxKeyLength);
- 		M_ExitOnError (err);
-@@ -1712,12 +1712,12 @@ OSStatus	BTGetInformation	(SFCB					*filePtr,
- 	BTreeControlBlockPtr	btreePtr;
- 
- 
--	M_ReturnErrorIf (filePtr == nil, 	paramErr);
-+	M_ReturnErrorIf (filePtr == NULL, 	paramErr);
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
- 
--	M_ReturnErrorIf (btreePtr == nil,	fsBTInvalidFileErr);
--	M_ReturnErrorIf (info == nil,		paramErr);
-+	M_ReturnErrorIf (btreePtr == NULL,	fsBTInvalidFileErr);
-+	M_ReturnErrorIf (info == NULL,		paramErr);
- 
- 	//¥¥ check version?
- 
-@@ -1730,7 +1730,7 @@ OSStatus	BTGetInformation	(SFCB					*filePtr,
- 	info->keyDescriptor	= btreePtr->keyDescPtr;	//¥¥ this won't do at all...
- 	info->reserved		= 0;
- 
--	if (btreePtr->keyDescPtr == nil)
-+	if (btreePtr->keyDescPtr == NULL)
- 		info->keyDescLength	= 0;
- 	else
- 		info->keyDescLength	= (UInt32) btreePtr->keyDescPtr->length;
-@@ -1762,11 +1762,11 @@ OSStatus	BTFlushPath				(SFCB					*filePtr)
- 
- //	LogStartTime(kTraceFlushBTree);
- 
--	M_ReturnErrorIf (filePtr == nil, 	paramErr);
-+	M_ReturnErrorIf (filePtr == NULL, 	paramErr);
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
- 
--	M_ReturnErrorIf (btreePtr == nil,	fsBTInvalidFileErr);
-+	M_ReturnErrorIf (btreePtr == NULL,	fsBTInvalidFileErr);
- 
- 	err = UpdateHeader (btreePtr);
- 
-@@ -1788,13 +1788,13 @@ Input:		iterator	- pointer to BTreeIterator
- Output:		iterator	- iterator with the hint.nodeNum cleared
- 
- Result:		noErr			- success
--			paramErr	- iterator == nil
-+			paramErr	- iterator == NULL
- -------------------------------------------------------------------------------*/
- 
- 
- OSStatus	BTInvalidateHint	(BTreeIterator				*iterator )
- {
--	if (iterator == nil)
-+	if (iterator == NULL)
- 		return	paramErr;
- 
- 	iterator->hint.nodeNum = 0;
-diff --git a/fsck_hfs.tproj/dfalib/BTreeAllocate.c b/fsck_hfs.tproj/dfalib/BTreeAllocate.c
-index 485d867..02bdd8d 100644
---- a/fsck_hfs.tproj/dfalib/BTreeAllocate.c
-+++ b/fsck_hfs.tproj/dfalib/BTreeAllocate.c
-@@ -83,7 +83,7 @@ OSStatus	AllocateNode (BTreeControlBlockPtr		btreePtr, UInt32	*nodeNum)
- 	
- 	
- 	nodeNumber		= 0;				// first node number of header map record
--	node.buffer		= nil;				// clear node.buffer to get header node
-+	node.buffer		= NULL;				// clear node.buffer to get header node
- 										//	- and for ErrorExit
- 	
- 	while (true)
-@@ -192,7 +192,7 @@ OSStatus	FreeNode (BTreeControlBlockPtr		btreePtr, UInt32	nodeNum)
- 
- 	//////////////////////////// Find Map Record ////////////////////////////////
- 	nodeIndex			= 0;				// first node number of header map record
--	node.buffer			= nil;				// invalidate node.buffer to get header node
-+	node.buffer			= NULL;				// invalidate node.buffer to get header node
- 	
- 	while (nodeNum >= nodeIndex)
- 	{
-@@ -278,8 +278,8 @@ OSStatus	ExtendBTree	(BTreeControlBlockPtr	btreePtr,
- 	nodeSize			= btreePtr->nodeSize;
- 	filePtr				= btreePtr->fcbPtr;
- 	
--	mapNode.buffer		= nil;
--	newNode.buffer		= nil;
-+	mapNode.buffer		= NULL;
-+	newNode.buffer		= NULL;
- 
- 	mapNodeRecSize	= nodeSize - sizeof(BTNodeDescriptor) - 6;	// 2 bytes of free space (see note)
- 
-@@ -448,7 +448,7 @@ ErrorExit:
- Routine:	GetMapNode	-	Get the next map node and pointer to the map record.
- 
- Function:	Given a BlockDescriptor to a map node in nodePtr, GetMapNode releases
--			it and gets the next node. If nodePtr->buffer is nil, then the header
-+			it and gets the next node. If nodePtr->buffer is NULL, then the header
- 			node is retrieved.
- 
- 
-@@ -474,7 +474,7 @@ OSStatus	GetMapNode (BTreeControlBlockPtr	  btreePtr,
- 	UInt16		mapIndex;
- 	UInt32		nextNodeNum;
- 	
--	if (nodePtr->buffer != nil)		// if iterator is valid...
-+	if (nodePtr->buffer != NULL)		// if iterator is valid...
- 	{
- 		nextNodeNum = ((NodeDescPtr)nodePtr->buffer)->fLink;
- 		if (nextNodeNum == 0)
-@@ -521,7 +521,7 @@ ErrorExit:
- 	
- 	(void) ReleaseNode (btreePtr, nodePtr);
- 	
--	*mapPtr		= nil;
-+	*mapPtr		= NULL;
- 	*mapSize	= 0;
- 	
- 	return	err;
-diff --git a/fsck_hfs.tproj/dfalib/BTreeMiscOps.c b/fsck_hfs.tproj/dfalib/BTreeMiscOps.c
-index 7c9edca..997f34b 100644
---- a/fsck_hfs.tproj/dfalib/BTreeMiscOps.c
-+++ b/fsck_hfs.tproj/dfalib/BTreeMiscOps.c
-@@ -236,13 +236,13 @@ OSStatus	FindIteratorPosition	(BTreeControlBlockPtr	 btreePtr,
- 	// assume index points to UInt16
- 	// assume foundRecord points to Boolean
- 	
--	left->buffer		= nil;
--	middle->buffer		= nil;
--	right->buffer		= nil;
-+	left->buffer		= NULL;
-+	middle->buffer		= NULL;
-+	right->buffer		= NULL;
- 	
- 	foundIt				= false;
- 	
--	if (iterator == nil)						// do we have an iterator?
-+	if (iterator == NULL)						// do we have an iterator?
- 	{
- 		err = fsBTInvalidIteratorErr;
- 		goto ErrorExit;
-@@ -250,7 +250,7 @@ OSStatus	FindIteratorPosition	(BTreeControlBlockPtr	 btreePtr,
- 
- #if SupportsKeyDescriptors
- 	//¥¥ verify iterator key (change CheckKey to take btreePtr instead of keyDescPtr?)
--	if (btreePtr->keyDescPtr != nil)
-+	if (btreePtr->keyDescPtr != NULL)
- 	{
- 		err = CheckKey (&iterator->key, btreePtr->keyDescPtr, btreePtr->maxKeyLength );
- 		M_ExitOnError (err);
-@@ -309,7 +309,7 @@ OSStatus	FindIteratorPosition	(BTreeControlBlockPtr	 btreePtr,
- 		{
- 			*right			= *middle;
- 			*middle			= *left;
--			left->buffer	= nil;
-+			left->buffer	= NULL;
- 			index			= leftIndex;
- 			
- 			goto SuccessfulExit;
-@@ -330,7 +330,7 @@ OSStatus	FindIteratorPosition	(BTreeControlBlockPtr	 btreePtr,
- 		{
- 			*right			= *middle;
- 			*middle			= *left;
--			left->buffer	= nil;
-+			left->buffer	= NULL;
- 			index			= leftIndex;
- 			
- 			goto SuccessfulExit;
-@@ -363,7 +363,7 @@ OSStatus	FindIteratorPosition	(BTreeControlBlockPtr	 btreePtr,
- 		{
- 			*left			= *middle;
- 			*middle			= *right;
--			right->buffer	= nil;
-+			right->buffer	= NULL;
- 			index			= rightIndex;
- 			
- 			goto SuccessfulExit;
-@@ -427,15 +427,15 @@ OSStatus	CheckInsertParams		(SFCB						*filePtr,
- {
- 	BTreeControlBlockPtr	btreePtr;
- 	
--	if (filePtr == nil)									return	paramErr;
-+	if (filePtr == NULL)									return	paramErr;
- 
- 	btreePtr = (BTreeControlBlockPtr) filePtr->fcbBtree;
--	if (btreePtr == nil)								return	fsBTInvalidFileErr;
--	if (iterator == nil)								return	paramErr;
--	if (record	 == nil)								return	paramErr;
-+	if (btreePtr == NULL)								return	fsBTInvalidFileErr;
-+	if (iterator == NULL)								return	paramErr;
-+	if (record	 == NULL)								return	paramErr;
- 	
- #if SupportsKeyDescriptors
--	if (btreePtr->keyDescPtr != nil)
-+	if (btreePtr->keyDescPtr != NULL)
- 	{
- 		OSStatus	err;
- 
-diff --git a/fsck_hfs.tproj/dfalib/BTreeNodeOps.c b/fsck_hfs.tproj/dfalib/BTreeNodeOps.c
-index da07cc7..ef2bd7b 100644
---- a/fsck_hfs.tproj/dfalib/BTreeNodeOps.c
-+++ b/fsck_hfs.tproj/dfalib/BTreeNodeOps.c
-@@ -105,7 +105,7 @@ Function:	Gets an existing BTree node from FS Agent and verifies it.
- Input:		btreePtr	- pointer to BTree control block
- 			nodeNum		- number of node to request
- 			
--Output:		nodePtr		- pointer to beginning of node (nil if error)
-+Output:		nodePtr		- pointer to beginning of node (NULL if error)
- 			
- Result:
- 			noErr		- success
-@@ -139,7 +139,7 @@ OSStatus	GetNode		(BTreeControlBlockPtr	 btreePtr,
- 	if (err != noErr)
- 	{
- 		Panic ("\pGetNode: getNodeProc returned error.");
--		nodePtr->buffer = nil;
-+		nodePtr->buffer = NULL;
- 		goto ErrorExit;
- 	}
- 	++btreePtr->numGetNodes;
-@@ -156,8 +156,8 @@ OSStatus	GetNode		(BTreeControlBlockPtr	 btreePtr,
- 	return noErr;
- 
- ErrorExit:
--	nodePtr->buffer			= nil;
--	nodePtr->blockHeader	= nil;
-+	nodePtr->buffer		= NULL;
-+	nodePtr->blockHeader	= NULL;
- 	
- //	LogEndTime(kTraceGetNode, err);
- 
-@@ -176,7 +176,7 @@ Function:	Gets a new BTree node from FS Agent and initializes it to an empty
- Input:		btreePtr		- pointer to BTree control block
- 			nodeNum			- number of node to request
- 			
--Output:		returnNodePtr	- pointer to beginning of node (nil if error)
-+Output:		returnNodePtr	- pointer to beginning of node (NULL if error)
- 			
- Result:		noErr		- success
- 			!= noErr	- failure
-@@ -203,7 +203,7 @@ OSStatus	GetNewNode	(BTreeControlBlockPtr	 btreePtr,
- 	if (err != noErr)
- 	{
- 		Panic ("\pGetNewNode: getNodeProc returned error.");
--		returnNodePtr->buffer = nil;
-+		returnNodePtr->buffer = NULL;
- 		return err;
- 	}
- 	++btreePtr->numGetNewNodes;
-@@ -248,7 +248,7 @@ OSStatus	ReleaseNode	(BTreeControlBlockPtr	 btreePtr,
- 
- 	err = noErr;
- 	
--	if (nodePtr->buffer != nil)
-+	if (nodePtr->buffer != NULL)
- 	{
- 		/*
- 		 * The nodes must remain in the cache as big endian!
-@@ -267,8 +267,8 @@ OSStatus	ReleaseNode	(BTreeControlBlockPtr	 btreePtr,
- 		++btreePtr->numReleaseNodes;
- 	}
- 	
--	nodePtr->buffer = nil;
--	nodePtr->blockHeader = nil;
-+	nodePtr->buffer = NULL;
-+	nodePtr->blockHeader = NULL;
- 	
- //	LogEndTime(kTraceReleaseNode, err);
- 
-@@ -299,7 +299,7 @@ OSStatus	TrashNode	(BTreeControlBlockPtr	 btreePtr,
- 
- 	err = noErr;
- 	
--	if (nodePtr->buffer != nil)
-+	if (nodePtr->buffer != NULL)
- 	{
- 		releaseNodeProc = btreePtr->releaseBlockProc;
- 		err = releaseNodeProc (btreePtr->fcbPtr,
-@@ -309,8 +309,8 @@ OSStatus	TrashNode	(BTreeControlBlockPtr	 btreePtr,
- 		++btreePtr->numReleaseNodes;
- 	}
- 
--	nodePtr->buffer			= nil;
--	nodePtr->blockHeader	= nil;
-+	nodePtr->buffer		= NULL;
-+	nodePtr->blockHeader	= NULL;
- 	
- 	return err;
- }
-@@ -338,7 +338,7 @@ OSStatus	UpdateNode	(BTreeControlBlockPtr	 btreePtr,
- 	
- 	err = noErr;
- 		
--	if (nodePtr->buffer != nil)			//¥¥ why call UpdateNode if nil ?!?
-+	if (nodePtr->buffer != NULL)			//¥¥ why call UpdateNode if NULL ?!?
- 	{
- 	//	LogStartTime(kTraceReleaseNode);
- 		err = hfs_swap_BTNode(nodePtr, btreePtr->fcbPtr, kSwapBTNodeHostToBig);
-@@ -358,8 +358,8 @@ OSStatus	UpdateNode	(BTreeControlBlockPtr	 btreePtr,
- 		++btreePtr->numUpdateNodes;
- 	}
- 	
--	nodePtr->buffer			= nil;
--	nodePtr->blockHeader	= nil;
-+	nodePtr->buffer		= NULL;
-+	nodePtr->blockHeader	= NULL;
- 
- 	return	noErr;
- 
-diff --git a/fsck_hfs.tproj/dfalib/BTreeTreeOps.c b/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-index 37fb170..73e1fda 100644
---- a/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-+++ b/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
-@@ -177,7 +177,7 @@ Output:		nodeNum			- number of the node containing the key position
- 			
- Result:		noErr			- key found, index is record index
- 			fsBTRecordNotFoundErr	- key not found, index is insert index
--			fsBTEmptyErr		- key not found, return params are nil
-+			fsBTEmptyErr		- key not found, return params are NULL
- 			otherwise			- catastrophic failure (GetNode/ReleaseNode failed)
- -------------------------------------------------------------------------------*/
- 
-@@ -321,8 +321,8 @@ ReleaseAndExit:
- ErrorExit:
- 	
- 	*nodeNum					= 0;
--	nodePtr->buffer				= nil;
--	nodePtr->blockHeader		= nil;
-+	nodePtr->buffer				= NULL;
-+	nodePtr->blockHeader		= NULL;
- 	*returnIndex				= 0;
- 
- 	return	err;
-@@ -354,7 +354,7 @@ OSStatus	InsertTree ( BTreeControlBlockPtr		 btreePtr,
- 	primaryKey.replacingKey	= replacingKey;
- 	primaryKey.skipRotate	= false;
- 
--	err	= InsertLevel (btreePtr, treePathTable, &primaryKey, nil,
-+	err	= InsertLevel (btreePtr, treePathTable, &primaryKey, NULL,
- 					   targetNode, index, level, insertNode );
- 						
- 	return err;
-@@ -385,7 +385,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- #if defined(applec) && !defined(__SC__)
- 	PanicIf ((level == 1) && (((NodeDescPtr)targetNode->buffer)->kind != kBTLeafNode), "\P InsertLevel: non-leaf at level 1! ");
- #endif
--	siblingNode.buffer = nil;
-+	siblingNode.buffer = NULL;
- 	targetNodeNum = treePathTable [level].node;
- 
- 	insertParent = false;
-@@ -420,7 +420,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 	
- 	////// process second insert (if any) //////
- 
--	if  ( secondaryKey != nil )
-+	if (secondaryKey != NULL)
- 	{
- 		Boolean				temp;
- 
-@@ -446,7 +446,7 @@ OSStatus	InsertLevel (BTreeControlBlockPtr		 btreePtr,
- 		UInt8 *				recPtr;
- 		UInt16				recSize;
- 		
--		secondaryKey = nil;
-+		secondaryKey = NULL;
- 		
- 		PanicIf ( (level == btreePtr->treeDepth), "InsertLevel: unfinished insert!?");
- 
-@@ -606,9 +606,9 @@ static OSErr	InsertNode	(BTreeControlBlockPtr	 btreePtr,
- 	
- 	if ( leftNodeNum > 0 )
- 	{
--		PanicIf ( siblingNode->buffer != nil, "InsertNode: siblingNode already aquired!");
-+		PanicIf(siblingNode->buffer != NULL, "InsertNode: siblingNode already aquired!");
- 
--		if ( siblingNode->buffer == nil )
-+		if (siblingNode->buffer == NULL)
- 		{
- 			err = GetNode (btreePtr, leftNodeNum, siblingNode);	// will be released by caller or a split below
- 			M_ExitOnError (err);
-@@ -703,7 +703,7 @@ OSStatus	DeleteTree			(BTreeControlBlockPtr		 btreePtr,
- 
- 	targetNodeNum = treePathTable[level].node;
- 	targetNodePtr = targetNode->buffer;
--	PanicIf (targetNodePtr == nil, "DeleteTree: targetNode has nil buffer!");
-+	PanicIf (targetNodePtr == NULL, "DeleteTree: targetNode has NULL buffer!");
- 
- 	DeleteRecord (btreePtr, targetNodePtr, index);
- 		
-@@ -766,7 +766,7 @@ OSStatus	DeleteTree			(BTreeControlBlockPtr		 btreePtr,
- 		deleteRequired = false;
- 		updateRequired = false;
- 		
--		if ( targetNode->buffer == nil )	// then root was freed and the btree is empty
-+		if (targetNode->buffer == NULL)	// then root was freed and the btree is empty
- 		{
- 			btreePtr->rootNode  = 0;
- 			btreePtr->treeDepth = 0;
-@@ -1124,7 +1124,7 @@ static OSStatus	SplitLeft		(BTreeControlBlockPtr		 btreePtr,
- 	if ( (right->height == 1) && (right->kind != kBTLeafNode) )
- 		return	fsBTInvalidNodeErr;
- 	
--	if ( left != nil )
-+	if (left != NULL)
- 	{
- 		if ( left->fLink != rightNodeNum )
- 			return fsBTInvalidNodeErr;										//¥¥ E_BadSibling ?
-@@ -1145,7 +1145,7 @@ static OSStatus	SplitLeft		(BTreeControlBlockPtr		 btreePtr,
- 
- 	/////////////// Update Forward Link In Original Left Node ///////////////////
- 
--	if ( left != nil )
-+	if (left != NULL)
- 	{
- 		left->fLink	= newNodeNum;
- 		err = UpdateNode (btreePtr, leftNode);
-@@ -1240,8 +1240,8 @@ static OSStatus	AddNewRootNode	(BTreeControlBlockPtr	 btreePtr,
- 	Boolean				didItFit;
- 	UInt16				keyLength;	
- 	
--	PanicIf (leftNode == nil, "AddNewRootNode: leftNode == nil");
--	PanicIf (rightNode == nil, "AddNewRootNode: rightNode == nil");
-+	PanicIf (leftNode == NULL, "AddNewRootNode: leftNode == NULL");
-+	PanicIf (rightNode == NULL, "AddNewRootNode: rightNode == NULL");
- 	
- 	
- 	/////////////////////// Initialize New Root Node ////////////////////////////
-@@ -1362,7 +1362,7 @@ static OSStatus	SplitRight		(BTreeControlBlockPtr		 btreePtr,
- 	if ( (leftPtr->height == 1) && (leftPtr->kind != kBTLeafNode) )
- 		return	fsBTInvalidNodeErr;
- 	
--	if ( rightPtr != nil )
-+	if (rightPtr != NULL)
- 	{
- 		if ( rightPtr->bLink != nodeNum )
- 			return fsBTInvalidNodeErr;										//¥¥ E_BadSibling ?
-@@ -1382,7 +1382,7 @@ static OSStatus	SplitRight		(BTreeControlBlockPtr		 btreePtr,
- 
- 	/////////////// Update backward Link In Original Right Node ///////////////////
- 
--	if ( rightPtr != nil )
-+	if (rightPtr != NULL)
- 	{
- 		rightPtr->bLink	= newNodeNum;
- 		err = UpdateNode (btreePtr, rightNodePtr);
-@@ -1739,7 +1739,7 @@ static int DoKeyCheck( NodeDescPtr nodeP, BTreeControlBlock *btcb )
- 	UInt16				keyLength;
- 	KeyPtr 				keyPtr;
- 	UInt8				*dataPtr;
--	KeyPtr				prevkeyP	= nil;
-+	KeyPtr				prevkeyP	= NULL;
- 
- 
- 	if ( nodeP->numRecords == 0 )
-@@ -1766,7 +1766,7 @@ static int DoKeyCheck( NodeDescPtr nodeP, BTreeControlBlock *btcb )
- 				return( -1 );
- 			}
- 	
--			if ( prevkeyP != nil )
-+			if (prevkeyP != NULL)
- 			{
- 				if ( CompareKeys( (BTreeControlBlockPtr)btcb, prevkeyP, keyPtr ) >= 0 )
- 				{
-diff --git a/fsck_hfs.tproj/dfalib/SControl.c b/fsck_hfs.tproj/dfalib/SControl.c
-index 8b03ece..d3145e0 100644
---- a/fsck_hfs.tproj/dfalib/SControl.c
-+++ b/fsck_hfs.tproj/dfalib/SControl.c
-@@ -82,7 +82,7 @@ CheckHFS( 	int fsReadRef, int fsWriteRef, int checkLevel, int repairLevel,
- {
- 	SGlob				dataArea;	// Allocate the scav globals
- 	short				temp; 	
--	FileIdentifierTable	*fileIdentifierTable	= nil;
-+	FileIdentifierTable	*fileIdentifierTable	= NULL;
- 	OSErr				err = noErr;
- 	OSErr				scavError = 0;
- 	int					scanCount = 0;
-@@ -228,7 +228,7 @@ DoAgain:
- 	}
- 
- 	//	Set up structures for post processing
--	if ( (autoRepair == true) && (dataArea.fileIdentifierTable != nil) )
-+	if ((autoRepair == true) && (dataArea.fileIdentifierTable != NULL))
- 	{
- 	//	*repairInfo = *repairInfo | kVolumeHadOverlappingExtents;	//	Report back that volume has overlapping extents
- 		fileIdentifierTable	= (FileIdentifierTable *) AllocateMemory( GetHandleSize( (Handle) dataArea.fileIdentifierTable ) );
-@@ -239,7 +239,7 @@ DoAgain:
- 	//
- 	//	Post processing
- 	//
--	if ( fileIdentifierTable != nil )
-+	if (fileIdentifierTable != NULL)
- 	{
- 		DisposeMemory( fileIdentifierTable );
- 	}
-@@ -682,7 +682,7 @@ short CheckForStop( SGlob *GPtr )
- 
- 	//if ( ((ticks - 10) > GPtr->lastTickCount) || (dfaStage == kAboutToRepairStage) )			//	To reduce cursor flicker on fast machines, call through on a timed interval
- 	//{
--		if ( GPtr->userCancelProc != nil )
-+		if (GPtr->userCancelProc != NULL)
- 		{
- 			UInt64	progress = 0;
- 			Boolean	progressChanged;
-@@ -761,7 +761,7 @@ static int ScavSetUp( SGlob *GPtr)
- 	short	ioRefNum;
- #endif
- 
--	GPtr->MinorRepairsP = nil;
-+	GPtr->MinorRepairsP = NULL;
- 	
- 	GPtr->itemsProcessed = 0;
- 	GPtr->lastProgress = 0;
-@@ -774,7 +774,7 @@ static int ScavSetUp( SGlob *GPtr)
- 		ScavStaticStructures	*pointer;
- 		
- 		pointer = (ScavStaticStructures *) AllocateClearMemory( sizeof(ScavStaticStructures) );
--		if ( pointer == nil ) {
-+		if (pointer == NULL) {
- 			if ( GPtr->logLevel >= kDebugLog ) {
- 				printf( "\t error %d - could not allocate %i bytes of memory \n",
- 					R_NoMem, sizeof(ScavStaticStructures) );
-@@ -831,7 +831,7 @@ static int ScavSetUp( SGlob *GPtr)
- 	//	Save current value of vcbWrCnt, to detect modifications to volume by other apps etc
- 	if ( GPtr->volumeFeatures & volumeIsMountedMask )
- 	{
--		FlushVol( nil, GPtr->realVCB->vcbVRefNum );	//	Ask HFS to update all changes to disk
-+		FlushVol(NULL, GPtr->realVCB->vcbVRefNum);	//	Ask HFS to update all changes to disk
- 		GPtr->wrCnt = GPtr->realVCB->vcbWrCnt;		//	Remember write count after writing changes
- 	}
- #endif
-@@ -949,7 +949,7 @@ static int ScavSetUp( SGlob *GPtr)
-  	
- 	// Keep a valid file id list for HFS volumes
- 	GPtr->validFilesList = (UInt32**)NewHandle( 0 );
--	if ( GPtr->validFilesList == nil ) {
-+	if (GPtr->validFilesList == NULL) {
- 		if ( GPtr->logLevel >= kDebugLog ) {
- 			printf( "\t error %d - could not allocate file ID list \n", R_NoMem );
- 		}
-@@ -995,17 +995,17 @@ static int ScavTerm( SGlobPtr GPtr )
- 
- 	(void) BitMapCheckEnd();
- 
--	while( (rP = GPtr->MinorRepairsP) != nil )		//	loop freeing leftover (undone) repair orders
-+	while((rP = GPtr->MinorRepairsP) != NULL)		//	loop freeing leftover (undone) repair orders
- 	{
- 		GPtr->MinorRepairsP = rP->link;				//	(in case repairs were not made)
- 		DisposeMemory(rP);
- 		err = MemError();
- 	}
- 	
--	if( GPtr->validFilesList != nil )
-+	if (GPtr->validFilesList != NULL)
- 		DisposeHandle( (Handle) GPtr->validFilesList );
- 	
--	if( GPtr->overlappedExtents != nil ) {
-+	if (GPtr->overlappedExtents != NULL) {
-  		extentsTableH = GPtr->overlappedExtents;
-  	
- 		/* Overlapped extents list also allocated memory for attribute name */
-@@ -1021,44 +1021,44 @@ static int ScavTerm( SGlobPtr GPtr )
- 		DisposeHandle( (Handle) GPtr->overlappedExtents );
- 	}
- 	
--	if( GPtr->fileIdentifierTable != nil )
-+	if (GPtr->fileIdentifierTable != NULL)
- 		DisposeHandle( (Handle) GPtr->fileIdentifierTable );
- 	
--	if( GPtr->calculatedVCB == nil )								//	already freed?
-+	if (GPtr->calculatedVCB == NULL)								//	already freed?
- 		return( noErr );
- 
- 	//	If the FCB's and BTCB's have been set up, dispose of them
- 	fcbP = GPtr->calculatedExtentsFCB;	// release extent file BTree bit map
--	if ( fcbP != nil )
-+	if (fcbP != NULL)
- 	{
- 		btcbP = (BTreeControlBlock*)fcbP->fcbBtree;
--		if ( btcbP != nil)
-+		if (btcbP != NULL)
- 		{
--			if( btcbP->refCon != nil )
-+			if (btcbP->refCon != NULL)
- 			{
--				if(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != nil)
-+				if (((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != NULL)
- 				{
- 					DisposeMemory(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr);
- 					err = MemError();
- 				}
- 				DisposeMemory( (Ptr)btcbP->refCon );
- 				err = MemError();
--				btcbP->refCon = nil;
-+				btcbP->refCon = NULL;
- 			}
- 				
- 			fcbP = GPtr->calculatedCatalogFCB;	//	release catalog BTree bit map
- 			btcbP = (BTreeControlBlock*)fcbP->fcbBtree;
- 				
--			if( btcbP->refCon != nil )
-+			if (btcbP->refCon != NULL)
- 			{
--				if(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != nil)
-+				if (((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr != NULL)
- 				{
- 					DisposeMemory(((BTreeExtensionsRec*)btcbP->refCon)->BTCBMPtr);
- 					err = MemError();
- 				}
- 				DisposeMemory( (Ptr)btcbP->refCon );
- 				err = MemError();
--				btcbP->refCon = nil;
-+				btcbP->refCon = NULL;
- 			}
- 		}
- 	}
-@@ -1066,7 +1066,7 @@ static int ScavTerm( SGlobPtr GPtr )
- 	DisposeMemory( GPtr->calculatedVCB );						//	Release our block of data structures	
- 	err = MemError();
- 
--	GPtr->calculatedVCB = nil;
-+	GPtr->calculatedVCB = NULL;
- 
- 	return( noErr );
- }
-@@ -1113,7 +1113,7 @@ Boolean IsBlueBoxSharedDrive ( DrvQElPtr dqPtr )
- 	// Now look at the name of the Driver name. If it is .BlueBoxShared keep it out of the list of available disks.
- 	driverDCtlHandle = GetDCtlEntry(dqPtr->dQRefNum);
- 	driverDCtlPtr = *driverDCtlHandle;
--	if((((driverDCtlPtr->dCtlFlags) & Is_Native_Mask) == 0) && (driverDCtlPtr->dCtlDriver != nil))
-+	if((((driverDCtlPtr->dCtlFlags) & Is_Native_Mask) == 0) && (driverDCtlPtr->dCtlDriver != NULL))
- 	{
- 		if (((driverDCtlPtr->dCtlFlags) & Is_Ram_Based_Mask) == 0)
- 		{
-@@ -1127,19 +1127,19 @@ Boolean IsBlueBoxSharedDrive ( DrvQElPtr dqPtr )
- 			
- 		}
- 		driverName = (StringPtr)&(drvrHeaderPtr->drvrName);
--		if (!(IdenticalString(driverName,blueBoxSharedDriverName,nil)))
-+		if (!(IdenticalString(driverName,blueBoxSharedDriverName,NULL)))
- 		{
- 			return( true );
- 		}
- 
- 		// Special case for the ".Sony" floppy driver which might be accessed in Shared mode inside the Blue Box
- 		// Test its "where" string instead of the driver name.
--		if (!(IdenticalString(driverName,sonyDriverName,nil)))
-+		if (!(IdenticalString(driverName,sonyDriverName,NULL)))
- 		{
- 			CntrlParam			paramBlock;
- 		
--			paramBlock.ioCompletion	= nil;
--			paramBlock.ioNamePtr	= nil;
-+			paramBlock.ioCompletion	= NULL;
-+			paramBlock.ioNamePtr	= NULL;
- 			paramBlock.ioVRefNum	= dqPtr->dQDrive;
- 			paramBlock.ioCRefNum	= dqPtr->dQRefNum;
- 			paramBlock.csCode		= kDriveIcon;						// return physical icon
-@@ -1152,7 +1152,7 @@ Boolean IsBlueBoxSharedDrive ( DrvQElPtr dqPtr )
- 				
- 				iconAndStringRecPtr = * (IconAndStringRecPtr*) & paramBlock.csParam;
- 				whereStringPtr = (StringPtr) & iconAndStringRecPtr->string;
--				if (!(IdenticalString(whereStringPtr,blueBoxFloppyWhereString,nil)))
-+				if (!(IdenticalString(whereStringPtr,blueBoxFloppyWhereString,NULL)))
- 				{
- 					return( true );
- 				}
-diff --git a/fsck_hfs.tproj/dfalib/SRepair.c b/fsck_hfs.tproj/dfalib/SRepair.c
-index 89c12d6..b261c37 100644
---- a/fsck_hfs.tproj/dfalib/SRepair.c
-+++ b/fsck_hfs.tproj/dfalib/SRepair.c
-@@ -844,7 +844,7 @@ static	int	DelFThd( SGlobPtr GPtr, UInt32 fid )				//	the file ID
- 
- 	isHFSPlus = VolumeObjectIsHFSPlus( );
- 	
--	BuildCatalogKey( fid, (const CatalogName*) nil, isHFSPlus, &key );
-+	BuildCatalogKey(fid, NULL, isHFSPlus, &key);
- 	result = SearchBTreeRecord( GPtr->calculatedCatalogFCB, &key, kNoHint, &foundKey, &record, &recSize, &hint );
- 	
- 	if ( result )	return ( IntError( GPtr, result ) );
-@@ -910,7 +910,7 @@ static	OSErr	FixDirThread( SGlobPtr GPtr, UInt32 did )	//	the dir ID
- 
- 	isHFSPlus = VolumeObjectIsHFSPlus( );
- 
--	BuildCatalogKey( did, (const CatalogName*) nil, isHFSPlus, &key );
-+	BuildCatalogKey(did, NULL, isHFSPlus, &key);
- 	result = SearchBTreeRecord( GPtr->calculatedCatalogFCB, &key, kNoHint, &foundKey, &record, &recSize, &hint );
- 	
- 	if ( result )
-@@ -2171,7 +2171,7 @@ static	OSErr	FixOrphanedFiles ( SGlobPtr GPtr )
- 				}
- 
- 				//-- Build the key for the file thread
--				BuildCatalogKey( cNodeID, nil, isHFSPlus, &key );
-+				BuildCatalogKey(cNodeID, NULL, isHFSPlus, &key);
- 
- 				err = SearchBTreeRecord( GPtr->calculatedCatalogFCB, &key, kNoHint, 
- 										 &tempKey, &threadRecord, &recordSize, &hint2 );
-diff --git a/fsck_hfs.tproj/dfalib/SUtils.c b/fsck_hfs.tproj/dfalib/SUtils.c
-index 6e9253e..491afbf 100644
---- a/fsck_hfs.tproj/dfalib/SUtils.c
-+++ b/fsck_hfs.tproj/dfalib/SUtils.c
-@@ -395,11 +395,11 @@ OSErr GetVolumeFeatures( SGlobPtr GPtr )
- 	err = GetVCBDriveNum( &GPtr->realVCB, GPtr->DrvNum );
- 	ReturnIfError( err );
- 
--	if ( GPtr->realVCB != nil )
-+	if (GPtr->realVCB != NULL)
- 	{
- 		GPtr->volumeFeatures	|= volumeIsMountedMask;
- 
--		pb.ioParam.ioNamePtr	= nil;
-+		pb.ioParam.ioNamePtr	= NULL;
- 		pb.ioParam.ioVRefNum	= GPtr->realVCB->vcbVRefNum;
- 		pb.ioParam.ioBuffer		= (Ptr) &buffer;
- 		pb.ioParam.ioReqCount	= sizeof( buffer );
-@@ -2282,7 +2282,7 @@ void print_prime_buckets(PrimeBuckets *cur);
-  *     	   	4. btreetye - can be kHFSPlusCatalogRecord or kHFSPlusAttributeRecord
-  *                            indicates which btree prime number bucket should be incremented
-  *
-- * Output:	nil
-+ * Output:	NULL
-  */
- void RecordXAttrBits(SGlobPtr GPtr, UInt16 flags, HFSCatalogNodeID fileid, UInt16 btreetype) 
- {
-diff --git a/fsck_hfs.tproj/dfalib/SVerify1.c b/fsck_hfs.tproj/dfalib/SVerify1.c
-index 39bda5c..c33155f 100644
---- a/fsck_hfs.tproj/dfalib/SVerify1.c
-+++ b/fsck_hfs.tproj/dfalib/SVerify1.c
-@@ -790,13 +790,13 @@ OSErr	CreateExtentsBTreeControlBlock( SGlobPtr GPtr )
- 	//	set up our DFA extended BTCB area.  Will we have enough memory on all HFS+ volumes.
- 	//
- 	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == nil ) {
-+	if (btcb->refCon == NULL) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
- 	size = (btcb->totalNodes + 7) / 8;											//	size of BTree bit map
- 	((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr = AllocateClearMemory(size);			//	get precleared bitmap
--	if ( ((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == nil )
-+	if (((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == NULL)
- 	{
- 		err = R_NoMem;
- 		goto exit;
-@@ -1145,13 +1145,13 @@ OSErr	CreateCatalogBTreeControlBlock( SGlobPtr GPtr )
- 	//
- 
- 	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == nil ) {
-+	if (btcb->refCon == NULL) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
- 	size = (btcb->totalNodes + 7) / 8;											//	size of BTree bit map
- 	((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr = AllocateClearMemory(size);			//	get precleared bitmap
--	if ( ((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == nil )
-+	if (((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == NULL)
- 	{
- 		err = R_NoMem;
- 		goto exit;
-@@ -1339,7 +1339,7 @@ OSErr CatHChk( SGlobPtr GPtr )
- 	
- 	//¥¥ Can we ignore this part by just taking advantage of setting the selCode = 0x8001;
- 	{ 
--		BuildCatalogKey( 1, (const CatalogName *)nil, isHFSPlus, &key );
-+		BuildCatalogKey(1, NULL, isHFSPlus, &key);
- 		result = SearchBTreeRecord( GPtr->calculatedCatalogFCB, &key, kNoHint, &foundKey, &threadRecord, &recSize, &hint );
- 	
- 		GPtr->TarBlock = hint;									/* set target block */
-@@ -1443,7 +1443,7 @@ OSErr CatHChk( SGlobPtr GPtr )
- 				/* 
- 				 * Find thread record
- 				 */
--				BuildCatalogKey( dprP->directoryID, (const CatalogName *) nil, isHFSPlus, &key );
-+				BuildCatalogKey(dprP->directoryID, NULL, isHFSPlus, &key);
- 				result = SearchBTreeRecord( GPtr->calculatedCatalogFCB, &key, kNoHint, &foundKey, &threadRecord, &recSize, &hint );
- 				if ( result != noErr ) {
- 					char idStr[16];
-@@ -1780,26 +1780,26 @@ OSErr	CreateAttributesBTreeControlBlock( SGlobPtr GPtr )
- 	//	set up our DFA extended BTCB area.  Will we have enough memory on all HFS+ volumes.
- 	//
- 	btcb->refCon = AllocateClearMemory( sizeof(BTreeExtensionsRec) );			// allocate space for our BTCB extensions
--	if ( btcb->refCon == nil ) {
-+	if (btcb->refCon == NULL) {
- 		err = R_NoMem;
- 		goto exit;
- 	}
- 
- 	if (btcb->totalNodes == 0)
- 	{
--		((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr			= nil;
-+		((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr			= NULL;
- 		((BTreeExtensionsRec*)btcb->refCon)->BTCBMSize			= 0;
- 		((BTreeExtensionsRec*)btcb->refCon)->realFreeNodeCount	= 0;
- 	}
- 	else
- 	{
--		if ( btcb->refCon == nil ) {
-+		if (btcb->refCon == NULL) {
- 			err = R_NoMem;
- 			goto exit;
- 		}
- 		size = (btcb->totalNodes + 7) / 8;											//	size of BTree bit map
- 		((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr = AllocateClearMemory(size);			//	get precleared bitmap
--		if ( ((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == nil )
-+		if (((BTreeExtensionsRec*)btcb->refCon)->BTCBMPtr == NULL)
- 		{
- 			err = R_NoMem;
- 			goto exit;
-@@ -2358,7 +2358,7 @@ static	OSErr	RcdMDBEmbededVolDescriptionErr( SGlobPtr GPtr, OSErr type, HFSMaste
- 	RcdError( GPtr, type );												//	first, record the error
- 	
- 	p = AllocMinorRepairOrder( GPtr, sizeof(EmbededVolDescription) );	//	get the node
--	if ( p == nil )	return( R_NoMem );
-+	if (p == NULL)	return( R_NoMem );
- 	
- 	p->type							=  type;							//	save error info
- 	desc							=  (EmbededVolDescription *) &(p->name);
-@@ -2397,7 +2397,7 @@ static	OSErr	RcdInvalidWrapperExtents( SGlobPtr GPtr, OSErr type )
- 	RcdError( GPtr, type );												//	first, record the error
- 	
- 	p = AllocMinorRepairOrder( GPtr, 0 );	//	get the node
--	if ( p == nil )	return( R_NoMem );
-+	if (p == NULL)	return( R_NoMem );
- 	
- 	p->type							=  type;							//	save error info
- 	
-@@ -3029,7 +3029,7 @@ OSErr	CheckFileExtents( SGlobPtr GPtr, UInt32 fileNumber, UInt8 forkType,
- 	foundBadExtent = false;
- 	lastExtentIndex = GPtr->numExtents;
- 	
--	while ( (extents != nil) && (err == noErr) )
-+	while ((extents != NULL) && (err == noErr))
- 	{	
- 		//	checkout the extent record first
- 		err = ChkExtRec( GPtr, extents, &lastExtentIndex );
-@@ -3105,7 +3105,7 @@ OSErr	CheckFileExtents( SGlobPtr GPtr, UInt32 fileNumber, UInt8 forkType,
- 			if ( err == btNotFound )
- 			{
- 				err = noErr;								//	 no more extent records
--				extents = nil;
-+				extents = NULL;
- 				break;
- 			}
- 			else if ( err != noErr )
-@@ -3121,7 +3121,7 @@ OSErr	CheckFileExtents( SGlobPtr GPtr, UInt32 fileNumber, UInt8 forkType,
- 			if ( err == btNotFound )
- 			{
- 				err = noErr;								//	 no more extent records
--				extents = nil;
-+				extents = NULL;
- 				break;
- 			}
- 			else if ( err != noErr )
-@@ -3205,7 +3205,7 @@ static OSErr	AddExtentToOverlapList( SGlobPtr GPtr, HFSCatalogNodeID fileNumber,
- 	}
- 	
- 	//	If it's uninitialized
--	if ( GPtr->overlappedExtents == nil )
-+	if (GPtr->overlappedExtents == NULL)
- 	{
- 		GPtr->overlappedExtents	= (ExtentsTable **) NewHandleClear( sizeof(ExtentsTable) );
- 		extentsTableH	= GPtr->overlappedExtents;
-diff --git a/fsck_hfs.tproj/dfalib/SVerify2.c b/fsck_hfs.tproj/dfalib/SVerify2.c
-index c68f3d8..da1a982 100644
---- a/fsck_hfs.tproj/dfalib/SVerify2.c
-+++ b/fsck_hfs.tproj/dfalib/SVerify2.c
-@@ -1013,7 +1013,7 @@ static int BTKeyChk( SGlobPtr GPtr, NodeDescPtr nodeP, BTreeControlBlock *btcb )
- 	UInt16				keyLength;
- 	KeyPtr 				keyPtr;
- 	UInt8				*dataPtr;
--	KeyPtr				prevkeyP	= nil;
-+	KeyPtr				prevkeyP	= NULL;
- 
- 
- 	if ( nodeP->numRecords == 0 )
-@@ -1044,7 +1044,7 @@ static int BTKeyChk( SGlobPtr GPtr, NodeDescPtr nodeP, BTreeControlBlock *btcb )
- 				return( E_KeyLen );
- 			}
- 	
--			if ( prevkeyP != nil )
-+			if (prevkeyP != NULL)
- 			{
- 				if ( CompareKeys( (BTreeControlBlockPtr)btcb, prevkeyP, keyPtr ) >= 0 )
- 				{
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0011-Fix-types.patch b/trunk/package/feeds/packages/hfsprogs/patches/0011-Fix-types.patch
deleted file mode 100644
index 88c049fc..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0011-Fix-types.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:22 -0200
-Subject: Fix types
-
----
- fsck_hfs.tproj/cache.c | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/fsck_hfs.tproj/cache.c b/fsck_hfs.tproj/cache.c
-index 527088a..540fa0b 100644
---- a/fsck_hfs.tproj/cache.c
-+++ b/fsck_hfs.tproj/cache.c
-@@ -961,20 +961,21 @@ int CacheLookup (Cache_t *cache, uint64_t off, Tag_t **tag)
-  */
- int CacheRawRead (Cache_t *cache, uint64_t off, uint32_t len, void *buf)
- {
--	uint64_t	result;
-+	off_t	result1;
-+	ssize_t result2;
- 		
- 	/* Both offset and length must be multiples of the device block size */
- 	if (off % cache->DevBlockSize) return (EINVAL);
- 	if (len % cache->DevBlockSize) return (EINVAL);
- 	
- 	/* Seek to the position */
--	result = lseek (cache->FD_R, off, SEEK_SET);
--	if (result < 0) return (errno);
--	if (result != off) return (ENXIO);
-+	result1 = lseek(cache->FD_R, off, SEEK_SET);
-+	if (result1 < 0) return (errno);
-+	if (result1 != off) return (ENXIO);
- 	/* Read into the buffer */
--	result = read (cache->FD_R, buf, len);
--	if (result < 0) return (errno);
--	if (result == 0) return (ENXIO);
-+	result2 = read(cache->FD_R, buf, len);
-+	if (result2 < 0) return (errno);
-+	if (result2 == 0) return (ENXIO);
- 
- 	/* Update counters */
- 	cache->DiskRead++;
-@@ -989,21 +990,22 @@ int CacheRawRead (Cache_t *cache, uint64_t off, uint32_t len, void *buf)
-  */
- int CacheRawWrite (Cache_t *cache, uint64_t off, uint32_t len, void *buf)
- {
--	uint64_t	result;
-+	off_t	result1;
-+	ssize_t result2;
- 	
- 	/* Both offset and length must be multiples of the device block size */
- 	if (off % cache->DevBlockSize) return (EINVAL);
- 	if (len % cache->DevBlockSize) return (EINVAL);
- 	
- 	/* Seek to the position */
--	result = lseek (cache->FD_W, off, SEEK_SET);
--	if (result < 0) return (errno);
--	if (result != off) return (ENXIO);
-+	result1 = lseek (cache->FD_W, off, SEEK_SET);
-+	if (result1 < 0) return (errno);
-+	if (result1 != off) return (ENXIO);
- 	
- 	/* Write into the buffer */
--	result = write (cache->FD_W, buf, len);
--	if (result < 0) return (errno);
--	if (result == 0) return (ENXIO);
-+	result2 = write (cache->FD_W, buf, len);
-+	if (result2 < 0) return (errno);
-+	if (result2 == 0) return (ENXIO);
- 	
- 	/* Update counters */
- 	cache->DiskWrite++;
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0012-Fix-mkfs-not-creating-UUIDs-for-new-filesystems.patch b/trunk/package/feeds/packages/hfsprogs/patches/0012-Fix-mkfs-not-creating-UUIDs-for-new-filesystems.patch
deleted file mode 100644
index 883a7b74..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0012-Fix-mkfs-not-creating-UUIDs-for-new-filesystems.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Matthew Garrett <mjg59@codon.org.uk>
-Date: Thu, 24 Oct 2013 01:11:22 -0200
-Subject: Fix mkfs not creating UUIDs for new filesystems.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix mkfs not creating UUIDs for new filesystems.
-
-Thanks to Lars Noodén for reporting the bug at
- <https://bugs.launchpad.net/bugs/737002>.
-
-This closes LP: #737002.
----
- include/missing.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/include/missing.h b/include/missing.h
-index 0a859c4..f50e8fb 100644
---- a/include/missing.h
-+++ b/include/missing.h
-@@ -72,7 +72,7 @@
- #define NAME_MAX	255
- 
- /* Byteswap stuff */
--#define NXSwapHostLongToBig(x)		cpu_to_be64(x)
-+#define NXSwapHostLongToBig(x)		cpu_to_be32(x)
- #define NXSwapBigShortToHost(x) 	be16_to_cpu(x)
- #define OSSwapBigToHostInt16(x)		be16_to_cpu(x)
- #define NXSwapBigLongToHost(x)		be32_to_cpu(x)
-@@ -88,6 +88,9 @@
- #ifndef be32_to_cpu
- #define be32_to_cpu(x) bswap_32(x)
- #endif
-+#ifndef cpu_to_be32
-+#define cpu_to_be32(x) bswap_32(x)
-+#endif
- #ifndef be64_to_cpu
- #define be64_to_cpu(x) bswap_64(x)
- #endif
-@@ -102,6 +105,9 @@
- #ifndef be32_to_cpu
- #define be32_to_cpu(x)	(x)
- #endif
-+#ifndef cpu_to_be32
-+#define cpu_to_be32(x)	(x)
-+#endif
- #ifndef be64_to_cpu
- #define be64_to_cpu(x)	(x)
- #endif
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0013-Fix-manpages.patch b/trunk/package/feeds/packages/hfsprogs/patches/0013-Fix-manpages.patch
deleted file mode 100644
index d78083bd..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0013-Fix-manpages.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Theodoro=20de=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 25 Nov 2010 00:00:00 -0200
-Subject: Fix manpages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove typos, references in the "See also" sections of the manpages to
-commands that are not available in Debian systems (and, quite probably,
-other systems too) and non-Linux specific comments.
-
-Authored also by Christoph Hellwig <hch@lst.de> and  "A. Costa" <agcosta@gis.net>
-
-Bug-Debian: http://bugs.debian.org/598714
-Bug-Debian: http://bugs.debian.org/575201
-Forwarded: no
-Reviewed-by: Rogério Theodoro de Brito <rbrito@ime.usp.br>
----
- fsck_hfs.tproj/fsck_hfs.8   | 18 +++++++-----------
- newfs_hfs.tproj/newfs_hfs.8 | 23 ++++++++---------------
- 2 files changed, 15 insertions(+), 26 deletions(-)
-
-diff --git a/fsck_hfs.tproj/fsck_hfs.8 b/fsck_hfs.tproj/fsck_hfs.8
-index aec9949..0bc804d 100644
---- a/fsck_hfs.tproj/fsck_hfs.8
-+++ b/fsck_hfs.tproj/fsck_hfs.8
-@@ -19,18 +19,18 @@
- .Dt FSCK_HFS 8
- .Os "Mac OS X"
- .Sh NAME
--.Nm fsck_hfs
-+.Nm fsck.hfs
- .Nd HFS file system consistency check
- .Sh SYNOPSIS
--.Nm fsck_hfs
-+.Nm fsck.hfs
- .Fl q
- .Op Fl df
- .Ar special ...
--.Nm fsck_hfs
-+.Nm fsck.hfs
- .Fl p
- .Op Fl df
- .Ar special ...
--.Nm fsck_hfs
-+.Nm fsck.hfs
- .Op Fl n | y | r
- .Op Fl dfgl
- .Op Fl m Ar mode
-@@ -52,9 +52,7 @@ The second form of
- preens the specified file systems.
- It is normally started by
- .Xr fsck 8
--run from
--.Pa /etc/rc.boot
--during automatic reboot, when a HFS file system is detected.
-+during systen boot, when a HFS file system is detected.
- When preening file systems,
- .Nm
- will fix common inconsistencies for file systems that were not
-@@ -105,9 +103,9 @@ to check and repair journaled HFS+ file systems.
- .It Fl g
- Causes
- .Nm
--to generate it's output strings in GUI format.
-+to generate its output strings in GUI format.
- This option is used when another application with a graphical user interface
--(like Mac OS X Disk Utility) is envoking the
-+(like Mac OS X Disk Utility) is invoking the
- .Nm
- tool.
- .It Fl l
-@@ -144,8 +142,6 @@ specified file system for a new catalog file and if there is no damage
- to the leaf nodes in the existing catalog file.
- .El
- .Pp
--Because of inconsistencies between the block device and the buffer cache,
--the raw device should always be used.
- .Sh SEE ALSO
- .Xr fsck 8
- .Sh BUGS
-diff --git a/newfs_hfs.tproj/newfs_hfs.8 b/newfs_hfs.tproj/newfs_hfs.8
-index d002cc9..fe91962 100644
---- a/newfs_hfs.tproj/newfs_hfs.8
-+++ b/newfs_hfs.tproj/newfs_hfs.8
-@@ -19,10 +19,10 @@
- .Dt NEWFS_HFS 8
- .Os "Mac OS X"
- .Sh NAME
--.Nm newfs_hfs
-+.Nm mkfs.hfs
- .Nd construct a new HFS Plus file system
- .Sh SYNOPSIS
--.Nm newfs_hfs
-+.Nm mkfs.hfs
- .Op Fl N Ar [partition-size]
- .Op Fl U Ar uid
- .Op Fl G Ar gid
-@@ -37,19 +37,13 @@
- .Op Fl v Ar volume-name
- .Ar special
- .Sh DESCRIPTION
--.Nm Newfs_hfs
-+.Nm mkfs.hfs
- builds an HFS Plus file system on the specified special device.
--Before running 
--.Nm newfs_hfs
--the disk should be partitioned using the
--.Em Disk Utility
--application or
--.Xr pdisk 8 .
- .Pp
- The file system default parameters are calculated based on
- the size of the disk partition. Typically the defaults are
- reasonable, however
--.Nm newfs_hfs
-+.Nm mkfs.hfs
- has several options to allow the defaults to be selectively overridden.
- The options are as follows:
- .Bl -tag -width Fl
-@@ -66,7 +60,7 @@ Set the group of the file system's root directory to
- Specify the access permissions mask for the file system's root directory.
- .It Fl h
- Creates a legacy HFS format filesystem. This option
--is not recomended for file systems that will be
-+is not recommended for file systems that will be
- primarily used with Mac OS X or Darwin.
- .It Fl s
- Creates a case-sensitive HFS Plus filesystem. By
-@@ -93,7 +87,7 @@ sizes are specified with the
- option followed by a comma
- separated list of the form arg=blocks.
- .Pp
--Example:  -c c=5000,e=500
-+Example:  \-c c=5000,e=500
- .Bl -tag -width Fl
- .It Em a=blocks
- Set the attribute file clump size.
-@@ -126,7 +120,7 @@ the form arg=bytes. The
- size must be a power of two and no larger than
- 32768 bytes.
- .Pp
--Example:  -n c=8192,e=4096
-+Example:  \-n c=8192,e=4096
- .Bl -tag -width Fl
- .It Em a=bytes
- Set the attribute b-tree node size.
-@@ -139,8 +133,7 @@ Set the extent overflow b-tree node size.
- Volume name (file system name) in ascii or UTF-8 format.
- .El
- .Sh SEE ALSO
--.Xr mount 8 ,
--.Xr pdisk 8
-+.Xr mount 8
- .Sh HISTORY
- The
- .Nm
diff --git a/trunk/package/feeds/packages/hfsprogs/patches/0014-uClibc_no_loadavg.patch b/trunk/package/feeds/packages/hfsprogs/patches/0014-uClibc_no_loadavg.patch
deleted file mode 100644
index 48649ba5..00000000
--- a/trunk/package/feeds/packages/hfsprogs/patches/0014-uClibc_no_loadavg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- diskdev_cmds-332.25/newfs_hfs.tproj/makehfs.c	2015-03-27 21:58:04.163171675 -0700
-+++ hfsprogs-332.25/newfs_hfs.tproj/makehfs.c	2015-03-27 21:56:03.687175020 -0700
-@@ -2119,10 +2119,12 @@
- 		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
- 		SHA1_Update(&context, sysctlstring, datalen);
- #endif
-+#ifndef __UCLIBC__
- 		/* The system's load average: */
- 		datalen = sizeof(sysloadavg);
- 		getloadavg(sysloadavg, 3);
- 		SHA1_Update(&context, &sysloadavg, datalen);
-+#endif
- 
- 		/* The system's VM statistics: */
- #if !LINUX
diff --git a/trunk/package/feeds/packages/hidapi/Makefile b/trunk/package/feeds/packages/hidapi/Makefile
deleted file mode 100644
index efdbbf51..00000000
--- a/trunk/package/feeds/packages/hidapi/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hidapi
-PKG_VERSION:=0.8.0-rc1
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/signal11/hidapi.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=hidapi-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE-bsd.txt
-
-PKG_MAINTAINER:=Paul Fertser <fercerpav@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/hidapi
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libusb-1.0 +libiconv +librt
-  TITLE:=Library to talk to HID devices
-  URL:=http://www.signal11.us/oss/hidapi/
-endef
-
-define Package/hidapi/description
-HIDAPI is a multi-platform library which allows an application to interface
-with USB and Bluetooth HID-Class devices on Windows, Linux, FreeBSD, and Mac
-OS X.  HIDAPI can be either built as a shared library (.so or .dll) or
-can be embedded directly into a target application by adding a single source
-file (per platform) and a single header.
-endef
-
-define Build/Configure
-endef
-
-MAKE_PATH=libusb
-MAKE_FLAGS+=-f Makefile.linux
-TARGET_CFLAGS+=$(FPIC)
-
-define Build/Compile
-	$(call Build/Compile/Default, libhidapi-libusb.so)
-	mv $(PKG_BUILD_DIR)/libusb/libhidapi-libusb.so \
-		$(PKG_BUILD_DIR)/libusb/libhidapi-libusb.so.0
-	ln -s libhidapi-libusb.so.0 $(PKG_BUILD_DIR)/libusb/libhidapi-libusb.so
-	sed    's^@prefix@^/usr^; \
-		s^@exec_prefix@^/usr^; \
-		s^@libdir@^$$$${exec_prefix}/lib^; \
-		s^@includedir@^$$$${prefix}/include^' \
-		< $(PKG_BUILD_DIR)/pc/hidapi-libusb.pc.in \
-		> $(PKG_BUILD_DIR)/pc/hidapi-libusb.pc
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/hidapi
-	$(CP) $(PKG_BUILD_DIR)/hidapi/hidapi.h $(1)/usr/include/hidapi/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libusb/libhidapi-libusb.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_BUILD_DIR)/pc/hidapi-libusb.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/hidapi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libusb/libhidapi-libusb.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,hidapi))
diff --git a/trunk/package/feeds/packages/hidapi/patches/010-add-iconv-linkage.patch b/trunk/package/feeds/packages/hidapi/patches/010-add-iconv-linkage.patch
deleted file mode 100644
index d942d506..00000000
--- a/trunk/package/feeds/packages/hidapi/patches/010-add-iconv-linkage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: hidapi-0.8.0-rc1/libusb/Makefile.linux
-===================================================================
---- hidapi-0.8.0-rc1.orig/libusb/Makefile.linux
-+++ hidapi-0.8.0-rc1/libusb/Makefile.linux
-@@ -22,7 +22,7 @@ COBJS_LIBUSB = hid.o
- COBJS = $(COBJS_LIBUSB)
- CPPOBJS   = ../hidtest/hidtest.o
- OBJS      = $(COBJS) $(CPPOBJS)
--LIBS_USB  = `pkg-config libusb-1.0 --libs` -lrt -lpthread
-+LIBS_USB  = `pkg-config libusb-1.0 --libs` -lrt -lpthread -liconv
- LIBS      = $(LIBS_USB)
- INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags`
- 
-@@ -33,7 +33,7 @@ hidtest-libusb: $(COBJS_LIBUSB) $(CPPOBJ
- 
- # Shared Libs
- libhidapi-libusb.so: $(COBJS_LIBUSB)
--	$(CC) $(LDFLAGS) $(LIBS_USB) -shared -fpic -Wl,-soname,$@.0 $^ -o $@
-+	$(CC) $(LDFLAGS) $^ $(LIBS_USB) -shared -fpic -Wl,-soname,$@.0 -o $@
- 
- # Objects
- $(COBJS): %.o: %.c
diff --git a/trunk/package/feeds/packages/horst/Makefile b/trunk/package/feeds/packages/horst/Makefile
deleted file mode 100644
index 607e2705..00000000
--- a/trunk/package/feeds/packages/horst/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=horst
-PKG_VERSION:=4.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-git.tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://br1.einfach.org/horst
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=version-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-MAKE_FLAGS += DEBUG=1
-
-define Package/horst
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=wireless
-	DEPENDS:=+libncurses
-	MAINTAINER:=Bruno Randolf <br1@einfach.org>
-	TITLE:=Highly Optimized 802.11 Radio Scanning Tool
-	URL:=http://br1.einfach.org/tech/horst/
-endef
-
-define Package/horst/description
-	[horst] is a scanning and analysis tool for 802.11 wireless networks
-	and especially IBSS (ad-hoc) mode and mesh networks (OLSR).
-endef
-
-define Package/horst/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/horst $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/horst.sh $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,horst))
diff --git a/trunk/package/feeds/packages/htop/Makefile b/trunk/package/feeds/packages/htop/Makefile
deleted file mode 100644
index 7cb47067..00000000
--- a/trunk/package/feeds/packages/htop/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=htop
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://hisham.hm/htop/releases/$(PKG_VERSION)/
-PKG_MD5SUM:=e768b9b55c033d9c1dffda72db3a6ac7
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/htop
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Interactive processes viewer
-  DEPENDS:=+libncurses
-  URL:=http://htop.sourceforge.net/
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-endef
-
-define Package/htop/description
- Htop is an ncursed-based process viewer similar to top, but
- it allows to scroll the list vertically and horizontally to
- see all processes and their full command lines.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-native-affinity \
-	--disable-unicode \
-	--enable-hwloc
-
-CONFIGURE_VARS += \
-	ac_cv_file__proc_stat=yes \
-	ac_cv_file__proc_meminfo=yes \
-	ac_cv_func_malloc_0_nonnull=yes \
-	ac_cv_func_realloc_0_nonnull=yes
-
-define Package/htop/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,htop))
diff --git a/trunk/package/feeds/packages/hub-ctrl/Makefile b/trunk/package/feeds/packages/hub-ctrl/Makefile
deleted file mode 100644
index 48cca4d7..00000000
--- a/trunk/package/feeds/packages/hub-ctrl/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hub-ctrl
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/codazoda/hub-ctrl.c.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3eef0240fac90067d081551e9f73dfa741d94a9e
-PKG_LICENSE:=GPL-2.0+
-
-PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/hub-ctrl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Control USB power on a port by port basis 
-  URL:=https://github.com/codazoda/hub-ctrl.c
-  DEPENDS:=+libusb-compat
-endef
-
-define Package/hub-ctrl/description
-  Control USB power on a port by port basis on some USB hubs.
-  This only works on USB hubs that have the hardware necessary 
-  to allow software controlled power switching.
-  Most hubs DO NOT include the hardware.
-endef
-
-define Build/Compile
-	$(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include \
-		-L$(STAGING_DIR)/usr/lib -lusb \
-		-o $(PKG_BUILD_DIR)/hub-ctrl $(PKG_BUILD_DIR)/hub-ctrl.c
-endef
-
-define Package/hub-ctrl/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hub-ctrl $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,hub-ctrl))
diff --git a/trunk/package/feeds/packages/ibrcommon/Makefile b/trunk/package/feeds/packages/ibrcommon/Makefile
deleted file mode 100644
index 579ded3c..00000000
--- a/trunk/package/feeds/packages/ibrcommon/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ibrcommon
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=0104763ede969c470f32244d76c234b8
-PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
-PKG_LICENSE:=Apache-2.0
-
-PKG_INSTALL:=1
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ibrcommon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libstdcpp +libpthread +librt +libnl +libopenssl
-  TITLE:=IBR Common C++ Library
-endef
-
-CONFIGURE_ARGS += \
-	--with-openssl
-
-define Package/ibrcommon/description
- A library with common functions for C++.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/ibrcommon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,ibrcommon))
diff --git a/trunk/package/feeds/packages/ibrdtn-tools/Makefile b/trunk/package/feeds/packages/ibrdtn-tools/Makefile
deleted file mode 100644
index 2ffb30a8..00000000
--- a/trunk/package/feeds/packages/ibrdtn-tools/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ibrdtn-tools
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=3e527cedc6132739403fc210e4f8abe2
-PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
-PKG_LICENSE:=Apache-2.0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ibrdtn-tools
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+ibrdtn +libarchive
-  TITLE:=DTN Tools
-endef
-
-define Package/ibrdtn-tools/description
- The IBR-DTN Tools include functionality for sending and receiving files (dtnsend/dtnrecv)
- and a tools to ping a DTN node (dtnping).
-endef
-
-CONFIGURE_ARGS += \
-	--without-libdaemon
-
-define Package/ibrdtn-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnping $(1)/usr/bin/dtnping
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnsend $(1)/usr/bin/dtnsend
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnrecv $(1)/usr/bin/dtnrecv
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtninbox $(1)/usr/bin/dtninbox
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnoutbox $(1)/usr/bin/dtnoutbox
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtntrigger $(1)/usr/bin/dtntrigger
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtntracepath $(1)/usr/bin/dtntracepath
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnstream $(1)/usr/bin/dtnstream
-endef
-
-$(eval $(call BuildPackage,ibrdtn-tools))
diff --git a/trunk/package/feeds/packages/ibrdtn/Makefile b/trunk/package/feeds/packages/ibrdtn/Makefile
deleted file mode 100644
index 45051ad3..00000000
--- a/trunk/package/feeds/packages/ibrdtn/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ibrdtn
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=37208be202f199f1790983ff78b2fa8f
-PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
-PKG_LICENSE:=Apache-2.0
-
-PKG_INSTALL:=1
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ibrdtn
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+ibrcommon +zlib
-  TITLE:=IBR-DTN Library
-endef
-
-define Package/ibrdtn/description
- Base library for IBR-DTN daemon and tools.
-endef
-
-CONFIGURE_ARGS += \
-	--with-compression \
-	--without-glib
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/ibrdtn/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,ibrdtn))
diff --git a/trunk/package/feeds/packages/ibrdtnd/Makefile b/trunk/package/feeds/packages/ibrdtnd/Makefile
deleted file mode 100644
index 36d59874..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ibrdtnd
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=933d37bf777700a6e1709d0f7a129613
-PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
-PKG_LICENSE:=Apache-2.0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ibrdtnd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+dtndht +ibrdtn +libsqlite3
-  TITLE:=DTN Daemon
-endef
-
-define Package/ibrdtnd/conffiles
-/etc/config/ibrdtn
-endef
-
-define Package/ibrdtnd/description
- The implementation of the bundle protocol of the IBR (TU Braunschweig).
-endef
-
-CONFIGURE_ARGS += \
-	--with-tls \
-	--with-sqlite \
-	--with-dht \
-	--without-wifip2p \
-	--without-vmime \
-	--disable-libdaemon
-
-define Package/ibrdtnd/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dtnd $(1)/usr/sbin/
-	$(INSTALL_BIN) files/safety-wrapper.sh $(1)/usr/sbin/dtnd-safety-wrapper.sh
-	$(INSTALL_DIR) $(1)/usr/share/ibrdtn/
-	$(INSTALL_BIN) files/build-config.sh $(1)/usr/share/ibrdtn/build-config.sh
-	$(INSTALL_BIN) files/mkcontainer.sh $(1)/usr/share/ibrdtn/mkcontainer.sh
-	$(INSTALL_BIN) files/mountcontainer.sh $(1)/usr/share/ibrdtn/mountcontainer.sh
-	$(INSTALL_BIN) files/systemcheck.sh $(1)/usr/share/ibrdtn/systemcheck.sh
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/ibrdtn.init $(1)/etc/init.d/ibrdtn
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/ibrdtn.uci $(1)/etc/config/ibrdtn
-endef
-
-$(eval $(call BuildPackage,ibrdtnd))
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/build-config.sh b/trunk/package/feeds/packages/ibrdtnd/files/build-config.sh
deleted file mode 100644
index c9a6128c..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/build-config.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/sh
-#
-# convert uci configuration into daemon specific format
-#
-
-UCI=/sbin/uci
-
-create_file() {
-	echo "# -- DO NOT EDIT THIS FILE --" > $1
-	echo "# automatic generated configuration file for IBR-DTN daemon" >> $1
-	echo "#" >> $1
-}
-
-add_param() {
-	VALUE=`$UCI -q get $2`
-	
-	if [ $? == 0 ]; then
-		echo "$3 = $VALUE" >> $1
-	fi
-}
-
-getconfig() {
-	$UCI -q get ibrdtn.$1
-	return $?
-}
-
-if [ "$1" == "--safe-mode" ]; then
-	SAFEMODE=yes
-	CONFFILE=$2
-else
-	SAFEMODE=no
-	CONFFILE=$1
-fi
-
-# create the file and write some header info
-create_file $CONFFILE
-
-add_param $CONFFILE "ibrdtn.main.uri" "local_uri"
-add_param $CONFFILE "ibrdtn.main.routing" "routing"
-add_param $CONFFILE "ibrdtn.main.fragmentation" "fragmentation"
-
-if [ "$SAFEMODE" == "yes" ]; then
-	if [ -n "`getconfig safemode.forwarding`" ]; then
-		add_param $CONFFILE "ibrdtn.safemode.forwarding" "routing_forwarding"
-	else
-		add_param $CONFFILE "ibrdtn.main.forwarding" "routing_forwarding"
-	fi
-
-	if [ -n "`getconfig safemode.maxblock`" ]; then
-		add_param $CONFFILE "ibrdtn.safemode.maxblock" "limit_blocksize"
-	else
-		add_param $CONFFILE "ibrdtn.main.blocksize" "limit_blocksize"
-	fi
-
-	if [ -n "`getconfig safemode.storage`" ]; then
-		add_param $CONFFILE "ibrdtn.safemode.storage" "limit_storage"
-	else
-		add_param $CONFFILE "ibrdtn.storage.limit" "limit_storage"
-	fi
-else
-	add_param $CONFFILE "ibrdtn.main.forwarding" "routing_forwarding"
-	add_param $CONFFILE "ibrdtn.main.blocksize" "limit_blocksize"
-	add_param $CONFFILE "ibrdtn.storage.limit" "limit_storage"
-	add_param $CONFFILE "ibrdtn.storage.blobs" "blob_path"
-	add_param $CONFFILE "ibrdtn.storage.bundles" "storage_path"
-	add_param $CONFFILE "ibrdtn.storage.engine" "storage"
-fi
-
-add_param $CONFFILE "ibrdtn.main.max_predated_timestamp" "limit_predated_timestamp"
-add_param $CONFFILE "ibrdtn.main.limit_lifetime" "limit_lifetime"
-add_param $CONFFILE "ibrdtn.main.foreign_blocksize" "limit_foreign_blocksize"
-
-add_param $CONFFILE "ibrdtn.discovery.address" "discovery_address"
-add_param $CONFFILE "ibrdtn.discovery.timeout" "discovery_timeout"
-add_param $CONFFILE "ibrdtn.discovery.version" "discovery_version"
-add_param $CONFFILE "ibrdtn.discovery.crosslayer" "discovery_crosslayer"
-
-add_param $CONFFILE "ibrdtn.tcptuning.idle_timeout" "tcp_idle_timeout"
-add_param $CONFFILE "ibrdtn.tcptuning.nodelay" "tcp_nodelay"
-add_param $CONFFILE "ibrdtn.tcptuning.chunksize" "tcp_chunksize"
-
-add_param $CONFFILE "ibrdtn.security.level" "security_level"
-add_param $CONFFILE "ibrdtn.security.bab_key" "security_bab_default_key"
-add_param $CONFFILE "ibrdtn.security.key_path" "security_path"
-add_param $CONFFILE "ibrdtn.security.generate_dh" "generate_dh_params"
-
-add_param $CONFFILE "ibrdtn.tls.certificate" "security_certificate"
-add_param $CONFFILE "ibrdtn.tls.key" "security_key"
-add_param $CONFFILE "ibrdtn.tls.trustedpath" "security_trusted_ca_path"
-add_param $CONFFILE "ibrdtn.tls.required" "security_tls_required"
-add_param $CONFFILE "ibrdtn.tls.noencryption" "security_tls_disable_encryption"
-add_param $CONFFILE "ibrdtn.tls.fallback_badclock" "security_tls_fallback_badclock"
-
-add_param $CONFFILE "ibrdtn.timesync.reference" "time_reference"
-add_param $CONFFILE "ibrdtn.timesync.synchronize" "time_synchronize"
-add_param $CONFFILE "ibrdtn.timesync.discovery_announcement" "time_discovery_announcements"
-add_param $CONFFILE "ibrdtn.timesync.sigma" "time_sigma"
-add_param $CONFFILE "ibrdtn.timesync.psi" "time_psi"
-add_param $CONFFILE "ibrdtn.timesync.sync_level" "time_sync_level"
-add_param $CONFFILE "ibrdtn.timesync.time_set_clock" "time_set_clock"
-
-add_param $CONFFILE "ibrdtn.dht.enabled" "dht_enabled"
-add_param $CONFFILE "ibrdtn.dht.port" "dht_port"
-add_param $CONFFILE "ibrdtn.dht.id" "dht_id"
-add_param $CONFFILE "ibrdtn.dht.bootstrap" "dht_bootstrapping"
-add_param $CONFFILE "ibrdtn.dht.nodesfile" "dht_nodes_file"
-add_param $CONFFILE "ibrdtn.dht.enable_ipv4" "dht_enable_ipv4"
-add_param $CONFFILE "ibrdtn.dht.enable_ipv6" "dht_enable_ipv6"
-add_param $CONFFILE "ibrdtn.dht.bind_ipv4" "dht_bind_ipv4"
-add_param $CONFFILE "ibrdtn.dht.bind_ipv6" "dht_bind_ipv6"
-add_param $CONFFILE "ibrdtn.dht.ignore_neighbour_informations" "dht_ignore_neighbour_informations"
-add_param $CONFFILE "ibrdtn.dht.allow_neighbours_to_announce_me" "dht_allow_neighbours_to_announce_me"
-add_param $CONFFILE "ibrdtn.dht.allow_neighbour_announcement" "dht_allow_neighbour_announcement"
-
-
-# iterate through all network interfaces
-iter=0
-netinterfaces=
-netinternet=
-while [ 1 == 1 ]; do
-	$UCI -q get "ibrdtn.@network[$iter]" > /dev/null
-	if [ $? == 0 ]; then
-		netinterfaces="${netinterfaces} lan${iter}"
-		add_param $CONFFILE "ibrdtn.@network[$iter].type" "net_lan${iter}_type"
-		add_param $CONFFILE "ibrdtn.@network[$iter].interface" "net_lan${iter}_interface"
-		add_param $CONFFILE "ibrdtn.@network[$iter].port" "net_lan${iter}_port"
-		if [ "$(uci -q get ibrdtn.@network[$iter].global)" == "yes" ]; then
-			netinternet="${netinternet} $(uci -q get ibrdtn.@network[$iter].interface)"
-		fi
-	else
-		break
-	fi
-	
-	let iter=iter+1
-done
-
-# write list of network interfaces
-echo "net_interfaces =$netinterfaces" >> $CONFFILE
-echo "net_internet =${netinternet}" >> $CONFFILE
-
-# iterate through all static routes
-iter=0
-while [ 1 == 1 ]; do
-	$UCI -q get "ibrdtn.@static-route[$iter]" > /dev/null
-	if [ $? == 0 ]; then
-		PATTERN=`$UCI -q get "ibrdtn.@static-route[$iter].pattern"`
-		DESTINATION=`$UCI -q get "ibrdtn.@static-route[$iter].destination"`
-		let NUMBER=iter+1
-		echo "route$NUMBER = $PATTERN $DESTINATION" >> $CONFFILE
-	else
-		break
-	fi
-	
-	let iter=iter+1
-done
-
-#iterate through all static connections
-iter=0
-while [ 1 == 1 ]; do
-	$UCI -q get "ibrdtn.@static-connection[$iter]" > /dev/null
-	if [ $? == 0 ]; then
-		let NUMBER=iter+1
-		add_param $CONFFILE "ibrdtn.@static-connection[$iter].uri" "static${NUMBER}_uri"
-		add_param $CONFFILE "ibrdtn.@static-connection[$iter].address" "static${NUMBER}_address"
-		add_param $CONFFILE "ibrdtn.@static-connection[$iter].port" "static${NUMBER}_port"
-		add_param $CONFFILE "ibrdtn.@static-connection[$iter].protocol" "static${NUMBER}_proto"
-		add_param $CONFFILE "ibrdtn.@static-connection[$iter].immediately" "static${NUMBER}_immediately"
-	else
-		break
-	fi
-	
-	let iter=iter+1
-done
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.init b/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.init
deleted file mode 100644
index 5a00c241..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.init
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-
-START=90
-
-start() {
-	# check if the daemon is disabled
-	if [ "`/sbin/uci -P/var/state -q get ibrdtn.disable`" == "1" ]; then
-		/bin/echo "dtnd is disabled"
-		return
-	fi
-	
-	/bin/echo -n "running dtnd ..."
-	
-	# startup the safety-wrapper for the daemon
-	/usr/sbin/dtnd-safety-wrapper.sh &
-	
-	# store the pid of the process in uci states
-	/sbin/uci -P/var/state -q set ibrdtn.safetypid=`echo $!`
-	
-	/bin/echo " done"
-}
-
-stop() { 
-	# check if the daemon is disabled
-	if [ "`/sbin/uci -P/var/state -q get ibrdtn.disable`" == "1" ]; then
-		/bin/echo "dtnd is disabled"
-		return
-	fi
-	
-	/bin/echo -n "stopping dtnd ..."
-	
-	# set state to None, this indicates a clear shutdown to the safety-wrapper.
-	/sbin/uci -P/var/state -q set ibrdtn.state=None
-	
-	# stop the safety-wrapper
-	if [ -n "`/sbin/uci -P/var/state -q get ibrdtn.safetypid`" ]; then
-		/usr/bin/kill `/sbin/uci -P/var/state -q get ibrdtn.safetypid` 2> /dev/null >/dev/null
-	fi
-	
-	# finally kill really all safety-wrapper!
-	/bin/sleep 2
-	/usr/bin/killall -9 dtnd-safety-wrapper.sh
-	
-	# send a kill signal to the daemon
-	/usr/bin/killall dtnd 2> /dev/null >/dev/null
-	
-	# wait for some time
-	TIMEOUT=0;
-	
-	# check if the daemon is running
-	while [ -n "`ps | grep dtnd | grep -v grep`" ]; do
-		# check if the daemon is still running
-		if [ $TIMEOUT -ge 10 ]; then
-			/bin/echo " killing"
-			# kill all processes of dtnd
-			/usr/bin/killall -9 dtnd 2> /dev/null >/dev/null
-			return
-		fi
-		
-		# increment timeout
-		TIMEOUT=`expr $TIMEOUT + 1`
-		
-		echo -n "."
-		
-		# wait some time
-		/bin/sleep 1
-	done
-	
-	echo " done"
-}
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.uci b/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.uci
deleted file mode 100644
index e0256818..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/ibrdtn.uci
+++ /dev/null
@@ -1,176 +0,0 @@
-#####################################
-# IBR-DTN daemon                    #
-#####################################
-
-config 'daemon' 'main'
-	# The local eid of the dtn node. Default is the hostname.
-#	option uri			dtn://node.dtn
-	
-	# logfile for standard output
-	option logfile		/tmp/ibrdtn.log
-	option errfile		/tmp/ibrdtn.err
-	
-	# debug level
-#	option debug		20
-
-	# block size limit
-#	option blocksize		512M
-#	option foreign_blocksize	128M
-
-
-#
-# If something bad happened, the safe mode will be activated.
-# These are the restrictions for safe mode only.
-#
-config 'daemon' 'safemode'
-	option forwarding	no
-	option storage		64M
-	option maxblock		16M
-#	option wait_mount	/dev/sda1
-
-
-#####################################
-# storage configuration             #
-#####################################
-
-config 'daemon' 'storage'
-	# possible engines are: simple, sqlite
-	option engine		simple
-	option blobs		/tmp/ibrdtn/blobs
-	option bundles		/tmp/ibrdtn/bundles
-#	option container	/tmp/ibrdtn/container.img
-#	option path			/tmp/ibrdtn/container
-#	option limit		1G
-
-
-#####################################
-# routing configuration             #
-#####################################
-
-#
-# In the "default" the daemon only delivers bundles to neighbors and static
-# available nodes. The alternative module "epidemic" spread all bundles to
-# all available neighbors.
-#
-config 'daemon' 'main'
-	# values: none | default | epidemic | flooding | prophet
-	option	routing		prophet
-#	option	forwarding	no
-#	option	fragmentation	yes
-
-#
-# static routing rules
-# - a rule is a regex pattern
-# - format is <target-scheme> <routing-node>
-#
-#config 'static-route'
-#	list pattern		^dtn://[[:alpha:]].moon.dtn/[[:alpha:]]
-#	option destination	dtn://router.dtn
-
-
-#####################################
-# static connections
-#####################################
-
-#config 'static-connection'
-#	option uri			dtn://node-five.dtn
-#	option address		10.0.0.5
-#	option port			4556
-#	option protocol		tcp
-#	option immediately	yes
-
-#config 'static-connection'
-#	option uri			dtn://node-ten
-#	option address		10.0.0.10
-#	option port			4556
-#	option protocol		udp
-#	option immediately	no
-
-
-#####################################
-# convergence layer configuration   #
-#####################################
-
-#
-# You can specify an multicast address to listen to for discovery announcements.
-# If no address is specified the multicast equivalent of broadcast is used.
-#
-config 'daemon' 'discovery'
-#	option address		224.0.0.1
-#	option timeout		5
-#	option crosslayer	yes
-
-config 'daemon' 'tcptuning'
-#	option 'idle_timeout'	120
-#	option 'nodelay'		yes
-#	option 'chunksize'		4096
-
-config 'network'
-	option type			tcp
-	option interface	eth0
-	option port			4556
-	option global		yes
-	
-#config 'network'
-#	option type			tcp
-#	option interface	wlan0
-#	option port			4556
-
-
-#####################################
-# bundle security protocol          #
-#####################################
-
-#
-# the level specifies the security constains
-#
-# 0 = no constrains (default)
-# 1 = accept only BAB authenticated bundles
-# 2 = accept only encrypted bundles
-# 3 = accept only BAB authenticated and encrypted bundles
-#
-
-#config 'daemon' 'security'
-#	option level		0
-#	option bab_key		/path/to/default-bab-key.mac
-#	option key_path		/path/to/security-keys
-#	option generate_dh	yes
-	
-#config 'daemon' 'tls'
-#	option certificate	/path/to/tls-cert.crt
-#	option key			/path/to/tls-key.key
-#	option trustedpath	/path/to/tls-ca
-#	option required		no
-#	option noencryption no
-
-
-#####################################
-# time synchronization              #
-#####################################
-
-#config 'daemon' 'timesync'
-#	option reference		yes
-#	option synchronize		yes
-#	option discovery_announcement	yes
-#	option sigma			1.001
-#	option psi			0.9
-#	option sync_level		0.1
-
-#####################################
-# DHT                               #
-#####################################
-
-config 'daemon' 'dht'
-#	option 'enabled'	'yes'
-#	option 'id'		'<enter your unique id here>'
-	option 'bootstrap'	'yes'
-#	option 'nodesfile'	'/tmp/dht_nodes.dat'
-	option 'port' 		'9999'
-	option 'enable_ipv6'	'no'
-#	option 'enable_ipv4'	'no'
-#	option 'bind_ipv4'	'127.0.0.1'
-#	option 'bind_ipv6'	'::1'
-	option 'ignore_neighbour_informations'		'yes'
-	option 'allow_neighbours_to_announce_me'	'no'
-	option 'allow_neighbour_announcement'		'no'
-
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/mkcontainer.sh b/trunk/package/feeds/packages/ibrdtnd/files/mkcontainer.sh
deleted file mode 100644
index 5718111b..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/mkcontainer.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# This script creates a bundle storage of a given size.
-#
-# $1 = container file
-# $2 = size of the container in MB
-#
-
-help_message() {
-	echo "usage: "
-	echo " $0 <container file> <size in MB>"
-}
-
-if [ $# -le 1 ]; then
-	help_message
-	exit 1
-fi
-
-CONTAINER=$(cd "$(dirname "$1")"; pwd)/$(basename $1)
-SIZE=$2
-
-# check if the container already exists
-if [ -f $CONTAINER ]; then
-	echo "Aborted! The specified container already exists."
-	exit 1
-fi
-
-# create the container
-echo -n "creating the container file..."
-/bin/dd if=/dev/zero of=$CONTAINER bs=1M count=$SIZE >/dev/null 2>/dev/null
-echo " done" 
-
-# create file system
-echo -n "initializing ext3 filesystem for the container..."
-/usr/sbin/mkfs.ext3 -q -F $CONTAINER > /dev/null
-echo " done"
-
-# final hint
-echo "The container is now ready. To use it with IBR-DTN set the container with:"
-echo "# uci set ibrdtn.storage.container=$CONTAINER"
-echo "# uci set ibrdtn.storage.container_size=$SIZE"
-
-exit 0
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/mountcontainer.sh b/trunk/package/feeds/packages/ibrdtnd/files/mountcontainer.sh
deleted file mode 100644
index 2eaed2f9..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/mountcontainer.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-#
-
-CONTAINER=`/sbin/uci -q get ibrdtn.storage.container`
-CPATH=`/sbin/uci -q get ibrdtn.storage.path`
-
-check_var() {
-	if [ -z "$1" ]; then
-		echo "$2"
-		exit 1
-	fi
-}
-
-check_path() {
-	if [ ! -d "$1" ]; then
-		echo "$2"
-		return 1
-	fi
-}
-
-check_file() {
-	if [ ! -f "$1" ]; then
-		echo "$2"
-		exit 1
-	fi
-}
-
-container_mount() {
-	CONTAINER=`/sbin/uci -q get ibrdtn.storage.container`
-	CPATH=`/sbin/uci -q get ibrdtn.storage.path`
-
-	if [ -z "`mount | grep ' on $CPATH '`" ]; then
-		# try to mount the container
-		/bin/mount -o loop $CONTAINER $CPATH
-
-		return $?
-	fi
-
-	return 0
-}
-
-container_reinitialize() {
-	SIZE=`/sbin/uci get -q ibrdtn.storage.container_size`
-	CONTAINER=`/sbin/uci -q get ibrdtn.storage.container`
-
-	# try to rebuild the container
-	if [ -n "$SIZE" ]; then
-		/bin/rm -f $CONTAINER
-		/usr/share/ibrdtn/mkcontainer.sh $CONTAINER $SIZE
-
-		if [ $? -eq 0 ]; then
-			container_mount
-			return $?
-		fi
-
-		return 1
-	fi
-
-	return 1
-}
-
-check_var $CONTAINER "Storage container not set in uci.\nuse: uci set ibrdtn.storage.container=<container-file>"
-check_var $CPATH "Storage container mount path not set in uci.\nuse: uci set ibrdtn.storage.path=<mount-path>"
-
-check_path $CPATH "Storage container mount path does not exist."
-if [ $? -gt 0 ]; then
-	/bin/mkdir -p $CPATH
-
-	if [ $? -gt 0 ]; then
-		echo "can not create container mount path."
-		exit 1
-	fi
-fi
-
-if [ "$1" == "-u" ]; then
-	/bin/umount $CPATH
-	exit 0
-fi
-
-if [ -n "`/bin/mount | grep $CPATH`" ]; then
-	echo "Container already mounted"
-	exit 0
-fi
-
-if [ ! -f "$CONTAINER" ]; then
-	echo "Storage container file $CONTAINER does not exist."
-	container_reinitialize
-	exit $?
-fi
-
-# try to mount the container
-container_mount
-
-if [ $? -gt 0 ]; then
-	echo -n "can not mount container file. checking... "
-	/usr/sbin/e2fsck -p $CONTAINER
-
-	if [ $? -gt 0 ]; then
-		echo " error"
-		echo "Container file $CONTAINER broken. Try to reinitialize the container."
-		container_reinitialize
-
-		if [ $? -eq 0 ]; then
-			echo "container ready!"
-			exit 0
-		else
-			exit 1
-		fi
-	fi
-	echo "done"
-
-	container_mount
-
-	if [ $? -gt 0 ]; then
-		echo "mount failed!"
-		exit 1
-	fi
-fi
-
-echo "container ready!"
-exit 0
-
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/safety-wrapper.sh b/trunk/package/feeds/packages/ibrdtnd/files/safety-wrapper.sh
deleted file mode 100644
index 2f35283d..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/safety-wrapper.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-#
-# safety wrapper for IBR-DTN daemon
-#
-# Tasks:
-#  * start IBR-DTN daemon
-#  * restart the daemon after a crash
-#  * if respawning to fast, then slow down with backoff
-#  * check for enough space on disk and delete bundles if necessary.
-#  * clean the blob directory on startup
-#
-
-DTND=/usr/sbin/dtnd
-TMPCONF=/tmp/ibrdtn.config
-UCI=/sbin/uci
-
-getstate() {
-	$UCI -P/var/state -q get ibrdtn.$1
-	return $?
-}
-
-setstate() {
-	$UCI -P/var/state -q set ibrdtn.$1=$2
-	return $?
-}
-
-getconfig() {
-	$UCI -q get ibrdtn.$1
-	return $?
-}
-
-setconfig() {
-	$UCI -q set ibrdtn.$1=$2
-	return $?
-}
-
-# remove the old state file
-/bin/rm /var/state/ibrdtn
-
-# read uci configuration
-BLOB_PATH=`getconfig storage.blobs`
-BUNDLE_PATH=`getconfig storage.bundles`
-CONTAINER_PATH=`getconfig storage.path`
-CONTAINER_FILE=`getconfig storage.container`
-LOG_FILE=`getconfig main.logfile`
-ERR_FILE=`getconfig main.errfile`
-DEBUG_LEVEL=`getconfig main.debug`
-SAFEMODE=no
-
-# run a system check
-/bin/sh /usr/share/ibrdtn/systemcheck.sh
-
-if [ $? -eq 0 ]; then
-	# mount container if specified
-	if [ -n "$CONTAINER_FILE" ] && [ -n "$CONTAINER_PATH" ]; then
-		/bin/sh /usr/share/ibrdtn/mountcontainer.sh
-
-		# if the mount of the container failed
-		# switch to safe mode!
-		if [ $? -gt 0 ]; then
-			SAFEMODE=yes
-		fi
-	fi
-else
-	SAFEMODE=yes
-fi
-
-# create blob & bundle path
-if [ -n "$BLOB_PATH" ]; then
-	/bin/mkdir -p $BLOB_PATH
-
-	# clean the blob directory on startup
-	/bin/rm -f $BLOB_PATH/file*
-fi
-
-if [ -n "$BUNDLE_PATH" ]; then
-	/bin/mkdir -p $BUNDLE_PATH
-fi
-
-LOGGING=""
-if [ -n "$LOG_FILE" ]; then
-	LOGGING="$LOGGING > $LOG_FILE"
-else
-	LOGGING="$LOGGING > /dev/null"
-fi
-
-if [ -n "$ERR_FILE" ]; then
-	LOGGING="$LOGGING 2> $ERR_FILE"
-else
-	LOGGING="$LOGGING 2> /dev/null"
-fi
-
-if [ -z "$LOG_FILE" ] && [ -z "$ERR_FILE" ]; then
-	LOGGING="-q"
-fi
-
-# check for debugging option
-if [ -n "$DEBUG_LEVEL" ]; then
-	DEBUG_ARGS="-v -d ${DEBUG_LEVEL}"
-else
-	DEBUG_ARGS=""
-fi
-
-# create configuration
-if [ "$SAFEMODE" == "yes" ]; then
-	/bin/sh /usr/share/ibrdtn/build-config.sh --safe-mode $TMPCONF
-else
-	/bin/sh /usr/share/ibrdtn/build-config.sh $TMPCONF
-fi
-
-# set the crash counter to zero
-CRASH=0
-
-# run the daemon
-setstate state running
-
-while [ "`getstate state`" == "running" ]; do
-	# run a system check
-	/bin/sh /usr/share/ibrdtn/systemcheck.sh
-
-	# run in safe mode if the system check has failed
-	if [ $? -gt 0 ] && [ "$SAFEMODE" == "no" ]; then
-		SAFEMODE=yes
-		/usr/bin/logger -t "ibrdtn-safe-wrapper" -p 2 "system check failed! Switch to safe-mode settings."
-		/bin/sh /usr/share/ibrdtn/build-config.sh --safe-mode $TMPCONF
-	fi
-
-	# measure the running time
-	TIMESTART=`/bin/date +%s`
-	
-	# run the daemon
-	echo "${DTND} ${DEBUG_ARGS} -c ${TMPCONF} ${LOGGING}" | /bin/sh
-	
-	# measure the stopping time
-	TIMESTOP=`/bin/date +%s`
-	
-	# calc the running time
-	let TIMERUN=$TIMESTOP-$TIMESTART
-	
-	# reset the CRASH counter if there is one hour between the crashes
-	if [ $TIMERUN -ge 3600 ]; then
-		CRASH=0
-	fi
-	
-	# check if the daemon is crashed
-	if [ "`getstate state`" == "running" ]; then
-		# if the crash counter is higher than 20 switch to safe-mode settings
-		if [ $CRASH -eq 20 ] && [ "$SAFEMODE" == "no" ]; then
-			SAFEMODE=yes
-			/usr/bin/logger -t "ibrdtn-safe-wrapper" -p 2 "IBR-DTN daemon crashed 20 times! Switch to safe-mode settings."
-			/bin/sh /usr/share/ibrdtn/build-config.sh --safe-mode $TMPCONF
-		fi
-
-		# increment the crash counter
-		let CRASH=$CRASH+1
-		
-		# backoff wait timer
-		let WAIT=2**$CRASH
-		
-		# set a upper limit for the wait time
-		if [ $WAIT -ge 1800 ]; then
-			WAIT=1800
-		fi
-
-		# log the crash
-		/usr/bin/logger -t "ibrdtn-safe-wrapper" -p 2 "IBR-DTN daemon crashed $CRASH times! Wait $WAIT seconds."
-		
-		# wait sometime
-		/bin/sleep $WAIT
-	fi
-done
-
diff --git a/trunk/package/feeds/packages/ibrdtnd/files/systemcheck.sh b/trunk/package/feeds/packages/ibrdtnd/files/systemcheck.sh
deleted file mode 100644
index 3110bcf0..00000000
--- a/trunk/package/feeds/packages/ibrdtnd/files/systemcheck.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-#
-
-check_mounted() {
-	DIR=$1
-	while [ "$DIR" != "/" ]; do
-		if [ -n "`mount | grep "$DIR"`" ]; then
-			return 0
-		fi
-
-		DIR=`dirname $DIR`
-	done
-	return 1
-}
-
-check_writable() {
-	CHECKFILE="$1/.container-lock"
-	/bin/touch $CHECKFILE
-
-	if [ $? -gt 0 ]; then
-		return 1;
-	fi
-
-	/bin/echo "0123456789" >> $CHECKFILE
-
-	if [ $? -gt 0 ]; then
-		return 2;
-	fi
-
-	/bin/rm $CHECKFILE
-
-	if [ $? -gt 0 ]; then
-		return 3;
-	fi
-}
-
-check_mountdev() {
-	# get wait_mount option
-	WAIT_MOUNT_DEV=`uci -q get ibrdtn.safemode.wait_mount`
-	
-	if [ $? -ne 0 ]; then
-		return 0
-	fi
-	
-	DATA=`mount | grep ${WAIT_MOUNT_DEV}`
-
-	if [ -n "${DATA}" ]; then
-		return 0
-	fi
-	
-	return 1
-}
-
-# check the storage device
-check_mountdev
-RET=$?
-
-if [ ${RET} -ne 0 ]; then
-	WAIT_SECONDS=60
-	/usr/bin/logger -t "systemcheck.sh" -p 2 "disk storage not ready, wait max. ${WAIT_SECONDS} seconds until it is mounted"
-	while [ ${RET} -ne 0 ] && [ ${WAIT_SECONDS} -ne 0 ]; do
-		sleep 1
-		let WAIT_SECONDS=WAIT_SECONDS-1
-		check_mountdev
-		RET=$?
-	done
-fi
-
-if [ ${RET} -ne 0 ]; then
-	# failed, storage not mounted
-	exit 1
-fi
-
-# get the path for the container
-CONTAINER=`uci -q get ibrdtn.storage.container`
-
-if [ -z "$CONTAINER" ]; then
-	exit 0
-fi
-
-CONTAINER_PATH=`dirname $CONTAINER`
-
-if [ -n "$CONTAINER_PATH" ]; then
-	# check if the container is on a mounted device
-	check_mounted $CONTAINER_PATH
-
-	if [ $? -gt 0 ]; then
-		# failed
-		exit 1
-	fi
-
-	# check if the device is writable
-	check_writable $CONTAINER_PATH
-
-	if [ $? -gt 0 ]; then
-		# failed
-		exit 1
-	fi
-fi
-
diff --git a/trunk/package/feeds/packages/icecast/Makefile b/trunk/package/feeds/packages/icecast/Makefile
deleted file mode 100644
index 796e9bb9..00000000
--- a/trunk/package/feeds/packages/icecast/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=icecast
-PKG_VERSION:=2.4.1
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=André Gaul <andre@gaul.io>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/icecast/
-PKG_MD5SUM:=b1402712a79734d4720c8fe15fd9fb10
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave
-TREMOR_DIR=$(TREMOR_BUILD_DIR)/ipkg-install/usr
-
-define Package/icecast
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libcurl +libxml2 +libxslt +libogg +libopenssl
-  TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
-  URL:=http://www.icecast.org/
-endef
-
-define Package/icecast/description
-	Icecast is a streaming media server which currently supports Ogg
-	Vorbis and MP3 audio streams. It can be used to create an Internet
-	radio station or a privately running jukebox and many things in
-	between. It is very versatile in that new formats can be added
-	relatively easily and supports open standards for commuincation and
-	interaction.
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	$(SUBMAKE) -f libvorbisidec.mk \
-		BUILD_DIR="$(PKG_BUILD_DIR)" \
-		V=99 \
-		prepare
-endef
-
-define Build/Configure
-	$(MAKE) -f libvorbisidec.mk \
-		BUILD_DIR="$(PKG_BUILD_DIR)" \
-		V=99 \
-		compile
-	$(SED) 's,-lvorbis ,$(TREMOR_DIR)/lib/libvorbisidec.a -logg ,g' $(PKG_BUILD_DIR)/configure
-	$(call Build/Configure/Default, \
-		--enable-yp \
-		--with-curl="yes" \
-		--with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
-		--with-ogg="$(STAGING_DIR)/usr" \
-		--with-speex="no" \
-		--with-theora="no" \
-		--with-vorbis="$(TREMOR_DIR)" \
-		--with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
-		, \
-		CPPFLAGS="-I$(TREMOR_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 $(TARGET_CPPFLAGS)" \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		INCLUDES="-I$(PKG_BUILD_DIR)/src -I$(TREMOR_DIR)/include" \
-		all install
-endef
-
-define Package/icecast/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/icecast.init $(1)/etc/init.d/icecast
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/icecast
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(1)/usr/share/icecast/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/
-endef
-
-define Package/icecast/conffiles
-/etc/icecast.xml
-endef
-
-$(eval $(call BuildPackage,icecast))
diff --git a/trunk/package/feeds/packages/icecast/files/icecast.init b/trunk/package/feeds/packages/icecast/files/icecast.init
deleted file mode 100755
index 355e4b71..00000000
--- a/trunk/package/feeds/packages/icecast/files/icecast.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Example script
-# Copyright (C) 2014 OpenWrt.org
- 
-USE_PROCD=1
-START=99
-STOP=15
-
-start_service() {
-	procd_open_instance
-	procd_set_param command /usr/bin/icecast -c /etc/icecast.xml
-	procd_set_param respawn
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/icecast/libvorbisidec.mk b/trunk/package/feeds/packages/icecast/libvorbisidec.mk
deleted file mode 100644
index eda6e762..00000000
--- a/trunk/package/feeds/packages/icecast/libvorbisidec.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=icecast-libvorbisidec
-PKG_VERSION:=1.2.0-dave
-PKG_RELEASE:=1
-
-PKG_SOURCE:=libvorbisidec-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
-PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/libvorbisidec-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PATCH_DIR=./patches-libvorbisidec
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-shared \
-		--enable-static \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	true
-endef
-
-$(eval $(call Build/DefaultTargets))
diff --git a/trunk/package/feeds/packages/icecast/patches/001-icecast-2.4.0-tremor.patch b/trunk/package/feeds/packages/icecast/patches/001-icecast-2.4.0-tremor.patch
deleted file mode 100644
index 6fa6f082..00000000
--- a/trunk/package/feeds/packages/icecast/patches/001-icecast-2.4.0-tremor.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- a/src/format_flac.c
-+++ b/src/format_flac.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <string.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_midi.c
-+++ b/src/format_midi.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <string.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_ogg.c
-+++ b/src/format_ogg.c
-@@ -24,7 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- 
- #include "refbuf.h"
- #include "source.h"
---- a/src/format_ogg.h
-+++ b/src/format_ogg.h
-@@ -18,7 +18,7 @@
- #ifndef __FORMAT_OGG_H__
- #define __FORMAT_OGG_H__
- 
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include "refbuf.h"
- #include "format.h"
- 
---- a/src/format_speex.c
-+++ b/src/format_speex.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <speex/speex_header.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_theora.c
-+++ b/src/format_theora.c
-@@ -18,7 +18,7 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <theora/theora.h>
- 
- typedef struct source_tag source_t;
---- a/src/format_vorbis.c
-+++ b/src/format_vorbis.c
-@@ -18,8 +18,8 @@
- #endif
- 
- #include <stdlib.h>
--#include <ogg/ogg.h>
--#include <vorbis/codec.h>
-+#include <tremor/ogg.h>
-+#include <tremor/ivorbiscodec.h>
- #include <memory.h>
- #include <string.h>
- 
---- a/src/source.c
-+++ b/src/source.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #include <errno.h>
- 
- #ifndef _WIN32
---- a/src/format_kate.c
-+++ b/src/format_kate.c
-@@ -19,7 +19,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- #ifdef HAVE_KATE
- #include <kate/oggkate.h>
- #endif
---- a/m4/vorbis.m4
-+++ b/m4/vorbis.m4
-@@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref
-             ])
- fi
- 
--VORBIS_LIBS="-lvorbis"
--VORBISFILE_LIBS="-lvorbisfile"
--VORBISENC_LIBS="-lvorbisenc"
-+VORBIS_LIBS="-lvorbisidec"
-+VORBISFILE_LIBS="-lvorbisidec"
-+VORBISENC_LIBS="-lvorbisidec"
- 
- xt_save_LIBS="$LIBS"
- xt_save_LDFLAGS="$LDFLAGS"
-@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li
-             )
-         ])
- 
--if test "x$xt_lib_vorbis" = "xok"; then
--#
--# Now check if the installed Vorbis is sufficiently new.
--#
--AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#include <vorbis/codec.h>
--#include <vorbis/vorbisenc.h>
--        ], [
--struct ovectl_ratemanage_arg a;
--])],,[xt_lib_vorbis="old version found"])
--AC_MSG_RESULT([$xt_lib_vorbis])
--fi
- CPPFLAGS="$xt_save_CPPFLAGS"
- LIBS="$xt_save_LIBS"
- LDFLAGS="$xt_save_LDFLAGS"
---- a/m4/ogg.m4
-+++ b/m4/ogg.m4
-@@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include]
-       ])
- AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
- [dnl
--OGG_LIBS="-logg"
-+OGG_LIBS="-lvorbisidec"
- 
- #
- # check if the installed Ogg is sufficiently new.
-@@ -42,7 +42,7 @@ LIBS="$LIBS $OGG_LIBS"
- LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
- AC_TRY_LINK_FUNC(ogg_sync_init,
-     [ xt_cv_lib_ogg=ok ],
--    [ AC_TRY_LINK([#include <ogg/ogg.h>],, 
-+    [ AC_TRY_LINK([#include <tremor/ogg.h>],, 
-         [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
-         [ xt_cv_lib_ogg="not found" ])
-     ])
diff --git a/trunk/package/feeds/packages/icecast/patches/010-fix_libcurl_test_crap.patch b/trunk/package/feeds/packages/icecast/patches/010-fix_libcurl_test_crap.patch
deleted file mode 100644
index 8da6e33b..00000000
--- a/trunk/package/feeds/packages/icecast/patches/010-fix_libcurl_test_crap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/xiph_curl.m4
-+++ b/m4/xiph_curl.m4
-@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok
- AC_MSG_CHECKING(for libcurl)
- if test "$curl_ok" = "yes"
- then
--    AC_RUN_IFELSE(AC_LANG_SOURCE([
-+    AC_COMPILE_IFELSE(AC_LANG_SOURCE([
- #include <curl/curl.h>
- int main()
- {
diff --git a/trunk/package/feeds/packages/ices/Makefile b/trunk/package/feeds/packages/ices/Makefile
deleted file mode 100644
index a3cb714a..00000000
--- a/trunk/package/feeds/packages/ices/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-# Copyright (C) 2009 Freifunk Leipzig
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ices
-PKG_VERSION:=2.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ices/
-PKG_MD5SUM:=832c448cc993170a70fd95804fcda5b2
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ices
-  SECTION:=sound
-  CATEGORY:=Sound
-  TITLE:=ices client for Icecast media streaming servers
-  URL:=http://www.icecast.org/ices/
-  DEPENDS:=+libshout +libxml2 +zlib +libogg +libvorbis +alsa-lib
-endef
-
-define Package/ices/description
-  ices is a command line source client for Icecast media streaming servers.
-  It began as the successor of the old "shout" utility, and has since gained a
-  lot of useful features.
-endef
-
-CONFIGURE_ARGS+= \
-	--with-ogg="$(STAGING_DIR)/usr/include" \
-	--with-vorbis="$(STAGING_DIR)/usr/include" \
-
-define Package/ices/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ices $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,ices))
diff --git a/trunk/package/feeds/packages/intltool/Makefile b/trunk/package/feeds/packages/intltool/Makefile
deleted file mode 100644
index 7c24469e..00000000
--- a/trunk/package/feeds/packages/intltool/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=intltool
-PKG_LIBVER:=0.40
-PKG_VERSION:=$(PKG_LIBVER).6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
-PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_HOST_ONLY:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/intltool
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=set of tools to centralize translation using GNU gettext
-  URL:=http://www.freedesktop.org/wiki/Software/intltool
-  BUILDONLY:=1
-endef
-
-define Package/intltool/description
-  intltool is a set of tools to centralize translation of many different
-  file formats using GNU gettext-compatible PO files.
-endef
-
-define Require/perl-xml-parser
-  perl -e 'use XML::Parser;'
-endef
-
-$(eval $(call Require,perl-xml-parser, \
-	Please install Perl XML::Parser \
-))
-
-$(eval $(call BuildPackage,intltool))
-$(eval $(call HostBuild))
diff --git a/trunk/package/feeds/packages/iodine/Makefile b/trunk/package/feeds/packages/iodine/Makefile
deleted file mode 100644
index af97aab5..00000000
--- a/trunk/package/feeds/packages/iodine/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iodine
-PKG_VERSION:=0.7.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://code.kryo.se/iodine/
-PKG_MD5SUM:=fdbf3b81cd69caf5230d76a8b039fd99
-
-PKG_MAINTAINER:=Uwe Kleine-König <uwe+openwrt@kleine-koenig.org>
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=README
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iodine/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall Tunnel
-  DEPENDS:= +kmod-tun +zlib
-  TITLE:=IP over DNS tunneling
-  URL:=http://code.kryo.se/iodine/
-endef
-
-define Package/iodine
-  $(call Package/iodine/Default)
-  TITLE+= client version
-endef
-
-define Package/iodine/description
- iodine client version
-endef
-
-define Package/iodined
-  $(call Package/iodine/Default)
-  TITLE+= server version
-endef
-
-define Package/iodined/description
- iodine server version
-endef
-
-define Build/Configure
-endef
-
-define Package/iodine/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodine $(1)/usr/sbin
-endef
-
-define Package/iodined/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/iodined.init $(1)/etc/init.d/iodined
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/iodined.config $(1)/etc/config/iodined
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodined $(1)/usr/sbin
-endef
-
-define Package/iodined/conffiles
-/etc/config/iodined
-endef
-
-$(eval $(call BuildPackage,iodine))
-$(eval $(call BuildPackage,iodined))
diff --git a/trunk/package/feeds/packages/iodine/files/iodined.config b/trunk/package/feeds/packages/iodine/files/iodined.config
deleted file mode 100644
index f95549d7..00000000
--- a/trunk/package/feeds/packages/iodine/files/iodined.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config iodined
-        option address     ''
-        option password    ''
-        option tunnelip    '10.0.0.1'
-        option tld     	   ''
diff --git a/trunk/package/feeds/packages/iodine/files/iodined.init b/trunk/package/feeds/packages/iodine/files/iodined.init
deleted file mode 100644
index 48dea619..00000000
--- a/trunk/package/feeds/packages/iodine/files/iodined.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=50
-
-start_instance () {
-	local section="$1"
-	config_get address  "$section" 'address'
-	config_get password "$section" 'password'
-	config_get tunnelip "$section" 'tunnelip'
-	config_get tld      "$section" 'tld'
-	config_get port     "$section" 'port'
-	
-	test -n "$address" || address='0.0.0.0'
-	test -n "$port" || port='53'
-
-	service_start /usr/sbin/iodined -l "$address" -P "$password" -p "$port" "$tunnelip" "$tld"
-}
-
-start() {
-	config_load 'iodined'
-	config_foreach start_instance 'iodined'
-}
-
-stop() {
-	service_stop /usr/sbin/iodined
-}
diff --git a/trunk/package/feeds/packages/iodine/patches/010-cross-compile.patch b/trunk/package/feeds/packages/iodine/patches/010-cross-compile.patch
deleted file mode 100644
index 40dfb0a7..00000000
--- a/trunk/package/feeds/packages/iodine/patches/010-cross-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iodine-0.7.0.orig/src/osflags
-+++ iodine-0.7.0/src/osflags
-@@ -16,12 +16,6 @@ link)
- 		windows32)
- 			echo '-lws2_32 -liphlpapi';
- 		;;
--		Linux)
--			FLAGS="";
--			[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
--			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon";
--			echo $FLAGS;
--		;;
- 	esac
- 	;;
- cflags)
-@@ -34,8 +28,6 @@ cflags)
- 		;;
- 		Linux)
- 			FLAGS="-D_GNU_SOURCE"
--			[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON";
--			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD";
- 			echo $FLAGS;
- 		;;
- 	esac
diff --git a/trunk/package/feeds/packages/ipsec-tools/Makefile b/trunk/package/feeds/packages/ipsec-tools/Makefile
deleted file mode 100644
index ae9c83c0..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#               2014 Noah Meyerhans <frodo@morgul.net>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ipsec-tools
-PKG_VERSION:=0.8.2
-PKG_RELEASE:=2
-PKG_MAINTAINER := "Noah Meyerhans <frodo@morgul.net>"
-PKG_LICENSE := BSD-3-Clause
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/ipsec-tools
-PKG_MD5SUM:=d53ec14a0a3ece64e09e5e34b3350b41
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ipsec-tools
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=VPN
-  DEPENDS:=+libopenssl +kmod-ipsec
-  TITLE:=IPsec management tools
-  URL:=http://ipsec-tools.sourceforge.net/
-  MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-kernel-headers="$(LINUX_DIR)/include" \
-	--without-readline \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--without-libradius \
-	--without-libpam \
-	--enable-dpd \
-	--enable-hybrid \
-	--enable-security-context=no \
-	--enable-natt \
-	--enable-adminport \
-	--enable-frag \
-	 $(call autoconf_bool,CONFIG_IPV6,ipv6)
-
-# override CFLAGS holding "-Werror" that break builds on compile warnings
-MAKE_FLAGS+=\
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	chmod -R u+w $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.ac \
-		aclocal.m4 \
-		Makefile.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default)
-ifndef CONFIG_SHADOW_PASSWORDS
-	echo "#undef HAVE_SHADOW_H" >> $(PKG_BUILD_DIR)/config.h
-endif
-endef
-
-define Package/ipsec-tools/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/racoon.conf $(1)/etc/racoon.conf
-	$(INSTALL_DIR) $(1)/etc/racoon
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/psk.txt $(1)/etc/racoon/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/racoon.init $(1)/etc/init.d/racoon
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/
-endef
-
-define Package/ipsec-tools/conffiles
-/etc/racoon.conf
-/etc/racoon/psk.txt
-endef
-
-$(eval $(call BuildPackage,ipsec-tools))
diff --git a/trunk/package/feeds/packages/ipsec-tools/files/racoon.conf b/trunk/package/feeds/packages/ipsec-tools/files/racoon.conf
deleted file mode 100644
index 5c05bcd3..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/files/racoon.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Simple racoon.conf
-# 
-# Refer to http://wiki.openwrt.org/doc/howto/vpn.ipsec.basics.racoon for
-# details about configuring racoon in OpenWRT.
-#
-# Also read the Linux IPSEC Howto up at 
-# http://www.ipsec-howto.org/t1.html 
-#
-# Manual pages for ipsec-tools are not included with OpenWRT. Refer to
-# the following locations to view them online:
-# http://linux.die.net/man/8/racoon
-# http://linux.die.net/man/5/racoon.conf
-# http://linux.die.net/man/8/setkey
-#
-
-log notify;
-path pre_shared_key "/etc/racoon/psk.txt";
-path certificate "/etc/racoon/certs";
-
-#remote 172.31.1.1 {
-#        exchange_mode main,aggressive;
-#        proposal {
-#                encryption_algorithm 3des;
-#                hash_algorithm sha1;
-#                authentication_method pre_shared_key;
-#                dh_group modp1024;
-#        }
-#        generate_policy off;
-#}
-# 
-#sainfo address 192.168.203.10[any] any address 192.168.22.0/24[any] any {
-#        pfs_group modp768;
-#        encryption_algorithm 3des;
-#        authentication_algorithm hmac_md5;
-#        compression_algorithm deflate;
-#}
diff --git a/trunk/package/feeds/packages/ipsec-tools/files/racoon.init b/trunk/package/feeds/packages/ipsec-tools/files/racoon.init
deleted file mode 100644
index 68053c91..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/files/racoon.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2011 Artem Makhutov
-# Copyright (C) 2014 Noah Meyerhans <frodo@morgul.net>
-
-USE_PROCD=1
-
-START=49
-
-start_service() {
-    mkdir -m 0700 -p /var/racoon
-    [ -f /etc/ipsec.conf ] && /usr/sbin/setkey -f /etc/ipsec.conf
-    procd_open_instance
-    procd_set_param command /usr/sbin/racoon -F -f /etc/racoon.conf
-    procd_set_param respawn
-    procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/001-ipsec-tools-def-psk.patch b/trunk/package/feeds/packages/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
deleted file mode 100644
index db5b3064..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/racoon/oakley.c
-+++ b/src/racoon/oakley.c
-@@ -2424,8 +2424,21 @@ oakley_skeyid(iph1)
- 				plog(LLV_ERROR, LOCATION, iph1->remote,
- 					"couldn't find the pskey for %s.\n",
- 					saddrwop2str(iph1->remote));
-+			}
-+		}
-+		if (iph1->authstr == NULL) {
-+			/*
-+			 * If we could not locate a psk above try and locate
-+			 * the default psk, ie, "*".
-+			 */
-+			iph1->authstr = privsep_getpsk("*", 1);
-+			if (iph1->authstr == NULL) {
-+				plog(LLV_ERROR, LOCATION, iph1->remote,
-+					"couldn't find the the default pskey either.\n");
- 				goto end;
- 			}
-+			plog(LLV_NOTIFY, LOCATION, iph1->remote,
-+					"Using default PSK.\n");
- 		}
- 		plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n");
- 		/* should be secret PSK */
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/001-no_libfl.patch b/trunk/package/feeds/packages/ipsec-tools/patches/001-no_libfl.patch
deleted file mode 100644
index b56b596b..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/001-no_libfl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/racoon/cftoken.l
-+++ b/src/racoon/cftoken.l
-@@ -104,6 +104,8 @@ static struct include_stack {
- static int incstackp = 0;
- 
- static int yy_first_time = 1;
-+
-+int yywrap(void) { return 1; }
- %}
- 
- /* common seciton */
---- a/src/setkey/token.l
-+++ b/src/setkey/token.l
-@@ -86,6 +86,8 @@
- #if defined(SADB_X_EALG_AES) && ! defined(SADB_X_EALG_AESCBC)
- #define SADB_X_EALG_AESCBC  SADB_X_EALG_AES
- #endif
-+
-+int yywrap(void) { return 1; }
- %}
- 
- /* common section */
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/002-patch8-utmp.patch b/trunk/package/feeds/packages/ipsec-tools/patches/002-patch8-utmp.patch
deleted file mode 100644
index 16dc9237..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/002-patch8-utmp.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/src/racoon/isakmp_cfg.c
-+++ b/src/racoon/isakmp_cfg.c
-@@ -38,7 +38,7 @@
- #include <sys/socket.h>
- #include <sys/queue.h>
- 
--#include <utmpx.h>
-+#include <utmp.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <util.h>
- #endif
-@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
- 	int inout;
- {
- 	int error = 0;
--	struct utmpx ut;
-+	struct utmp ut;
-+	char term[UT_LINESIZE];
- 	char addr[NI_MAXHOST];
- 	
- 	if (usr == NULL || usr[0]=='\0') {
-@@ -1670,34 +1671,37 @@ isakmp_cfg_accounting_system(port, raddr
- 		return -1;
- 	}
- 
--	memset(&ut, 0, sizeof ut);
--	gettimeofday((struct timeval *)&ut.ut_tv, NULL);
--	snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
-+	sprintf(term, TERMSPEC, port);
- 
- 	switch (inout) {
- 	case ISAKMP_CFG_LOGIN:
--		ut.ut_type = USER_PROCESS;
--		strncpy(ut.ut_user, usr, sizeof ut.ut_user);
-+		strncpy(ut.ut_name, usr, UT_NAMESIZE);
-+		ut.ut_name[UT_NAMESIZE - 1] = '\0';
-+		
-+		strncpy(ut.ut_line, term, UT_LINESIZE);
-+		ut.ut_line[UT_LINESIZE - 1] = '\0';
- 
- 		GETNAMEINFO_NULL(raddr, addr);
--		strncpy(ut.ut_host, addr, sizeof ut.ut_host);
-+		strncpy(ut.ut_host, addr, UT_HOSTSIZE);
-+		ut.ut_host[UT_HOSTSIZE - 1] = '\0';
-+
-+		ut.ut_time = time(NULL);
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' logging on '%s' from %s.\n",
--			ut.ut_user, ut.ut_id, addr);
--
--		pututxline(&ut);
-+			ut.ut_name, ut.ut_line, ut.ut_host);
- 
-+		login(&ut);
-+		
- 		break;
- 	case ISAKMP_CFG_LOGOUT:	
--		ut.ut_type = DEAD_PROCESS;
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' unlogging from '%s'.\n",
--			usr, ut.ut_id);
--
--		pututxline(&ut);
-+			usr, term);
- 
-+		logout(term);
-+		
- 		break;
- 	default:
- 		plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n");
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch b/trunk/package/feeds/packages/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch
deleted file mode 100644
index 443d38d5..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/racoon/ipsec_doi.c
-+++ b/src/racoon/ipsec_doi.c
-@@ -3582,8 +3582,8 @@ ipsecdoi_checkid1(iph1)
- 	    iph1->approval->authmethod == OAKLEY_ATTR_AUTH_METHOD_PSKEY) {
- 		 if (id_b->type != IPSECDOI_ID_IPV4_ADDR
- 		  && id_b->type != IPSECDOI_ID_IPV6_ADDR) {
--			plog(LLV_ERROR, LOCATION, NULL,
--				"Expecting IP address type in main mode, "
-+			plog(LLV_WARNING, LOCATION, NULL,
-+				"Expecting IP address type in main mode (RFC2409) , "
- 				"but %s.\n", s_ipsecdoi_ident(id_b->type));
- 			return ISAKMP_NTYPE_INVALID_ID_INFORMATION;
- 		}
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/005-isakmp-fix.patch b/trunk/package/feeds/packages/ipsec-tools/patches/005-isakmp-fix.patch
deleted file mode 100644
index f7aa3c26..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/005-isakmp-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/racoon/isakmp.c
-+++ b/src/racoon/isakmp.c
-@@ -31,6 +31,8 @@
-  * SUCH DAMAGE.
-  */
- 
-+#define __packed __attribute__((__packed__))
-+
- #include "config.h"
- 
- #include <sys/types.h>
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/006-linux-3.7-compat.patch b/trunk/package/feeds/packages/ipsec-tools/patches/006-linux-3.7-compat.patch
deleted file mode 100644
index 46b11ee5..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/006-linux-3.7-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,9 +74,10 @@ case "$host_os" in
- 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
- 
-     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
--	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
--	  KERNEL_INCLUDE=/usr/src/linux/include ,
--	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
-+	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
-+	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
-+	    KERNEL_INCLUDE=/usr/src/linux/include ,
-+	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
-     AC_SUBST(KERNEL_INCLUDE)
-     # We need the configure script to run with correct kernel headers.
-     # However we don't want to point to kernel source tree in compile time,
-@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
- #ifdef SADB_X_EXT_NAT_T_TYPE
- yes
- #endif
--], [kernel_natt="yes"])
-+], [kernel_natt="yes"], [
-+  AC_EGREP_CPP(yes,
-+  [#include <uapi/linux/pfkeyv2.h>
-+  #ifdef SADB_X_EXT_NAT_T_TYPE
-+  yes
-+  #endif
-+  ], [kernel_natt="yes"])
-+])
- 	;;
- freebsd*|netbsd*)
- # NetBSD case
---- a/src/include-glibc/Makefile.am
-+++ b/src/include-glibc/Makefile.am
-@@ -1,14 +1,7 @@
--
--.includes: ${top_builddir}/config.status
--	ln -snf $(KERNEL_INCLUDE)/linux
--	touch .includes
--
--all: .includes
--
- EXTRA_DIST = \
-   glibc-bugs.h \
-   net/pfkeyv2.h \
-   netinet/ipsec.h \
-   sys/queue.h
- 
--DISTCLEANFILES = .includes linux
-+DISTCLEANFILES = linux
diff --git a/trunk/package/feeds/packages/ipsec-tools/patches/force_HAVE_POLICY_FWD b/trunk/package/feeds/packages/ipsec-tools/patches/force_HAVE_POLICY_FWD
deleted file mode 100644
index 24e64458..00000000
--- a/trunk/package/feeds/packages/ipsec-tools/patches/force_HAVE_POLICY_FWD
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8506245..eca8895 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -724,7 +724,8 @@ case $host in
- 			],
- 			[AC_MSG_RESULT(yes)
- 			 AC_DEFINE([HAVE_POLICY_FWD], [], [Have forward policy])],
--			[AC_MSG_RESULT(no)])
-+			[AC_MSG_RESULT(forced)
-+			 AC_DEFINE([HAVE_POLICY_FWD], [], [Have forward policy])])
- 		;;
- 	*)
- 		AC_MSG_RESULT(no)
diff --git a/trunk/package/feeds/packages/irssi/Makefile b/trunk/package/feeds/packages/irssi/Makefile
deleted file mode 100644
index 3fbfef11..00000000
--- a/trunk/package/feeds/packages/irssi/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=irssi
-PKG_VERSION:=0.8.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://irssi.org/files/
-PKG_MD5SUM:=ecf64be47978d89a742b435a81cb47db
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/irssi/Default
-  SUBMENU:=Instant Messaging
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+glib2 +libncurses +libpthread
-  TITLE:=Console IRC client
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://irssi.org/
-endef
-
-define Package/irssi/Default/description
-	Irssi is a terminal based IRC client for UNIX systems.
-endef
-
-define Package/irssi
-$(call Package/irssi/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+= +libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/irssi/description
-$(call Package/irssi/Default/description)
- This package is built with OpenSSL support.
-endef
-
-define Package/irssi-nossl
-$(call Package/irssi/Default)
-  TITLE+= (without OpenSSL support)
-  VARIANT:=nossl
-endef
-
-define Package/irssi-nossl/description
-$(call Package/irssi/Default/description)
- This package is built without OpenSSL support.
-endef
-
-CONFIGURE_ARGS += \
-	--with-perl=no \
-	--with-glib-prefix="$(STAGING_DIR)/usr" \
-	--with-textui \
-	--without-terminfo \
-	--without-bot \
-	--disable-proxy
-
-EXTRA_CFLAGS+=$(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+=-lncurses
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--without-ssl \
-		--disable-ssl
-endif
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/irssi
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/irssi/* $(1)/usr/include/irssi/
-endef
-
-define Package/irssi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
-endef
-
-Package/irssi-nossl/install = $(Package/irssi/install)
-
-$(eval $(call BuildPackage,irssi))
-$(eval $(call BuildPackage,irssi-nossl))
diff --git a/trunk/package/feeds/packages/jamvm/Makefile b/trunk/package/feeds/packages/jamvm/Makefile
deleted file mode 100644
index 996dfa0e..00000000
--- a/trunk/package/feeds/packages/jamvm/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=jamvm
-PKG_VERSION:=2.0.0
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=a6e3321ef4b3cfb4afc20bd75452e11e
-
-PKG_USE_MIPS16:=0
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/jamvm
-  SUBMENU:=Java
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=A compact Java Virtual Machine
-  URL:=http://sourceforge.net/projects/jamvm
-  DEPENDS:=+zlib +libpthread +librt +classpath @!avr32
-endef
-
-define Package/jamvm/description
- JamVM is a new Java Virtual Machine which conforms to the JVM
- specification version (blue book). In comparison to most other VM's (free
- and commercial) it is extremely small.However, unlike other small VMs
- (e.g. KVM) it is designed to support the full specification, and includes
- support for object finalisation, Soft/Weak/Phantom References, the Java
- Native Interface (JNI) and the Reflection API.
-endef
-
-CONFIGURE_ARGS += \
-	--with-java-runtime-library=gnuclasspath \
-	--with-classpath-install-dir=/usr \
-	--disable-int-inlining \
-	--disable-shared \
-	--without-pic
-
-MAKE_FLAGS += \
-	GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip
-
-define Package/jamvm/install
-	$(INSTALL_DIR) $(1)/usr
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin \
-		$(PKG_INSTALL_DIR)/usr/share \
-		$(1)/usr/
-endef
-
-define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-$(eval $(call BuildPackage,jamvm))
diff --git a/trunk/package/feeds/packages/jansson/Makefile b/trunk/package/feeds/packages/jansson/Makefile
deleted file mode 100644
index 3d18d426..00000000
--- a/trunk/package/feeds/packages/jansson/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=jansson
-PKG_VERSION:=2.7
-PKG_RELEASE:=1
-PKG_LICENSE:=MIT
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/
-PKG_MD5SUM:=3a106a465bbb77637550b422f5b262ef
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/jansson
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Jansson library
-  URL:=http://www.digip.org/jansson/
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-endef
-
-define Package/jansson/description
-  Jansson is a C library for encoding, decoding and manipulating JSON data
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lm
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson* $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-endef
-
-define Package/jansson/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,jansson))
diff --git a/trunk/package/feeds/packages/joe/Makefile b/trunk/package/feeds/packages/joe/Makefile
deleted file mode 100644
index 3019d34d..00000000
--- a/trunk/package/feeds/packages/joe/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-# changes by David Kuehling <dvdkhlng TA gmx TOD de>:
-#
-#  - include support for all emulation modes jmacs jpico etc.
-#  - see patches/002-builtinrc.patch
-#
-# changes by Vitaly Prosko <villy TA sft TOD ru>:
-#
-#  - updated for new build system rules
-#  - added static joerc config - no more defaults for native mode
-#  - got maintenance role
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=joe
-PKG_VERSION:=3.7
-PKG_RELEASE:=3
-
-PKG_SOURCE_URL:=@SF/joe-editor
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=66de1b073e869ba12abbfcde3885c577
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
-PKG_LICENCE:=GPL-1.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/joe
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Editors
-  TITLE:=JOE - Joes own editor
-  URL:=http://sourceforge.net/projects/joe-editor/
-  DEPENDS:=+libncurses
-endef
-
-define Package/joe/description
-Joe is world-famous Wordstar like text editor, that also features
-Emacs and Pico emulation
-endef
-
-define Package/joe/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/joe $(1)/usr/bin/
-	for i in jmacs jstar rjoe jpico; do \
-	  ln -sf joe $(1)/usr/bin/$$$$i; \
-	done
-	$(INSTALL_DIR) $(1)/etc/joe
-	$(INSTALL_CONF) ./files/joerc $(1)/etc/joe/joerc
-endef
-
-define Package/joe/conffiles
-/etc/joe/joerc
-endef
-
-$(eval $(call BuildPackage,joe))
diff --git a/trunk/package/feeds/packages/joe/files/joerc b/trunk/package/feeds/packages/joe/files/joerc
deleted file mode 100644
index 24def75a..00000000
--- a/trunk/package/feeds/packages/joe/files/joerc
+++ /dev/null
@@ -1,621 +0,0 @@
-
--asis
--nobackups
--nonotice
--noxon
--notite
--assume_color
--assume_256color
--guess_non_utf8
--guess_crlf
--guess_indent
--menu_above
--transpose
--joe_state
--restore
--mouse
--joexterm
--search_prompting
--lmsg \i%k%T%W%I%X %n %m%y%R %M %x
--rmsg  %S Row %r Col %c %t  Ctrl-K H for help
--highlight
--istep 2
-
- :include ftyperc
-
-:defmenu root
-mode,"overwrite",rtn	T Overtype %Zoverwrite%
-mode,"hex",rtn	% % Hex edit mode
-mode,"autoindent",rtn	I Autoindent %Zautoindent%
-mode,"wordwrap",rtn	W Word wrap %Zwordwrap%
-mode,"tab",rtn	D Tab width %Ztab%
-mode,"lmargin",rtn	L Left margin %Zlmargin%
-mode,"rmargin",rtn	R Right margin %Zrmargin%
-mode,"square",rtn	X Rectangle mode %Zsquare%
-mode,"indentc",rtn	% % Indent char %Zindentc%
-mode,"istep",rtn	% % Indent step %Zistep%
-mode,"highlight",rtn	H Highlighting %Zhighlight%
-mode,"crlf",rtn	Z CR-LF (MS-DOS) %Zcrlf%
-mode,"linums",rtn	N Line numbers %Zlinums%
-mode,"beep",rtn	B Beep %Zbeep%
-mode,"rdonly",rtn	O Read only %Zrdonly%
- mode,"syntax",rtn	Y Syntax
-mode,"encoding",rtn	E Encoding
-mode,"asis",rtn	% % Meta chars as-is
-mode,"language",rtn	V Language
-mode,"picture",rtn	P picture %Zpicture%
-menu,"more-options",rtn	  % % More options...
-
-:defmenu more-options
-menu,"^G",rtn	% % ^G options
-menu,"search",rtn	% % search options
-menu,"paragraph",rtn	% % paragraph options
-menu,"file",rtn	% % file options
-menu,"menu",rtn	% % menu options
-menu,"global",rtn	% % global options
-menu,"cursor",rtn	% % cursor options
-menu,"marking",rtn	% % marking options
-menu,"tab",rtn	% % tab/indent options
-
-:defmenu menu
-mode,"menu_explorer",rtn	% % Menu explorer %Zmenu_explorer%
-mode,"menu_above",rtn	% % Menu position %Zmenu_above%
-mode,"menu_jump",rtn	% % Jump into menu %Zmenu_jump%
-mode,"transpose",rtn	% % Transpose menus %Ztranspose%
-
-:defmenu ^G
-mode,"single_quoted",rtn	% % ^G ignores '...' %Zsingle_quoted%
-mode,"no_double_quoted",rtn	% % ^G no ignore "..." %Zno_double_quoted%
-mode,"c_comment",rtn	% % ^G ignores /*...*/ %Zc_comment%
-mode,"cpp_comment",rtn	% % ^G ignores //... %Zcpp_comment%
-mode,"pound_comment",rtn	% % ^G ignores #... %Zpound_comment%
-mode,"vhdl_comment",rtn	% % ^G ignores --... %Zvhdl_comment%
-mode,"semi_comment",rtn	% % ^G ignores ;... %Zsemi_comment%
-mode,"tex_comment",rtn % % ^G ignores %... %Ztex_comment%
-mode,"text_delimiters",rtn % % Text delimiters %Ztext_delimiters%
-
-:defmenu search
-mode,"icase",rtn	% % Case insensitivity %Zicase%
-mode,"wrap",rtn	% % Search wraps %Zwrap%
-mode,"search_prompting",rtn	% % Search prompting %Zsearch_prompting%
-mode,"csmode",rtn	% % Continued search %Zcsmode%
-
-:defmenu paragraph
-mode,"french",rtn	% % French spacing %Zfrench%
-mode,"flowed",rtn	% % Flowed text %Zflowed%
-mode,"cpara",rtn	% % Paragraph indent chars %Zcpara%
-
-:defmenu file
-mode,"restore",rtn	% % Restore cursor %Zrestore%
-mode,"guess_crlf",rtn	% % Auto detect CR-LF %Zguess_crlf%
-mode,"guess_indent",rtn	% % Guess indent %Zguess_indent%
-mode,"guess_non_utf8",rtn	% % Guess non-UTF-8 %Zguess_non_utf8%
-mode,"guess_utf8",rtn	% % Guess UTF-8 %Zguess_utf8%
-mode,"force",rtn	% % Force last NL %Zforce%
-mode,"nobackup",rtn	% % No backup %Znobackup%
-
-:defmenu global
-mode,"nolocks",rtn	% % Disable locks %Znolocks%
-mode,"nobackups",rtn	% % Disable backups %Znobackups%
-mode,"nomodcheck",rtn	% % Disable mtime check %Znomodcheck%
-mode,"nocurdir",rtn	% % Disable current dir %Znocurdir%
-mode,"exask",rtn	% % Exit ask %Zexask%
-mode,"nosta",rtn	% % Disable status line %Znosta%
-mode,"keepup",rtn	% % Fast status line %Zkeepup%
-mode,"break_hardlinks",rtn	% % Break hard links %Zbreak_hardlinks%
-mode,"break_links",rtn	% % Break links %Zbreak_links%
-mode,"joe_state",rtn	% % Joe_state file %Zjoe_state%
-mode,"undo_keep",rtn	% % No. undo records %Zundo_keep%
-mode,"backpath",rtn	% % Path to backup files %Zbackpath%
-
-:defmenu cursor
-mode,"pg",rtn	% % No. PgUp/PgDn lines %Zpg%
-mode,"mid",rtn	C Center on scroll %Zmid%
-mode,"floatmouse",rtn	% % Click past end %Zfloatmouse%
-mode,"rtbutton",rtn	% % Right button %Zrtbutton%
-
-:defmenu marking
-mode,"autoswap",rtn	% % Autoswap mode %Zautoswap%
-mode,"marking",rtn	% % Marking %Zmarking%
-mode,"lightoff",rtn	% % Auto unmask %Zlightoff%
-
-:defmenu tab
-mode,"smarthome",rtn	% % Smart home key %Zsmarthome%
-mode,"smartbacks",rtn	% % Smart backspace %Zsmartbacks%
-mode,"indentfirst",rtn	% % To indent first %Zindentfirst%
-mode,"purify",rtn	% % Clean up indents %Zpurify%
-mode,"spaces",rtn	% % No tabs %Zspaces%
-
-{Basic
-\i   Help Screen    \|turn off with ^KH    more help with ESC . (^[.)              \i
-\i \i\|\uCURSOR\u           \|\uGO TO\u            \|\uBLOCK\u      \|\uDELETE\u   \|\uMISC\u         \|\uEXIT\u      \|\i \i
-\i \i\|^B left ^F right \|^U  prev. screen \|^KB begin  \|^D char. \|^KJ reformat \|^KX save  \|\i \i
-\i \i\|^P up   ^N down  \|^V  next screen  \|^KK end    \|^Y line  \|^KA center   \|^C  abort \|\i \i
-\i \i\|^Z previous word \|^A  beg. of line \|^KM move   \|^W >word \|^T  options  \|^KZ shell \|\i \i
-\i \i\|^X next word     \|^E  end of line  \|^KC copy   \|^O word< \|^R  refresh  \|\uFILE\u      \|\i \i
-\i \i\|\uSEARCH\u           \|^KU top of file  \|^KW file   \|^J >line \|\uSPELL\u        \|^KE edit  \|\i \i
-\i \i\|^KF find text    \|^KV end of file  \|^KY delete \|^_ undo  \|^[N word     \|^KR insert\|\i \i
-\i \i\|^L  find next    \|^KL to line No.  \|^K/ filter \|^^ redo  \|^[L file     \|^KD save  \|\i \i
-}
-
-{Windows
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i\|^KO Split the window in half           \|^KE Load file into window             \|\i \i
-\i \i\|^KG Make current window bigger         \|^KT Make current window smaller       \|\i \i
-\i \i\|^KN Go to the window below             \|^KP Go to the window above            \|\i \i
-\i \i\|^[V Switch to next buffer              \|^[U Switch to previous buffer         \|\i \i
-\i \i\|^C  Eliminate the current window       \|^KI Show all windows / Show one window\|\i \i
-}
-
-{Advanced
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i\|\uMACROS\u         \|\uMISC\u            \|\uSCROLL\u    \|\uSHELL\u       \|\uGOTO\u       \|\uI-SEARCH\u     \|\i \i
-\i \i\|^K[ 0-9 Record \|^K SPACE status \|^[W Up    \|^K' Window  \|^[B To ^KB \|^[R Backwards\|\i \i
-\i \i\|^K]     Stop   \|^K\\ Repeat      \|^[Z Down  \|^[! Command \|^[K To ^KK \|^[S Forwards \|\i \i
-\i \i\|^K 0-9  Play   \|\uINSERT\u          \|^K< Left  \|\uQUOTE\u       \|\uDELETE\u     \|\uBOOKMARKS\u    \|\i \i
-\i \i\|^K?     Query  \|^] split line   \|^K> Right \|^[' Ctrl-   \|^[Y yank   \|^[ 0-9 Goto  \|\i \i
-\i \i\|^[D     Dump   \|^SPACE ins space\|          \|^\\ Meta-    \|^[O line<  \|^[^[   Set   \|\i \i
-}
-
-{Programs
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i\|\uGOTO\u                 \|\uINDENT\u   \|\uCOMPILING\u          \uQUICK\u                       \|\i \i
-\i \i\|^G  Matching ( [ {   \|^K, less \|^[C Compile & parse ^G  find word under cursor \|\i \i
-\i \i\|^K- Previous place   \|^K. more \|^[G Grep & parse    ^[ENTER complete word      \|\i \i
-\i \i\|^K= Next place       \|\uFILE\u     \|^[= To next error   ^[Y paste deleted text     \|\i \i
-\i \i\|^K; Tags file search \|^K `     \|^[- To prev. error  ^[^Y cycle through deleted \|\i \i
-\i \i\|                     \| revert  \|^[ SP Jump to error                            \|\i \i
-}
-
-{Search
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \iSpecial search sequences:                                                    \|\i \i
-\i \i    \\^  \\$  matches beg./end of line      \\?     match any single char       \|\i \i
-\i \i    \\<  \\>  matches beg./end of word      \\*     match 0 or more chars       \|\i \i
-\i \i    \\c      matches balanced C expression \\\\     matches a \\                 \|\i \i
-\i \i    \\[..]   matches one of a set          \\n     matches a newline           \|\i \i
-\i \i    \\+      matches 0 or more of the character which follows the \\+          \|\i \i
-\i \iSpecial replace sequences:                                                   \|\i \i
-\i \i    \\&      replaced with text which matched search string                   \|\i \i
-\i \i    \\0 - 9  replaced with text which matched Nth \\*, \\?, \\c, \\+, or \\[..]    \|\i \i
-\i \i    \\\\      replaced with \\               \\n     replaced with newline       \|\i \i
-}
-
-{SearchOptions
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \iSearch options:                                                              \|\i \i
-\i \i   r Replace                                                                 \|\i \i
-\i \i   k Restrict search to highlighted block, which can be rectangular          \|\i \i
-\i \i   b Search backward instead of forward                                      \|\i \i
-\i \i   i Ignore case                                                             \|\i \i
-\i \i   a Search across all loaded files                                          \|\i \i
-\i \i   e Search across all files in Grep or Compile error list                   \|\i \i
-\i \i   w Wrap to beginning of file for this search                               \|\i \i
-\i \i   n Do not wrap to beginning of file for this search                        \|\i \i
-\i \i   nnn Perform exaclty nnn replacements                                      \|\i \i
-}
-
-{Math
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i \uCOMMANDS\u (hit ESC m for math)  \uFUNCTIONS\u                                    \|\i \i
-\i \i     hex hex display mode       sin cos tab asin acos atan                   \|\i \i
-\i \i     dec decimal mode           sinh cosh tanh asinh acosh atanh             \|\i \i
-\i \i     ins type result into file  sqrt cbrt exp ln log                         \|\i \i
-\i \i    eval evaluate block         int floor ceil abs erg ergc                  \|\i \i
-\i \i    0xff enter number in hex    joe(..macro..) - runs an editor macro        \|\i \i
-\i \i    3e-4 floating point decimal \uBLOCK\u                                        \|\i \i
-\i \i    a=10 assign a variable      sum cnt  Sum, count                          \|\i \i
-\i \i 2+3:ins multiple commands      avg dev  Average, std. deviation             \|\i \i
-\i \i    e pi constants              \uOPERATORS\u                                    \|\i \i
-\i \i     ans previous result        ! ^  * / %  + -  < <= > >= == !=  &&  ||  ? :\|\i \i
-}
-
-{Names
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i Hit TAB at file name prompts to generate menu of file names                 \|\i \i
-\i \i Or use up/down keys to access history of previously entered names           \|\i \i
-\i \i Special file names:                                                         \|\i \i
-\i \i      !command                 Pipe in/out of a shell command                \|\i \i
-\i \i      >>filename               Append to a file                              \|\i \i
-\i \i      -                        Read/Write to/from standard I/O               \|\i \i
-\i \i      filename,START,SIZE      Read/Write a part of a file/device            \|\i \i
-\i \i          Give START/SIZE in decimal (255), octal (0377) or hex (0xFF)       \|\i \i
-}
-
-{Joe
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,    next screen ^[.     \i
-\i \i Send bug reports to: http://sourceforge.net/projects/joe-editor \|\i \i
-\i \i \|\i \i
-\i \i  default joerc file is here /etc/joe/joerc \|\i \i
-\i \i  default syntax and i18n files are here /usr/share/joe \|\i \i
-\i \i  additional documentation can be found here /usr/share/doc/joe \|\i \i
-}
-
-{CharTable
-\i   Help Screen    \|turn off with ^KH    prev. screen ^[,                        \i
-\i \i\| Dec  \u 0123 4567  8901 2345    0123 4567  8901 2345 \u  Dec \|\i \i
-\i \i\|     |                                              |     \|\i \i
-\i \i\|   0 | \u@ABC\u \uDEFG\u  \uHIJK\u \uLMNO\u    \i\u@ABC\u\i \i\uDEFG\u\i  \i\uHIJK\u\i \i\uLMNO\u\i | 128 \|\i \i
-\i \i\|  16 | \uPQRS\u \uTUVW\u  \uXYZ[\u \u\\]^_\u    \i\uPQRS\u\i \i\uTUVW\u\i  \i\uXYZ[\u\i \i\u\\]^_\u\i | 144 \|\i \i
-\i \i\|  32 |  !"# $%&'  ()*+ ,-./     ¡¢£ ¤¥¦§  ¨©ª« ¬­®¯ | 160 \|\i \i
-\i \i\|  48 | 0123 4567  89:; <=>?    °±²³ ´µ¶·  ¸¹º» ¼½¾¿ | 176 \|\i \i
-\i \i\|  64 | @ABC DEFG  HIJK LMNO    ÀÁÂÃ ÄÅÆÇ  ÈÉÊË ÌÍÎÏ | 192 \|\i \i
-\i \i\|  80 | PQRS TUVW  XYZ[ \\]^_    ÐÑÒÓ ÔÕÖ×  ØÙÚÛ ÜÝÞß | 208 \|\i \i
-\i \i\|  96 | `abc defg  hijk lmno    àáâã äåæç  èéêë ìíîï | 224 \|\i \i
-\i \i\| 112 | pqrs tuvw  xyz{ |}~    ðñòó ôõö÷  øùúû üýþÿ | 240 \|\i \i
-}
-
-:windows		Bindings common to all windows
-type		^@ TO ÿ
-abort		^C
-abort		^K Q
-abort		^K ^Q
-abort		^K q
-arg		^K \
-explode		^K I
-explode		^K ^I
-explode		^K i
-help		^K H
-help		^K ^H
-help		^K h
-hnext		^[ .
-hprev		^[ ,
-math		^[ m
-math		^[ M
-msg		^[ h
-msg		^[ H
-msg		^[ ^H
-nextw		^K N
-nextw		^K ^N
-nextw		^K n
-pgdn		.kN
-pgdn		^V
-pgdn		^[ [ 6 ~
-pgup		.kP
-pgup		^U
-pgup		^[ [ 5 ~
-play		^K 0 TO 9
-prevw		^K P
-prevw		^K ^P
-prevw		^K p
-query		^K ?
-record		^K [
-retype		^R
-rtn		^M
-shell		^K Z
-shell		^K ^Z
-shell		^K z
-stop		^K ]
-
-defmdown	MDOWN
-defmup		MUP
-defmdrag	MDRAG
-defm2down	M2DOWN
-defm2up		M2UP
-defm2drag	M2DRAG
-defm3down	M3DOWN
-defm3up		M3UP
-defm3drag	M3DRAG
-
-xtmouse		^[ [ M
-
-if,"char==65",then,"it's an A",else,"it's not an a",endif	^[ q
-
-:main			Text editing window
-:inherit windows
-
-:def ispellfile filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;cat ispell.tmp;/bin/rm ispell.tmp",rtn,retype
-:def ispellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword
-
-:def aspellfile filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype
-:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
-
-aspellfile	^[ l
-aspellword	^[ n
-
-:def compile mwind!,mfit!,querysave,query,scratch,"* Build Log *",rtn,bof,markb,eof," ",markk,blkdel,build
-
-:def grep_find mwind!,mfit!,scratch,"* Grep Log *",rtn,bof,markb,eof," ",markk,blkdel,grep
-
-:def man scratch,"* Man Page *",rtn,bof,markb,eof," ",markk,blkdel," ",ltarw,run,"man -P cat -S 2:3 "
-
-paste			^[ ] 5 2 ;
-
-insc			^[ [ 2 ~
-insc			^[ [ L
-
-delch			^[ [ 3 ~
-
-pgup			^[ [ I
-
-pgdn			^[ [ G
-
-home			^[ [ 1 ~
-home			^[ [ H
-home			^[ O H
-home			^[ [ 7 ~
-
-eol			^[ [ 4 ~
-eol			^[ [ F
-eol			^[ O F
-eol			^[ [ 8 ~
-
-rtarw,ltarw,begin_marking,rtarw,toggle_marking	^[ [ 1 ; 5 C
-rtarw,ltarw,begin_marking,rtarw,toggle_marking	^[ [ 5 C
-rtarw,ltarw,begin_marking,rtarw,toggle_marking	^[ O c
-
-ltarw,rtarw,begin_marking,ltarw,toggle_marking	^[ [ 1 ; 5 D
-ltarw,rtarw,begin_marking,ltarw,toggle_marking	^[ [ 5 D
-ltarw,rtarw,begin_marking,ltarw,toggle_marking	^[ O d
-
-uparw,dnarw,begin_marking,uparw,toggle_marking	^[ [ 1 ; 5 A
-uparw,dnarw,begin_marking,uparw,toggle_marking	^[ [ 5 A
-uparw,dnarw,begin_marking,uparw,toggle_marking	^[ O a
-
-dnarw,uparw,begin_marking,dnarw,toggle_marking	^[ [ 1 ; 5 B
-dnarw,uparw,begin_marking,dnarw,toggle_marking	^[ [ 5 B
-dnarw,uparw,begin_marking,dnarw,toggle_marking	^[ O b
-
-blkdel,nmark   ^[ [ 3 ; 5 -
-blkdel,nmark   ^[ [ 3 ; 5 ~
-
-yank		^[ [ 2 ; 5 -
-yank		^[ [ 2 ; 5 ~
-
-delbol		^[ o
-delbol		^[ ^O
-dnslide		^[ z
-dnslide		^[ Z
-dnslide		^[ ^Z
-dnslide,dnslide,dnslide,dnslide		MWDOWN
-compile		^[ c
-compile		^[ C
-compile		^[ ^C
-grep_find	^[ g
-grep_find	^[ G
-grep_find	^[ ^G
-execmd		^[ x
-execmd		^[ X
-execmd		^[ ^X
-finish		^[ ^I
-finish		^[ ^M
-mwind,mfit,jump,bol		^[ SP
-isrch		^[ s
-isrch		^[ S
-isrch		^[ ^S
-notmod		^[ ~
-mwind,mfit,prevw,nxterr		^[ =
-parserr		^[ e
-parserr		^[ E
-parserr		^[ ^E
-mwind,mfit,prevw,prverr		^[ -
-rsrch		^[ r
-rsrch		^[ R
-rsrch		^[ ^R
-run		^[ !
-tomarkb		^[ b
-tomarkb		^[ ^B
-tomarkk		^[ k
-tomarkk		^[ ^K
-tomarkk		^[ K
-txt		^[ i
-txt		^[ I
-upslide		^[ w
-upslide		^[ ^W
-upslide		^[ W
-upslide,upslide,upslide,upslide		MWUP
-yank		^[ y
-yankpop		^[ ^Y
-yank		^[ Y
-
-insc		^@
-
-nbuf		^[ v
-nbuf		^[ V
-nbuf		^[ ^V
-pbuf		^[ u
-pbuf		^[ U
-pbuf		^[ ^U
-
-quote8		^\
-quote		^[ '
-quote		^Q
-
-backs		^?
-backs		^H
-backw		^O
-bknd		^K '
-blkcpy		^K C
-blkcpy		^K ^C
-blkcpy		^K c
-blkdel		^K Y
-blkdel		^K ^Y
-blkdel		^K y
-blkmove		^K M
-blkmove		^K ^M
-blkmove		^K m
-blksave		^K W
-blksave		^K ^W
-blksave		^K w
-bof		^K U
-bof		^K ^U
-bof		^K u
-home		.kh
-home		^A
-center		^K A
-center		^K ^A
-center		^K a
-crawll		^K <
-crawlr		^K >
-delch		.kD
-delch		^D
-deleol		^J
-dellin		^Y
-delw		^W
-dnarw		.kd
-dnarw		^N
-dnarw		^[ O B
-dnarw		^[ [ B
-edit		^K E
-edit		^K ^E
-edit		^K e
-eof		^K V
-eof		^K ^V
-eof		^K v
-eol		.kH
-eol		.@7
-eol		^E
-exsave		^K X
-exsave		^K ^X
-exsave		^K x
-ffirst		^K F
-ffirst		^K ^F
-ffirst		^K f
-filt		^K /
-fnext		^L
-fmtblk		^K J
-fmtblk		^K ^J
-fmtblk		^K j
-gomark		^[ 0 TO 9
-groww		^K G
-groww		^K ^G
-groww		^K g
-insc		.kI
-insf		^K R
-insf		^K ^R
-insf		^K r
-lindent		^K ,
-line		^K L
-line		^K ^L
-line		^K l
-ltarw		.kl
-ltarw		^B
-ltarw		^[ O D
-ltarw		^[ [ D
-macros		^[ d
-macros		^[ ^D
-markb		^K B
-markb		^K ^B
-markb		^K b
-markk		^K K
-markk		^K ^K
-markk		^K k
-menu,"root",rtn	^T
-nextpos		^K =
-nextword	^X
-open		^]
-prevpos		^K -
-prevword	^Z
-reload		^K `
-redo		^^
-rindent		^K .
-rtarw		.kr
-rtarw		^F
-rtarw		^[ O C
-rtarw		^[ [ C
-run		^K !
-save		^K D
-save		^K S
-save		^K ^D
-save		^K ^S
-save		^K d
-save		^K s
-setmark		^[ ^[
-shrinkw		^K T
-shrinkw		^K ^T
-shrinkw		^K t
-splitw		^K O
-splitw		^K ^O
-splitw		^K o
-stat		^K SP
-tag		^K ;
-tomatch		^G
-undo		^_
-uparw		.ku
-uparw		^P
-uparw		^[ O A
-uparw		^[ [ A
-
-:prompt			Prompt windows
-:inherit main
-if,"byte>size",then,complete,complete,else,delch,endif	^D
-complete	^I
-dnarw,eol	.kd
-dnarw,eol	^N
-dnarw,eol	^[ O B
-dnarw,eol	^[ [ B
-uparw,eol	.ku
-uparw,eol	^P
-uparw,eol	^[ O A
-uparw,eol	^[ [ A
-
-:menu			Selection menus
-:inherit windows
-
-pgupmenu	^[ [ I
-
-pgdnmenu	^[ [ G
-
-bolmenu		^[ [ 1 ~
-bolmenu		^[ [ H
-bolmenu		^[ O H
-bolmenu		^[ [ 7 ~
-
-eolmenu		^[ [ 4 ~
-eolmenu		^[ [ F
-eolmenu		^[ O F
-eolmenu		^[ [ 8 ~
-
-abort		^[ ^[
-backsmenu	^?
-backsmenu	^H
-bofmenu		^K U
-bofmenu		^K ^U
-bofmenu		^K u
-bolmenu		.kh
-bolmenu		^A
-dnarwmenu	.kd
-dnarwmenu	^N
-dnarwmenu	^[ [ B
-dnarwmenu	^[ O B
-dnarwmenu	MWDOWN
-eofmenu		^K V
-eofmenu		^K ^V
-eofmenu		^K v
-eolmenu		.kH
-eolmenu		^E
-ltarwmenu	.kl
-ltarwmenu	^B
-ltarwmenu	^[ [ D
-ltarwmenu	^[ O D
-pgdnmenu	.kN
-pgdnmenu	^V
-pgdnmenu	^[ [ 6 ~
-pgupmenu	.kP
-pgupmenu	^U
-pgupmenu	^[ [ 5 ~
-rtarwmenu	.kr
-rtarwmenu	^F
-rtarwmenu	^[ [ C
-rtarwmenu	^[ O C
-rtn		SP
-rtn		^I
-rtn		^K H
-rtn		^K h
-rtn		^K ^H
-tabmenu		^I
-uparwmenu	.ku
-uparwmenu	^P
-uparwmenu	^[ [ A
-uparwmenu	^[ O A
-uparwmenu	MWUP
-defm2down	M2DOWN
-
-:query			Single-key query window
-:inherit windows
-
-:querya			Single-key query window for quoting
-type		^@ TO ÿ
-
-:querysr		Search & replace query window
-type		^@ TO ÿ
diff --git a/trunk/package/feeds/packages/joe/patches/001-mathaway.patch b/trunk/package/feeds/packages/joe/patches/001-mathaway.patch
deleted file mode 100644
index 99fc9300..00000000
--- a/trunk/package/feeds/packages/joe/patches/001-mathaway.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/umath.c
-+++ b/umath.c
-@@ -378,7 +378,6 @@ double m_cos(double n) { return cos(n); 
- double m_tan(double n) { return tan(n); }
- double m_exp(double n) { return exp(n); }
- double m_sqrt(double n) { return sqrt(n); }
--double m_cbrt(double n) { return cbrt(n); }
- double m_log(double n) { return log(n); }
- double m_log10(double n) { return log10(n); }
- double m_asin(double n) { return asin(n); }
-@@ -387,19 +386,10 @@ double m_atan(double n) { return atan(n)
- double m_sinh(double n) { return sinh(n); }
- double m_cosh(double n) { return cosh(n); }
- double m_tanh(double n) { return tanh(n); }
--double m_asinh(double n) { return asinh(n); }
--double m_acosh(double n) { return acosh(n); }
--double m_atanh(double n) { return atanh(n); }
- double m_int(double n) { return (int)(n); }
- double m_floor(double n) { return floor(n); }
- double m_ceil(double n) { return ceil(n); }
- double m_fabs(double n) { return fabs(n); }
--double m_erf(double n) { return erf(n); }
--double m_erfc(double n) { return erfc(n); }
--double m_j0(double n) { return j0(n); }
--double m_j1(double n) { return j1(n); }
--double m_y0(double n) { return y0(n); }
--double m_y1(double n) { return y1(n); }
- 
- double calc(BW *bw, unsigned char *s)
- {
-@@ -414,7 +404,6 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "tan"); v->func = m_tan;
- 		v = get(USTR "exp"); v->func = m_exp;
- 		v = get(USTR "sqrt"); v->func = m_sqrt;
--		v = get(USTR "cbrt"); v->func = m_cbrt;
- 		v = get(USTR "ln"); v->func = m_log;
- 		v = get(USTR "log"); v->func = m_log10;
- 		v = get(USTR "asin"); v->func = m_asin;
-@@ -425,19 +414,10 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "sinh"); v->func = m_sinh;
- 		v = get(USTR "cosh"); v->func = m_cosh;
- 		v = get(USTR "tanh"); v->func = m_tanh;
--		v = get(USTR "asinh"); v->func = m_asinh;
--		v = get(USTR "acosh"); v->func = m_acosh;
--		v = get(USTR "atanh"); v->func = m_atanh;
- 		v = get(USTR "int"); v->func = m_int;
- 		v = get(USTR "floor"); v->func = m_floor;
- 		v = get(USTR "ceil"); v->func = m_ceil;
- 		v = get(USTR "abs"); v->func = m_fabs;
--		v = get(USTR "erf"); v->func = m_erf;
--		v = get(USTR "erfc"); v->func = m_erfc;
--		v = get(USTR "j0"); v->func = m_j0;
--		v = get(USTR "j1"); v->func = m_j1;
--		v = get(USTR "y0"); v->func = m_y0;
--		v = get(USTR "y1"); v->func = m_y1;
- 	}
- 
- 	v = get(USTR "top");
diff --git a/trunk/package/feeds/packages/json4lua/Makefile b/trunk/package/feeds/packages/json4lua/Makefile
deleted file mode 100644
index ff8774cf..00000000
--- a/trunk/package/feeds/packages/json4lua/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#  
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=json4lua
-PKG_VERSION:=0.9.53
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/amrhassan/$(PKG_NAME)/archive/
-PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
-PKG_LICENSE=MIT
-
-LUA_MODULE_PATH:=/usr/lib/lua
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/json4lua
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=json4lua
-  URL:=https://github.com/amrhassan/json4lua
-  DEPENDS:=+lua +luasocket
-endef
-
-define Package/json4lua/description
-	JSON and JSONRPC for Lua
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/json4lua/install
-	$(INSTALL_DIR) $(1)/$(LUA_MODULE_PATH)/json
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/json/json.lua $(1)/$(LUA_MODULE_PATH)/json.lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/json/rpc.lua $(1)/$(LUA_MODULE_PATH)/json/rpc.lua
-endef
-
-$(eval $(call BuildPackage,json4lua))
diff --git a/trunk/package/feeds/packages/keepalived/Makefile b/trunk/package/feeds/packages/keepalived/Makefile
deleted file mode 100644
index 04a041fa..00000000
--- a/trunk/package/feeds/packages/keepalived/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=keepalived
-PKG_VERSION:=1.2.16
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= http://www.keepalived.org/software
-PKG_MD5SUM:=f834ab2cfc2e7300edf1bafaf4a5d83e
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-define Package/keepalived
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Failover and monitoring daemon for LVS clusters
-  URL:=http://www.keepalived.org/
-  DEPENDS:=+libnl +libopenssl
-endef
-
-define Package/keepalived/description
- Failover and monitoring daemon for Linux Virtual Server (LVS) clusters.
-endef
-
-define Package/keepalived/conffiles
-/etc/keepalived/keepalived.conf
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-vrrp \
-	--enable-fwmark \
-	--enable-sha1 \
-	--disable-lvs \
-	--disable-lvs-syncd \
-	--disable-snmp \
-	--disable-debug \
-	--disable-profile \
-	--with-kernel-dir="$(LINUX_DIR)/$(LINUX_UAPI_DIR)"
-
-MAKE_FLAGS += \
-		STRIP="/bin/true" \
-
-define Package/keepalived/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/keepalived $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/genhash $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/keepalived
-	$(CP) $(PKG_INSTALL_DIR)/etc/keepalived/keepalived.conf $(1)/etc/keepalived/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/keepalived.init $(1)/etc/init.d/keepalived
-endef
-
-$(eval $(call BuildPackage,keepalived))
diff --git a/trunk/package/feeds/packages/keepalived/files/keepalived.init b/trunk/package/feeds/packages/keepalived/files/keepalived.init
deleted file mode 100644
index 1d1ada25..00000000
--- a/trunk/package/feeds/packages/keepalived/files/keepalived.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2015 OpenWrt.org
-
-START=70
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/sbin/keepalived
-}
-
-stop() {
-	service_stop /usr/sbin/keepalived
-}
diff --git a/trunk/package/feeds/packages/kismet/Makefile b/trunk/package/feeds/packages/kismet/Makefile
deleted file mode 100644
index de609495..00000000
--- a/trunk/package/feeds/packages/kismet/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=kismet
-PKG_VERSION:=2013-03-R1b
-PKG_RELEASE:=1
-
-PKG_LICENSE:=LGPLv2.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.kismetwireless.net/code
-PKG_MD5SUM:=6cdcd78baf2e15edbe8a9de3c5493f02
-
-PKG_BUILD_DEPENDS:=libpcap libncurses libpcre
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/kismet/Default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Kismet
-  MAINTAINER:=Sebastian Wendel <packages@sourceindex.de>
-  DEPENDS:= $(CXX_DEPENDS) +libnl
-  URL:=http://www.kismetwireless.net/
-  SUBMENU:=wireless
-endef
-
-define Package/kismet/Default/description
- An 802.11 layer2 wireless network detector, sniffer, and intrusion
- detection system.
-endef
-
-define Package/kismet-client/conffiles
-/etc/kismet/kismet.conf
-endef
-
-define Package/kismet-drone/conffiles
-/etc/kismet/kismet_drone.conf
-endef
-
-define Package/kismet-server/conffiles
-/etc/kismet/kismet.conf
-endef
-
-define Package/kismet-client
-$(call Package/kismet/Default)
-  TITLE+= client
-  DEPENDS+= +libncurses
-endef
-
-define Package/kismet-client/description
-$(call Package/kismet/Default/description)
- This package contains the kismet text interface client.
-endef
-
-define Package/kismet-drone
-$(call Package/kismet/Default)
-  DEPENDS+= +libpcap +libpcre +libcap +wireless-tools 
-  TITLE+= drone
-endef
-
-define Package/kismet-drone/description
-$(call Package/kismet/Default/description)
- This package contains the kismet remote sniffing.and monitoring drone.
-endef
-
-define Package/kismet-server
-$(call Package/kismet/Default)
-  DEPENDS+= +libpcap +libpcre +libcap +wireless-tools
-  TITLE+= server
-endef
-
-define Package/kismet-server/description
-$(call Package/kismet/Default/description)
- This package contains the kismet server.
-endef
-
-CONFIGURE_ARGS += \
-	--sysconfdir=/etc/kismet \
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
-	LIBS="-lm" \
-	CLIENTCLIBS="-lm"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD="$(TARGET_CXX)" \
-		all
-endef
-
-define Package/kismet/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/kismet $(1)/usr/bin/kismet
-endef
-
-define Package/kismet-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) ./files/kismet.conf $(1)/etc/kismet/
-endef
-
-define Package/kismet-drone/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) ./files/kismet_drone.conf $(1)/etc/kismet/
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/kismet_drone.config $(1)/etc/config/kismet_drone
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/kismet_drone.init $(1)/etc/init.d/kismet_drone
-endef
-
-define Package/kismet-server/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) ./files/kismet.conf $(1)/etc/kismet/
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/kismet_server.config $(1)/etc/config/kismet_server
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/kismet_server.init $(1)/etc/init.d/kismet_server
-endef
-
-$(eval $(call BuildPackage,kismet-client))
-$(eval $(call BuildPackage,kismet-drone))
-$(eval $(call BuildPackage,kismet-server))
diff --git a/trunk/package/feeds/packages/kismet/files/kismet.conf b/trunk/package/feeds/packages/kismet/files/kismet.conf
deleted file mode 100644
index 971f2e23..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet.conf
+++ /dev/null
@@ -1,304 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2009-newcore
-
-# Name of server (Purely for organizational purposes)
-# If commented out, defaults to host name of system
-# servername=Kismet Server
-
-# Prefix of where we log (as used in the logtemplate later)
-logprefix=/tmp
-
-# Do we process the contents of data frames?  If this is enabled, data
-# frames will be truncated to the headers only immediately after frame type
-# detection.  This will disable IP detection, etc, however it is likely
-# safer (and definitely more polite) if monitoring networks you do not own.
-# hidedata=true
-
-# Do we allow plugins to be used?  This will load plugins from the system
-# and user plugin directiories when set to true (See the README for the default
-# plugin locations).
-allowplugins=false
-
-# See the README for full information on the new source format
-# ncsource=interface:options
-# for example:
-# ncsource=wifi0:type=madwifi
-# ncsource=wlan0:name=intel,hop=false,channel=11
-ncsource=wlan0
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example, if sources with name=prismsource and name=ciscosource are defined,
-# and you only want to enable those two:
-# enablesources=prismsource,ciscosource
-
-# Control which channels we like to spend more time on.  By default, the list
-# of channels is pulled from the driver automatically.  By setting preferred channels,
-# if they are present in the channel list, they'll be set with a timing delay so that
-# more time is spent on them.  Since 1, 6, 11 are the common default channels, it makes
-# sense to spend more time monitoring them.
-# For finer control, see further down in the config for the channellist= directives.
-preferredchannels=1,6,11
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=3
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Channels are defined as:
-# channellist=name:ch1,ch2,ch3
-# or
-# channellist=name:range-start-end-width-offset,ch,range,ch,...
-#
-# Channels may be a numeric channel or a frequency
-#
-# Channels may specify an additional wait period.  For common default channels,
-# an additional wait period can be useful.  Wait periods delay for that number 
-# of times per second - so a configuration hopping 10 times per second with a
-# channel of 6:3 would delay 3/10ths of a second on channel 6.
-#
-# Channel lists may have up to 256 channels and ranges (combined).  For power 
-# users scanning more than 256 channels with a single card, ranges must be used.
-#
-# Ranges are meant for "power users" who wish to define a very large number of
-# channels.  A range may specify channels or frequencies, and will automatically
-# sort themselves to cover channels in a non-overlapping fashion.  An example
-# range for the normal 802.11b/g spectrum would be:
-#
-# range-1-11-3-1
-#
-# which indicates starting at 1, ending at 11, a channel width of 3 channels,
-# incrementing by one.  A frequency based definition would be:
-#
-# range-2412-2462-22-5
-#
-# since 11g channels are 22 mhz wide and 5 mhz apart.
-#
-# Ranges have the flaw that they cannot be shared between sources in a non-overlapping
-# way, so multiple sources using the same range may hop in lockstep with each other
-# and duplicate the coverage.
-#
-# channellist=demo:1:3,6:3,11:3,range-5000-6000-20-10
-
-# Default channel lists
-# These channel lists MUST BE PRESENT for Kismet to work properly.  While it is
-# possible to change these, it is not recommended.  These are used when the supported
-# channel list can not be found for the source; to force using these instead of
-# the detected supported channels, override with channellist= in the source defintion
-#
-# IN GENERAL, if you think you want to modify these, what you REALLY want to do is
-# copy them and use channellist= in the packet source.
-channellist=IEEE80211b:1:3,6:3,11:3,2,7,3,8,4,9,5,10
-channellist=IEEE80211a:36,40,44,48,52,56,60,64,149,153,157,161,165
-channellist=IEEE80211ab:1:3,6:3,11:3,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64,149,153,157,161,165
-
-# Client/server listen config
-listen=tcp://127.0.0.1:2501
-#listen=tcp://0.0.0.0:2501
-
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-# Maximum backlog before we start throwing out or killing clients.  The
-# bigger this number, the more memory and the more power it will use.
-maxbacklog=5000
-
-# Server + Drone config options.  To have a Kismet server export live packets
-# as if it were a drone, uncomment these.
-# dronelisten=tcp://127.0.0.1:3501
-# droneallowedhosts=127.0.0.1
-# dronemaxclients=5
-# droneringlen=65535
-
-# OUI file, expected format 00:11:22<tab>manufname
-# IEEE OUI file used to look up manufacturer info.  We default to the
-# wireshark one since most people have that.
-#ouifile=/usr/share/manuf
-
-# Do we have a GPS?
-gps=false
-# Do we use a locally serial attached GPS, or use a gpsd server, or
-# use a fixed virtual gps?
-# (Pick only one)
-gpstype=gpsd
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-
-
-# gpstype=serial
-# What serial device do we look for the GPS on?
-# gpsdevice=/dev/rfcomm0
-
-# gpstype=virtual
-# gpsposition=100,-50
-# gpsaltitude=1234
-
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-# Do we try to reconnect if we lose our link to the GPS, or do we just
-# let it die and be disabled?
-gpsreconnect=true
-
-# Do we export packets over tun/tap virtual interfaces?
-tuntap_export=false
-# What virtual interface do we use
-tuntap_device=kistap0
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!"00:00:DE:AD:BE:EF")
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-# filter_netclient=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=ADHOCCONFLICT,5/min,1/sec
-alert=AIRJACKSSID,5/min,1/sec
-alert=APSPOOF,10/min,1/sec
-alert=BCASTDISCON,5/min,2/sec
-alert=BSSTIMESTAMP,5/min,1/sec
-alert=CHANCHANGE,5/min,1/sec
-alert=CRYPTODROP,5/min,1/sec
-alert=DISASSOCTRAFFIC,10/min,1/sec
-alert=DEAUTHFLOOD,5/min,2/sec
-alert=DEAUTHCODEINVALID,5/min,1/sec
-alert=DISCONCODEINVALID,5/min,1/sec
-alert=DHCPNAMECHANGE,5/min,1/sec
-alert=DHCPOSCHANGE,5/min,1/sec
-alert=DHCPCLIENTID,5/min,1/sec
-alert=DHCPCONFLICT,10/min,1/sec
-alert=NETSTUMBLER,5/min,1/sec
-alert=LUCENTTEST,5/min,1/sec
-alert=LONGSSID,5/min,1/sec
-alert=MSFBCOMSSID,5/min,1/sec
-alert=MSFDLINKRATE,5/min,1/sec
-alert=MSFNETGEARBEACON,5/min,1/sec
-alert=NULLPROBERESP,5/min,1/sec
-alert=PROBENOJOIN,5/min,1/sec
-
-# Controls behavior of the APSPOOF alert.  SSID may be a literal match (ssid=) or
-# a regex (ssidregex=) if PCRE was available when kismet was built.  The allowed 
-# MAC list must be comma-separated and enclosed in quotes if there are multiple 
-# MAC addresses allowed.  MAC address masks are allowed.
-#apspoof=Foo1:ssidregex="(?i:foobar)",validmacs=00:11:22:33:44:55
-#apspoof=Foo2:ssid="Foobar",validmacs="00:11:22:33:44:55,aa:bb:cc:dd:ee:ff"
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=10
-
-# Do we use sound?
-# Not to be confused with GUI sound parameter, this controls wether or not the
-# server itself will play sound.  Primarily for headless or automated systems.
-enablesound=false
-# Path to sound player
-soundbin=play
-
-sound=newnet,true
-sound=newcryptnet,true
-sound=packet,true
-sound=gpslock,true
-sound=gpslost,true
-sound=alert,true
-
-# Does the server have speech? (Again, not to be confused with the GUI's speech)
-enablespeech=false
-# Binary used for speech (if not in path, full path must be specified)
-speechbin=flite
-# Specify raw or festival; Flite (and anything else that doesn't need formatting
-# around the string to speak) is 'raw', festival requires the string be wrapped in
-# SayText("...")
-speechtype=raw
-
-# How do we speak?  Valid options:
-# speech    Normal speech
-# nato      NATO spellings (alpha, bravo, charlie)
-# spell     Spell the letters out (aye, bee, sea)
-speechencoding=nato
-
-speech=new,"New network detected s.s.i.d. %1 channel %2"
-speech=alert,"Alert %1"
-speech=gpslost,"G.P.S. signal lost"
-speech=gpslock,"G.P.S. signal O.K."
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated.  Built-in log file types:
-# alert				Text file of alerts
-# gpsxml			XML per-packet GPS log
-# nettxt			Networks in text format
-# netxml			Networks in XML format
-# pcapdump			tcpdump/wireshark compatible pcap log file
-# string			All strings seen (increases CPU load)
-logtypes=pcapdump,gpsxml,netxml,alert
-
-# Format of the pcap dump (PPI or 80211)
-pcapdumpformat=ppi
-# pcapdumpformat=80211
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %p is replaced by the logging prefix + '/'
-# %n is replaced by the logging instance name
-# %d is replaced by the starting date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting time as HH-MM-SS
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (pcapdump, strings, etc)
-# %h is replaced by the home directory
-
-logtemplate=%p%n-%D-%t-%i.%l
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
diff --git a/trunk/package/feeds/packages/kismet/files/kismet_drone.conf b/trunk/package/feeds/packages/kismet/files/kismet_drone.conf
deleted file mode 100644
index bd165403..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet_drone.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-# Kismet drone config file
-
-version=newcore.1
-
-# Name of drone server (informational)
-servername=Kismet-Drone
-
-# Drone configuration
-# Protocol, interface, and port to listen on
-dronelisten=tcp://127.0.0.1:2502
-# Hosts allowed to connect, comma separated.  May include netmasks.
-# allowedhosts=127.0.0.1,10.10.10.0/255.255.255.0
-droneallowedhosts=127.0.0.1
-# Maximum number of drone clients
-dronemaxclients=10
-droneringlen=65535
-
-# Do we have a GPS?
-gps=true
-# Do we use a locally serial attached GPS, or use a gpsd server?
-# (Pick only one)
-gpstype=gpsd
-# gpstype=serial
-# What serial device do we look for the GPS on?
-gpsdevice=/dev/rfcomm0
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-# Do we try to reconnect if we lose our link to the GPS, or do we just
-# let it die and be disabled?
-gpsreconnect=true
-
-# See the README for full information on the new source format
-# ncsource=interface:options
-ncsource=null
-# for example:
-# ncsource=wlan0
-# ncsource=wifi0:type=madwifi
-# ncsource=wlan0:name=intel,hop=false,channel=11
-
-# Special per-source options
-# sourceopts=[sourcename|*]:opt1,opt2
-# sourceopts=*:fuzzycrypt,weakvalidate
-
-# Comma-separated list of sources to enable, if you don't want to enable all
-# the sources you defined.
-# enablesource=source1,source2
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Users outside the US might want to use this list:
-# channellist=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-channellist=IEEE80211b:1:3,6:3,11:3,2,7,3,8,4,9,5,10
-
-# US IEEE 80211a
-channellist=IEEE80211a:36,40,44,48,52,56,60,64,149,153,157,161,165
-
-# Combo
-channellist=IEEE80211ab:1:3,6:3,11:3,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64,149,153,157,161,165
-
-
diff --git a/trunk/package/feeds/packages/kismet/files/kismet_drone.config b/trunk/package/feeds/packages/kismet/files/kismet_drone.config
deleted file mode 100644
index 749505d1..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet_drone.config
+++ /dev/null
@@ -1,2 +0,0 @@
-config kismet_drone
-    option enabled 0
diff --git a/trunk/package/feeds/packages/kismet/files/kismet_drone.init b/trunk/package/feeds/packages/kismet/files/kismet_drone.init
deleted file mode 100755
index 2cbbe7ed..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet_drone.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013-2014 OpenWrt.org
-
-START=99
-STOP=99
-
-USE_PROCD=1
-PROG=/usr/bin/kismet_drone
-NAME=kismet_drone
-
-kismet_drone_instance() {
-        procd_open_instance
-        procd_set_param command "${PROG}"
-        procd_append_param command -f /etc/kismet/kismet_drone.conf -s
-        procd_set_param respawn
-        procd_close_instance
-}
-
-start_service() {
-        config_load "${NAME}"
-        config_foreach kismet_drone_instance
-}
-
-stop_service() {
-        service_stop "${PROG}"
-}
diff --git a/trunk/package/feeds/packages/kismet/files/kismet_server.config b/trunk/package/feeds/packages/kismet/files/kismet_server.config
deleted file mode 100644
index ad39f3e1..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet_server.config
+++ /dev/null
@@ -1,2 +0,0 @@
-config kismet_server
-    option enabled 0
diff --git a/trunk/package/feeds/packages/kismet/files/kismet_server.init b/trunk/package/feeds/packages/kismet/files/kismet_server.init
deleted file mode 100755
index 7d731e77..00000000
--- a/trunk/package/feeds/packages/kismet/files/kismet_server.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013-2014 OpenWrt.org
-
-START=99
-STOP=99
-
-USE_PROCD=1
-PROG=/usr/bin/kismet_server
-NAME=kismet_server
-
-kismet_server_instance() {
-        procd_open_instance
-        procd_set_param command "${PROG}"
-        procd_append_param command -f /etc/kismet/kismet.conf -s
-        procd_set_param respawn
-        procd_close_instance
-}
-
-start_service() {
-        config_load "${NAME}"
-        config_foreach kismet_server_instance
-}
-
-stop_service() {
-        service_stop "${PROG}"
-}
diff --git a/trunk/package/feeds/packages/kismet/patches/010-dont-add-host-include-paths.patch b/trunk/package/feeds/packages/kismet/patches/010-dont-add-host-include-paths.patch
deleted file mode 100644
index 23a87bdc..00000000
--- a/trunk/package/feeds/packages/kismet/patches/010-dont-add-host-include-paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure b/configure
-index 6936a47..9a85269 100755
---- a/configure
-+++ b/configure
-@@ -6980,9 +6980,6 @@ else
- fi
- 
- 
--# Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
--
- termcontrol="none";
- 
- if test "$wantclient" = "yes"; then
diff --git a/trunk/package/feeds/packages/kmod/Makefile b/trunk/package/feeds/packages/kmod/Makefile
deleted file mode 100644
index 96769aae..00000000
--- a/trunk/package/feeds/packages/kmod/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (C) 2015 Jeff Waugh
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=kmod
-PKG_VERSION:=20
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.kernel.org/pub/linux/utils/kernel/kmod/
-PKG_MD5SUM:=d6f4fef718a50bd88080de6a43bc64d8
-PKG_MAINTAINER:=Jeff Waugh <jdub@bethesignal.org>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-PKG_FIXUP:=autoreconf
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += --with-zlib
-
-define Package/kmod/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Linux kernel module handling
-  URL:=https://www.kernel.org/pub/linux/utils/kernel/kmod/
-  DEPENDS:=+zlib
-endef
-
-
-define Package/kmod
-$(call Package/kmod/Default)
-  TITLE+= (tools)
-endef
-
-define Package/kmod/description
-Linux kernel module handling
- kmod is a set of tools to handle common tasks with Linux kernel modules like
- insert, remove, list, check properties, resolve dependencies and aliases.
-endef
-
-LEGACY_BINARIES:= \
-	depmod \
-	insmod \
-	lsmod \
-	modinfo \
-	modprobe \
-	rmmod
-
-define Package/kmod/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/kmod $(1)/sbin
-
-	for b in $(LEGACY_BINARIES); do \
-		ln -sf kmod $(1)/sbin/$$$$b ; \
-	done
-endef
-
-
-define Package/libkmod
-$(call Package/kmod/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (library)
-endef
-
-define Package/libkmod/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libkmod.so.* $(1)/usr/lib/
-endef
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libkmod.{so*,la} $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libkmod.pc $(1)/usr/lib/pkgconfig/
-endef
-
-
-$(eval $(call BuildPackage,kmod))
-$(eval $(call BuildPackage,libkmod))
diff --git a/trunk/package/feeds/packages/kmod/patches/001-fix_pkgconfig_file.patch b/trunk/package/feeds/packages/kmod/patches/001-fix_pkgconfig_file.patch
deleted file mode 100644
index 1891078d..00000000
--- a/trunk/package/feeds/packages/kmod/patches/001-fix_pkgconfig_file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -35,9 +35,6 @@ SED_PROCESS = \
- 	-e 's,@zlib_LIBS\@,${zlib_LIBS},g' \
- 	< $< > $@ || rm $@
- 
--%.pc: %.pc.in Makefile
--	$(SED_PROCESS)
--
- LIBKMOD_CURRENT=4
- LIBKMOD_REVISION=9
- LIBKMOD_AGE=2
---- a/configure.ac
-+++ b/configure.ac
-@@ -221,6 +221,7 @@ AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_FILES([
- 	Makefile
- 	man/Makefile
-+	libkmod/libkmod.pc
- 	libkmod/docs/Makefile
- 	libkmod/docs/version.xml
- ])
diff --git a/trunk/package/feeds/packages/knot/Makefile b/trunk/package/feeds/packages/knot/Makefile
deleted file mode 100644
index d35fb7f9..00000000
--- a/trunk/package/feeds/packages/knot/Makefile
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# Copyright (C) 2014-2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=knot
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_MD5SUM:=ad0a2d641556ad30d17d45200a2c45df
-
-PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
-PKG_LICENSE:=GPL-2.0+
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/knot/Default
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Knot DNS
-	URL:=https://www.knot-dns.cz
-	SUBMENU:=IP Addresses and Names
-	DEPENDS:=+libopenssl +liburcu
-endef
-
-define Package/knot-libknot
-	$(call Package/knot/Default)
-	TITLE+= (library)
-endef
-
-define Package/knot
-	$(call Package/knot/Default)
-	TITLE+= (server)
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-dig
-	$(call Package/knot/Default)
-	TITLE+= lookup utility
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-host
-	$(call Package/knot/Default)
-	TITLE+= simple DNS lookup utility
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-nsec3hash
-	$(call Package/knot/Default)
-	TITLE+= simple NSEC3 hash utility
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-nsupdate
-	$(call Package/knot/Default)
-	TITLE+= dynamic DNS update utility
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-tests
-	$(call Package/knot/Default)
-	TITLE+= (tests)
-	DEPENDS+=+knot-libknot
-endef
-
-define Package/knot-libknot/description
-	Knot DNS library.
-endef
-
-define Package/knot/description
-	High-performance authoritative-only DNS server.
-endef
-
-define Package/knot-dig/description
-	Knot DNS lookup utility.
-endef
-
-define Package/knot-host/description
-	Knot DNS simple DNS lookup utility.
-endef
-
-define Package/knot-nsec3hash/description
-	Knot DNS simple utility to compute NSEC3 hash.
-endef
-
-define Package/knot-nsupdate/description
-	Knot DNS dynamic DNS update utility.
-endef
-
-define Package/knot-tests/description
-	Unit tests for Knot DNS server.
-	Usage: /usr/share/knot/runtests.sh
-endef
-
-define Package/knot/conffiles
-/etc/knot/knot.conf
-endef
-
-CONFIGURE_ARGS += 			\
-	--enable-recvmmsg=no		\
-	--disable-fastparser		\
-	--without-libidn		\
-	--with-rundir=/var/run		\
-	--with-storage=/etc/knot
-
-TARGET_CFLAGS += -std=gnu99 -DPSELECT_COMPAT
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR)/libtap check
-	$(MAKE) -C $(PKG_BUILD_DIR)/tests check-compile-only
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/zscanner check-compile-only
-endef
-
-define Package/knot-libknot/install
-	$(INSTALL_DIR) 						$(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libknot.so.*		$(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzscanner.so.*	$(1)/usr/lib/
-endef
-
-define Package/knot/install
-	$(INSTALL_DIR) 						$(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/knotc	$(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/knotd	$(1)/usr/sbin/
-
-	$(INSTALL_DIR) 							$(1)/etc/knot
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knot/knot.sample.conf	$(1)/etc/knot/knot.conf
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/knot/example.com.zone	$(1)/etc/knot/
-
-	$(INSTALL_DIR)				$(1)/etc/init.d
-	$(INSTALL_BIN) ./files/knotd.init	$(1)/etc/init.d/knotd
-endef
-
-define Package/knot-dig/install
-	$(INSTALL_DIR)						$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdig		$(1)/usr/bin/
-endef
-
-define Package/knot-host/install
-	$(INSTALL_DIR)						$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/khost		$(1)/usr/bin/
-endef
-
-define Package/knot-nsec3hash/install
-	$(INSTALL_DIR)						$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knsec3hash	$(1)/usr/bin/
-endef
-
-define Package/knot-nsupdate/install
-	$(INSTALL_DIR)						$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knsupdate	$(1)/usr/bin/
-endef
-
-define Package/knot-tests/install
-	$(INSTALL_DIR) 						$(1)/usr/share/knot
-	$(INSTALL_BIN) ./files/runtests.sh			$(1)/usr/share/knot/
-
-	$(INSTALL_DIR) 						$(1)/usr/share/knot/tap
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libtap/runtests		$(1)/usr/share/knot/tap/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libtap/tap/libtap.sh	$(1)/usr/share/knot/tap/
-
-	$(INSTALL_DIR)								$(1)/usr/share/knot/tests
-	find $(PKG_BUILD_DIR)/tests/.libs -maxdepth 1 -executable -type f | \
-		xargs -I{} basename {} | \
-		xargs -I{} $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/tests/.libs/{}	$(1)/usr/share/knot/tests/test_{}
-
-	$(INSTALL_DIR)						$(1)/usr/share/knot/tests/data
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/data/sample_conf	$(1)/usr/share/knot/tests/data/
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/.libs/zscanner-tool	$(1)/usr/share/knot/tests/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/unittests		$(1)/usr/share/knot/tests/test_zscanner
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/zscanner/tests/TESTS		$(1)/usr/share/knot/tests/
-	cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data				$(1)/usr/share/knot/tests/
-endef
-
-$(eval $(call BuildPackage,knot-libknot))
-$(eval $(call BuildPackage,knot))
-$(eval $(call BuildPackage,knot-dig))
-$(eval $(call BuildPackage,knot-host))
-$(eval $(call BuildPackage,knot-nsec3hash))
-$(eval $(call BuildPackage,knot-nsupdate))
-$(eval $(call BuildPackage,knot-tests))
diff --git a/trunk/package/feeds/packages/knot/files/knotd.init b/trunk/package/feeds/packages/knot/files/knotd.init
deleted file mode 100644
index 23d3bd58..00000000
--- a/trunk/package/feeds/packages/knot/files/knotd.init
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=70
-
-knot_bin="/usr/sbin/knotd"
-knot_ctl="/usr/sbin/knotc"
-config_file="/etc/knot/knot.conf"
-pid_file="/var/run/knot.pid"
-
-start() {
-  echo "Starting Knot DNS"
-
-  if [ -e $pid_file ]; then
-     echo "  Already running with PID `cat $pid_file`"
-     return 1
-  fi
-
-  $knot_bin -c $config_file -d
-
-  if [ $? -ne 0 ]; then
-    echo "  Failed to start"
-  fi
-}
-
-stop() {
-  echo "Stopping Knot DNS"
-
-  if [ -e $pid_file ]; then
-    kill `cat $pid_file`
-    rm -f $pid_file
-  else
-    echo "  No PID file $pid_file"
-    return 1
-  fi
-}
-
-restart() {
-  stop
-  start
-}
-
-reload() {
-  echo "Reloading Knot DNS"
-
-  $knot_ctl -c $config_file reload
-}
diff --git a/trunk/package/feeds/packages/knot/files/runtests.sh b/trunk/package/feeds/packages/knot/files/runtests.sh
deleted file mode 100644
index 10032cb5..00000000
--- a/trunk/package/feeds/packages/knot/files/runtests.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-cd `dirname "$0"`/tests
-../tap/runtests -b /tmp ./test_*
-
-ret=$?
-cd -
-
-return $ret
diff --git a/trunk/package/feeds/packages/knot/patches/01_strptime_susv3.patch b/trunk/package/feeds/packages/knot/patches/01_strptime_susv3.patch
deleted file mode 100644
index fc14b91d..00000000
--- a/trunk/package/feeds/packages/knot/patches/01_strptime_susv3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/libknot/dnssec/key.c b/src/libknot/dnssec/key.c
-index 7dc0540..3e351bb 100644
---- a/src/libknot/dnssec/key.c
-+++ b/src/libknot/dnssec/key.c
-@@ -260,7 +260,15 @@ static int key_param_time(const void *save_to, char *value)
- 
- 	struct tm parsed = { 0 };
- 
--	if (!strptime(value, "%Y%m%d%H%M%S", &parsed)) {
-+	if (strlen(value) != 14) {
-+		return KNOT_EINVAL;
-+	}
-+
-+	char *v = value;
-+	char buf[32] = "";
-+	int ret = sprintf(buf, "%.4s %.2s %.2s %.2s %.2s %.2s",
-+	                  v, v + 4, v + 6, v + 8, v + 10, v + 12);
-+	if (ret != 19 || !strptime(buf, "%Y %m %d %H %M %S", &parsed)) {
- 		return KNOT_EINVAL;
- 	}
- 
diff --git a/trunk/package/feeds/packages/knot/patches/02_knot.conf.patch b/trunk/package/feeds/packages/knot/patches/02_knot.conf.patch
deleted file mode 100644
index f82af0cf..00000000
--- a/trunk/package/feeds/packages/knot/patches/02_knot.conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in
-index 956e8a9..a068e67 100644
---- a/samples/knot.sample.conf.in
-+++ b/samples/knot.sample.conf.in
-@@ -14,7 +14,7 @@ system {
- 
-   # User for running server
-   # May also specify user.group (e.g. knot.knot)
--  user knot.knot;
-+  user root.root;
- 
-   # Directory for storing run-time data
-   # e.g. PID file and control sockets
-@@ -63,11 +63,11 @@ zones {
- #  storage "@storage_dir@";
- #
- #  Example master zone
--#  example.com {
--#    file "@config_dir@/example.com.zone";
-+  example.com {
-+    file "example.com.zone";
- #    xfr-out slave0;
- #    notify-out slave0;
--#  }
-+  }
- #
- #  Example slave zone
- #  example.net {
diff --git a/trunk/package/feeds/packages/knot/patches/03_zscanner_tests.patch b/trunk/package/feeds/packages/knot/patches/03_zscanner_tests.patch
deleted file mode 100644
index 279df279..00000000
--- a/trunk/package/feeds/packages/knot/patches/03_zscanner_tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/zscanner/tests/TESTS b/src/zscanner/tests/TESTS
-index c88aef1..4e2148f 100644
---- a/src/zscanner/tests/TESTS
-+++ b/src/zscanner/tests/TESTS
-@@ -18,10 +18,8 @@
- 05-2_TTL
- 05-3_TTL
- 05-4_TTL
--06-0_INCLUDE
- 06-1_INCLUDE
- 06-2_INCLUDE
--06-3_INCLUDE
- 06-4_INCLUDE
- 06-5_INCLUDE
- 06-6_INCLUDE
-diff --git a/src/zscanner/tests/unittests.in b/src/zscanner/tests/unittests.in
-index 846f351..272856c 100644
---- a/src/zscanner/tests/unittests.in
-+++ b/src/zscanner/tests/unittests.in
-@@ -1,9 +1,9 @@
- #!/bin/sh
- 
--SOURCE=@top_srcdir@/src/zscanner/tests
--BUILD=@top_builddir@/src/zscanner/tests
-+SOURCE="."
-+BUILD="."
- 
--. @top_srcdir@/libtap/tap/libtap.sh
-+. ../tap/libtap.sh
- 
- cd "$BUILD"
- 
-@@ -11,7 +11,7 @@ TMPDIR=$(test_tmpdir)
- TESTS_DIR="$SOURCE"/data
- ZSCANNER_TOOL="$BUILD"/zscanner-tool
- 
--plan 69
-+plan 67
- 
- mkdir -p "$TMPDIR"/includes/
- for a in 1 2 3 4 5 6; do
diff --git a/trunk/package/feeds/packages/knxd/Makefile b/trunk/package/feeds/packages/knxd/Makefile
deleted file mode 100644
index b9ce06d8..00000000
--- a/trunk/package/feeds/packages/knxd/Makefile
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-### Remarks
-### 'python pascal ruby lua' need to be deleted in src/clients/Makefile.am
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=knxd
-PKG_VERSION=2015-03-31-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
-PKG_SOURCE_VERSION:=2c6c6732a684dffb87b391ea92cccdf07c8385b8
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS:=argp-standalone
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/knxd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=EIB KNX daemon
-  DEPENDS:=+pthsem +libusb-1.0
-endef
-
-define Package/knxd/description
-EIB KNX Daemon
-endef
-
-define Package/knxd/conffiles
-/etc/config/knxd
-endef
-
-define Package/libeibclient
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for EIB clients
-  DEPENDS:=+pthsem
-endef
-
-define Package/libeibclient/description
-EIB KNX client library
-endef
-
-define Package/knxd-tools
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=EIB KNX Utils
-  DEPENDS:=+libeibclient
-endef
-
-define Package/knxd-tools/description
-EIB KNX Tools
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-ft12 \
-	--enable-eibnetip \
-	--enable-eibnetiptunnel \
-	--enable-eibnetipserver \
-	--enable-usb \
-	--enable-tpuart \
-	--enable-tpuarts \
-	--disable-pei16 \
-	--disable-pei16s \
-	--enable-groupcache \
-	--without-pth-test \
-	--without-libstdc
-
-EXTRA_LDFLAGS+= \
-	-fno-builtin -nodefaultlibs -lc -lgcc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eib*.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/knxd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/knxd.config $(1)/etc/config/knxd
-endef
-
-define Package/libeibclient/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.so* $(1)/usr/lib/
-endef
-
-define Package/knxd-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/knxtool $(1)/usr/bin/
-	ln -sf knxtool $(1)/usr/bin/knxread
-	ln -sf knxtool $(1)/usr/bin/knxreadtemp
-	ln -sf knxtool $(1)/usr/bin/knxwrite
-	ln -sf knxtool $(1)/usr/bin/knxlog
-	ln -sf knxtool $(1)/usr/bin/knxon
-	ln -sf knxtool $(1)/usr/bin/knxoff
-	ln -sf knxtool $(1)/usr/bin/knxif
-	ln -sf knxtool $(1)/usr/bin/knxswrite
-	ln -sf knxtool $(1)/usr/bin/knxbool
-	ln -sf knxtool $(1)/usr/bin/knxdimup
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor1 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor2 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor3 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibread-cgi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibwrite-cgi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor1 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor2 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor3 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupwrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupswrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/grouplisten $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupread $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupresponse $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupreadresponse $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketlisten $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketread $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketwrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketswrite $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,knxd))
-$(eval $(call BuildPackage,libeibclient))
-$(eval $(call BuildPackage,knxd-tools))
diff --git a/trunk/package/feeds/packages/knxd/files/knxd.config b/trunk/package/feeds/packages/knxd/files/knxd.config
deleted file mode 100644
index cd86a62a..00000000
--- a/trunk/package/feeds/packages/knxd/files/knxd.config
+++ /dev/null
@@ -1,12 +0,0 @@
-config daemon args
-        # daemon is started as 'knxd $options $url'
-        # use 'knxd --help' to get all possible options'
-        #
-        # typical example for options for tunnel mode
-        option options '-D -T -S -d/tmp/knxd.log -i -p/var/run/knxd.pid'
-        # add '-t1023' or '--trace=1023' for full log trace
-
-        # example with tpuarts interface
-        # option url 'tpuarts:/dev/ttyAMA0'
-        # example with IP interface in tunnel mode
-        option url 'ipt:192.168.1.20'
diff --git a/trunk/package/feeds/packages/knxd/files/knxd.init b/trunk/package/feeds/packages/knxd/files/knxd.init
deleted file mode 100644
index 026e4cf6..00000000
--- a/trunk/package/feeds/packages/knxd/files/knxd.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=98
-STOP=20
-NAME=knxd
-PROG=/usr/bin/$NAME
-
-start() {
-        local options url
-        config_load "$NAME"
-        config_get options args options ''
-        config_get url args url
-        service_start $PROG $options $url
-}
-
-stop() {
-        service_stop $PROG
-}
diff --git a/trunk/package/feeds/packages/knxd/patches/0099-openwrt.patch b/trunk/package/feeds/packages/knxd/patches/0099-openwrt.patch
deleted file mode 100644
index f7e33ed1..00000000
--- a/trunk/package/feeds/packages/knxd/patches/0099-openwrt.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/client/Makefile.am 2014-12-21 20:17:14.000000000 +0100
-+++ b/src/client/Makefile.am 2014-12-21 20:18:50.639995000 +0100
-@@ -4,5 +4,5 @@
- BUILDJAVA =
- endif
-
--SUBDIRS=def c $(BUILDJAVA) php perl cs python pascal ruby lua .
-+SUBDIRS=def c $(BUILDJAVA) php perl cs .
diff --git a/trunk/package/feeds/packages/krb5/Makefile b/trunk/package/feeds/packages/krb5/Makefile
deleted file mode 100644
index c0de8524..00000000
--- a/trunk/package/feeds/packages/krb5/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=krb5
-PKG_VERSION:=1.13.1
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=NOTICE
-
-PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar
-PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.13/
-PKG_MD5SUM:=567586cdf02aa8c842c2fab7a94f3c1f
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-MAKE_PATH:=src
-
-define Package/krb5/Default
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Kerberos
-	URL:=http://web.mit.edu/kerberos/
-endef
-
-define Package/krb5-libs
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Kerberos
-	DEPENDS:=+libncurses
-	TITLE:=Kerberos 5 Shared Libraries
-	URL:=http://web.mit.edu/kerberos/
-endef
-
-define Package/krb5-server
-	$(call Package/krb5/Default)
-	DEPENDS:=+krb5-libs +libpthread
-	TITLE:=Kerberos 5 Server
-endef
-
-define Package/krb5-client
-	$(call Package/krb5/Default)
-	DEPENDS:=+krb5-libs
-	TITLE:=Kerberos 5 Client
-endef
-
-define Package/krb5/description
-	Kerberos
-endef
-
-define Build/Prepare
-	# Krb5 tarball contains signature and a second tarball
-	# containing source code.
-	tar xf "$(DL_DIR)/$(PKG_SOURCE)" -C "$(BUILD_DIR)"
-	tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)"
-	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-fix-build.patch"
-endef
-
-CONFIGURE_PATH = ./src
-
-CONFIGURE_VARS += \
-	cross_compiling=yes \
-	krb5_cv_attr_constructor_destructor=yes,yes \
-	ac_cv_func_regcomp=yes \
-	ac_cv_printf_positional=yes \
-	ac_cv_file__etc_environment=no \
-	ac_cv_file__etc_TIMEZONE=no
-
-CONFIGURE_ARGS += \
-	--without-tcl \
-	--without-libedit \
-	--localstatedir=/etc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include \
-		$(1)/usr/include/krb5
-	$(INSTALL_DIR) $(1)/usr
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib \
-		$(1)/usr
-	rm -f $(1)/usr/lib/libcom_err*
-endef
-
-define Package/krb5-libs/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/krb5
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins/kdb
-	$(INSTALL_DIR) $(1)/usr/lib/krb5/plugins/libkrb5
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/krb5/plugins/kdb/db2.so $(1)/usr/lib/krb5/plugins/kdb
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
-define Package/krb5-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdestroy $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kinit $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/klist $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kpasswd $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ksu $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kvno $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5-send-pr $(1)/usr/sbin
-endef
-
-# Removed some server-side software to reduce package size. This should be
-# put in a separate package if needed.
-define Package/krb5-server/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc
-#	$(INSTALL_DIR) $(1)/usr/bin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sclient $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmin.local $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdb5_util $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5kdc $(1)/usr/sbin
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sim_server $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,krb5-libs))
-$(eval $(call BuildPackage,krb5-server))
-$(eval $(call BuildPackage,krb5-client))
diff --git a/trunk/package/feeds/packages/krb5/files/krb5kdc b/trunk/package/feeds/packages/krb5/files/krb5kdc
deleted file mode 100644
index dec7188e..00000000
--- a/trunk/package/feeds/packages/krb5/files/krb5kdc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
-
-START=60
-
-start() {
-	mkdir -p /var/tmp
-	mkdir -p /etc/krb5kdc
-	
-	[ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s
-	
-	/usr/sbin/krb5kdc
-	/usr/sbin/kadmind
-}
-
-stop() {
-	killall krb5kdc 2> /dev/null
-	killall kadmind 2> /dev/null
-}
diff --git a/trunk/package/feeds/packages/krb5/patches/001-fix-build.patch b/trunk/package/feeds/packages/krb5/patches/001-fix-build.patch
deleted file mode 100644
index 2801fd36..00000000
--- a/trunk/package/feeds/packages/krb5/patches/001-fix-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -u --recursive krb5-1.13.1-vanilla/src/lib/krad/packet.c krb5-1.13.1/src/lib/krad/packet.c
---- krb5-1.13.1-vanilla/src/lib/krad/packet.c	2015-02-22 10:08:38.213087138 -0500
-+++ krb5-1.13.1/src/lib/krad/packet.c	2015-02-22 10:13:25.223709951 -0500
-@@ -253,7 +253,7 @@
- {
-     krb5_error_code retval;
-     krad_packet *pkt;
--    uchar id;
-+    uchar id = 0;
-     size_t attrset_len;
- 
-     pkt = packet_new();
-diff -u --recursive krb5-1.13.1-vanilla/src/lib/krb5/ccache/cc_file.c krb5-1.13.1/src/lib/krb5/ccache/cc_file.c
---- krb5-1.13.1-vanilla/src/lib/krb5/ccache/cc_file.c	2015-02-22 10:08:38.211087133 -0500
-+++ krb5-1.13.1/src/lib/krb5/ccache/cc_file.c	2015-02-22 10:14:15.410819464 -0500
-@@ -401,7 +401,7 @@
- {
-     krb5_error_code ret;
-     struct k5buf buf;
--    size_t maxsize;
-+    size_t maxsize = 0;
- 
-     *princ = NULL;
-     k5_cc_mutex_assert_locked(context, &((fcc_data *)id->data)->lock);
-@@ -1088,7 +1088,7 @@
-     krb5_fcc_cursor *fcursor = *cursor;
-     fcc_data *data = id->data;
-     struct k5buf buf;
--    size_t maxsize;
-+    size_t maxsize = 0;
- 
-     memset(creds, 0, sizeof(*creds));
-     k5_cc_mutex_lock(context, &data->lock);
-diff -u --recursive krb5-1.13.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
---- krb5-1.13.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-02-22 10:08:38.190087088 -0500
-+++ krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-02-22 10:17:37.981263250 -0500
-@@ -3593,7 +3593,7 @@
- {
-     CK_ULONG i, r;
-     unsigned char *cp;
--    size_t label_len;
-+    size_t label_len = 0;
-     CK_ULONG count = 0;
-     CK_SLOT_ID_PTR slotlist;
-     CK_TOKEN_INFO tinfo;
diff --git a/trunk/package/feeds/packages/l7-protocols/Makefile b/trunk/package/feeds/packages/l7-protocols/Makefile
deleted file mode 100644
index 0258216f..00000000
--- a/trunk/package/feeds/packages/l7-protocols/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=l7-protocols
-PKG_VERSION:=2009-05-28
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/l7-filter
-PKG_MD5SUM:=91be154d12134dcdbc560cc7aa7fe4ce
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/l7-protocols
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Protocols for layer7 filtering
-  URL:=http://l7-filter.sourceforge.net/
-  SUBMENU:=Firewall
-  MAINTAINER:=Lim Guo Wei <limguowei@gmail.com>
-  DEPENDS:=iptables-mod-filter
-endef
-
-define Package/l7-protocols/description
-       l7-filter classifies packets based on patterns in application
-       layer data. This allows correct classification of P2P traffic that
-       uses unpredictable ports as well as standard protocols running on
-       non-standard ports.
-endef
-
-define Package/l7-protocols-testing
-	$(call Package/l7-protocols)
-	TITLE:=testing utilities for layer7
-	DEPENDS+=l7-protocols $(CXX_DEPENDS)
-endef
-
-define Package/l7-protocols-testing/description
-	testing utilities for layer 7 patterns
-endef
-
-define Build/Configure
-endef
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_l7-protocols-testing),)
-  define Build/Compile
-	cd $(PKG_BUILD_DIR)/testing && $(MAKE) $(CONFIGURE_VARS)
-  endef
-else
-  define Build/Compile
-  endef
-endif
-
-define Package/l7-protocols/install
-	find $(PKG_BUILD_DIR) -name "README" -delete
-	$(INSTALL_DIR) $(1)/etc/l7-protocols
-	$(CP) $(PKG_BUILD_DIR)/extra \
-		$(PKG_BUILD_DIR)/file_types \
-		$(PKG_BUILD_DIR)/groups.sh \
-		$(PKG_BUILD_DIR)/malware \
-		$(PKG_BUILD_DIR)/protocols \
-		$(1)/etc/l7-protocols
-endef
-
-define Package/l7-protocols-testing/install
-	$(INSTALL_DIR) $(1)/etc/l7-protocols/testing
-	$(CP) $(PKG_BUILD_DIR)/testing/data \
-		$(1)/etc/l7-protocols/testing
-	$(INSTALL_BIN) \
-		$(PKG_BUILD_DIR)/testing/rand{chars,printable} \
-		$(PKG_BUILD_DIR)/testing/test_speed-{kernel,userspace} \
-		$(PKG_BUILD_DIR)/testing/match_kernel \
-		$(PKG_BUILD_DIR)/testing/doallspeeds.sh \
-		$(PKG_BUILD_DIR)/testing/test_match.sh \
-		$(PKG_BUILD_DIR)/testing/timeit.sh \
-		$(1)/etc/l7-protocols/testing
-endef
-
-$(eval $(call BuildPackage,l7-protocols))
-$(eval $(call BuildPackage,l7-protocols-testing))
diff --git a/trunk/package/feeds/packages/l7-protocols/patches/100-testing_crosscompile.patch b/trunk/package/feeds/packages/l7-protocols/patches/100-testing_crosscompile.patch
deleted file mode 100644
index b5d39530..00000000
--- a/trunk/package/feeds/packages/l7-protocols/patches/100-testing_crosscompile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/testing/Makefile
-+++ b/testing/Makefile
-@@ -1,19 +1,19 @@
- all: randchars randprintable test_speed-kernel test_speed-userspace match_kernel
- 
- randchars: randchars.c
--	gcc -O2 -o randchars randchars.c
-+	$(CC) $(CFLAGS) -o randchars randchars.c
- 
- randprintable: randprintable.c
--	gcc -O2 -o randprintable randprintable.c
-+	$(CC) $(CFLAGS) -o randprintable randprintable.c
- 
- test_speed-kernel: test_speed-kernel.c
--	gcc -o test_speed-kernel test_speed-kernel.c
-+	$(CC) $(CFLAGS) -o test_speed-kernel test_speed-kernel.c
- 
- test_speed-userspace: test_speed-userspace.cpp l7-parse-patterns.cpp l7-parse-patterns.h
--	g++ -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp
-+	$(CXX) $(CXXFLAGS) -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp
- 
- match_kernel: match-kernel.c
--	gcc -O2 -o match_kernel match-kernel.c
-+	$(CC) $(CFLAGS) -o match_kernel match-kernel.c
- 
- clean:
- 	rm -f randprintable randchars test_speed-kernel test_speed-userspace match_kernel
diff --git a/trunk/package/feeds/packages/l7-protocols/patches/101-testing-timeit.patch b/trunk/package/feeds/packages/l7-protocols/patches/101-testing-timeit.patch
deleted file mode 100644
index 66568892..00000000
--- a/trunk/package/feeds/packages/l7-protocols/patches/101-testing-timeit.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/testing/timeit.sh
-+++ b/testing/timeit.sh
-@@ -1,11 +1,8 @@
- #!/bin/bash
- 
--# "man 1 time" for details
--export TIME="%U seconds"
--
- add()
- {
--	if ! dc -e ""; then
-+	if ! dc p >/dev/null 2>&1; then
- 	        echo you do not have dc, so I cannot add these numbers...
- 	        exit 1
- 	fi
-@@ -14,7 +11,7 @@ add()
- 	tot=0
- 
- 	while read n; do
--	        tot=`dc -e "$n $tot + pop" 2> /dev/null`
-+	        tot=`dc $n $tot + p 2> /dev/null`
- 	done
- 
- 	echo $tot seconds
-@@ -34,7 +31,7 @@ extract()
- 
- if [ ! $3 ] || [ $2 == "-h" ] || [ $2 == "--help" ]; then
- 	echo
--	echo Syntax: ./timeit.sh patternfile kernel\|userspace all\|print\|real [data_files]
-+	echo Syntax: .//usr/bin/timeit.sh patternfile kernel\|userspace all\|print\|real [data_files]
- 	echo
- 	echo \"kernel\" uses the kernel pattern and library
- 	echo \"userspace\" uses userspace pattern and library
-@@ -72,12 +69,12 @@ echo Timing $1
- if [ $3 == "all" ]; then
- 	echo Using all characters
- 	if [ $2 == "kernel" ]; then
--		if ! ./randchars | time $speedprog "`extract $1`" verbose; then
-+		if ! ./randchars | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
- 	else
--		if ! ./randchars | time $speedprog -f "$1" -v; then
-+		if ! ./randchars | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
-@@ -85,12 +82,12 @@ if [ $3 == "all" ]; then
- elif [ $3 == "print" ]; then
- 	echo Using only printable characters
- 	if [ $2 == "kernel" ]; then
--		if ! ./randprintable | time $speedprog "`extract $1`" verbose; then
-+		if ! ./randprintable | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
- 	else
--		if ! ./randprintable | time $speedprog -f "$1" -v; then
-+		if ! ./randprintable | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
-@@ -107,12 +104,12 @@ elif [ $3 == "real" ]; then
- 				printf $f\\t
- 				#echo `extract $1`
- 				if [ $2 == "kernel" ]; then
--					if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then
-+					if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 						echo $speedprog failed. > /dev/stderr
- 						exit 1
- 					fi
- 				else
--					if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then
-+					if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 						echo $speedprog failed. > /dev/stderr
- 						exit 1
- 					fi
-@@ -123,12 +120,12 @@ elif [ $3 == "real" ]; then
- 		for f in data/*; do
- 			printf $f\\t
- 			if [ $2 == "kernel" ]; then
--				if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then
-+				if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 					echo $speedprog failed. > /dev/stderr
- 					exit 1
- 				fi
- 			else
--				if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then
-+				if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 					echo $speedprog failed. > /dev/stderr
- 					exit 1
- 				fi
-@@ -137,7 +134,7 @@ elif [ $3 == "real" ]; then
- 	fi
- 
- 	printf Total:\ 
--	cat tmp.$$ | cut -d\  -f 2 | add
-+	cat tmp.$$ | cut -ds -f 1| add
- 
- 	rm tmp.$$
- else
diff --git a/trunk/package/feeds/packages/l7-protocols/patches/102-testing-doallspeeds.patch b/trunk/package/feeds/packages/l7-protocols/patches/102-testing-doallspeeds.patch
deleted file mode 100644
index 850a1d6a..00000000
--- a/trunk/package/feeds/packages/l7-protocols/patches/102-testing-doallspeeds.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/testing/doallspeeds.sh
-+++ b/testing/doallspeeds.sh
-@@ -25,11 +25,11 @@ for f in ../*/*.pat; do 
- 	printf `basename $f .pat`
- 
- 	if [ $userspace ]; then 
--		gtime=`./timeit.sh $f userspace   real | grep Total | cut -d\  -f 2`
-+		gtime=`./timeit.sh $f userspace   real | grep Total | cut -d\  -f 2 | awk '{print $1}'`
- 		printf \\t$gtime
- 	fi
- 	if [ $kernel ]; then 
--		htime=`./timeit.sh $f kernel real | grep Total | cut -d\  -f 2`
-+		htime=`./timeit.sh $f kernel real | grep Total | cut -d\  -f 2 | awk '{print $1}'`
- 		printf \\t$htime
- 	fi
- 	printf \\n
diff --git a/trunk/package/feeds/packages/lame/Makefile b/trunk/package/feeds/packages/lame/Makefile
deleted file mode 100644
index e7057e5e..00000000
--- a/trunk/package/feeds/packages/lame/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lame
-PKG_VERSION:=3.99.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/lame
-PKG_MD5SUM:=84835b313d4a8b68f5349816d33e07ce
-PKG_FIXUP:=autoreconf
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=LGPL-2.0
-PKG_LICENSE_FILES:=COPYING LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/lame/Default
-  SECTION:=sound
-  CATEGORY:=Sound
-  URL:=http://sourceforge.net/projects/lame
-  DEPENDS:=@BUILD_PATENTED
-endef
-
-define Package/lame
-$(call Package/lame/Default)
-  TITLE:=lame
-  MENU:=1
-  DEPENDS += +libncurses
-endef
-
-define Package/lame/description
-lame mp3 encoder
-endef
-
-define Package/lame-lib
-$(call Package/lame/Default)
-  TITLE:=lame-lib
-endef
-
-define Package/lame-lib/description
-lame mp3 encoder libs
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	--disable-nasm \
-	)
-endef
-
-
-define Package/lame/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/
-endef
-
-define Package/lame-lib/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/lame
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/lame/*.h \
-		$(1)/usr/include/lame/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,lame-lib))
-$(eval $(call BuildPackage,lame))
diff --git a/trunk/package/feeds/packages/lame/patches/001-automake-compat.patch b/trunk/package/feeds/packages/lame/patches/001-automake-compat.patch
deleted file mode 100644
index 8857ad73..00000000
--- a/trunk/package/feeds/packages/lame/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -393,7 +393,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"
- 
- dnl configure use of features
- 
--AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+HAVE_GTK="no"
- 
- dnl ElectricFence malloc debugging
- AC_MSG_CHECKING(use of ElectricFence malloc debugging)
---- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -35,7 +35,7 @@ lame_SOURCES = lame_main.c $(common_sour
- mp3rtp_SOURCES = mp3rtp.c rtp.c $(common_sources)
- mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources)
- 
--CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
-+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
- LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
---- a/frontend/Makefile.in
-+++ b/frontend/Makefile.in
-@@ -99,7 +99,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
-+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
- CONFIG_DEFS = @CONFIG_DEFS@
- CONFIG_MATH_LIB = @CONFIG_MATH_LIB@
- CPP = @CPP@
diff --git a/trunk/package/feeds/packages/less/Makefile b/trunk/package/feeds/packages/less/Makefile
deleted file mode 100644
index f3893e96..00000000
--- a/trunk/package/feeds/packages/less/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=less
-PKG_VERSION:=458
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less
-PKG_MD5SUM:=935b38aa2e73c888c210dedf8fd94f49
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/less/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Pager program similar to more
-  URL:=http://www.greenwoodsoftware.com/less/
-endef
-
-define Package/less/Default/description
-  Full version of GNU less utility
-endef
-
-define Package/less
-  $(call Package/less/Default)
-  DEPENDS:=+libncurses
-  VARIANT:=narrow
-endef
-
-define Package/less/description
-  $(call Package/less/Default/description)
-endef
-
-define Package/less-wide
-  $(call Package/less/Default)
-  TITLE+= (Unicode)
-  DEPENDS:=+libncursesw
-  VARIANT:=wide
-endef
-
-define Package/less-wide/description
-  $(call Package/less/Default/description)
-  This package contains the Unicode enabled version of less.
-endef
-
-ifeq ($(BUILD_VARIANT),narrow)
-	CONFIGURE_VARS += \
-		ac_cv_lib_ncursesw_initscr=no		
-endif
-
-ifeq ($(BUILD_VARIANT),wide)
-	CONFIGURE_VARS += \
-		ac_cv_lib_ncursesw_initscr=yes
-endif
-
-define Package/less/install
-	$(INSTALL_DIR) $(1)/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/less $(1)/bin/less
-endef
-
-define Package/less/postinst
-#!/bin/sh
-[ -L "$${IPKG_INSTROOT}/usr/bin/less" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/less"
-exit 0
-endef
-
-define Package/less/postrm
-#!/bin/sh
-/bin/busybox less -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/less
-exit 0
-endef
-
-Package/less-wide/install = $(Package/less/install)
-Package/less-wide/postinst = $(Package/less/postinst)
-Package/less-wide/postrm = $(Package/less/postrm)
-
-$(eval $(call BuildPackage,less))
-$(eval $(call BuildPackage,less-wide))
diff --git a/trunk/package/feeds/packages/lftp/Makefile b/trunk/package/feeds/packages/lftp/Makefile
deleted file mode 100644
index 8a4819cc..00000000
--- a/trunk/package/feeds/packages/lftp/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lftp
-PKG_VERSION:=4.6.0
-PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://lftp.yar.ru/ftp \ http://lftp.cybermirror.org \ http://lftp.cybermirror.org/old
-PKG_MD5SUM:=fc5f4e3b45c9011a193eb8c0c12eb2eb
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lftp
-  SUBMENU:=File Transfer
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libncurses +libopenssl +libreadline $(CXX_DEPENDS) +libexpat
-  TITLE:=a sophisticated file transfer program with command line interface.
-  MAINTAINER:=Federico Di Marco <fededim@gmail.com>
-  URL:=http://lftp.yar.ru/
-endef
-
-define Package/lftp/description
-LFTP is a sophisticated file transfer program with command line interface. It supports FTP, HTTP, FISH, SFTP, HTTPS and FTPS protocols. GNU Readline library is used for input.
-Every operation in lftp is reliable, that is any non-fatal error is handled and the operation is retried automatically. So if downloading breaks, it will be restarted from the point automatically. Even if ftp server does not support REST command, lftp will try to retrieve the file from the very beginning until the file is transferred completely. This is useful for dynamic-ip machines which change their IP addresses quite often, and for sites with very bad internet connectivity.
-
-If you exit lftp when some jobs are not finished yet, lftp will move itself to nohup mode in background. The same happens when you have a real modem hangup or when you close an xterm.
-
-lftp has shell-like command syntax allowing you to launch several commands in parallel in background (&). It is also possible to group commands within () and execute them in background. All background jobs are executed in the same single process. You can bring a foreground job to background with ^Z (c-z) and back with command `wait' (or `fg' which is alias to `wait'). To list running jobs, use command `jobs'. Some commands allow redirecting their output (cat, ls, ...) to file or via pipe to external command. Commands can be executed conditionally based on termination status of previous command (&&, ||).
-
-lftp has builtin mirror which can download or update a whole directory tree. There is also reverse mirror (mirror -R) which uploads or updates a directory tree on server.
-
-There is command `at' to launch a job at specified time in current context, command `queue' to queue commands for sequential execution for current server, and much more.
-
-LFTP supports IPv6 for both FTP and HTTP protocols. For FTP protocol it uses method described in RFC2428.
-
-Other low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, fxp transfers, socks.
-
-LFTP supports secure versions of the protocols FTP and HTTP: FTPS (explicit and implicit) and HTTPS. LFTP needs to be linked with an SSL library to support them. GNU TLS and OpenSSL are both supported as SSL backend.
-endef
-
-CONFIGURE_ARGS += \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-gnutls \
-	--without-libidn \
-	--without-libresolv \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--disable-static
-
-#CONFIGURE_VARS += \
-#	LIBS="-lz -lutil -lcurses -ldl" \
-#	i_cv_posix_fallocate_works=no
-
-#MAKE_VARS += \
-#	LD="$(TARGET_CXX)"
-
-define Package/lftp/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lftp $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,lftp))
diff --git a/trunk/package/feeds/packages/libaio/Makefile b/trunk/package/feeds/packages/libaio/Makefile
deleted file mode 100644
index dbcb59f7..00000000
--- a/trunk/package/feeds/packages/libaio/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libaio
-PKG_VERSION:=0.3.110
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/liba/libaio/
-PKG_MD5SUM:=2a35602e43778383e2f4907a4ca39ab8
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=LGPL-2.1
-
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libaio
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Linux kernel AIO interface access library
-  URL:=http://lse.sourceforge.net/io/aio.html
-endef
-
-define Build/Configure
-endef
-
-LIBAIO_CFLAGS:=-nostdlib -nostartfiles -I. $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		ARCH="$(ARCH)" \
-		CC="$(TARGET_CROSS)gcc" \
-		LD="$(TARGET_CROSS)ld" \
-		CFLAGS="$(LIBAIO_CFLAGS)" \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libaio.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaio.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libaio/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaio.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libaio))
diff --git a/trunk/package/feeds/packages/libaio/patches/001_arches.patch b/trunk/package/feeds/packages/libaio/patches/001_arches.patch
deleted file mode 100644
index 4130af38..00000000
--- a/trunk/package/feeds/packages/libaio/patches/001_arches.patch
+++ /dev/null
@@ -1,566 +0,0 @@
----
- harness/main.c       |   10 ++
- src/libaio.h         |    1 
- src/syscall-m68k.h   |   78 +++++++++++++++++
- src/syscall-mips.h   |  223 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/syscall-parisc.h |  146 +++++++++++++++++++++++++++++++++
- src/syscall-sparc.h  |   20 +++-
- src/syscall.h        |    6 +
- 7 files changed, 479 insertions(+), 5 deletions(-)
-
---- /dev/null
-+++ b/src/syscall-m68k.h
-@@ -0,0 +1,78 @@
-+#define __NR_io_setup		241
-+#define __NR_io_destroy		242
-+#define __NR_io_getevents	243
-+#define __NR_io_submit		244
-+#define __NR_io_cancel		245
-+
-+#define io_syscall1(type,fname,sname,atype,a) \
-+type fname(atype a) \
-+{ \
-+register long __res __asm__ ("%d0") = __NR_##sname; \
-+register long __a __asm__ ("%d1") = (long)(a); \
-+__asm__ __volatile__ ("trap  #0" \
-+		      : "+d" (__res) \
-+		      : "d" (__a)  ); \
-+return (type) __res; \
-+}
-+
-+#define io_syscall2(type,fname,sname,atype,a,btype,b) \
-+type fname(atype a,btype b) \
-+{ \
-+register long __res __asm__ ("%d0") = __NR_##sname; \
-+register long __a __asm__ ("%d1") = (long)(a); \
-+register long __b __asm__ ("%d2") = (long)(b); \
-+__asm__ __volatile__ ("trap  #0" \
-+		      : "+d" (__res) \
-+		      : "d" (__a), "d" (__b) \
-+		     ); \
-+return (type) __res; \
-+}
-+
-+#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \
-+type fname(atype a,btype b,ctype c) \
-+{ \
-+register long __res __asm__ ("%d0") = __NR_##sname; \
-+register long __a __asm__ ("%d1") = (long)(a); \
-+register long __b __asm__ ("%d2") = (long)(b); \
-+register long __c __asm__ ("%d3") = (long)(c); \
-+__asm__ __volatile__ ("trap  #0" \
-+		      : "+d" (__res) \
-+		      : "d" (__a), "d" (__b), \
-+			"d" (__c) \
-+		     ); \
-+return (type) __res; \
-+}
-+
-+#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \
-+type fname (atype a, btype b, ctype c, dtype d) \
-+{ \
-+register long __res __asm__ ("%d0") = __NR_##sname; \
-+register long __a __asm__ ("%d1") = (long)(a); \
-+register long __b __asm__ ("%d2") = (long)(b); \
-+register long __c __asm__ ("%d3") = (long)(c); \
-+register long __d __asm__ ("%d4") = (long)(d); \
-+__asm__ __volatile__ ("trap  #0" \
-+		      : "+d" (__res) \
-+		      : "d" (__a), "d" (__b), \
-+			"d" (__c), "d" (__d)  \
-+		     ); \
-+return (type) __res; \
-+}
-+
-+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-+type fname (atype a,btype b,ctype c,dtype d,etype e) \
-+{ \
-+register long __res __asm__ ("%d0") = __NR_##sname; \
-+register long __a __asm__ ("%d1") = (long)(a); \
-+register long __b __asm__ ("%d2") = (long)(b); \
-+register long __c __asm__ ("%d3") = (long)(c); \
-+register long __d __asm__ ("%d4") = (long)(d); \
-+register long __e __asm__ ("%d5") = (long)(e); \
-+__asm__ __volatile__ ("trap  #0" \
-+		      : "+d" (__res) \
-+		      : "d" (__a), "d" (__b), \
-+			"d" (__c), "d" (__d), "d" (__e)  \
-+		     ); \
-+return (type) __res; \
-+}
-+
---- a/src/syscall.h
-+++ b/src/syscall.h
-@@ -28,6 +28,12 @@
- #include "syscall-sparc.h"
- #elif defined(__aarch64__)
- #include "syscall-arm64.h"
-+#elif defined(__m68k__)
-+#include "syscall-m68k.h"
-+#elif defined(__hppa__)
-+#include "syscall-parisc.h"
-+#elif defined(__mips__)
-+#include "syscall-mips.h"
- #else
- #warning "using generic syscall method"
- #include "syscall-generic.h"
---- /dev/null
-+++ b/src/syscall-mips.h
-@@ -0,0 +1,223 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle
-+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
-+ *
-+ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto
-+ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A
-+ */
-+
-+#ifndef _MIPS_SIM_ABI32
-+#define _MIPS_SIM_ABI32			1
-+#define _MIPS_SIM_NABI32		2
-+#define _MIPS_SIM_ABI64			3
-+#endif
-+
-+#if _MIPS_SIM == _MIPS_SIM_ABI32
-+
-+/*
-+ * Linux o32 style syscalls are in the range from 4000 to 4999.
-+ */
-+#define __NR_Linux			4000
-+#define __NR_io_setup			(__NR_Linux + 241)
-+#define __NR_io_destroy			(__NR_Linux + 242)
-+#define __NR_io_getevents		(__NR_Linux + 243)
-+#define __NR_io_submit			(__NR_Linux + 244)
-+#define __NR_io_cancel			(__NR_Linux + 245)
-+
-+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
-+
-+#if _MIPS_SIM == _MIPS_SIM_ABI64
-+
-+/*
-+ * Linux 64-bit syscalls are in the range from 5000 to 5999.
-+ */
-+#define __NR_Linux			5000
-+#define __NR_io_setup			(__NR_Linux + 200)
-+#define __NR_io_destroy			(__NR_Linux + 201)
-+#define __NR_io_getevents		(__NR_Linux + 202)
-+#define __NR_io_submit			(__NR_Linux + 203)
-+#define __NR_io_cancel			(__NR_Linux + 204)
-+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
-+
-+#if _MIPS_SIM == _MIPS_SIM_NABI32
-+
-+/*
-+ * Linux N32 syscalls are in the range from 6000 to 6999.
-+ */
-+#define __NR_Linux			6000
-+#define __NR_io_setup			(__NR_Linux + 200)
-+#define __NR_io_destroy			(__NR_Linux + 201)
-+#define __NR_io_getevents		(__NR_Linux + 202)
-+#define __NR_io_submit			(__NR_Linux + 203)
-+#define __NR_io_cancel			(__NR_Linux + 204)
-+#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
-+
-+#define io_syscall1(type,fname,sname,atype,a) \
-+type fname(atype a) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a3 asm("$7"); \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"li\t$2, %3\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "=r" (__a3) \
-+	: "r" (__a0), "i" (__NR_##sname) \
-+	: "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#define io_syscall2(type,fname,sname,atype,a,btype,b) \
-+type fname(atype a, btype b) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+	register unsigned long __a3 asm("$7"); \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"li\t$2, %4\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "=r" (__a3) \
-+	: "r" (__a0), "r" (__a1), "i" (__NR_##sname) \
-+	: "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \
-+type fname(atype a, btype b, ctype c) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+	register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+	register unsigned long __a3 asm("$7"); \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"li\t$2, %5\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "=r" (__a3) \
-+	: "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \
-+	: "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \
-+type fname(atype a, btype b, ctype c, dtype d) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+	register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+	register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"li\t$2, %5\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "+r" (__a3) \
-+	: "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \
-+	: "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#if (_MIPS_SIM == _MIPS_SIM_ABI32)
-+
-+/*
-+ * Using those means your brain needs more than an oil change ;-)
-+ */
-+
-+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-+type fname(atype a, btype b, ctype c, dtype d, etype e) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+	register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+	register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"lw\t$2, %6\n\t" \
-+	"subu\t$29, 32\n\t" \
-+	"sw\t$2, 16($29)\n\t" \
-+	"li\t$2, %5\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	"addiu\t$29, 32\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "+r" (__a3) \
-+	: "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname), \
-+	  "m" ((unsigned long)e) \
-+	: "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-+
-+#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64)
-+
-+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-+type fname (atype a,btype b,ctype c,dtype d,etype e) \
-+{ \
-+	register unsigned long __a0 asm("$4") = (unsigned long) a; \
-+	register unsigned long __a1 asm("$5") = (unsigned long) b; \
-+	register unsigned long __a2 asm("$6") = (unsigned long) c; \
-+	register unsigned long __a3 asm("$7") = (unsigned long) d; \
-+	register unsigned long __a4 asm("$8") = (unsigned long) e; \
-+	unsigned long __v0; \
-+	\
-+	__asm__ volatile ( \
-+	".set\tnoreorder\n\t" \
-+	"li\t$2, %6\t\t\t# " #fname "\n\t" \
-+	"syscall\n\t" \
-+	"move\t%0, $2\n\t" \
-+	".set\treorder" \
-+	: "=&r" (__v0), "+r" (__a3) \
-+	: "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "i" (__NR_##sname) \
-+	: "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-+	  "memory"); \
-+	\
-+	if (__a3 == 0) \
-+		return (type) __v0; \
-+	return (type) -1; \
-+}
-+
-+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-+
---- a/src/libaio.h
-+++ b/src/libaio.h
-@@ -66,6 +66,7 @@ typedef enum io_iocb_cmd {
- 
- /* big endian, 64 bits */
- #elif defined(__powerpc64__) || defined(__s390x__) || \
-+      (defined(__hppa__) && defined(__arch64__)) || \
-       (defined(__sparc__) && defined(__arch64__)) || \
-       (defined(__aarch64__) && defined(__AARCH64EB__))
- #define PADDED(x, y)	unsigned y; x
---- /dev/null
-+++ b/src/syscall-parisc.h
-@@ -0,0 +1,146 @@
-+/*
-+ * Linux system call numbers.
-+ *
-+ * Cary Coutant says that we should just use another syscall gateway
-+ * page to avoid clashing with the HPUX space, and I think he's right:
-+ * it will would keep a branch out of our syscall entry path, at the
-+ * very least.  If we decide to change it later, we can ``just'' tweak
-+ * the LINUX_GATEWAY_ADDR define at the bottom and make __NR_Linux be
-+ * 1024 or something.  Oh, and recompile libc. =)
-+ *
-+ * 64-bit HPUX binaries get the syscall gateway address passed in a register
-+ * from the kernel at startup, which seems a sane strategy.
-+ */
-+
-+#define __NR_Linux                0
-+#define __NR_io_setup           (__NR_Linux + 215)
-+#define __NR_io_destroy         (__NR_Linux + 216)
-+#define __NR_io_getevents       (__NR_Linux + 217)
-+#define __NR_io_submit          (__NR_Linux + 218)
-+#define __NR_io_cancel          (__NR_Linux + 219)
-+
-+#define SYS_ify(syscall_name)   __NR_##syscall_name
-+
-+/* Assume all syscalls are done from PIC code just to be
-+ * safe. The worst case scenario is that you lose a register
-+ * and save/restore r19 across the syscall. */
-+#define PIC
-+
-+/* Definition taken from glibc 2.3.3
-+ * sysdeps/unix/sysv/linux/hppa/sysdep.h
-+ */
-+
-+#ifdef PIC
-+/* WARNING: CANNOT BE USED IN A NOP! */
-+# define K_STW_ASM_PIC	"       copy %%r19, %%r4\n"
-+# define K_LDW_ASM_PIC	"       copy %%r4, %%r19\n"
-+# define K_USING_GR4	"%r4",
-+#else
-+# define K_STW_ASM_PIC	" \n"
-+# define K_LDW_ASM_PIC	" \n"
-+# define K_USING_GR4
-+#endif
-+
-+/* GCC has to be warned that a syscall may clobber all the ABI
-+   registers listed as "caller-saves", see page 8, Table 2
-+   in section 2.2.6 of the PA-RISC RUN-TIME architecture
-+   document. However! r28 is the result and will conflict with
-+   the clobber list so it is left out. Also the input arguments
-+   registers r20 -> r26 will conflict with the list so they
-+   are treated specially. Although r19 is clobbered by the syscall
-+   we cannot say this because it would violate ABI, thus we say
-+   r4 is clobbered and use that register to save/restore r19
-+   across the syscall. */
-+
-+#define K_CALL_CLOB_REGS "%r1", "%r2", K_USING_GR4 \
-+			 "%r20", "%r29", "%r31"
-+
-+#undef K_INLINE_SYSCALL
-+#define K_INLINE_SYSCALL(name, nr, args...)	({			\
-+	long __sys_res;							\
-+	{								\
-+		register unsigned long __res __asm__("r28");		\
-+		K_LOAD_ARGS_##nr(args)					\
-+		/* FIXME: HACK stw/ldw r19 around syscall */		\
-+		__asm__ volatile(					\
-+			K_STW_ASM_PIC					\
-+			"	ble  0x100(%%sr2, %%r0)\n"		\
-+			"	ldi %1, %%r20\n"			\
-+			K_LDW_ASM_PIC					\
-+			: "=r" (__res)					\
-+			: "i" (SYS_ify(name)) K_ASM_ARGS_##nr		\
-+			: "memory", K_CALL_CLOB_REGS K_CLOB_ARGS_##nr	\
-+		);							\
-+		__sys_res = (long)__res;				\
-+	}								\
-+	__sys_res;							\
-+})
-+
-+#define K_LOAD_ARGS_0()
-+#define K_LOAD_ARGS_1(r26)					\
-+	register unsigned long __r26 __asm__("r26") = (unsigned long)(r26);   \
-+	K_LOAD_ARGS_0()
-+#define K_LOAD_ARGS_2(r26,r25)					\
-+	register unsigned long __r25 __asm__("r25") = (unsigned long)(r25);   \
-+	K_LOAD_ARGS_1(r26)
-+#define K_LOAD_ARGS_3(r26,r25,r24)				\
-+	register unsigned long __r24 __asm__("r24") = (unsigned long)(r24);   \
-+	K_LOAD_ARGS_2(r26,r25)
-+#define K_LOAD_ARGS_4(r26,r25,r24,r23)				\
-+	register unsigned long __r23 __asm__("r23") = (unsigned long)(r23);   \
-+	K_LOAD_ARGS_3(r26,r25,r24)
-+#define K_LOAD_ARGS_5(r26,r25,r24,r23,r22)			\
-+	register unsigned long __r22 __asm__("r22") = (unsigned long)(r22);   \
-+	K_LOAD_ARGS_4(r26,r25,r24,r23)
-+#define K_LOAD_ARGS_6(r26,r25,r24,r23,r22,r21)			\
-+	register unsigned long __r21 __asm__("r21") = (unsigned long)(r21);   \
-+	K_LOAD_ARGS_5(r26,r25,r24,r23,r22)
-+
-+/* Even with zero args we use r20 for the syscall number */
-+#define K_ASM_ARGS_0
-+#define K_ASM_ARGS_1 K_ASM_ARGS_0, "r" (__r26)
-+#define K_ASM_ARGS_2 K_ASM_ARGS_1, "r" (__r25)
-+#define K_ASM_ARGS_3 K_ASM_ARGS_2, "r" (__r24)
-+#define K_ASM_ARGS_4 K_ASM_ARGS_3, "r" (__r23)
-+#define K_ASM_ARGS_5 K_ASM_ARGS_4, "r" (__r22)
-+#define K_ASM_ARGS_6 K_ASM_ARGS_5, "r" (__r21)
-+
-+/* The registers not listed as inputs but clobbered */
-+#define K_CLOB_ARGS_6
-+#define K_CLOB_ARGS_5 K_CLOB_ARGS_6, "%r21"
-+#define K_CLOB_ARGS_4 K_CLOB_ARGS_5, "%r22"
-+#define K_CLOB_ARGS_3 K_CLOB_ARGS_4, "%r23"
-+#define K_CLOB_ARGS_2 K_CLOB_ARGS_3, "%r24"
-+#define K_CLOB_ARGS_1 K_CLOB_ARGS_2, "%r25"
-+#define K_CLOB_ARGS_0 K_CLOB_ARGS_1, "%r26"
-+
-+#define io_syscall1(type,fname,sname,type1,arg1)			\
-+type fname(type1 arg1)							\
-+{									\
-+    return K_INLINE_SYSCALL(sname, 1, arg1);				\
-+}
-+
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2)		\
-+type fname(type1 arg1, type2 arg2)					\
-+{									\
-+    return K_INLINE_SYSCALL(sname, 2, arg1, arg2);			\
-+}
-+
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3)	\
-+type fname(type1 arg1, type2 arg2, type3 arg3)				\
-+{									\
-+    return K_INLINE_SYSCALL(sname, 3, arg1, arg2, arg3);		\
-+}
-+
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
-+{									\
-+    return K_INLINE_SYSCALL(sname, 4, arg1, arg2, arg3, arg4);		\
-+}
-+
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
-+{									\
-+    return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5);	\
-+}
-+
---- a/harness/main.c
-+++ b/harness/main.c
-@@ -12,7 +12,17 @@
- #include <libaio.h>
- 
- #if __LP64__ == 0
-+#if defined(__i386__) || defined(__powerpc__) || defined(__mips__)
- #define KERNEL_RW_POINTER	((void *)0xc0010000)
-+#elif defined(__arm__) || defined(__m68k__) || defined(__s390__)
-+#define KERNEL_RW_POINTER	((void *)0x00010000)
-+#elif defined(__hppa__)
-+#define KERNEL_RW_POINTER	((void *)0x10100000)
-+#elif defined(__sparc__)
-+#define KERNEL_RW_POINTER	((void *)0xf0010000)
-+#else
-+#error Unknown kernel memory address.
-+#endif
- #else
- //#warning Not really sure where kernel memory is.  Guessing.
- #define KERNEL_RW_POINTER	((void *)0xffffffff81000000)
---- a/src/syscall-sparc.h
-+++ b/src/syscall-sparc.h
-@@ -20,7 +20,9 @@ __asm__ __volatile__ ("t 0x10\n\t" \
-                       : "=r" (__res), "=&r" (__o0) \
-                       : "1" (__o0), "r" (__g1) \
-                       : "cc"); \
--return (type) __res; \
-+if (__res < -255 || __res >= 0) \
-+	return (type) __res; \
-+return -1; \
- }
- 
- #define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
-@@ -38,7 +40,9 @@ __asm__ __volatile__ ("t 0x10\n\t" \
-                       : "=r" (__res), "=&r" (__o0) \
-                       : "1" (__o0), "r" (__o1), "r" (__g1) \
-                       : "cc"); \
--return (type) __res; \
-+if (__res < -255 || __res >= 0) \
-+	return (type) __res; \
-+return -1; \
- }
- 
- #define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
-@@ -57,7 +61,9 @@ __asm__ __volatile__ ("t 0x10\n\t" \
-                       : "=r" (__res), "=&r" (__o0) \
-                       : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \
-                       : "cc"); \
--return (type) __res; \
-+if (__res < -255 || __res >= 0) \
-+	return (type) __res; \
-+return -1; \
- }
- 
- #define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-@@ -77,7 +83,9 @@ __asm__ __volatile__ ("t 0x10\n\t" \
-                       : "=r" (__res), "=&r" (__o0) \
-                       : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \
-                       : "cc"); \
--return (type) __res; \
-+if (__res < -255 || __res >= 0) \
-+	return (type) __res; \
-+return -1; \
- }
- 
- #define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-@@ -99,5 +107,7 @@ __asm__ __volatile__ ("t 0x10\n\t" \
-                       : "=r" (__res), "=&r" (__o0) \
-                       : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \
-                       : "cc"); \
--return (type) __res; \
-+if (__res < -255 || __res >= 0) \
-+	return (type) __res; \
-+return -1; \
- }
diff --git a/trunk/package/feeds/packages/libaio/patches/002_arches_sh.patch b/trunk/package/feeds/packages/libaio/patches/002_arches_sh.patch
deleted file mode 100644
index ddf9a113..00000000
--- a/trunk/package/feeds/packages/libaio/patches/002_arches_sh.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-Subject: Add SH supprt
-
-The test-suite logs can be found at:
-
-  <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535288>
-
-
----
- harness/main.c   |    2 -
- src/libaio.h     |    4 ++
- src/syscall-sh.h |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/syscall.h    |    2 +
- 4 files changed, 84 insertions(+), 2 deletions(-)
-
-
---- a/harness/main.c
-+++ b/harness/main.c
-@@ -14,7 +14,7 @@
- #if __LP64__ == 0
- #if defined(__i386__) || defined(__powerpc__) || defined(__mips__)
- #define KERNEL_RW_POINTER	((void *)0xc0010000)
--#elif defined(__arm__) || defined(__m68k__) || defined(__s390__)
-+#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__)
- #define KERNEL_RW_POINTER	((void *)0x00010000)
- #elif defined(__hppa__)
- #define KERNEL_RW_POINTER	((void *)0x10100000)
---- a/src/libaio.h
-+++ b/src/libaio.h
-@@ -51,7 +51,8 @@ typedef enum io_iocb_cmd {
- 
- /* little endian, 32 bits */
- #if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) || \
--    defined(__sh__) || defined(__bfin__) || defined(__MIPSEL__) || \
-+    (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
-+    defined(__bfin__) || defined(__MIPSEL__) || \
-     defined(__cris__)
- #define PADDED(x, y)	x; unsigned y
- #define PADDEDptr(x, y)	x; unsigned y
-@@ -76,6 +77,7 @@ typedef enum io_iocb_cmd {
- /* big endian, 32 bits */
- #elif defined(__PPC__) || defined(__s390__) || \
-       (defined(__arm__) && defined(__ARMEB__)) || \
-+      (defined(__sh__) && defined (__BIG_ENDIAN__)) || \
-       defined(__sparc__) || defined(__MIPSEB__) || defined(__m68k__) || \
-       defined(__hppa__) || defined(__frv__) || defined(__avr32__)
- #define PADDED(x, y)	unsigned y; x
---- /dev/null
-+++ b/src/syscall-sh.h
-@@ -0,0 +1,78 @@
-+/* Copy from ./arch/sh/include/asm/unistd_32.h */
-+#define __NR_io_setup       245
-+#define __NR_io_destroy     246
-+#define __NR_io_getevents   247
-+#define __NR_io_submit      248
-+#define __NR_io_cancel      249
-+
-+#define io_syscall1(type,fname,sname,type1,arg1) \
-+type fname(type1 arg1) \
-+{ \
-+register long __sc0 __asm__ ("r3") = __NR_##sname; \
-+register long __sc4 __asm__ ("r4") = (long) arg1; \
-+__asm__ __volatile__ ("trapa    #0x11" \
-+	: "=z" (__sc0) \
-+	: "0" (__sc0), "r" (__sc4) \
-+	: "memory"); \
-+	return (type) __sc0;\
-+}
-+
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
-+type fname(type1 arg1,type2 arg2) \
-+{ \
-+register long __sc0 __asm__ ("r3") = __NR_##sname; \
-+register long __sc4 __asm__ ("r4") = (long) arg1; \
-+register long __sc5 __asm__ ("r5") = (long) arg2; \
-+	__asm__ __volatile__ ("trapa    #0x12" \
-+	: "=z" (__sc0) \
-+	: "0" (__sc0), "r" (__sc4), "r" (__sc5) \
-+	: "memory"); \
-+	return (type) __sc0;\
-+}
-+
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
-+type fname(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+register long __sc0 __asm__ ("r3") = __NR_##sname; \
-+register long __sc4 __asm__ ("r4") = (long) arg1; \
-+register long __sc5 __asm__ ("r5") = (long) arg2; \
-+register long __sc6 __asm__ ("r6") = (long) arg3; \
-+	__asm__ __volatile__ ("trapa    #0x13" \
-+	: "=z" (__sc0) \
-+	: "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6) \
-+	: "memory"); \
-+	return (type) __sc0;\
-+}
-+
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-+{ \
-+register long __sc0 __asm__ ("r3") = __NR_##sname; \
-+register long __sc4 __asm__ ("r4") = (long) arg1; \
-+register long __sc5 __asm__ ("r5") = (long) arg2; \
-+register long __sc6 __asm__ ("r6") = (long) arg3; \
-+register long __sc7 __asm__ ("r7") = (long) arg4; \
-+__asm__ __volatile__ ("trapa    #0x14" \
-+	: "=z" (__sc0) \
-+	: "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6),  \
-+	"r" (__sc7) \
-+	: "memory" ); \
-+	return (type) __sc0;\
-+}
-+
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-+{ \
-+register long __sc3 __asm__ ("r3") = __NR_##sname; \
-+register long __sc4 __asm__ ("r4") = (long) arg1; \
-+register long __sc5 __asm__ ("r5") = (long) arg2; \
-+register long __sc6 __asm__ ("r6") = (long) arg3; \
-+register long __sc7 __asm__ ("r7") = (long) arg4; \
-+register long __sc0 __asm__ ("r0") = (long) arg5; \
-+__asm__ __volatile__ ("trapa    #0x15" \
-+	: "=z" (__sc0) \
-+	: "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7),  \
-+	"r" (__sc3) \
-+	: "memory" ); \
-+	return (type) __sc0;\
-+}
---- a/src/syscall.h
-+++ b/src/syscall.h
-@@ -34,6 +34,8 @@
- #include "syscall-parisc.h"
- #elif defined(__mips__)
- #include "syscall-mips.h"
-+#elif defined(__sh__)
-+#include "syscall-sh.h"
- #else
- #warning "using generic syscall method"
- #include "syscall-generic.h"
diff --git a/trunk/package/feeds/packages/libaio/patches/003_arches_sparc64.patch b/trunk/package/feeds/packages/libaio/patches/003_arches_sparc64.patch
deleted file mode 100644
index c685f5ec..00000000
--- a/trunk/package/feeds/packages/libaio/patches/003_arches_sparc64.patch
+++ /dev/null
@@ -1,117 +0,0 @@
----
- src/syscall-sparc64.h |   98 ++++++++++++++++++++++++++++++++++++++++++++++++++
- src/syscall.h         |    2 +
- 2 files changed, 100 insertions(+)
-
---- a/src/syscall.h
-+++ b/src/syscall.h
-@@ -24,6 +24,8 @@
- #include "syscall-alpha.h"
- #elif defined(__arm__)
- #include "syscall-arm.h"
-+#elif defined(__sparc__) && defined(__arch64__)
-+#include "syscall-sparc64.h"
- #elif defined(__sparc__)
- #include "syscall-sparc.h"
- #elif defined(__aarch64__)
---- /dev/null
-+++ b/src/syscall-sparc64.h
-@@ -0,0 +1,98 @@
-+#define __NR_io_setup		268
-+#define __NR_io_destroy		269
-+#define __NR_io_submit		270
-+#define __NR_io_cancel		271
-+#define __NR_io_getevents	272
-+
-+#define io_syscall1(type,fname,sname,type1,arg1)			  \
-+type fname(type1 arg1)							  \
-+{									  \
-+	unsigned long __res;						  \
-+	register unsigned long __g1 __asm__("g1") = __NR_##sname;	  \
-+	register unsigned long __o0 __asm__("o0") = (unsigned long) arg1; \
-+	__asm__ __volatile__("t		0x6d\n\t"			  \
-+			     "sub	%%g0, %%o0, %0\n\t"		  \
-+			     "movcc	%%xcc, %%o0, %0\n"		  \
-+			     "1:"					  \
-+			     : "=r" (__res), "=&r" (__o0)		  \
-+			     : "1" (__o0), "r" (__g1)			  \
-+			     : "cc");					  \
-+	return (type) __res;						  \
-+}
-+
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2)		  \
-+type fname(type1 arg1, type2 arg2)					  \
-+{									  \
-+	unsigned long __res;						  \
-+	register unsigned long __g1 __asm__("g1") = __NR_##sname;	  \
-+	register unsigned long __o0 __asm__("o0") = (unsigned long) arg1; \
-+	register unsigned long __o1 __asm__("o1") = (unsigned long) arg2; \
-+	__asm__ __volatile__("t		0x6d\n\t"			  \
-+			     "sub	%%g0, %%o0, %0\n\t"		  \
-+			     "movcc	%%xcc, %%o0, %0\n"		  \
-+			     "1:"					  \
-+			     : "=r" (__res), "=&r" (__o0)		  \
-+			     : "1" (__o0), "r" (__o1), "r" (__g1)	  \
-+			     : "cc");					  \
-+	return (type) __res;						  \
-+}
-+
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3)	  \
-+type fname(type1 arg1, type2 arg2, type3 arg3)				  \
-+{									  \
-+	unsigned long __res;						  \
-+	register unsigned long __g1 __asm__("g1") = __NR_##sname;	  \
-+	register unsigned long __o0 __asm__("o0") = (unsigned long) arg1; \
-+	register unsigned long __o1 __asm__("o1") = (unsigned long) arg2; \
-+	register unsigned long __o2 __asm__("o2") = (unsigned long) arg3; \
-+	__asm__ __volatile__("t		0x6d\n\t"			  \
-+			     "sub	%%g0, %%o0, %0\n\t"		  \
-+			     "movcc	%%xcc, %%o0, %0\n"		  \
-+			     "1:"					  \
-+			     : "=r" (__res), "=&r" (__o0)		  \
-+			     : "1" (__o0), "r" (__o1), "r" (__o2),	  \
-+			       "r" (__g1)	  			  \
-+			     : "cc");					  \
-+	return (type) __res;						  \
-+}
-+
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4)		  \
-+{									  \
-+	unsigned long __res;						  \
-+	register unsigned long __g1 __asm__("g1") = __NR_##sname;	  \
-+	register unsigned long __o0 __asm__("o0") = (unsigned long) arg1; \
-+	register unsigned long __o1 __asm__("o1") = (unsigned long) arg2; \
-+	register unsigned long __o2 __asm__("o2") = (unsigned long) arg3; \
-+	register unsigned long __o3 __asm__("o3") = (unsigned long) arg4; \
-+	__asm__ __volatile__("t		0x6d\n\t"			  \
-+			     "sub	%%g0, %%o0, %0\n\t"		  \
-+			     "movcc	%%xcc, %%o0, %0\n"		  \
-+			     "1:"					  \
-+			     : "=r" (__res), "=&r" (__o0)		  \
-+			     : "1" (__o0), "r" (__o1), "r" (__o2),	  \
-+			       "r" (__o3), "r" (__g1)	  		  \
-+			     : "cc");					  \
-+	return (type) __res;						  \
-+}
-+
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	  \
-+{									  \
-+	unsigned long __res;						  \
-+	register unsigned long __g1 __asm__("g1") = __NR_##sname;	  \
-+	register unsigned long __o0 __asm__("o0") = (unsigned long) arg1; \
-+	register unsigned long __o1 __asm__("o1") = (unsigned long) arg2; \
-+	register unsigned long __o2 __asm__("o2") = (unsigned long) arg3; \
-+	register unsigned long __o3 __asm__("o3") = (unsigned long) arg4; \
-+	register unsigned long __o4 __asm__("o4") = (unsigned long) arg5; \
-+	__asm__ __volatile__("t		0x6d\n\t"			  \
-+			     "sub	%%g0, %%o0, %0\n\t"		  \
-+			     "movcc	%%xcc, %%o0, %0\n"		  \
-+			     "1:"					  \
-+			     : "=r" (__res), "=&r" (__o0)		  \
-+			     : "1" (__o0), "r" (__o1), "r" (__o2),	  \
-+			       "r" (__o3), "r" (__o4), "r" (__g1)	  \
-+			     : "cc");					  \
-+	return (type) __res;						  \
-+}
diff --git a/trunk/package/feeds/packages/libaio/patches/004_arches_x32.patch b/trunk/package/feeds/packages/libaio/patches/004_arches_x32.patch
deleted file mode 100644
index 8d315f27..00000000
--- a/trunk/package/feeds/packages/libaio/patches/004_arches_x32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: libaio-0.3.109/src/syscall-x86_64.h
-===================================================================
---- libaio-0.3.109.orig/src/syscall-x86_64.h	2009-10-09 11:17:02.000000000 -0700
-+++ libaio-0.3.109/src/syscall-x86_64.h	2013-03-03 07:15:13.000000000 -0800
-@@ -1,8 +1,18 @@
-+#ifndef __NR_io_setup
- #define __NR_io_setup		206
-+#endif
-+#ifndef __NR_io_destroy
- #define __NR_io_destroy		207
-+#endif
-+#ifndef __NR_io_getevents
- #define __NR_io_getevents	208
-+#endif
-+#ifndef __NR_io_submit
- #define __NR_io_submit		209
-+#endif
-+#ifndef __NR_io_cancel
- #define __NR_io_cancel		210
-+#endif
- 
- #define __syscall_clobber "r11","rcx","memory" 
- #define __syscall "syscall"
-@@ -42,10 +52,11 @@
- type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ;" __syscall				\
-+register long __a4 asm ("r10") = (long) arg4;                           \
-+__asm__ volatile (__syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
-+	  "d" ((long)(arg3)),"r" (__a4)); \
- return __res;								\
- } 
- 
-@@ -54,10 +65,11 @@
- type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall		\
-+register long __a4 asm ("r10") = (long) arg4;				\
-+register long __a5 asm ("r8") = (long) arg5;                            \
-+__asm__ volatile (__syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) :	\
--	__syscall_clobber,"r8","r10" );					\
-+	  "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \
- return __res;								\
- }
-Index: libaio-0.3.109/harness/main.c
-===================================================================
---- libaio-0.3.109.orig/harness/main.c	2013-03-03 06:58:51.000000000 -0800
-+++ libaio-0.3.109/harness/main.c	2013-03-03 07:23:40.000000000 -0800
-@@ -14,7 +14,7 @@
- #if __LP64__ == 0
- #if defined(__i386__) || defined(__powerpc__) || defined(__mips__)
- #define KERNEL_RW_POINTER	((void *)0xc0010000)
--#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__)
-+#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__) || defined(__x86_64__)
- #define KERNEL_RW_POINTER	((void *)0x00010000)
- #elif defined(__hppa__)
- #define KERNEL_RW_POINTER	((void *)0x10100000)
diff --git a/trunk/package/feeds/packages/libaio/patches/005_arches_mips.patch b/trunk/package/feeds/packages/libaio/patches/005_arches_mips.patch
deleted file mode 100644
index 1bd0971a..00000000
--- a/trunk/package/feeds/packages/libaio/patches/005_arches_mips.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fix mips/mipsel syscall wrappers to return correct error values.
-Author: Jurica Stanojkovic <Jurica.Stanojkovic@rt-rk.com>
-Forwarded: no
-Last-Update: 2012-09-24
-
-
-diff -upNr a/src/syscall-mips.h b/src/syscall-mips.h
---- a/src/syscall-mips.h	2012-09-13 11:46:35.652286733 +0200
-+++ b/src/syscall-mips.h	2012-09-13 16:09:17.964407909 +0200
-@@ -76,7 +76,7 @@ type fname(atype a) \
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #define io_syscall2(type,fname,sname,atype,a,btype,b) \
-@@ -100,7 +100,7 @@ type fname(atype a, btype b) \
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \
-@@ -125,7 +125,7 @@ type fname(atype a, btype b, ctype c) \
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \
-@@ -150,7 +150,7 @@ type fname(atype a, btype b, ctype c, dt
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #if (_MIPS_SIM == _MIPS_SIM_ABI32)
-@@ -186,7 +186,7 @@ type fname(atype a, btype b, ctype c, dt
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-@@ -216,7 +216,7 @@ type fname (atype a,btype b,ctype c,dtyp
- 	\
- 	if (__a3 == 0) \
- 		return (type) __v0; \
--	return (type) -1; \
-+	return (type) 0 - __v0; \
- }
- 
- #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
diff --git a/trunk/package/feeds/packages/libaio/patches/006_arches_mips_fix_padding.patch b/trunk/package/feeds/packages/libaio/patches/006_arches_mips_fix_padding.patch
deleted file mode 100644
index 06bd00fb..00000000
--- a/trunk/package/feeds/packages/libaio/patches/006_arches_mips_fix_padding.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix structure padding for mips64
-Author: Guillem Jover <guillem@debian.org>
-Forwarded: no
-Last-Update: 2014-07-23
-
----
- src/libaio.h |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/src/libaio.h
-+++ b/src/libaio.h
-@@ -52,7 +52,8 @@ typedef enum io_iocb_cmd {
- /* little endian, 32 bits */
- #if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) || \
-     (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
--    defined(__bfin__) || defined(__MIPSEL__) || \
-+    defined(__bfin__) || \
-+    (defined(__MIPSEL__) && !defined(__mips64)) || \
-     defined(__cris__)
- #define PADDED(x, y)	x; unsigned y
- #define PADDEDptr(x, y)	x; unsigned y
-@@ -60,6 +61,7 @@ typedef enum io_iocb_cmd {
- 
- /* little endian, 64 bits */
- #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || \
-+      (defined(__mips64) && defined(__MIPSEL__)) || \
-       (defined(__aarch64__) && defined(__AARCH64EL__))
- #define PADDED(x, y)	x, y
- #define PADDEDptr(x, y)	x
-@@ -69,6 +71,7 @@ typedef enum io_iocb_cmd {
- #elif defined(__powerpc64__) || defined(__s390x__) || \
-       (defined(__hppa__) && defined(__arch64__)) || \
-       (defined(__sparc__) && defined(__arch64__)) || \
-+      (defined(__mips64) && defined(__MIPSEB__)) || \
-       (defined(__aarch64__) && defined(__AARCH64EB__))
- #define PADDED(x, y)	unsigned y; x
- #define PADDEDptr(x,y)	x
diff --git a/trunk/package/feeds/packages/libantlr3c/Makefile b/trunk/package/feeds/packages/libantlr3c/Makefile
deleted file mode 100644
index bd1e51e0..00000000
--- a/trunk/package/feeds/packages/libantlr3c/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libantlr3c
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
-PKG_MD5SUM:=674646e1d1bf5c6015435480cead725a
-
-PKG_SOURCE_URL:=http://www.antlr3.org/download/C
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libantlr3c
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libantlr3c
-  URL:=http://www.antlr3.org/
-endef
-
-define Package/libantlr3c/description
-  ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers,
-  interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libantlr3c.{a,so} $(1)/usr/lib/
-endef
-
-define Package/libantlr3c/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libantlr3c.so  $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libantlr3c))
diff --git a/trunk/package/feeds/packages/libao/Makefile b/trunk/package/feeds/packages/libao/Makefile
deleted file mode 100644
index 690af47a..00000000
--- a/trunk/package/feeds/packages/libao/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libao
-PKG_VERSION:=1.2.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
-PKG_MD5SUM:=9f5dd20d7e95fd0dd72df5353829f097
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libao
-  SECTION:=libs
-  DEPENDS:=+alsa-lib
-  CATEGORY:=Libraries
-  TITLE:=A cross platform audio library
-  URL:=http://www.xiph.org/ao/
-endef
-
-define Package/libao/description
-	Libao is a cross-platform audio library that allows programs to
-	output audio using a simple API on a wide variety of platforms.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-esd \
-	--disable-arts \
-	--disable-nas \
-	--disable-pulse
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libao/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/ao/plugins-4
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ao/plugins-4/lib*.so $(1)/usr/lib/ao/plugins-4/
-endef
-
-$(eval $(call BuildPackage,libao))
diff --git a/trunk/package/feeds/packages/libarchive/Makefile b/trunk/package/feeds/packages/libarchive/Makefile
deleted file mode 100644
index 91bbe546..00000000
--- a/trunk/package/feeds/packages/libarchive/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libarchive
-PKG_VERSION:=3.1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.libarchive.org/downloads
-PKG_MD5SUM:=efad5a503f66329bb9d2f4308b5de98a
-PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libarchive
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +zlib
-  TITLE:=Multi-format archive and compression library
-  URL:=http://www.libarchive.org/
-endef
-
-CONFIGURE_ARGS += \
-	--disable-bsdcpio \
-	--disable-bsdtar \
-	--disable-acl \
-	--disable-xattr \
-	--without-bz2lib \
-	--without-lzma \
-	--without-lzmadec \
-	--without-lzo2 \
-	--without-nettle \
-	--without-expat \
-	--without-xml2
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/libarchive/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libarchive))
diff --git a/trunk/package/feeds/packages/libartnet/Makefile b/trunk/package/feeds/packages/libartnet/Makefile
deleted file mode 100644
index c5b003e0..00000000
--- a/trunk/package/feeds/packages/libartnet/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libartnet
-PKG_VERSION:=1.1.2
-PKG_RELEASE:=1.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/OpenLightingProject/libartnet/releases/download/1.1.2
-PKG_MD5SUM:=dcceab3efe3dae4c18fa549dbd198e71
-
-PKG_MAINTAINER:=Martijn Zilverschoon <martijn@friedzombie.com>
-
-PKG_LICENSE:=GPL-2.1
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libartnet
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=Libartnet is an implementation of the ArtNet protocol.
-	URL:=http://www.openlighting.org/libartnet-main/
-endef
-
-define Package/libartnet/description
-	Libartnet is an implementation of the ArtNet protocol. ArtNet allows the
-	transmission of DMX and related data over IP networks.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/artnet $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libartnet.{so,so.1,so.1.0.0} $(1)/usr/lib/
-endef
-
-
-define Package/libartnet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libartnet.{so,so.1,so.1.0.0} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libartnet))
diff --git a/trunk/package/feeds/packages/libartnet/patches/001-bswap_16.patch b/trunk/package/feeds/packages/libartnet/patches/001-bswap_16.patch
deleted file mode 100644
index 9c9be5f1..00000000
--- a/trunk/package/feeds/packages/libartnet/patches/001-bswap_16.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/artnet/private.h
-+++ b/artnet/private.h
-@@ -100,7 +100,9 @@ extern uint16_t HIGH_BYTE;
- #endif
- 
- // byte ordering macros
-+#ifndef bswap_16
- #define bswap_16(x)  ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
-+#endif
- 
- // htols : convert short from host to little endian order
- #ifdef WIN32
diff --git a/trunk/package/feeds/packages/libaudiofile/Makefile b/trunk/package/feeds/packages/libaudiofile/Makefile
deleted file mode 100644
index d3a7a4a0..00000000
--- a/trunk/package/feeds/packages/libaudiofile/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=audiofile
-PKG_VERSION:=0.3.6
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	http://github.com/downloads/mpruett/audiofile/ \
-	http://www.68k.org/~michael/audiofile/
-PKG_MD5SUM:=2731d79bec0acef3d30d2fc86b0b72fd
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libaudiofile
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Audio File library
-  URL:=http://www.68k.org/~michael/audiofile/
-  DEPENDS:=+libflac +libstdcpp
-endef
-
-define Package/libaudiofile/description
- The audiofile library allows the processing of audio data to and from audio
- files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS,
- FLAC, ALAC, and raw data).
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-examples \
-	--with-build-cc="$(HOSTCC)" \
-
-TARGET_CFLAGS+= $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/{af_vfs,audiofile,aupvlist}.h \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libaudiofile/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libaudiofile))
diff --git a/trunk/package/feeds/packages/libavl/Makefile b/trunk/package/feeds/packages/libavl/Makefile
deleted file mode 100644
index 0ff2385a..00000000
--- a/trunk/package/feeds/packages/libavl/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libavl
-PKG_VERSION:=0.3.5
-PKG_RELEASE:=1
-PKG_MD5SUM:=882c68ea7f71876ca110f3b84d7ab12d
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/liba/libavl
-PKG_BUILD_DIR:=$(BUILD_DIR)/avl-$(PKG_VERSION)
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=LGPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libavl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=AVLTree (this is not GNU libavl)
-  URL:=https://packages.debian.org/wheezy/libavl1
-endef
-
-define Package/libavl/description
-  AVLTree is a small implementation of AVL trees for the C programming language.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/avl.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavl.so* $(1)/usr/lib/
-endef
-
-define Package/libavl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavl.so.*  $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libavl))
diff --git a/trunk/package/feeds/packages/libavl/patches/010-update_GNUmakefile.patch b/trunk/package/feeds/packages/libavl/patches/010-update_GNUmakefile.patch
deleted file mode 100644
index 30139491..00000000
--- a/trunk/package/feeds/packages/libavl/patches/010-update_GNUmakefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/GNUmakefile	2002-11-15 19:57:48.000000000 +0100
-+++ a/GNUmakefile	2014-10-02 16:03:02.864803002 +0200
-@@ -6,7 +6,7 @@
- LDCONFIG ?= /sbin/ldconfig
- 
- # Some suggestions: (-mcpu= generates i386 compatible code)
--CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w
-+CFLAGS ?= -O2 -pipe -Wall -Werror
- #CFLAGS = -O2 -fomit-frame-pointer -pipe -march=i586 -Wall -g
- #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i586 -Wall -ansi -pedantic
- #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i686 -Wall -ansi -pedantic
-@@ -15,10 +15,9 @@
- #CFLAGS = -g -pg -a -pipe -march=i686 -Wall
- #LDFLAGS = -s
- 
--prefix ?= /usr/local
-+prefix ?= /usr
- libdir ?= $(prefix)/lib
- includedir ?= $(prefix)/include
--includedir ?= /usr/include
- 
- PROGRAMS = avlsort setdiff
- LIBRARY = libavl.so.1.5
-@@ -34,16 +33,17 @@
- 	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- $(LIBRARY): avl.o
--	$(CC) -nostdlib -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc
-+	$(CC) -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc
- 
- clean:
- 	$(RM) *.o $(PROGRAMS) libavl.*
- 
- install: all
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
--	$(INSTALL) avl.h $(DESTDIR)$(includedir)
--	$(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir)
--	for i in $(LIBRARIES); do\
-+	$(INSTALL) -d $(DESTDIR)$(includedir)
-+	$(INSTALL) -m 644 avl.h $(DESTDIR)$(includedir)
-+	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	for i in $(LIBRARY); do\
- 		$(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\
- 		$(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\
- 	done
diff --git a/trunk/package/feeds/packages/libcap/Makefile b/trunk/package/feeds/packages/libcap/Makefile
deleted file mode 100644
index 418033dd..00000000
--- a/trunk/package/feeds/packages/libcap/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libcap
-PKG_VERSION:=2.24
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
-PKG_MD5SUM:=d43ab9f680435a7fff35b4ace8d45b80
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-define Package/libcap
-  TITLE:=Linux capabilities library
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
-endef
-
-MAKE_FLAGS += \
-    CFLAGS="$(TARGET_CFLAGS)" \
-    BUILD_CC="$(CC)" \
-    BUILD_CFLAGS="$(FPIC) -I$(PKG_BUILD_DIR)/libcap/include" \
-    CFLAGS="$(TARGET_CFLAGS)" \
-    LD="$(TARGET_CC)" \
-    LDFLAGS="$(TARGET_LDFLAGS) -shared" \
-    INDENT="| true" \
-    PAM_CAP="no" \
-    LIBATTR="no" \
-    DYNAMIC="yes" \
-    lib="lib"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/sys
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/usr/lib/
-endef
-
-define Package/libcap/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/lib/libcap.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libcap))
diff --git a/trunk/package/feeds/packages/libdaemon/Makefile b/trunk/package/feeds/packages/libdaemon/Makefile
deleted file mode 100644
index 958a37d2..00000000
--- a/trunk/package/feeds/packages/libdaemon/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdaemon
-PKG_VERSION:=0.14
-PKG_RELEASE:=5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
-PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdaemon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A lightweight C library that eases the writing of UNIX daemons
-  URL:=http://0pointer.de/lennart/projects/libdaemon/
-endef
-
-define Package/libdaemon/description
-	libdaemon is a lightweight C library that eases the writing of UNIX daemons.
-	It consists of the following parts:
-	- A wrapper around fork() which does the correct daemonization procedure of a process
-	- A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR
-	- An API for writing PID files
-	- An API for serializing UNIX signals into a pipe for usage with select() or poll()
-	- An API for running subprocesses with STDOUT and STDERR redirected to syslog
-
-	APIs like these are used in most daemon software available. It is not that
-	simple to get it done right and code duplication is not a goal.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-lynx \
-		--disable-examples \
-		, \
-		ac_cv_func_setpgrp_void=yes \
-	)
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libdaemon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdaemon))
diff --git a/trunk/package/feeds/packages/libdaemon/patches/001-daemon_set_verbosity.patch b/trunk/package/feeds/packages/libdaemon/patches/001-daemon_set_verbosity.patch
deleted file mode 100644
index d0c66c7a..00000000
--- a/trunk/package/feeds/packages/libdaemon/patches/001-daemon_set_verbosity.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 013963ba35e8fe8897211c0acf5ee98f9a871fc1 Mon Sep 17 00:00:00 2001
-From: Michael Heimpold <mhei@heimpold.de>
-Date: Fri, 10 Jan 2014 19:38:51 +0100
-Subject: [PATCH] daemon_set_verbosity: fix erroneous error message
-
-When calling this function with a value other than LOG_DEBUG
-the error message was triggered erroneously.
-
-Signed-off-by: Michael Heimpold <mhei@heimpold.de>
----
-
- libdaemon/dlog.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdaemon/dlog.c b/libdaemon/dlog.c
-index 1cc0566..cc2b918 100644
---- a/libdaemon/dlog.c
-+++ b/libdaemon/dlog.c
-@@ -42,7 +42,7 @@ static int daemon_verbosity_level = LOG_INFO;
- void daemon_set_verbosity(int verbosity_prio) {
- 
-     /* Allow using negative verbosity levels to hide _all_ messages */
--    if (verbosity_prio > 0 && (verbosity_prio & LOG_PRIMASK) != LOG_PRIMASK)
-+    if (verbosity_prio > 0 && (verbosity_prio & LOG_PRIMASK) != verbosity_prio)
-         daemon_log(LOG_ERR, "The value %d is not a valid priority value", verbosity_prio);
- 
-     daemon_verbosity_level = verbosity_prio & LOG_PRIMASK;
--- 
-1.7.10.4
-
diff --git a/trunk/package/feeds/packages/libdaq/Makefile b/trunk/package/feeds/packages/libdaq/Makefile
deleted file mode 100644
index fb3585bd..00000000
--- a/trunk/package/feeds/packages/libdaq/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdaq
-PKG_VERSION:=2.0.4
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=https://www.snort.org/downloads/snort/
-PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=65e51d72e9d5d8b397e192e4e5857eff
-PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libdaq
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=DAQ library
-  URL:=$(PKG_SOURCE_URL)
-  DEPENDS:=+libdnet +libpcap
-endef
-
-define Package/libdaq/description
- Data Acquisition library for packet I/O.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-static \
-	--disable-nfq-module \
-	--with-dnet-includes="$(STAGING_DIR)/usr/include" \
-	--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-libpcap-includes="$(STAGING_DIR)/usr/include" \
-	--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
-
-define Build/Compile
-	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/Install
-	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/
-endef
-
-define Package/libdaq/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/daq
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libdaq))
diff --git a/trunk/package/feeds/packages/libdaq/patches/001-compile.patch b/trunk/package/feeds/packages/libdaq/patches/001-compile.patch
deleted file mode 100644
index 6eadb9ee..00000000
--- a/trunk/package/feeds/packages/libdaq/patches/001-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- daq-1.1.1/configure	2012-07-10 21:32:51.000000000 +0200
-+++ daq-new/configure	2012-08-03 15:47:07.654945651 +0200
-@@ -12717,10 +12717,11 @@
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5
- $as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; }
-     if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+#as_fn_error $? "cannot run test program while cross compiling
-+#See \`config.log' for more details" "$LINENO" 5; }
-+        echo "    No cross compiling test."
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
diff --git a/trunk/package/feeds/packages/libdbi-drivers/Makefile b/trunk/package/feeds/packages/libdbi-drivers/Makefile
deleted file mode 100644
index e5a2da7f..00000000
--- a/trunk/package/feeds/packages/libdbi-drivers/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdbi-drivers
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/libdbi-drivers
-PKG_MD5SUM:=9f47b960e225eede2cdeaabf7d22f59f
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdbi-drivers/default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://libdbi-drivers.sourceforge.net/
-endef
-
-define Package/libdbi-drivers
-$(call Package/libdbi-drivers/default)
-  DEPENDS:=libdbi +libdbd-mysql +libdbd-pgsql +libdbd-sqlite3
-  TITLE:=Database drivers for libdbi
-endef
-
-define Package/libdbd-mysql
-$(call Package/libdbi-drivers/default)
-  DEPENDS:=libdbi +libmysqlclient
-  TITLE:=MySQL database server driver for libdbi
-endef
-
-define Package/libdbd-pgsql
-$(call Package/libdbi-drivers/default)
-  DEPENDS:=libdbi +libpq
-  TITLE:=PostgreSQL database server driver for libdbi
-endef
-
-define Package/libdbd-sqlite3
-$(call Package/libdbi-drivers/default)
-  DEPENDS:=libdbi +libsqlite3
-  TITLE:=SQLite3 database driver for libdbi
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--disable-static \
-	--disable-rpath \
-	--disable-docs \
-	--with-dbi-incdir=$(STAGING_DIR)/usr/include \
-	--with-dbi-libdir=$(STAGING_DIR)/usr/lib
-
-ifneq ($(CONFIG_PACKAGE_libdbd-mysql),)
-	CONFIGURE_ARGS += \
-		--with-mysql \
-		--with-mysql-incdir=$(STAGING_DIR)/usr/include/mysql \
-		--with-mysql-libdir=$(STAGING_DIR)/usr/lib/mysql
-	TARGET_LDFLAGS += \
-		-L$(STAGING_DIR)/usr/lib/mysql/
-else
-	CONFIGURE_ARGS += --without-mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_libdbd-pgsql),)
-	CONFIGURE_ARGS += \
-		--with-pgsql \
-		--with-pgsql-incdir=$(STAGING_DIR)/usr/include \
-		--with-pgsql-libdir=$(STAGING_DIR)/usr/lib
-else
-	CONFIGURE_ARGS += --without-pgsql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_libdbd-sqlite3),)
-	CONFIGURE_ARGS += \
-		--with-sqlite3 \
-		--with-sqlite3-incdir=$(STAGING_DIR)/usr/include \
-		--with-sqlite3-libdir=$(STAGING_DIR)/usr/lib
-else
-	CONFIGURE_ARGS += --without-sqlite3
-endif
-
-define BuildPlugin
-  define Package/libdbd-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/dbd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/dbd/libdbd$(1).so $$(1)/usr/lib/dbd/
-  endef
-  $$(eval $$(call BuildPackage,libdbd-$(1)))
-endef
-
-#$(eval $(call BuildPackage,libdbi-drivers))
-$(eval $(call BuildPlugin,mysql))
-$(eval $(call BuildPlugin,pgsql))
-$(eval $(call BuildPlugin,sqlite3))
diff --git a/trunk/package/feeds/packages/libdbi-drivers/patches/001_libsqlite3_fix.patch b/trunk/package/feeds/packages/libdbi-drivers/patches/001_libsqlite3_fix.patch
deleted file mode 100644
index 5ded9532..00000000
--- a/trunk/package/feeds/packages/libdbi-drivers/patches/001_libsqlite3_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then
- 		AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)
- 		SQLITE3_LDFLAGS=""
- 	else
--		SQLITE3_LIBS=-lsqlite
-+		SQLITE3_LIBS=-lsqlite3
- 		SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
- 	fi
- 
diff --git a/trunk/package/feeds/packages/libdbi/Makefile b/trunk/package/feeds/packages/libdbi/Makefile
deleted file mode 100644
index a1079fea..00000000
--- a/trunk/package/feeds/packages/libdbi/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdbi
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/libdbi
-PKG_MD5SUM:=05e2ceeac4bc85fbe40de8b4b22d9ab3
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdbi
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Database Independent Abstraction Layer library
-  URL:=http://libdbi.sourceforge.net/
-endef
-
-define Package/libdbi/description
- This package provides a database-independent abstraction layer library in C.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-docs
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/dbi $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbi.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbi.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libdbi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbi.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdbi))
diff --git a/trunk/package/feeds/packages/libdmapsharing/Makefile b/trunk/package/feeds/packages/libdmapsharing/Makefile
deleted file mode 100644
index 557b31e2..00000000
--- a/trunk/package/feeds/packages/libdmapsharing/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# This Makefile is a skeleton
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdmapsharing
-PKG_VERSION:=2.9.30
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/
-PKG_MD5SUM:=25de55d128d432d82f2a1ec010d7069a
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/libdmapsharing
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libsoup +mdnsresponder +gstreamer1 +gst1-plugins-base +libgst1app
-  TITLE:=libdmapsharing
-  URL:=http://www.flyn.org/projects/libdmapsharing/
-endef
-
-define Package/libdmapsharing/decription
-  Libdmapsharing is a DMAP library implementation in C
-endef
-
-CONFIGURE_ARGS += \
-	--disable-introspection \
-	--disable-gtk-doc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/libdmapsharing-3.0/ \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libdmapsharing/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdmapsharing))
diff --git a/trunk/package/feeds/packages/libdmapsharing/patches/001-disable_pixbuf.patch b/trunk/package/feeds/packages/libdmapsharing/patches/001-disable_pixbuf.patch
deleted file mode 100644
index fcc84535..00000000
--- a/trunk/package/feeds/packages/libdmapsharing/patches/001-disable_pixbuf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,18 +117,7 @@ dnl make GOBJECT_CFLAGS and GOBJECT_LIBS
- AC_SUBST(GOBJECT_CFLAGS)
- AC_SUBST(GOBJECT_LIBS)
- 
--dnl Check for gdk-pixbuf, needed for DACP Now Playing Artwork
--PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0,
--  HAVE_GDKPIXBUF=yes,
--  HAVE_GDKPIXBUF=no)
--
--if test x"$HAVE_GDKPIXBUF" = "xyes"; then
--  AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
--else
--  AC_WARN(Gdk-pixbuf library not present, Now Playing artwork might be affected.)
--fi
--
--AM_CONDITIONAL(USE_GDKPIXBUF, test x"$HAVE_GDKPIXBUF" = "xyes")
-+HAVE_GDKPIXBUF=no
- 
- AC_SUBST(GDKPIXBUF_CFLAGS)
- AC_SUBST(GDKPIXBUF_LIBS)
diff --git a/trunk/package/feeds/packages/libdmapsharing/patches/002-disable_tests.patch b/trunk/package/feeds/packages/libdmapsharing/patches/002-disable_tests.patch
deleted file mode 100644
index bafc52f9..00000000
--- a/trunk/package/feeds/packages/libdmapsharing/patches/002-disable_tests.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = libdmapsharing vala tests doc
-+SUBDIRS = libdmapsharing vala doc
- DIST_SUBDIRS = $(SUBDIRS) m4 media
- 
- # pcfiles = libdmapsharing-@LIBDMAPSHARING_MAJORMINOR@.pc
diff --git a/trunk/package/feeds/packages/libdmapsharing/patches/003-make_unit_test_optional.patch b/trunk/package/feeds/packages/libdmapsharing/patches/003-make_unit_test_optional.patch
deleted file mode 100644
index 14d020f2..00000000
--- a/trunk/package/feeds/packages/libdmapsharing/patches/003-make_unit_test_optional.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,7 +357,13 @@ if test -n "$BUILD_DPAPVIEW" ; then
- 	AC_WARN([will not build dpapview])
- fi
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+dnl Test if --enable-unit-test given
-+AC_ARG_ENABLE(unit-test, [AC_HELP_STRING([--enable-unit-test],[enable unit test])])
-+if test "x$enable_unit_test" = "xyes" ; then
-+  PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-+else
-+  have_check=no
-+fi
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- if test "x$have_check" = "xyes"; then
- 	AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
diff --git a/trunk/package/feeds/packages/libdnet/Makefile b/trunk/package/feeds/packages/libdnet/Makefile
deleted file mode 100644
index 08d3e20b..00000000
--- a/trunk/package/feeds/packages/libdnet/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdnet
-PKG_VERSION:=1.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://libdnet.googlecode.com/files/
-PKG_MD5SUM:=9253ef6de1b5e28e9c9a62b882e44cc9
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_LICENSE:=BSD
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdnet
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Low-level network library
-  URL:=http://sourceforge.net/projects/libdnet/
-endef
-
-define Package/libdnet/description
- libdnet is a library of simplified, portable interface to several low-level
- networking routines.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--without-check \
-	--without-python
-
-CONFIGURE_VARS += \
-	ac_cv_dnet_bsd_bpf=no
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/dnet-config \
-		$(2)/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/dnet-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA)\
-		$(PKG_INSTALL_DIR)/usr/include/dnet.h \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/dnet \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdnet.{la,a,so*} \
-		$(1)/usr/lib/
-endef
-
-define Package/libdnet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/dnet \
-		$(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,libdnet))
diff --git a/trunk/package/feeds/packages/libdnet/patches/001-compile.patch b/trunk/package/feeds/packages/libdnet/patches/001-compile.patch
deleted file mode 100644
index 54223c90..00000000
--- a/trunk/package/feeds/packages/libdnet/patches/001-compile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/config/config.sub
-+++ b/config/config.sub
-@@ -228,7 +228,7 @@ case $basic_machine in
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
- 	| fr30 | frv \
-@@ -290,7 +290,7 @@ case $basic_machine in
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
-+	| avr-* | avr32-* \
- 	| bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
- 	| clipper-* | cydra-* \
diff --git a/trunk/package/feeds/packages/libdnet/patches/002-config.patch b/trunk/package/feeds/packages/libdnet/patches/002-config.patch
deleted file mode 100644
index cde376a8..00000000
--- a/trunk/package/feeds/packages/libdnet/patches/002-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/dnet-config.in
-+++ b/dnet-config.in
-@@ -45,10 +45,18 @@ while test $# -gt 0; do
- done
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@
-+      includes=
-+      if test "@includedir@" != "/usr/include" ; then
-+             includes=-I@includedir@
-+      fi
-+      echo $includes
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -ldnet @LIBS@
-+      libs=
-+      if test "@libdir@" != "/usr/lib" ; then
-+             libs=-I@libdir@
-+      fi
-+      echo $libs -ldnet @LIBS@
- fi      
- 
diff --git a/trunk/package/feeds/packages/libesmtp/Makefile b/trunk/package/feeds/packages/libesmtp/Makefile
deleted file mode 100644
index fa402c66..00000000
--- a/trunk/package/feeds/packages/libesmtp/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libesmtp
-PKG_VERSION:=1.0.6
-PKG_RELEASE:=2
-PKG_MD5SUM:=c4fedc999b6c3820296b0eb92cc2e252
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=LGPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE_URL:=http://www.stafford.uklinux.net/libesmtp
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libesmtp
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A Library for Posting Electronic Mail
-  URL:=http://www.stafford.uklinux.net/libesmtp/
-  DEPENDS:=+libpthread
-endef
-
-CONFIGURE_ARGS += \
-	--without-openssl
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libesmtp-config $(1)/usr/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libesmtp-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libesmtp.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(2)/bin
-	$(LN) ../../usr/bin/libesmtp-config $(2)/bin/
-endef
-
-define Package/libesmtp/install
-	$(INSTALL_DIR)  $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libesmtp.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libesmtp))
diff --git a/trunk/package/feeds/packages/libevent/Makefile b/trunk/package/feeds/packages/libevent/Makefile
deleted file mode 100644
index 4d5406bc..00000000
--- a/trunk/package/feeds/packages/libevent/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libevent
-PKG_VERSION:=1.4.14b
-PKG_RELEASE:=2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz
-PKG_SOURCE_URL:=https://github.com/downloads/libevent/libevent/
-PKG_MD5SUM:=a00e037e4d3f9e4fe9893e8a2d27918c
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libevent
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Event notification library (legacy)
-  DEPENDS:=+librt
-  URL:=http://www.libevent.org
-endef
-
-define Package/libevent/description
-	The libevent API provides a mechanism to execute a callback function
-	when a specific event occurs on a file descriptor or after a timeout
-	has been reached. Furthermore, libevent also support callbacks due
-	to signals or regular timeouts.
-
-	libevent is meant to replace the event loop found in event driven
-	network servers. An application just needs to call event_dispatch()
-	and then add or remove events dynamically without having to change
-	the event loop.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libevent
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/libevent/
-	$(INSTALL_DIR) $(1)/usr/lib/libevent
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/libevent/
-endef
-
-define Package/libevent/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libevent))
diff --git a/trunk/package/feeds/packages/libevhtp/Makefile b/trunk/package/feeds/packages/libevhtp/Makefile
deleted file mode 100644
index 8be811e6..00000000
--- a/trunk/package/feeds/packages/libevhtp/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libevhtp
-PKG_VERSION:=1.2.10
-PKG_RELEASE:=1
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/ellzey/libevhtp/archive/
-PKG_MD5SUM:=e7261c7e34654f78047431d169b88806
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libevhtp
-    SECTION:=libs
-    CATEGORY:=Libraries
-    TITLE:=A more flexible replacement for libevent's httpd API
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=https://github.com/ellzey/libevhtp
-    DEPENDS:=+libevent2 +libevent2-openssl +libevent2-pthreads +libopenssl +libpthread
-endef
-
-define Package/libevhtp/description
-   Libevhtp was created as a replacement API for Libevent's current HTTP API.
-   The reality of libevent's http interface is that it was created as a JIT server,
-   meaning the developer never thought of it being used for creating a full-fledged HTTP service.
-endef
-
-include $(INCLUDE_DIR)/cmake.mk
-
-Hooks/Prepare/Post += delete_source_package
-
-define delete_source_package
-	# deleting source package as its filename is ambiguous
-	rm -f $(DL_DIR)/$(PKG_SOURCE)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{include,lib}
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevhtp.so* $(1)/usr/lib/
-
-endef
-
-define Package/libevhtp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevhtp.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libevhtp))
diff --git a/trunk/package/feeds/packages/libevhtp/patches/010-enable-shared-object-building.patch b/trunk/package/feeds/packages/libevhtp/patches/010-enable-shared-object-building.patch
deleted file mode 100644
index fa6aa4b4..00000000
--- a/trunk/package/feeds/packages/libevhtp/patches/010-enable-shared-object-building.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN libevhtp-1.2.9.orig/CMakeLists.txt libevhtp-1.2.9/CMakeLists.txt
---- libevhtp-1.2.9.orig/CMakeLists.txt	2014-03-23 12:50:50.000000000 +0100
-+++ libevhtp-1.2.9/CMakeLists.txt	2014-11-21 11:46:58.644575813 +0100
-@@ -64,7 +64,7 @@ OPTION(EVHTP_DISABLE_EVTHR     "Disable
- OPTION(EVHTP_DISABLE_REGEX     "Disable regex support"    OFF)
- 
- # -DEVHTP_BUILD_SHARED:STRING=ON
--OPTION(EVHTP_BUILD_SHARED      "Build shared library too" OFF)
-+OPTION(EVHTP_BUILD_SHARED      "Build shared library too" ON)
- 
- # -DEVHTP_USE_DEFER_ACCEPT:STRING=ON
- OPTION(EVHTP_USE_DEFER_ACCEPT  "Enable TCP_DEFER_ACCEPT"  OFF)
diff --git a/trunk/package/feeds/packages/libexif/Makefile b/trunk/package/feeds/packages/libexif/Makefile
deleted file mode 100644
index c290bddb..00000000
--- a/trunk/package/feeds/packages/libexif/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libexif
-PKG_VERSION:=0.6.21
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/libexif
-PKG_MD5SUM:=27339b89850f28c8f1c237f233e05b27
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libexif
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=library for jpeg files with exif tags
-  URL:=http://libexif.sourceforge.net/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libexif/description
-  libexif is a library for parsing, editing, and saving EXIF data. It is
-  intended to replace lots of redundant implementations in command-line
-  utilities and programs with GUIs.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libexif.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libexif/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libexif))
diff --git a/trunk/package/feeds/packages/libexif/patches/100-no_doc.patch b/trunk/package/feeds/packages/libexif/patches/100-no_doc.patch
deleted file mode 100644
index ae5bf270..00000000
--- a/trunk/package/feeds/packages/libexif/patches/100-no_doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u --recursive libexif-0.6.21-vanilla/Makefile.in libexif-0.6.21/Makefile.in
---- libexif-0.6.21-vanilla/Makefile.in	2014-07-17 22:17:52.439423287 -0400
-+++ libexif-0.6.21/Makefile.in	2014-07-17 22:18:28.125359945 -0400
-@@ -289,7 +289,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4m po libexif test doc binary contrib
-+SUBDIRS = m4m po libexif test binary contrib
- EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt libexif.pc.in \
- 	libexif-uninstalled.pc.in
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/trunk/package/feeds/packages/libffi/Makefile b/trunk/package/feeds/packages/libffi/Makefile
deleted file mode 100644
index 1eea6f76..00000000
--- a/trunk/package/feeds/packages/libffi/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libffi
-PKG_VERSION:=3.0.13
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/
-PKG_MD5SUM:=45f3b6dbc9ee7c7dfbbbc5feba571529
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/libffi
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Foreign Function Interface (FFI) library
-  URL:=http://sourceware.org/libffi/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/libffi/description
-The libffi library provides a portable, high level programming interface to
-various calling conventions. This allows a programmer to call any function
-specified by a call interface description at run-time.
-
-FFI stands for Foreign Function Interface. A foreign function interface is the
-popular name for the interface that allows code written in one language to call
-code written in another language. The libffi library really only provides the
-lowest, machine dependent layer of a fully featured foreign function interface.
-A layer must exist above libffi that handles type conversions for values passed
-between the two languages.
-endef
-
-CONFIGURE_PATH = build
-CONFIGURE_CMD = ../configure
-MAKE_PATH = build
-
-define Build/Configure
-	mkdir -p $(PKG_BUILD_DIR)/build
-	$(Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libffi.{so*,a,la} \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libffi-$(PKG_VERSION)/include/*.h \
-		$(1)/usr/include/
-endef
-
-define Package/libffi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libffi.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libffi))
diff --git a/trunk/package/feeds/packages/libftdi/Makefile b/trunk/package/feeds/packages/libftdi/Makefile
deleted file mode 100644
index 058fd508..00000000
--- a/trunk/package/feeds/packages/libftdi/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2011-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libftdi
-PKG_VERSION:=0.20
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/
-PKG_MD5SUM:=355d4474e3faa81b485d6a604b06951f
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=LGPL-2.0
-PKG_LICENSE_FILES:=COPYING.LIB
-
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libftdi
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libusb-compat
-  TITLE:=Library to talk to FTDI chips
-  URL:=http://www.intra2net.com/en/developer/libftdi/
-endef
-
-define Package/libftdi/description
-  libFTDI - FTDI USB driver with bitbang mode
-  libFTDI is an open source library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232H, FT4232H, FT2232D and FT245R, including the popular bitbang mode. 
-  The library is linked with your program in userspace, no kernel driver required.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ftdi.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libftdi.pc $(1)/usr/lib/pkgconfig/libftdi.pc
-	$(SED) \
-		's,/usr/include,$$$${prefix}/include,g' \
-		 $(1)/usr/lib/pkgconfig/libftdi.pc
-	$(SED) \
-		's,/usr/lib,$$$${prefix}/lib,g' \
-		 $(1)/usr/lib/pkgconfig/libftdi.pc
-endef
-
-define Package/libftdi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libftdi-config $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libftdi))
diff --git a/trunk/package/feeds/packages/libftdi/patches/100-fix-x86_64-build.patch b/trunk/package/feeds/packages/libftdi/patches/100-fix-x86_64-build.patch
deleted file mode 100644
index 2460cb16..00000000
--- a/trunk/package/feeds/packages/libftdi/patches/100-fix-x86_64-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-     SET(LIB_SUFFIX "")
-     SET(PACK_ARCH "")
-   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
--    SET(LIB_SUFFIX 64)
-+    SET(LIB_SUFFIX "")
-     SET(PACK_ARCH .x86_64)
- endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- 
diff --git a/trunk/package/feeds/packages/libftdi/patches/101-fix-cmake-version-packagekit.patch b/trunk/package/feeds/packages/libftdi/patches/101-fix-cmake-version-packagekit.patch
deleted file mode 100644
index e6861dcd..00000000
--- a/trunk/package/feeds/packages/libftdi/patches/101-fix-cmake-version-packagekit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,9 +1,12 @@
- # Project
- project(libftdi)
-+set(PACKAGE libftdi)
- set(MAJOR_VERSION 0)
- set(MINOR_VERSION 20)
-+set(VERSION ${VERSION_STRING})
- set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
--SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
-+set(top_srcdir ${CMAKE_SOURCE_DIR})
- 
- # CMake
- if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-@@ -98,12 +101,6 @@ option(DOCUMENTATION "Generate API docum
- 
- find_package(Doxygen)
- if(DOCUMENTATION AND DOXYGEN_FOUND)
--
--   # Set variables
--   set(PACKAGE libftdi)
--   set(VERSION ${VERSION_STRING})
--   set(top_srcdir ${CMAKE_SOURCE_DIR})
--
-    # Find doxy config
-    message(STATUS "Doxygen found.")
-    set(DOXY_DIR "${CMAKE_SOURCE_DIR}/doc")
diff --git a/trunk/package/feeds/packages/libftdi1/Makefile b/trunk/package/feeds/packages/libftdi1/Makefile
deleted file mode 100644
index ed7ff2d2..00000000
--- a/trunk/package/feeds/packages/libftdi1/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2014-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libftdi1
-PKG_VERSION:=1.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/
-PKG_MD5SUM:=89dff802d89c4c0d55d8b4665fd52d0b
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=LGPL-2.0
-PKG_LICENSE_FILES:=COPYING.LIB
-
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libftdi1
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libusb-1.0
-  TITLE:=Library to talk to FTDI chips
-  URL:=http://www.intra2net.com/en/developer/libftdi/
-endef
-
-define Package/libftdi1/description
-  libFTDI - FTDI USB driver with bitbang mode
-  libFTDI is an open source library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232H, FT4232H, FT2232D and FT245R, including the popular bitbang mode. 
-  The library is linked with your program in userspace, no kernel driver required.
-endef
-
-define Package/ftdi_eeprom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+confuse +libftdi1
-  TITLE:=Tool for reading/erasing/flashing FTDI USB chip eeproms
-  URL:=http://www.intra2net.com/en/developer/libftdi/
-endef
-
-define Package/ftdi_eeprom/description
-  ftdi_eeprom is a small tool for reading/erasing/flashing FTDI USB chip
-  eeproms. It uses libftdi to access the chip, so you will need to have
-  the required permissions on the device.
-
-  The ftdi_sio module should not be loaded.
-
-  You have to unplug and replug your device to get the new values to be
-  read. Otherwise, you will still get the old values.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libftdi1/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libftdi1/ftdi.h $(1)/usr/include/libftdi1/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi1.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/cmake/libftdi1
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/libftdi1/* $(1)/usr/lib/cmake/libftdi1/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libftdi1.pc $(1)/usr/lib/pkgconfig/libftdi1.pc
-	$(SED) \
-		's,/usr/include,$$$${prefix}/include,g' \
-		 $(1)/usr/lib/pkgconfig/libftdi1.pc
-	$(SED) \
-		's,/usr/lib,$$$${prefix}/lib,g' \
-		 $(1)/usr/lib/pkgconfig/libftdi1.pc
-endef
-
-define Package/libftdi1/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libftdi1-config $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi1.so.* $(1)/usr/lib/
-endef
-
-define Package/ftdi_eeprom/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ftdi_eeprom $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libftdi1))
-$(eval $(call BuildPackage,ftdi_eeprom))
diff --git a/trunk/package/feeds/packages/libftdi1/patches/100-fix-x86_64-build.patch b/trunk/package/feeds/packages/libftdi1/patches/100-fix-x86_64-build.patch
deleted file mode 100644
index 495db178..00000000
--- a/trunk/package/feeds/packages/libftdi1/patches/100-fix-x86_64-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ if ( NOT DEFINED LIB_SUFFIX )
-       AND NOT EXISTS "/etc/debian_version"
-       AND NOT EXISTS "/etc/arch-release" )
-     if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" )
--      set ( LIB_SUFFIX 64 )
-+      set ( LIB_SUFFIX "" )
-     endif ()
-   endif ()
- endif ()
diff --git a/trunk/package/feeds/packages/libgcrypt/Makefile b/trunk/package/feeds/packages/libgcrypt/Makefile
deleted file mode 100644
index afa4096c..00000000
--- a/trunk/package/feeds/packages/libgcrypt/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2005-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libgcrypt
-PKG_VERSION:=1.6.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt
-PKG_MD5SUM:=a5a5060dc2f80bcac700ab0236ea47dc
-
-PKG_FIXUP:=patch-libtool
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgcrypt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libgpg-error
-  TITLE:=GNU crypto library
-  URL:=http://directory.fsf.org/security/libgcrypt.html
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libgcrypt/description
- This is a general purpose cryptographic library based on the code from
- GnuPG. It provides functions for all cryptograhic building blocks:
- symmetric ciphers (AES, DES, Arcfour, CAST5), hash algorithms (MD5, SHA-1,
- RIPE-MD160, SHA-224/256, SHA-384/512), MACs (HMAC for all hash
- algorithms), public key algorithms (RSA, DSA), large integer functions,
- random numbers and a lot of supporting functions. Some algorithms have
- been disabled to reduce size (Blowfish, Twofish, Serpent,
- RC2, SEED, Camellia, CRC, MD4, TIGER-192, Whirlpool, ElGamal, ECC).
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-asm \
-	--with-gpg-error-prefix="$(STAGING_DIR)/usr"
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{la,a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/
-	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
-	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
-	ln -sf $(STAGING_DIR)/usr/bin/libgcrypt-config $(2)/bin/
-endef
-
-define Package/libgcrypt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgcrypt))
diff --git a/trunk/package/feeds/packages/libgcrypt/patches/001-no_docs_tests.patch b/trunk/package/feeds/packages/libgcrypt/patches/001-no_docs_tests.patch
deleted file mode 100644
index b5aeaccb..00000000
--- a/trunk/package/feeds/packages/libgcrypt/patches/001-no_docs_tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u --recursive libgcrypt-1.6.1-vanilla/Makefile.am libgcrypt-1.6.1/Makefile.am
---- libgcrypt-1.6.1-vanilla/Makefile.am	2014-07-18 00:31:21.020329371 -0400
-+++ libgcrypt-1.6.1/Makefile.am	2014-07-18 00:31:49.076314616 -0400
-@@ -25,8 +25,8 @@
- # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
- GITLOG_TO_CHANGELOG=gitlog-to-changelog
- 
--DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
--SUBDIRS =         compat mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 compat mpi cipher random src
-+SUBDIRS =         compat mpi cipher random src
- 
- EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES      	           \
-              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
-diff -u --recursive libgcrypt-1.6.1-vanilla/Makefile.in libgcrypt-1.6.1/Makefile.in
---- libgcrypt-1.6.1-vanilla/Makefile.in	2014-07-18 00:31:21.020329371 -0400
-+++ libgcrypt-1.6.1/Makefile.in	2014-07-18 00:31:54.974311498 -0400
-@@ -331,8 +331,8 @@
- 
- # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
- GITLOG_TO_CHANGELOG = gitlog-to-changelog
--DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
--SUBDIRS = compat mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 compat mpi cipher random src
-+SUBDIRS = compat mpi cipher random src
- EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES      	           \
-              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
-              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \
diff --git a/trunk/package/feeds/packages/libgd/Makefile b/trunk/package/feeds/packages/libgd/Makefile
deleted file mode 100644
index 33d1dc08..00000000
--- a/trunk/package/feeds/packages/libgd/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libgd
-PKG_VERSION:=2.1.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=gd-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/libgd/libgd/archive
-PKG_MD5SUM:=e91a1a99903e460e7ba00a794e72cc1e
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=MIT
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgd-gd-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libjpeg +libpng
-  TITLE:=The GD graphics library
-  URL:=http://www.libgd.org/
-endef
-
-define Package/libgd/description
-  GD is an open source code library for the dynamic creation of images by
-  programmers. GD creates PNG, JPEG and GIF images, among other formats.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-x \
-	--without-fontconfig \
-	--without-freetype \
-	--with-jpeg=$(STAGING_DIR)/usr \
-	--with-png=$(STAGING_DIR)/usr \
-	--with-vpx=no \
-	--without-xpm \
-	--without-iconv
-
-CONFIGURE_VARS += \
-	LIBPNG12_CONFIG="$(STAGING_DIR)/host/bin/libpng12-config" \
-	ac_cv_header_iconv_h=no
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(1)/usr/bin/gdlib-config
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(2)/bin
-	$(LN) ../../usr/bin/gdlib-config $(2)/bin/
-endef
-
-define Package/libgd/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgd))
diff --git a/trunk/package/feeds/packages/libgd/patches/101-gdlib-config.patch b/trunk/package/feeds/packages/libgd/patches/101-gdlib-config.patch
deleted file mode 100644
index e51502ca..00000000
--- a/trunk/package/feeds/packages/libgd/patches/101-gdlib-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/config/gdlib-config.in
-+++ b/config/gdlib-config.in
-@@ -71,7 +71,7 @@ while test $# -gt 0; do
- 	echo @LDFLAGS@
- 	;;
-     --libs)
--	echo -lgd @LIBS@ @LIBICONV@
-+	echo -lgd @LIBS@
- 	;;
-     --cflags|--includes)
- 	echo -I@includedir@
-@@ -84,7 +84,7 @@ while test $# -gt 0; do
- 	echo "includedir: $includedir"
- 	echo "cflags:     -I@includedir@"
- 	echo "ldflags:    @LDFLAGS@"
--	echo "libs:       @LIBS@ @LIBICONV@"
-+	echo "libs:       @LIBS@"
- 	echo "libdir:     $libdir"
- 	echo "features:   @FEATURES@"
- 	;;
diff --git a/trunk/package/feeds/packages/libgd/patches/200-uclibc-ceill.patch b/trunk/package/feeds/packages/libgd/patches/200-uclibc-ceill.patch
deleted file mode 100644
index 8d2aa123..00000000
--- a/trunk/package/feeds/packages/libgd/patches/200-uclibc-ceill.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -21,6 +21,7 @@
- #include <math.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <features.h>
- #include "gd.h"
- #include "gdhelpers.h"
- #include "bmp.h"
-@@ -42,6 +43,13 @@ static int bmp_read_rle(gdImagePtr im, g
- 
- #define BMP_DEBUG(s)
- 
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)
-+long double ceill(long double x)
-+{
-+	return (long double)ceil((double)x);
-+}
-+#endif
-+
- static int gdBMPPutWord(gdIOCtx *out, int w)
- {
- 	/* Byte order is little-endian */
diff --git a/trunk/package/feeds/packages/libgpg-error/Makefile b/trunk/package/feeds/packages/libgpg-error/Makefile
deleted file mode 100644
index 27e5e095..00000000
--- a/trunk/package/feeds/packages/libgpg-error/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2005-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libgpg-error
-PKG_VERSION:=1.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error
-PKG_MD5SUM:=8f0eb41a344d19ac2aa9bd101dfb9ce6
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgpg-error
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GnuPG error handling helper library
-  URL:=http://www.gnupg.org/related_software/libgpg-error/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libgpg-error/description
-	An helper library for common error codes and descriptions.
-	This is a library that defines common error values for all GnuPG
-	components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
-	Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
-	future.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/gpg-error-config \
-		$(2)/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/gpg-error-config
-	ln -sf $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/gpg-error.h \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/share/aclocal
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 \
-		$(1)/usr/share/aclocal/
-endef
-
-define Package/libgpg-error/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgpg-error))
diff --git a/trunk/package/feeds/packages/libhttp-parser/Makefile b/trunk/package/feeds/packages/libhttp-parser/Makefile
deleted file mode 100644
index fe28b4ca..00000000
--- a/trunk/package/feeds/packages/libhttp-parser/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libhttp-parser
-PKG_VERSION:=2.3.0
-PKG_RELEASE=1
-PKG_MAINTAINER:=Ramanathan Sivagurunathan <ramzthecoder@gmail.com>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE-MIT
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/joyent/http-parser.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=56f7ad0e2e5a80f79d214015c91e1f17d11d109f
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libhttp-parser
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A library to parse http request and response
-  URL:=https://github.com/joyent/http-parser
-endef
-
-define Package/libhttp-parser/description
-  A parser for HTTP messages written in C. It parses both requests and responses. 
-  The parser is designed to be used in performance HTTP applications. 
-  It does not make any syscalls nor allocations, it does not buffer data, 
-  it can be interrupted at anytime. Depending on your architecture, 
-  it only requires about 40 bytes of data per message stream 
-  (in a web server that is per connection).
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default, library) 
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/http_parser.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libhttp_parser.so.* $(1)/usr/lib/
-	( cd $(1)/usr/lib ; ln -s libhttp_parser.so.* libhttp_parser.so )
-endef
-
-define Package/libhttp-parser/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libhttp_parser.so.* $(1)/usr/lib/
-	( cd $(1)/usr/lib ; ln -s libhttp_parser.so.* libhttp_parser.so )
-endef
-
-$(eval $(call BuildPackage,libhttp-parser))
diff --git a/trunk/package/feeds/packages/libical/Makefile b/trunk/package/feeds/packages/libical/Makefile
deleted file mode 100644
index 4af4c859..00000000
--- a/trunk/package/feeds/packages/libical/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libical
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/freeassociation
-PKG_MD5SUM:=
-
-PKG_LICENSE:=LGPL-2.1 MPL-1.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=libtool
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libical
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=iCal (RFC 2445) library
-  URL:=http://www.nabber.org/projects/ical/
-  DEPENDS:=+libpthread
-endef
-
-define Package/libical/description
- This package provides a a read/write library of classes for object oriented
- languages (Initial goals of PHP and Python) that implement and enforce the iCal
- standard (RFC 2445).
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-cxx \
-	--disable-java \
-	--disable-python \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/{ical.h,libical} $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libical{,ss,vcal}.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libical.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libical/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libical{,ss,vcal}.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libical))
diff --git a/trunk/package/feeds/packages/libid3tag/Makefile b/trunk/package/feeds/packages/libid3tag/Makefile
deleted file mode 100644
index 127bc17d..00000000
--- a/trunk/package/feeds/packages/libid3tag/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libid3tag
-PKG_VERSION:=0.15.1b
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mad
-PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libid3tag
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib
-  TITLE:=An ID3 tag manipulation library
-  URL:=http://mad.sourceforge.net/
-endef
-
-define Package/libid3tag/description
-	libid3tag is a library for reading and (eventually) writing ID3 tags, both
-	ID3v1 and the various versions of ID3v2.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_VARS += CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-debugging \
-		--disable-profiling \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(1)/usr/lib/
-endef
-
-define Package/libid3tag/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libid3tag))
diff --git a/trunk/package/feeds/packages/libidn/Makefile b/trunk/package/feeds/packages/libidn/Makefile
deleted file mode 100644
index b92e3924..00000000
--- a/trunk/package/feeds/packages/libidn/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libidn
-PKG_VERSION:=1.30
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/libidn
-PKG_MD5SUM:=b17edc8551cd31cc5f14c82a9dabf58e
-
-PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0
-PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=GNUmakefile aclocal.m4
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/idn/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.gnu.org/software/libidn/
-  MAINTAINER:=Marcel Denia <naoir@gmx.net>
-endef
-
-define Package/idn/Default/description
-  GNU Libidn is a fully documented implementation of the Stringprep,
-  Punycode and IDNA specifications. Libidn's purpose is to encode and
-  decode internationalized domain names.
-endef
-
-define Package/idn
-  $(call Package/idn/Default)
-  SUBMENU:=IP Addresses and Names
-  TITLE:=GNU IDN (Internationalized Domain Name) tool
-  DEPENDS:=+libidn
-endef
-
-define Package/idn/description
-$(call Package/idn/Default/description)
-
-  Command line tool using libidn
-
-endef
-
-define Package/libidn
-  $(call Package/idn/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Stringprep, Punycode and IDNA implementation
-endef
-
-define Package/libidn/description
-$(call Package/idn/Default/description)
-
-  Library only package
-
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-MAKE_FLAGS += \
-	CC="$(TARGET_CC)" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/idn/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/libidn/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,idn))
-$(eval $(call BuildPackage,libidn))
diff --git a/trunk/package/feeds/packages/libidn/patches/002-disable-po-docs-examples.patch b/trunk/package/feeds/packages/libidn/patches/002-disable-po-docs-examples.patch
deleted file mode 100644
index e99f2a11..00000000
--- a/trunk/package/feeds/packages/libidn/patches/002-disable-po-docs-examples.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,7 +16,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples	\
-+SUBDIRS = gl lib/gl lib src \
- 	java csharp
- 
- EXTRA_DIST = cfg.mk maint.mk .clcopying
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,8 +48,6 @@ AC_PROG_LIBTOOL
- # Checks for programs.
- AM_MISSING_PROG(PERL, perl, $missing_dir)
- AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
--AM_GNU_GETTEXT(external)
--AM_GNU_GETTEXT_VERSION(0.19.3)
- AM_ICONV
- AM_PATH_LISPDIR
- 
diff --git a/trunk/package/feeds/packages/libidn/patches/010-fix-idn-error-usage.patch b/trunk/package/feeds/packages/libidn/patches/010-fix-idn-error-usage.patch
deleted file mode 100644
index 9b7ab2cc..00000000
--- a/trunk/package/feeds/packages/libidn/patches/010-fix-idn-error-usage.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/src/idn.c
-+++ b/src/idn.c
-@@ -169,7 +169,7 @@ main (int argc, char *argv[])
-       (args_info.idna_to_unicode_given ? 1 : 0) +
-       (args_info.nfkc_given ? 1 : 0) != 1)
-     {
--      error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified"));
-+      error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified"));
-       usage (EXIT_FAILURE);
-     }
- 
-@@ -184,7 +184,7 @@ main (int argc, char *argv[])
-   if (!args_info.quiet_given
-       && args_info.inputs_num == 0
-       && isatty (fileno (stdin)))
--    fprintf (stderr, _("Type each input string on a line by itself, "
-+    fprintf (stderr, "%s", _("Type each input string on a line by itself, "
- 		       "terminated by a newline character.\n"));
- 
-   do
-@@ -199,7 +199,7 @@ main (int argc, char *argv[])
- 	  if (feof (stdin))
- 	    break;
- 
--	  error (EXIT_FAILURE, errno, _("input error"));
-+	  error (EXIT_FAILURE, errno, "%s", _("input error"));
- 	}
- 
-       if (readbuf[strlen (readbuf) - 1] == '\n')
-@@ -216,7 +216,7 @@ main (int argc, char *argv[])
- 	  if (!q)
- 	    {
- 	      free (p);
--	      error (EXIT_FAILURE, 0,
-+	      error (EXIT_FAILURE, 0, "%s",
- 		     _("could not convert from UTF-8 to UCS-4"));
- 	    }
- 
-@@ -241,7 +241,7 @@ main (int argc, char *argv[])
- 	  if (!q)
- 	    {
- 	      free (r);
--	      error (EXIT_FAILURE, 0,
-+	      error (EXIT_FAILURE, 0, "%s",
- 		     _("could not convert from UTF-8 to UCS-4"));
- 	    }
- 
-@@ -277,7 +277,7 @@ main (int argc, char *argv[])
- 	  q = stringprep_utf8_to_ucs4 (p, -1, &len);
- 	  free (p);
- 	  if (!q)
--	    error (EXIT_FAILURE, 0,
-+	    error (EXIT_FAILURE, 0, "%s",
- 		   _("could not convert from UTF-8 to UCS-4"));
- 
- 	  if (args_info.debug_given)
-@@ -336,7 +336,7 @@ main (int argc, char *argv[])
- 	  r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
- 	  free (q);
- 	  if (!r)
--	    error (EXIT_FAILURE, 0,
-+	    error (EXIT_FAILURE, 0, "%s",
- 		   _("could not convert from UCS-4 to UTF-8"));
- 
- 	  p = stringprep_utf8_to_locale (r);
-@@ -360,7 +360,7 @@ main (int argc, char *argv[])
- 	  q = stringprep_utf8_to_ucs4 (p, -1, NULL);
- 	  free (p);
- 	  if (!q)
--	    error (EXIT_FAILURE, 0,
-+	    error (EXIT_FAILURE, 0, "%s",
- 		   _("could not convert from UCS-4 to UTF-8"));
- 
- 	  if (args_info.debug_given)
-@@ -438,7 +438,7 @@ main (int argc, char *argv[])
- 	  if (!q)
- 	    {
- 	      free (p);
--	      error (EXIT_FAILURE, 0,
-+	      error (EXIT_FAILURE, 0, "%s",
- 		     _("could not convert from UCS-4 to UTF-8"));
- 	    }
- 
-@@ -494,7 +494,7 @@ main (int argc, char *argv[])
- 	  r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
- 	  free (q);
- 	  if (!r)
--	    error (EXIT_FAILURE, 0,
-+	    error (EXIT_FAILURE, 0, "%s",
- 		   _("could not convert from UTF-8 to UCS-4"));
- 
- 	  p = stringprep_utf8_to_locale (r);
-@@ -523,7 +523,7 @@ main (int argc, char *argv[])
- 	      if (!q)
- 		{
- 		  free (p);
--		  error (EXIT_FAILURE, 0,
-+		  error (EXIT_FAILURE, 0, "%s",
- 			 _("could not convert from UTF-8 to UCS-4"));
- 		}
- 
-@@ -537,7 +537,7 @@ main (int argc, char *argv[])
- 	  r = stringprep_utf8_nfkc_normalize (p, -1);
- 	  free (p);
- 	  if (!r)
--	    error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
-+	    error (EXIT_FAILURE, 0, "%s", _("could not do NFKC normalization"));
- 
- 	  if (args_info.debug_given)
- 	    {
-@@ -547,7 +547,7 @@ main (int argc, char *argv[])
- 	      if (!q)
- 		{
- 		  free (r);
--		  error (EXIT_FAILURE, 0,
-+		  error (EXIT_FAILURE, 0, "%s",
- 			 _("could not convert from UTF-8 to UCS-4"));
- 		}
- 
diff --git a/trunk/package/feeds/packages/libimobiledevice/Makefile b/trunk/package/feeds/packages/libimobiledevice/Makefile
deleted file mode 100644
index 7cb06224..00000000
--- a/trunk/package/feeds/packages/libimobiledevice/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libimobiledevice
-PKG_VERSION:=1.2.0
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LESSER
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/libimobiledevice/libimobiledevice.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=53eb963f8e6d607cca6b50381c10820a5e8357f4
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-$(call include_mk, python-package.mk)
-
-define Package/libimobiledevice/Default
-  TITLE:=A library that talks to Apple devices.
-  URL:=http://www.libimobiledevice.org/
-endef
-
-define Package/libimobiledevice/Default/description
-  libimobiledevice is a software library that talks the protocols to support
-  iPhone®, iPod Touch®, iPad® and Apple TV® devices.
-endef
-
-define Package/libimobiledevice
-  $(call Package/libimobiledevice/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(ICONV_DEPENDS) +libplist +libusbmuxd +libopenssl +libcrypto
-endef
-
-define Package/libimobiledevice/description
-  $(call Package/libimobiledevice/Default/description)
-endef
-
-define Package/libimobiledevice-utils
-  $(call Package/libimobiledevice/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libimobiledevice
-endef
-
-define Package/libimobiledevice-utils/description
-  $(call Package/libimobiledevice/Default/description)
-  This package contains the libimobiledevice utilities.
-endef
-
-CONFIGURE_VARS += \
-	libusbmuxd_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-	libusbmuxd_LIBS="-L$(STAGING_DIR)/usr/lib -lusbmuxd" \
-	openssl_CFLAGS=" " \
-	openssl_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto"
-
-CONFIGURE_ARGS += \
-	--without-cython \
-	--disable-largefile
-
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libimobiledevice $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libimobiledevice-*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libimobiledevice/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.so.* $(1)/usr/lib/
-endef
-
-define Package/libimobiledevice-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/idevice* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libimobiledevice))
-$(eval $(call BuildPackage,libimobiledevice-utils))
diff --git a/trunk/package/feeds/packages/libjpeg/Makefile b/trunk/package/feeds/packages/libjpeg/Makefile
deleted file mode 100644
index 8aebfdd8..00000000
--- a/trunk/package/feeds/packages/libjpeg/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=jpeg
-PKG_VERSION:=9a
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)src.v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ijg.org/files
-PKG_MD5SUM:=3353992aecaee1805ef4109aadd433e7
-
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=IJG
-PKG_LICENSE_FILES:=README
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=libltdl
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/jpeg/Default
-  TITLE:=The Independent JPEG Group's JPEG
-  URL:=http://www.ijg.org/
-endef
-
-define Package/libjpeg
-  $(call Package/jpeg/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= runtime library
-endef
-
-define Package/jpeg-tools
-  $(call Package/jpeg/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libjpeg
-  TITLE+= manipulation tools
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-HOST_CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		LIBTOOL="./libtool --tag=CC" \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		exec_prefix="$(PKG_INSTALL_DIR)/usr" \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libjpeg/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/
-endef
-
-define Package/jpeg-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libjpeg))
-$(eval $(call BuildPackage,jpeg-tools))
diff --git a/trunk/package/feeds/packages/liblo/Makefile b/trunk/package/feeds/packages/liblo/Makefile
deleted file mode 100644
index 4e8fa20e..00000000
--- a/trunk/package/feeds/packages/liblo/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=liblo
-PKG_VERSION:=0.28
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/liblo
-PKG_MD5SUM:=e2a4391a08b49bb316c03e2034e06fa2
-
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/liblo/Default
-  SUBMENU:=Sound
-  TITLE:=Lightweight Open Sound Control (OSC)
-  URL:=http://liblo.sourceforge.net/
-endef
-
-define Package/liblo
-$(call Package/liblo/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:= +libpthread
-endef
-
-define Package/liblo-utils
-$(call Package/liblo/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS:= +liblo
-endef
-
-TARGET_CFLAGS += \
-	-Wno-error=maybe-uninitialized \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lo $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liblo.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/liblo/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.so.* $(1)/usr/lib/
-endef
-
-define Package/liblo-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/osc{dump,send} $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,liblo))
-$(eval $(call BuildPackage,liblo-utils))
diff --git a/trunk/package/feeds/packages/libmad/Makefile b/trunk/package/feeds/packages/libmad/Makefile
deleted file mode 100644
index e5289ce7..00000000
--- a/trunk/package/feeds/packages/libmad/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmad
-PKG_VERSION:=0.15.1b
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mad \
-	ftp://ftp.mars.org/pub/mpeg/
-PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-FPM:=default
-ifeq ($(ARCH),armeb)
-  FPM:=arm
-endif
-ifeq ($(ARCH),i386)
-  FPM:=intel
-endif
-ifeq ($(ARCH),mipsel)
-  FPM:=mips
-endif
-
-define Package/libmad
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=An high-quality MPEG audio decoding library
-  URL:=http://www.underbit.com/products/mad/
-  DEPENDS:=@BUILD_PATENTED
-endef
-
-define Package/libmad/description
-	MAD is a high-quality MPEG audio decoder. It currently supports
-	MPEG-1 and the MPEG-2 extension to lower sampling frequencies,
-	as well as the de facto MPEG 2.5 format. All three audio layers -
-	Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--enable-fpm="$(FPM)" \
-	--disable-debugging \
-	--enable-speed \
-
-MAKE_FLAGS+= \
-	CFLAGS="$(TARGET_CFLAGS)" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libmad/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmad))
diff --git a/trunk/package/feeds/packages/libmad/patches/001-mips_removal_h_constraint.patch b/trunk/package/feeds/packages/libmad/patches/001-mips_removal_h_constraint.patch
deleted file mode 100644
index b65555e1..00000000
--- a/trunk/package/feeds/packages/libmad/patches/001-mips_removal_h_constraint.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
---- libmad-0.15.1b-orig/fixed.h	2004-02-17 12:32:03.000000000 +1030
-+++ libmad-0.15.1b/fixed.h	2009-08-05 10:46:30.000000000 +0930
-@@ -299,6 +299,23 @@
- 
- # elif defined(FPM_MIPS)
- 
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min)  0
-+#endif
-+
-+#if __GNUC_PREREQ(4,4)
-+  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
-+# define MAD_F_MLX(hi, lo, x, y) \
-+   do { \
-+      u64_di_t __ll = (u64_di_t) (x) * (y); \
-+      hi = __ll >> 32; \
-+      lo = __ll; \
-+   } while (0) 
-+#else
- /*
-  * This MIPS version is fast and accurate; the disposition of the least
-  * significant bit depends on OPT_ACCURACY via mad_f_scale64().
-@@ -328,6 +345,7 @@
- 	 : "%r" ((x) >> 12), "r" ((y) >> 16))
- #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
- # endif
-+#endif /* __GNU_PREREQ(4,4) */
- 
- # if defined(OPT_SPEED)
- #  define mad_f_scale64(hi, lo)  \
-diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
---- libmad-0.15.1b-orig/mad.h	2004-02-17 13:25:44.000000000 +1030
-+++ libmad-0.15.1b/mad.h	2009-08-05 10:42:40.000000000 +0930
-@@ -344,6 +344,23 @@
- 
- # elif defined(FPM_MIPS)
- 
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min)  0
-+#endif
-+
-+#if __GNUC_PREREQ(4,4)
-+  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
-+# define MAD_F_MLX(hi, lo, x, y) \
-+   do { \
-+      u64_di_t __ll = (u64_di_t) (x) * (y); \
-+      hi = __ll >> 32; \
-+      lo = __ll; \
-+   } while (0) 
-+#else
- /*
-  * This MIPS version is fast and accurate; the disposition of the least
-  * significant bit depends on OPT_ACCURACY via mad_f_scale64().
-@@ -373,6 +390,7 @@
- 	 : "%r" ((x) >> 12), "r" ((y) >> 16))
- #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
- # endif
-+#endif /* __GNU_PREREQ(4,4) */
- 
- # if defined(OPT_SPEED)
- #  define mad_f_scale64(hi, lo)  \
diff --git a/trunk/package/feeds/packages/libmcrypt/Makefile b/trunk/package/feeds/packages/libmcrypt/Makefile
deleted file mode 100644
index f7f3827d..00000000
--- a/trunk/package/feeds/packages/libmcrypt/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmcrypt
-PKG_VERSION:=2.5.8
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING.LIB
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/mcrypt
-PKG_MD5SUM:=c4f491dd411a09e9de3b8702ea6f73eb
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/libmcrypt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Cryptographic library
-  URL:=http://mcrypt.sourceforge.net/
-endef
-
-define Package/libmcrypt/description
-	libmcrypt is a cryptographic library that conveniently brings
-	together a variety of ciphers for convenient use.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/
-	$(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config
-	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config
-endef
-
-define Package/libmcrypt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmcrypt))
diff --git a/trunk/package/feeds/packages/libmicrohttpd/Makefile b/trunk/package/feeds/packages/libmicrohttpd/Makefile
deleted file mode 100644
index 3f1608ee..00000000
--- a/trunk/package/feeds/packages/libmicrohttpd/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmicrohttpd
-PKG_VERSION:=0.9.38
-PKG_RELEASE:=1.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/libmicrohttpd
-PKG_MD5SUM:=b72efbfe7f290846015d460aea7091fe
-
-PKG_MAINTAINER:=Martijn Zilverschoon <martijn@friedzombie.com>
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmicrohttpd
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=GNU libmicrohttpd is a library that runs an HTTP server.
-	URL:=http://www.gnu.org/software/libmicrohttpd/
-	DEPENDS:=+libpthread +libgcrypt +libgnutls +libgpg-error +libcrypto +libopenssl
-endef
-
-define Package/libmicrohttpd/description
-	GNU libmicrohttpd is a small C library that is supposed to make it easy
-	to run an HTTP server as part of another application.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmicrohttpd/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmicrohttpd))
diff --git a/trunk/package/feeds/packages/libmms/Makefile b/trunk/package/feeds/packages/libmms/Makefile
deleted file mode 100644
index 239c64f7..00000000
--- a/trunk/package/feeds/packages/libmms/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmms
-PKG_VERSION:=0.6.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/libmms
-PKG_MD5SUM:=d6b665b335a6360e000976e770da7691
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING.LIB
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libmms
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+glib2
-  TITLE:=MMS stream protocol library
-  URL:=http://libmms.sourceforge.net
-  DEPENDS:=$(ICONV_DEPENDS)
-endef
-
-define Package/libmms/description
-	LibMMS is a common library for parsing mms:// and mmsh:// type network streams.
-	These are commonly used to stream Windows Media Video content over the web.
-	LibMMS itself is only for receiving MMS stream,
-	it doesn't handle sending at all.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += $(if $(ICONV_FULL),-liconv)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmms $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig
-endef
-
-define Package/libmms/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmms))
diff --git a/trunk/package/feeds/packages/libmodbus/Makefile b/trunk/package/feeds/packages/libmodbus/Makefile
deleted file mode 100644
index 65fb00e0..00000000
--- a/trunk/package/feeds/packages/libmodbus/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmodbus
-PKG_VERSION:=3.1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libmodbus.org/releases
-PKG_MD5SUM:=dd4262f87ed835c4d1e560f8321a222c
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=GPL-3.0+ LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING COPYING.LESSER
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmodbus
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://www.libmodbus.org
-  TITLE:=libmodbus
-endef
-
-define Package/libmodbus/description
-  A Modbus library for Linux, Mac OS X, FreeBSD, QNX and Win32.
-endef
-
-CONFIGURE_ARGS += --without-documentation
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/modbus $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.{so*,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmodbus.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmodbus/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmodbus))
diff --git a/trunk/package/feeds/packages/libmpdclient/Makefile b/trunk/package/feeds/packages/libmpdclient/Makefile
deleted file mode 100644
index dbf5fe02..00000000
--- a/trunk/package/feeds/packages/libmpdclient/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmpdclient
-PKG_VERSION:=2.9
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.musicpd.org/download/libmpdclient/2/
-PGK_MD5SUM:=4b101a36e5c0cf967dc063391260ddbf
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmpdclient
-    TITLE:=libmpdclient
-    SECTION:=libs
-    CATEGORY:=Libraries
-    URL:=http://mpd.wikia.com/wiki/ClientLib:libmpdclient
-endef
-
-define Package/libmpdclient/description
-    A stable, documented, asynchronous API library for interfacing MPD in the C, C++ & Objective C languages.
-endef
-
-TARGET_CFLAGS+="-std=gnu99"
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-documentation \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/include \
-		$(1)/usr/lib \
-		$(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig \
-		$(1)/usr/lib/
-endef
-
-define Package/libmpdclient/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libmpdclient.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmpdclient))
diff --git a/trunk/package/feeds/packages/libmpdclient/patches/001-WIP_musl_compatibility.patch b/trunk/package/feeds/packages/libmpdclient/patches/001-WIP_musl_compatibility.patch
deleted file mode 100644
index 02ea6522..00000000
--- a/trunk/package/feeds/packages/libmpdclient/patches/001-WIP_musl_compatibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -43,6 +43,7 @@
- #else
- #  include <netinet/in.h>
- #  include <arpa/inet.h>
-+#  include <sys/select.h>
- #  include <sys/socket.h>
- #  include <netdb.h>
- #  include <sys/un.h>
---- a/src/sync.c
-+++ b/src/sync.c
-@@ -33,6 +33,9 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#ifndef WIN32
-+#include <sys/select.h>
-+#endif
- #include <fcntl.h>
- #include <unistd.h>
- 
diff --git a/trunk/package/feeds/packages/libmpeg2/Makefile b/trunk/package/feeds/packages/libmpeg2/Makefile
deleted file mode 100644
index 9d3c0522..00000000
--- a/trunk/package/feeds/packages/libmpeg2/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmpeg2
-PKG_VERSION:=0.5.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=libmpeg2-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libmpeg2.sourceforge.net/files/
-PKG_MD5SUM:=0f92c7454e58379b4a5a378485bbd8ef
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmpeg2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=MPEG-1 & -2 decoding library
-  URL:=http://libmpeg2.sourceforge.net/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/libmpeg2/decription
-  Libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams
-endef
-
-CONFIGURE_ARGS += \
-	--disable-sdl \
-	--without-x \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/mpeg2dec \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpeg2{,convert}.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmpeg2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmpeg2))
diff --git a/trunk/package/feeds/packages/libmpeg2/patches/101-ppc_no_altivec.patch b/trunk/package/feeds/packages/libmpeg2/patches/101-ppc_no_altivec.patch
deleted file mode 100644
index 49251a09..00000000
--- a/trunk/package/feeds/packages/libmpeg2/patches/101-ppc_no_altivec.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/libmpeg2/motion_comp_altivec.c
-+++ b/libmpeg2/motion_comp_altivec.c
-@@ -25,6 +25,8 @@
- 
- #ifdef ARCH_PPC
- 
-+#ifdef __I_WANT_ALTIVEC__
-+
- #ifdef HAVE_ALTIVEC_H
- #include <altivec.h>
- #endif
-@@ -1007,4 +1009,6 @@ static void MC_avg_xy_8_altivec (uint8_t
- 
- MPEG2_MC_EXTERN (altivec)
- 
-+#endif /* __I_WANT_ALTIVEC__ */
-+
- #endif
---- a/libmpeg2/idct_altivec.c
-+++ b/libmpeg2/idct_altivec.c
-@@ -25,6 +25,8 @@
- 
- #ifdef ARCH_PPC
- 
-+#ifdef __I_WANT_ALTIVEC__
-+
- #ifdef HAVE_ALTIVEC_H
- #include <altivec.h>
- #endif
-@@ -283,4 +285,6 @@ void mpeg2_idct_altivec_init (void)
-     }
- }
- 
-+#endif /* __I_WANT_ALTIVEC__ */
-+
- #endif
---- a/libmpeg2/idct.c
-+++ b/libmpeg2/idct.c
-@@ -251,11 +251,13 @@ void mpeg2_idct_init (uint32_t accel)
-     } else
- #endif
- #ifdef ARCH_PPC
-+#ifdef __I_WANT_ALTIVEC__
-     if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
- 	mpeg2_idct_copy = mpeg2_idct_copy_altivec;
- 	mpeg2_idct_add = mpeg2_idct_add_altivec;
- 	mpeg2_idct_altivec_init ();
-     } else
-+#endif /* __I_WANT_ALTIVEC__ */
- #endif
- #ifdef ARCH_ALPHA
-     if (accel & MPEG2_ACCEL_ALPHA_MVI) {
---- a/libmpeg2/motion_comp.c
-+++ b/libmpeg2/motion_comp.c
-@@ -43,9 +43,11 @@ void mpeg2_mc_init (uint32_t accel)
-     else
- #endif
- #ifdef ARCH_PPC
-+#ifdef __I_WANT_ALTIVEC__
-     if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
- 	mpeg2_mc = mpeg2_mc_altivec;
-     else
-+#endif /* __I_WANT_ALTIVEC__ */
- #endif
- #ifdef ARCH_ALPHA
-     if (accel & MPEG2_ACCEL_ALPHA)
diff --git a/trunk/package/feeds/packages/libmpeg2/patches/102-arm_data_preload_check.patch b/trunk/package/feeds/packages/libmpeg2/patches/102-arm_data_preload_check.patch
deleted file mode 100644
index 86793fcd..00000000
--- a/trunk/package/feeds/packages/libmpeg2/patches/102-arm_data_preload_check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S
---- libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S	2012-07-30 15:22:58.664964215 +0200
-@@ -19,6 +19,15 @@
- @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- 
-+@ Data preload is supported only by ARM V5TE and above
-+
-+#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
-+     || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
-+     || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \
-+     || defined (__ARM_ARCH_5T__))
-+.macro pld reg
-+.endm
-+#endif
- 	.text
- 
- @ ----------------------------------------------------------------
diff --git a/trunk/package/feeds/packages/libnatpmp/Makefile b/trunk/package/feeds/packages/libnatpmp/Makefile
deleted file mode 100644
index f90d9bc8..00000000
--- a/trunk/package/feeds/packages/libnatpmp/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2011-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libnatpmp
-PKG_VERSION:=20140401
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://miniupnp.free.fr/files
-PKG_MD5SUM:=7c9a7c76e200ead4e6447fe4b105f676
-PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libnatpmp/Default
-  TITLE:=NAT Port Mapping Protocol (NAT-PMP)
-  URL:=http://miniupnp.free.fr/libnatpmp.html
-endef
-
-define Package/libnatpmp/Default/description
-  libnatpmp is an attempt to make a portable and fully compliant implementation
-  of the protocol for the client side. It is based on non blocking sockets and
-  all calls of the API are asynchronous. It is therefore very easy to integrate
-  the NAT-PMP code to any event driven code.
-endef
-
-define Package/libnatpmp
-  $(call Package/libnatpmp/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-endef
-
-define Package/libnatpmp/description
-  $(call Package/libnatpmp/Default/description)
-  This package contains the shared library.
-endef
-
-define Package/natpmpc
-  $(call Package/libnatpmp/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= client
-  DEPENDS:=+libnatpmp
-endef
-
-define Package/natpmpc/description
-  $(call Package/libnatpmp/Default/description)
-  This package contains the natpmp client.
-endef
-
-MAKE_FLAGS += \
-	COPTS="$(TARGET_CFLAGS)" \
-	PREFIX="$(PKG_INSTALL_DIR)" \
-	OS="Linux"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/declspec.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/natpmp.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnatpmp*.{so*,a} $(1)/usr/lib/
-endef
-
-define Package/libnatpmp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libnatpmp.so.* $(1)/usr/lib/
-endef
-
-define Package/natpmpc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/natpmpc $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libnatpmp))
-$(eval $(call BuildPackage,natpmpc))
diff --git a/trunk/package/feeds/packages/libnatpmp/patches/001-install_declspec.patch b/trunk/package/feeds/packages/libnatpmp/patches/001-install_declspec.patch
deleted file mode 100644
index d79dd3f6..00000000
--- a/trunk/package/feeds/packages/libnatpmp/patches/001-install_declspec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ else
- endif
- endif
- 
--HEADERS = natpmp.h
-+HEADERS = natpmp.h declspec.h
- 
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
- 
diff --git a/trunk/package/feeds/packages/libnetfilter-acct/Makefile b/trunk/package/feeds/packages/libnetfilter-acct/Makefile
deleted file mode 100644
index 89266071..00000000
--- a/trunk/package/feeds/packages/libnetfilter-acct/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libnetfilter_acct
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-	http://www.netfilter.org/projects/libnetfilter_acct/files/ \
-	ftp://ftp.netfilter.org/pub/libnetfilter_acct/ \
-	http://mirrors.evolva.ro/netfilter.org/libnetfilter_acct/
-PKG_MD5SUM:=2118d9514c079839ebd9cb3144ad2ad7
-
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libnetfilter-acct
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=API to extended accounting infrastructure
-  URL:=http://www.netfilter.org/projects/libnetfilter_acct/
-  DEPENDS:=+libmnl
-endef
-
-define Package/libnetfilter-acct/description
- libnetfilter_acct is a userspace library providing a programming interface
- (API) to the extended accounting infrastructure.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-static \
-	--enable-shared \
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/libnetfilter_acct \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_acct*.{so*,a,la} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_acct.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libnetfilter-acct/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_acct.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libnetfilter-acct))
diff --git a/trunk/package/feeds/packages/libnfc/Makefile b/trunk/package/feeds/packages/libnfc/Makefile
deleted file mode 100644
index 9a144d25..00000000
--- a/trunk/package/feeds/packages/libnfc/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libnfc
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=1
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://code.google.com/p/libnfc/
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=LGPL-2.1
-PKG_MAINTAINER:=Sebastian Wendel <packages@sourceindex.de>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libnfc/Default
-	TITLE:=A open source library for Near Field Communication (NFC)
-	URL:=http://nfc-tools.org/
-endef
-
-define Package/libnfc
-	$(call Package/libnfc/Default)
-	SECTION:=libs
-	CATEGORY:=Libraries
-	DEPENDS:=+libusb-compat +pcscd +ccid
-endef
-
-define Package/libnfc/description
-	libnfc is the first libre, platform-independent, low level NFC SDK and Programmers API
-
-	* manipulate Jewel Topaz tags using libnfc
-	* manipulate MIFARE Classic and Ultralight tags using libnfc
-
-endef
-
-define Package/nfc-utils
-	$(call Package/libnfc/Default)
-	SECTION:=utils
-	CATEGORY:=Utilities
-	DEPENDS:=+libnfc
-endef
-
-define Package/nfc-utils/description
-	Provide some examples shared functions like print, parity calculation, options parsing
-
-	* Emulates a NFC Forum Tag Type 4 v2.0 (or v1.0)
-	* Jewel dump/restore tool
-	* Lists the first target present of each founded device
-	* MIFARE Classic manipulation example
-	* MIFARE Ultralight dump/restore tool
-	* Extract NDEF Message from a NFC Forum Tag Type 3
-	* Relay example using two PN532 devices
-	* Lists each available NFC device
-
-endef
-
-TARGET_CFLAGS+=$(FPIC)
-CONFIGURE_ARGS+=--without-readline
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/nfc $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfc.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libnfc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.so.* $(1)/usr/lib/
-endef
-
-define Package/nfc-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-forum-tag4 $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-jewel $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-list $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfclassic $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfultralight $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-read-forum-tag3 $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay-picc $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-scan-device $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libnfc))
-$(eval $(call BuildPackage,nfc-utils))
diff --git a/trunk/package/feeds/packages/libogg/Makefile b/trunk/package/feeds/packages/libogg/Makefile
deleted file mode 100644
index e5be9522..00000000
--- a/trunk/package/feeds/packages/libogg/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libogg
-PKG_VERSION:=1.3.2
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/
-PKG_MD5SUM:=5c3a34309d8b98640827e5d0991a4015
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libogg
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libogg
-  URL:=http://xiph.org/ogg/
-endef
-
-define Package/libogg/description
-Ogg project codecs use the Ogg bitstream format to arrange the raw,
-compressed bitstream into a more robust, useful form.  For example,
-the Ogg bitstream makes seeking, time stamping and error recovery
-possible, as well as mixing several sepearate, concurrent media
-streams into a single physical bitstream.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/ogg/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/ogg/* $(1)/usr/include/ogg/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DIR) $(1)/usr/share/aclocal/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
-endef
-
-define Package/libogg/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libogg))
diff --git a/trunk/package/feeds/packages/liboil/Makefile b/trunk/package/feeds/packages/liboil/Makefile
deleted file mode 100644
index 8850c74f..00000000
--- a/trunk/package/feeds/packages/liboil/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# 
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=liboil
-PKG_VERSION:=0.3.17
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
-PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701
-
-PKG_LICENSE:=FREE
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/liboil
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=simple functions optimized for various CPUs
-  URL:=http://liboil.freedesktop.org/wiki/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+librt $(ICONV_DEPENDS) $(INTL_DEPENDS)
-endef
-
-define Package/liboil/description
-  Liboil is a library of simple functions that are optimized for various CPUs.
-  These functions are generally loops implementing simple algorithms, such as
-  converting an array of N integers to floating-point numbers or multiplying
-  and summing an array of N numbers. Such functions are candidates for significant
-  optimization using various techniques, especially by using extended instructions
-  provided by modern CPUs (Altivec, MMX, SSE, etc.).
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-TARGET_CFLAGS += $(FPIC) $(if $(ICONV_FULL),-liconv) $(if $(INTL_FULL),-lintl)
-
-# XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks 
-# final linking stages, so override it until we find why
-MAKE_FLAGS += \
-	VFP_CFLAGS="" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/liboil-0.3/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liboil-0.3.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/liboil/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,liboil))
diff --git a/trunk/package/feeds/packages/liboping/Makefile b/trunk/package/feeds/packages/liboping/Makefile
deleted file mode 100644
index 54b45474..00000000
--- a/trunk/package/feeds/packages/liboping/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=liboping
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=GPL-2.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://verplant.org/liboping/files
-PKG_MD5SUM:=64a6f31310093d2517cfe7f05aa011e0
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/liboping/Default
-  URL:=http://verplant.org/liboping/
-endef
-
-define Package/liboping
-$(call Package/liboping/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=C library to generate ICMP echo requests.
-endef
-
-define Package/oping
-$(call Package/liboping/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Send ICMP echo request to network hosts
-  DEPENDS+= +liboping
-endef
-
-define Package/noping
-$(call Package/liboping/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Ncurses application to send ICMP echo request to network hosts
-  DEPENDS+= +liboping +libncurses
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--without-perl-bindings \
-	--enable-shared \
-	--enable-static
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/oping.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/liboping/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.so.* $(1)/usr/lib/
-endef
-
-define Package/oping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oping $(1)/usr/bin/
-endef
-
-define Package/noping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/noping $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,liboping))
-$(eval $(call BuildPackage,oping))
-$(eval $(call BuildPackage,noping))
diff --git a/trunk/package/feeds/packages/liboping/patches/01-no-werror.patch b/trunk/package/feeds/packages/liboping/patches/01-no-werror.patch
deleted file mode 100644
index 85892849..00000000
--- a/trunk/package/feeds/packages/liboping/patches/01-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
- SUBDIRS = mans
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- include_HEADERS = oping.h
diff --git a/trunk/package/feeds/packages/libowfat/Makefile b/trunk/package/feeds/packages/libowfat/Makefile
deleted file mode 100644
index 173e5dca..00000000
--- a/trunk/package/feeds/packages/libowfat/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-LOWFAT_VERSION=0.29
-
-PKG_NAME:=libowfat
-PKG_VERSION:=$(LOWFAT_VERSION)
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://dl.fefe.de
-PKG_MD5SUM:=1187c6acf11429e7adb9ebe180f644bb
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-# set to 1 to enable debugging
-DEBUG=
-
-define Package/libowfat
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=reimplemented libdjb under GPL
-  URL:=http://www.fefe.de/libowfat/
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += $(FPIC)
-LOWFAT_MAKEOPTS = $(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
-	DEBUG="$(DEBUG)" \
-	VERSION="$(LOWFAT_VERSION)" \
-	OS="Linux"
-
-# work around a nasty gcc bug
-ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
-  LOWFAT_MAKEOPTS += WOPTS=""
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(LOWFAT_MAKEOPTS)
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include/libowfat
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libowfat
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/*.a $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libowfat))
diff --git a/trunk/package/feeds/packages/libowfat/patches/001-fixbuild.patch b/trunk/package/feeds/packages/libowfat/patches/001-fixbuild.patch
deleted file mode 100644
index a21fcd0e..00000000
--- a/trunk/package/feeds/packages/libowfat/patches/001-fixbuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -278,6 +278,8 @@ socket_accept4.o socket_accept6.o socket
- socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
- socket_remote6.o: havesl.h
- 
-+socket_remote4.o: havescope.h
-+
- dns_nd6.o fmt_xlong.o scan_xlong.o fmt_ip6_flat.o $(TEXTCODE_OBJS): haveinline.h
- 
- iob_send.o scan_ip6if.o: havealloca.h
diff --git a/trunk/package/feeds/packages/libp11/Makefile b/trunk/package/feeds/packages/libp11/Makefile
deleted file mode 100644
index 4258604e..00000000
--- a/trunk/package/feeds/packages/libp11/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libp11
-PKG_VERSION:=20131021
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/OpenSC/libp11.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ab6306ee7ede9b2fb9c1fa2c3694c6e7ff044a9e
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_FIXUP:=libtool
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libp11
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=PKCS#11 wrapper library
-  URL:=https://www.opensc-project.org/opensc/wiki/libp11
-  DEPENDS:=+libopenssl
-endef
-
-define Package/libp11/description
-  Libp11 is a library implementing a small layer on top of PKCS#11 API
-  to make using PKCS#11 implementations easier.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libp11.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11.{a,so} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libp11.pc $(1)/usr/lib/pkgconfig/libp11.pc
-endef
-
-define Package/libp11/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libp11))
diff --git a/trunk/package/feeds/packages/libpam/Makefile b/trunk/package/feeds/packages/libpam/Makefile
deleted file mode 100644
index e9c4a3c7..00000000
--- a/trunk/package/feeds/packages/libpam/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libpam
-PKG_VERSION:=1.1.8
-PKG_RELEASE:=4
-
-PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.linux-pam.org/library/
-PKG_MD5SUM:=35b6091af95981b1b2cd60d813b5e4ee
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libpam
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=the Linux-PAM libraries and modules.
-  URL:=http://www.kernel.org/pub/linux/libs/pam
-endef
-
-define Package/libpam/description
-	The Linux-PAM Pluggable Authentication Modules.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--enable-pamlocking \
-		--disable-prelude \
-		--disable-lckpwdf \
-		--disable-selinux \
-		--disable-nls \
-		--disable-rpath \
-		--enable-db=no \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include
-endef
-
-define Package/libpam/install
-	$(INSTALL_DIR) $(1)/lib $(1)/lib/security $(1)/lib/security/pam_filter
-	$(INSTALL_DIR) $(1)/etc $(1)/etc/pam.d
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/lib/*.so* $(1)/lib/
-	$(CP) $(PKG_INSTALL_DIR)/lib/security/*.so* $(1)/lib/security/
-	$(CP) $(PKG_INSTALL_DIR)/lib/security/pam_filter/* $(1)/lib/security/pam_filter/
-	$(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/
-	$(CP) ./files/* $(1)/etc/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,libpam))
diff --git a/trunk/package/feeds/packages/libpam/files/pam.conf b/trunk/package/feeds/packages/libpam/files/pam.conf
deleted file mode 100644
index 3eeb72d3..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# ---------------------------------------------------------------------------#
-# /etc/pam.conf								     #
-# ---------------------------------------------------------------------------#
-#
-# NOTE
-# ----
-#
-# NOTE: Most program use a file under the /etc/pam.d/ directory to setup their
-# PAM service modules. This file is used only if that directory does not exist.
-# ---------------------------------------------------------------------------#
-
-# Format:
-# serv.	module	   ctrl	      module [path]	...[args..]		     #
-# name	type	   flag							     #
-
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/common-account b/trunk/package/feeds/packages/libpam/files/pam.d/common-account
deleted file mode 100644
index 7162548c..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/common-account
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/pam.d/common-account - authorization settings common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of the authorization modules that define
-# the central access policy for use on the system.  The default is to
-# only deny service to users whose accounts are expired in /etc/shadow.
-#
-
-# here are the per-package modules (the "Primary" block)
-account	[success=1 new_authtok_reqd=done default=ignore]	pam_unix.so 
-# here's the fallback if no module succeeds
-account	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-account	required			pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-
-# end of pam-auth-update config
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/common-auth b/trunk/package/feeds/packages/libpam/files/pam.d/common-auth
deleted file mode 100644
index 8fc529d7..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/common-auth
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# /etc/pam.d/common-auth - authentication settings common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of the authentication modules that define
-# the central authentication scheme for use on the system
-# (e.g., /etc/shadow, LDAP, Kerberos, etc.).  The default is to use the
-# traditional Unix authentication mechanisms.
-#
-
-# here are the per-package modules (the "Primary" block)
-auth	[success=1 default=ignore]	pam_unix.so nullok_secure
-# here's the fallback if no module succeeds
-auth	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-auth	required			pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-
-# end of pam-auth-update config
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/common-password b/trunk/package/feeds/packages/libpam/files/pam.d/common-password
deleted file mode 100644
index 5d0dee0a..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/common-password
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# /etc/pam.d/common-password - password-related modules common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define the services to be
-# used to change user passwords.  The default is pam_unix.
-
-# Explanation of pam_unix options:
-#
-# The "sha512" option enables salted SHA512 passwords.  Without this option,
-# the default is Unix crypt.  Prior releases used the option "md5".
-#
-# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in
-# login.defs.
-#
-# See the pam_unix manpage for other options.
-
-# here are the per-package modules (the "Primary" block)
-password	[success=1 default=ignore]	pam_unix.so obscure sha512
-# here's the fallback if no module succeeds
-password	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-password	required			pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-
-# end of pam-auth-update config
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/common-session b/trunk/package/feeds/packages/libpam/files/pam.d/common-session
deleted file mode 100644
index f0d41ccf..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/common-session
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# /etc/pam.d/common-session - session-related modules common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define tasks to be performed
-# at the start and end of sessions of *any* kind (both interactive and
-# non-interactive).
-#
-
-# here are the per-package modules (the "Primary" block)
-session	[default=1]			pam_permit.so
-# here's the fallback if no module succeeds
-session	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-session	required			pam_permit.so
-# The pam_umask module will set the umask according to the system default in
-# /etc/login.defs and user settings, solving the problem of different
-# umask settings with different shells, display managers, remote sessions etc.
-# See "man pam_umask".
-session optional			pam_umask.so
-# and here are more per-package modules (the "Additional" block)
-session	required			pam_unix.so 
-# end of pam-auth-update config
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/common-session-noninteractive b/trunk/package/feeds/packages/libpam/files/pam.d/common-session-noninteractive
deleted file mode 100644
index f4943e1b..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/common-session-noninteractive
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# /etc/pam.d/common-session-noninteractive - session-related modules
-# common to all non-interactive services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define tasks to be performed
-# at the start and end of all non-interactive sessions.
-#
-
-# here are the per-package modules (the "Primary" block)
-session	[default=1]			pam_permit.so
-# here's the fallback if no module succeeds
-session	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-session	required			pam_permit.so
-# The pam_umask module will set the umask according to the system default in
-# /etc/login.defs and user settings, solving the problem of different
-# umask settings with different shells, display managers, remote sessions etc.
-# See "man pam_umask".
-session optional			pam_umask.so
-# and here are more per-package modules (the "Additional" block)
-session	required			pam_unix.so 
-# end of pam-auth-update config
diff --git a/trunk/package/feeds/packages/libpam/files/pam.d/other b/trunk/package/feeds/packages/libpam/files/pam.d/other
deleted file mode 100644
index 6679e4f1..00000000
--- a/trunk/package/feeds/packages/libpam/files/pam.d/other
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# /etc/pam.d/other - specify the PAM fallback behaviour
-#
-# Note that this file is used for any unspecified service; for example
-#if /etc/pam.d/cron  specifies no session modules but cron calls
-#pam_open_session, the session module out of /etc/pam.d/other is
-#used.  If you really want nothing to happen then use pam_permit.so or
-#pam_deny.so as appropriate.
-
-# We fall back to the system default in /etc/pam.d/common-*
-# 
-
-auth       include      common-auth
-account    include      common-account
-password   include      common-password
-session    include      common-session
diff --git a/trunk/package/feeds/packages/libpam/patches/000-OE-libpam-xtests.patch b/trunk/package/feeds/packages/libpam/patches/000-OE-libpam-xtests.patch
deleted file mode 100644
index 19fbaa29..00000000
--- a/trunk/package/feeds/packages/libpam/patches/000-OE-libpam-xtests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This patch is used to create a new sub package libpam-xtests to do more checks.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kang Kai <kai.kang@windriver.com>
---- a/xtests/Makefile.am
-+++ b/xtests/Makefile.am
-@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src
- LDADD = $(top_builddir)/libpam/libpam.la \
- 	$(top_builddir)/libpam_misc/libpam_misc.la
- 
--CLEANFILES = *~ $(XTESTS)
-+CLEANFILES = *~
- 
- EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
- 	tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
-@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS)
- 
- xtests: $(XTESTS) run-xtests.sh
- 	"$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
-+
-+all: $(XTESTS)
-+
-+install: install_xtests
-+
-+install_xtests:
-+	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests
-+	for file in $(EXTRA_DIST) ; do \
-+		$(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \
-+	done
-+	for file in $(XTESTS); do \
-+		$(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \
-+	done
-+
-+.PHONY: all install_xtests
diff --git a/trunk/package/feeds/packages/libpam/patches/000-OE-pam-no-innetgr.patch b/trunk/package/feeds/packages/libpam/patches/000-OE-pam-no-innetgr.patch
deleted file mode 100644
index f7f5b489..00000000
--- a/trunk/package/feeds/packages/libpam/patches/000-OE-pam-no-innetgr.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-innetgr may not be there so make sure that when innetgr is not present
-then we inform about it and not use it.
-
--Khem
---- a/modules/pam_group/pam_group.c
-+++ b/modules/pam_group/pam_group.c
-@@ -656,7 +656,11 @@ static int check_account(pam_handle_t *p
- 	}
- 	/* If buffer starts with @, we are using netgroups */
- 	if (buffer[0] == '@')
-+#ifdef HAVE_INNETGR
- 	  good &= innetgr (&buffer[1], NULL, user, NULL);
-+#else
-+	pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support");
-+#endif
- 	/* otherwise, if the buffer starts with %, it's a UNIX group */
- 	else if (buffer[0] == '%')
-           good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
---- a/modules/pam_time/pam_time.c
-+++ b/modules/pam_time/pam_time.c
-@@ -555,9 +555,13 @@ check_account(pam_handle_t *pamh, const
- 	  }
- 	  /* If buffer starts with @, we are using netgroups */
- 	  if (buffer[0] == '@')
--	    good &= innetgr (&buffer[1], NULL, user, NULL);
-+#ifdef HAVE_INNETGR
-+	       good &= innetgr (&buffer[1], NULL, user, NULL);
-+#else
-+	       pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support");
-+#endif
- 	  else
--	    good &= logic_field(pamh, user, buffer, count, is_same);
-+	       good &= logic_field(pamh, user, buffer, count, is_same);
- 	  D(("with user: %s", good ? "passes":"fails" ));
- 
- 	  /* here we get the time field */
---- a/modules/pam_succeed_if/pam_succeed_if.c
-+++ b/modules/pam_succeed_if/pam_succeed_if.c
-@@ -231,18 +231,27 @@ evaluate_notingroup(pam_handle_t *pamh,
- }
- /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */
- static int
--evaluate_innetgr(const char *host, const char *user, const char *group)
-+evaluate_innetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- 	if (innetgr(group, host, user, NULL) == 1)
- 		return PAM_SUCCESS;
-+#else
-+        pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
-+#endif
-+
- 	return PAM_AUTH_ERR;
- }
- /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
- static int
--evaluate_notinnetgr(const char *host, const char *user, const char *group)
-+evaluate_notinnetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- 	if (innetgr(group, host, user, NULL) == 0)
- 		return PAM_SUCCESS;
-+#else
-+	pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
-+#endif
- 	return PAM_AUTH_ERR;
- }
- 
-@@ -387,14 +396,14 @@ evaluate(pam_handle_t *pamh, int debug,
- 		const void *rhost;
- 		if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
- 			rhost = NULL;
--		return evaluate_innetgr(rhost, user, right);
-+		return evaluate_innetgr(pamh, rhost, user, right);
- 	}
- 	/* (Rhost, user) is not in this group. */
- 	if (strcasecmp(qual, "notinnetgr") == 0) {
- 		const void *rhost;
- 		if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
- 			rhost = NULL;
--		return evaluate_notinnetgr(rhost, user, right);
-+		return evaluate_notinnetgr(pamh, rhost, user, right);
- 	}
- 	/* Fail closed. */
- 	return PAM_SERVICE_ERR;
diff --git a/trunk/package/feeds/packages/libpam/patches/001-no_nis.patch b/trunk/package/feeds/packages/libpam/patches/001-no_nis.patch
deleted file mode 100644
index c9988c7f..00000000
--- a/trunk/package/feeds/packages/libpam/patches/001-no_nis.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/modules/pam_access/pam_access.c
-+++ b/modules/pam_access/pam_access.c
-@@ -44,7 +44,7 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <sys/socket.h>
--#ifdef HAVE_RPCSVC_YPCLNT_H
-+#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS
- #include <rpcsvc/ypclnt.h>
- #endif
- #ifdef HAVE_LIBAUDIT
---- a/modules/pam_unix/pam_unix_passwd.c
-+++ b/modules/pam_unix/pam_unix_passwd.c
-@@ -79,18 +79,18 @@
- #include "passverify.h"
- #include "bigcrypt.h"
- 
--#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER
-+#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER && USE_NIS
- # define HAVE_NIS
- #endif
- 
- #ifdef HAVE_NIS
- # include <rpc/rpc.h>
- 
--# if HAVE_RPCSVC_YP_PROT_H
-+# if HAVE_RPCSVC_YP_PROT_H && USE_NIS
- #  include <rpcsvc/yp_prot.h>
- # endif
- 
--# if HAVE_RPCSVC_YPCLNT_H
-+# if HAVE_RPCSVC_YPCLNT_H && USE_NIS
- #  include <rpcsvc/ypclnt.h>
- # endif
- 
---- a/modules/pam_unix/support.c
-+++ b/modules/pam_unix/support.c
-@@ -19,7 +19,7 @@
- #include <ctype.h>
- #include <syslog.h>
- #include <sys/resource.h>
--#ifdef HAVE_RPCSVC_YPCLNT_H
-+#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS
- #include <rpcsvc/ypclnt.h>
- #endif
- 
-@@ -402,7 +402,7 @@ int _unix_getpwnam(pam_handle_t *pamh, c
- 		}
- 	}
- 
--#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND)
-+#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND) && (USE_NIS)
- 	if (!matched && nis) {
- 		char *userinfo = NULL, *domain = NULL;
- 		int len = 0, i;
---- a/modules/pam_unix/yppasswd_xdr.c
-+++ b/modules/pam_unix/yppasswd_xdr.c
-@@ -15,6 +15,10 @@
- #ifdef HAVE_RPC_RPC_H
- 
- #include <rpc/rpc.h>
-+#ifdef USE_NIS
-+#include <rpcsvc/yp_prot.h>
-+#include <rpcsvc/ypclnt.h>
-+#endif
- #include "yppasswd.h"
- 
- bool_t
diff --git a/trunk/package/feeds/packages/libpam/patches/002-no_yywrap.patch b/trunk/package/feeds/packages/libpam/patches/002-no_yywrap.patch
deleted file mode 100644
index 0d73e4be..00000000
--- a/trunk/package/feeds/packages/libpam/patches/002-no_yywrap.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/conf/pam_conv1/pam_conv_l.c
-+++ b/conf/pam_conv1/pam_conv_l.c
-@@ -534,7 +534,9 @@ void yyset_lineno (int line_number  );
- #ifdef __cplusplus
- extern "C" int yywrap (void );
- #else
--extern int yywrap (void );
-+int yywrap (void ) {
-+	return 1;
-+}
- #endif
- #endif
- 
---- a/doc/specs/parse_l.c
-+++ b/doc/specs/parse_l.c
-@@ -520,7 +520,9 @@ void yyset_lineno (int line_number  );
- #ifdef __cplusplus
- extern "C" int yywrap (void );
- #else
--extern int yywrap (void );
-+int yywrap (void ) {
-+	return 1;
-+}
- #endif
- #endif
- 
diff --git a/trunk/package/feeds/packages/libpam/patches/003-no_doc.patch b/trunk/package/feeds/packages/libpam/patches/003-no_doc.patch
deleted file mode 100644
index d3662151..00000000
--- a/trunk/package/feeds/packages/libpam/patches/003-no_doc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- 
- AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
- 
--SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
-+SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
- 
- CLEANFILES = *~
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -288,7 +288,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
--SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
-+SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
- CLEANFILES = *~
- EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright Make.xml.rules
- ACLOCAL_AMFLAGS = -I m4
diff --git a/trunk/package/feeds/packages/libpam/patches/004-fix_lib64.patch b/trunk/package/feeds/packages/libpam/patches/004-fix_lib64.patch
deleted file mode 100644
index 5605d829..00000000
--- a/trunk/package/feeds/packages/libpam/patches/004-fix_lib64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -28,12 +28,7 @@ dnl If we use /usr as prefix, use /etc f
-         fi
- 	if test ${libdir} = '${exec_prefix}/lib'
- 	then
--		case "`uname -m`" in
--		    x86_64|ppc64|s390x|sparc64)
--			libdir="/lib64" ;;
--		    *)
--			libdir="/lib" ;;
--		esac
-+		libdir="/lib"
- 	fi
- 	if test ${sbindir} = '${exec_prefix}/sbin'
-         then
diff --git a/trunk/package/feeds/packages/libpam/patches/005-fix_ruserok.patch b/trunk/package/feeds/packages/libpam/patches/005-fix_ruserok.patch
deleted file mode 100644
index 1f0f4633..00000000
--- a/trunk/package/feeds/packages/libpam/patches/005-fix_ruserok.patch
+++ /dev/null
@@ -1,364 +0,0 @@
---- a/modules/pam_rhosts/pam_rhosts.c
-+++ b/modules/pam_rhosts/pam_rhosts.c
-@@ -43,6 +43,361 @@
- #include <security/pam_modutil.h>
- #include <security/pam_ext.h>
- 
-+#ifdef __UCLIBC__
-+
-+#include <stdio.h>
-+#include <sys/stat.h>
-+
-+
-+int  __check_rhosts_file = 1;
-+
-+/* Extremely paranoid file open function. */
-+static FILE *
-+iruserfopen (const char *file, uid_t okuser)
-+{
-+  struct stat st;
-+  char *cp = NULL;
-+  FILE *res = NULL;
-+
-+  /* If not a regular file, if owned by someone other than user or
-+     root, if writeable by anyone but the owner, or if hardlinked
-+     anywhere, quit.  */
-+  if (lstat (file, &st))
-+    cp = "lstat failed";
-+  else if (!S_ISREG (st.st_mode))
-+    cp = "not regular file";
-+  else
-+    {
-+      res = fopen (file, "r");
-+      if (!res)
-+	cp = "cannot open";
-+      else if (fstat (fileno (res), &st) < 0)
-+	cp = "fstat failed";
-+      else if (st.st_uid && st.st_uid != okuser)
-+	cp = "bad owner";
-+      else if (st.st_mode & (S_IWGRP|S_IWOTH))
-+	cp = "writeable by other than owner";
-+      else if (st.st_nlink > 1)
-+	cp = "hard linked somewhere";
-+    }
-+
-+  /* If there were any problems, quit.  */
-+  if (cp != NULL)
-+    {
-+      if (res)
-+	fclose (res);
-+      return NULL;
-+    }
-+
-+  return res;
-+}
-+
-+/*
-+ * Returns 1 for blank lines (or only comment lines) and 0 otherwise
-+ */
-+static int
-+__isempty(char *p)
-+{
-+    while (*p && isspace (*p)) {
-+	++p;
-+    }
-+
-+    return (*p == '\0' || *p == '#') ? 1 : 0 ;
-+}
-+
-+/* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
-+static int
-+__icheckhost (u_int32_t raddr, char *lhost, const char *rhost)
-+{
-+	struct hostent *hp;
-+	u_int32_t laddr;
-+	int negate=1;    /* Multiply return with this to get -1 instead of 1 */
-+	char **pp;
-+
-+#ifdef __UCLIBC_HAS_REENTRANT_RPC__
-+	int save_errno;
-+	size_t buflen;
-+	char *buffer;
-+	struct hostent hostbuf;
-+	int herr;
-+#endif
-+
-+#ifdef HAVE_NETGROUP
-+	/* Check nis netgroup.  */
-+	if (strncmp ("+@", lhost, 2) == 0)
-+		return innetgr (&lhost[2], rhost, NULL, NULL);
-+
-+	if (strncmp ("-@", lhost, 2) == 0)
-+		return -innetgr (&lhost[2], rhost, NULL, NULL);
-+#endif /* HAVE_NETGROUP */
-+
-+	/* -host */
-+	if (strncmp ("-", lhost,1) == 0) {
-+		negate = -1;
-+		lhost++;
-+	} else if (strcmp ("+",lhost) == 0) {
-+		return 1;                    /* asking for trouble, but ok.. */
-+	}
-+
-+	/* Try for raw ip address first. */
-+	if (isdigit (*lhost) && (laddr = inet_addr (lhost)) != INADDR_NONE)
-+		return negate * (! (raddr ^ laddr));
-+
-+	/* Better be a hostname. */
-+#ifdef __UCLIBC_HAS_REENTRANT_RPC__
-+	buflen = 1024;
-+	buffer = malloc(buflen);
-+	save_errno = errno;
-+
-+	while (gethostbyname_r (lhost, &hostbuf, buffer, buflen, &hp, &herr)
-+	       != 0) {
-+	    free(buffer);
-+	    return (0);
-+	}
-+	free(buffer);
-+	__set_errno (save_errno);
-+#else
-+	hp = gethostbyname(lhost);
-+#endif /* __UCLIBC_HAS_REENTRANT_RPC__ */
-+
-+	if (hp == NULL)
-+		return 0;
-+
-+	/* Spin through ip addresses. */
-+	for (pp = hp->h_addr_list; *pp; ++pp)
-+		if (!memcmp (&raddr, *pp, sizeof (u_int32_t)))
-+			return negate;
-+
-+	/* No match. */
-+	return (0);
-+}
-+
-+/* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
-+static int
-+__icheckuser (const char *luser, const char *ruser)
-+{
-+
-+    /*
-+      luser is user entry from .rhosts/hosts.equiv file
-+      ruser is user id on remote host
-+      */
-+
-+#ifdef HAVE_NETGROUP
-+    /* [-+]@netgroup */
-+    if (strncmp ("+@", luser, 2) == 0)
-+	return innetgr (&luser[2], NULL, ruser, NULL);
-+
-+    if (strncmp ("-@", luser,2) == 0)
-+	return -innetgr (&luser[2], NULL, ruser, NULL);
-+#endif /* HAVE_NETGROUP */
-+
-+    /* -user */
-+    if (strncmp ("-", luser, 1) == 0)
-+	return -(strcmp (&luser[1], ruser) == 0);
-+
-+    /* + */
-+    if (strcmp ("+", luser) == 0)
-+	return 1;
-+
-+    /* simple string match */
-+    return strcmp (ruser, luser) == 0;
-+}
-+
-+/*
-+ * Returns 0 if positive match, -1 if _not_ ok.
-+ */
-+static int
-+__ivaliduser2(FILE *hostf, u_int32_t raddr,	const char *luser,
-+			  const char *ruser, const char *rhost)
-+{
-+    register const char *user;
-+    register char *p;
-+    int hcheck, ucheck;
-+    char *buf = NULL;
-+    size_t bufsize = 0;
-+    int retval = -1;
-+
-+    while (getline (&buf, &bufsize, hostf) > 0) {
-+	buf[bufsize - 1] = '\0'; /* Make sure it's terminated.  */
-+        p = buf;
-+
-+	/* Skip empty or comment lines */
-+	if (__isempty (p)) {
-+	    continue;
-+	}
-+
-+	/* Skip lines that are too long. */
-+	if (strchr (p, '\n') == NULL) {
-+	    int ch = getc_unlocked (hostf);
-+
-+	    while (ch != '\n' && ch != EOF)
-+	      ch = getc_unlocked (hostf);
-+	    continue;
-+	}
-+
-+	for (;*p && !isspace(*p); ++p) {
-+	    *p = tolower (*p);
-+	}
-+
-+	/* Next we want to find the permitted name for the remote user.  */
-+	if (*p == ' ' || *p == '\t') {
-+	    /* <nul> terminate hostname and skip spaces */
-+	    for (*p++='\0'; *p && isspace (*p); ++p);
-+
-+	    user = p;                   /* this is the user's name */
-+	    while (*p && !isspace (*p))
-+		++p;                    /* find end of user's name */
-+	} else
-+	    user = p;
-+
-+	*p = '\0';              /* <nul> terminate username (+host?) */
-+
-+	/* buf -> host(?) ; user -> username(?) */
-+
-+	/* First check host part */
-+	hcheck = __icheckhost (raddr, buf, rhost);
-+
-+	if (hcheck < 0)
-+	    break;
-+
-+	if (hcheck) {
-+	    /* Then check user part */
-+	    if (! (*user))
-+		user = luser;
-+
-+	    ucheck = __icheckuser (user, ruser);
-+
-+	    /* Positive 'host user' match? */
-+	    if (ucheck > 0) {
-+		retval = 0;
-+		break;
-+	    }
-+
-+	    /* Negative 'host -user' match? */
-+	    if (ucheck < 0)
-+		break;
-+
-+	    /* Neither, go on looking for match */
-+	}
-+    }
-+
-+    free (buf);
-+
-+    return retval;
-+}
-+
-+static int
-+iruserok2 (u_int32_t raddr, int superuser, const char *ruser, const char *luser,
-+		   const char *rhost)
-+{
-+	FILE *hostf = NULL;
-+	int isbad = -1;
-+
-+	if (!superuser)
-+		hostf = iruserfopen (_PATH_HEQUIV, 0);
-+
-+	if (hostf) {
-+		isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost);
-+		fclose (hostf);
-+
-+		if (!isbad)
-+			return 0;
-+	}
-+
-+	if (__check_rhosts_file || superuser) {
-+		char *pbuf;
-+		struct passwd *pwd;
-+		size_t dirlen;
-+		uid_t uid;
-+
-+#ifdef __UCLIBC_HAS_REENTRANT_RPC__
-+		size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
-+		struct passwd pwdbuf;
-+		char *buffer = stack_heap_alloc(buflen);
-+
-+		if (getpwnam_r (luser, &pwdbuf, buffer,
-+			    buflen, &pwd) != 0 || pwd == NULL)
-+		{
-+			stack_heap_free(buffer);
-+			return -1;
-+		}
-+		stack_heap_free(buffer);
-+#else
-+		if ((pwd = getpwnam(luser)) == NULL)
-+			return -1;
-+#endif
-+
-+		dirlen = strlen (pwd->pw_dir);
-+		pbuf = malloc (dirlen + sizeof "/.rhosts");
-+		strcpy (pbuf, pwd->pw_dir);
-+		strcat (pbuf, "/.rhosts");
-+
-+		/* Change effective uid while reading .rhosts.  If root and
-+		   reading an NFS mounted file system, can't read files that
-+		   are protected read/write owner only.  */
-+		uid = geteuid ();
-+		seteuid (pwd->pw_uid);
-+		hostf = iruserfopen (pbuf, pwd->pw_uid);
-+		free(pbuf);
-+
-+		if (hostf != NULL) {
-+			isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost);
-+			fclose (hostf);
-+		}
-+
-+		seteuid (uid);
-+		return isbad;
-+	}
-+	return -1;
-+}
-+
-+int ruserok(const char *rhost, int superuser, const char *ruser,
-+			const char *luser)
-+{
-+        struct hostent *hp;
-+	u_int32_t addr;
-+	char **ap;
-+#ifdef __UCLIBC_HAS_REENTRANT_RPC__
-+	size_t buflen;
-+	char *buffer;
-+	int herr;
-+	struct hostent hostbuf;
-+#endif
-+
-+#ifdef __UCLIBC_HAS_REENTRANT_RPC__
-+	buflen = 1024;
-+	buffer = stack_heap_alloc(buflen);
-+
-+	while (gethostbyname_r (rhost, &hostbuf, buffer,
-+		    buflen, &hp, &herr) != 0 || hp == NULL)
-+	{
-+	    if (herr != NETDB_INTERNAL || errno != ERANGE) {
-+		stack_heap_free(buffer);
-+		return -1;
-+	    } else
-+	    {
-+		/* Enlarge the buffer.  */
-+		buflen *= 2;
-+		stack_heap_free(buffer);
-+		buffer = stack_heap_alloc(buflen);
-+	    }
-+	}
-+	stack_heap_free(buffer);
-+#else
-+	if ((hp = gethostbyname(rhost)) == NULL) {
-+		return -1;
-+	}
-+#endif
-+	for (ap = hp->h_addr_list; *ap; ++ap) {
-+		memmove(&addr, *ap, sizeof(addr));
-+		if (iruserok2(addr, superuser, ruser, luser, rhost) == 0)
-+			return 0;
-+	}
-+	return -1;
-+}
-+
-+#endif /* __UCLIBC__ */
-+
- PAM_EXTERN
- int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,
- 			 const char **argv)
diff --git a/trunk/package/feeds/packages/libpam/patches/006-fix_xdr.patch b/trunk/package/feeds/packages/libpam/patches/006-fix_xdr.patch
deleted file mode 100644
index 97695060..00000000
--- a/trunk/package/feeds/packages/libpam/patches/006-fix_xdr.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- a/modules/pam_unix/yppasswd_xdr.c
-+++ b/modules/pam_unix/yppasswd_xdr.c
-@@ -21,6 +21,268 @@
- #endif
- #include "yppasswd.h"
- 
-+#ifdef __UCLIBC__
-+
-+static const char xdr_zero[BYTES_PER_XDR_UNIT] = {0, 0, 0, 0};
-+
-+/*
-+ * XDR integers
-+ */
-+bool_t
-+xdr_int (XDR *xdrs, int *ip)
-+{
-+
-+#if INT_MAX < LONG_MAX
-+  long l;
-+
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_ENCODE:
-+      l = (long) *ip;
-+      return XDR_PUTLONG (xdrs, &l);
-+
-+    case XDR_DECODE:
-+      if (!XDR_GETLONG (xdrs, &l))
-+	{
-+	  return FALSE;
-+	}
-+      *ip = (int) l;
-+    case XDR_FREE:
-+      return TRUE;
-+    }
-+  return FALSE;
-+#elif INT_MAX == LONG_MAX
-+  return xdr_long (xdrs, (long *) ip);
-+#elif INT_MAX == SHRT_MAX
-+  return xdr_short (xdrs, (short *) ip);
-+#else
-+#error unexpected integer sizes in xdr_int()
-+#endif
-+}
-+
-+/*
-+ * XDR null terminated ASCII strings
-+ * xdr_string deals with "C strings" - arrays of bytes that are
-+ * terminated by a NULL character.  The parameter cpp references a
-+ * pointer to storage; If the pointer is null, then the necessary
-+ * storage is allocated.  The last parameter is the max allowed length
-+ * of the string as specified by a protocol.
-+ */
-+bool_t
-+xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
-+{
-+  char *sp = *cpp;	/* sp is the actual string pointer */
-+  u_int size;
-+  u_int nodesize;
-+
-+  /*
-+   * first deal with the length since xdr strings are counted-strings
-+   */
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_FREE:
-+      if (sp == NULL)
-+	{
-+	  return TRUE;		/* already free */
-+	}
-+      /* fall through... */
-+    case XDR_ENCODE:
-+      if (sp == NULL)
-+	return FALSE;
-+      size = strlen (sp);
-+      break;
-+    case XDR_DECODE:
-+      break;
-+    }
-+  if (!xdr_u_int (xdrs, &size))
-+    {
-+      return FALSE;
-+    }
-+  if (size > maxsize)
-+    {
-+      return FALSE;
-+    }
-+  nodesize = size + 1;
-+
-+  /*
-+   * now deal with the actual bytes
-+   */
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_DECODE:
-+      if (nodesize == 0)
-+	{
-+	  return TRUE;
-+	}
-+      if (sp == NULL)
-+	*cpp = sp = (char *) mem_alloc (nodesize);
-+      if (sp == NULL)
-+	{
-+#ifdef USE_IN_LIBIO
-+	  if (_IO_fwide (stderr, 0) > 0)
-+	    (void) fwprintf (stderr, L"%s",
-+			       _("xdr_string: out of memory\n"));
-+	  else
-+#endif
-+	    (void) fputs (_("xdr_string: out of memory\n"), stderr);
-+	  return FALSE;
-+	}
-+      sp[size] = 0;
-+      /* fall into ... */
-+
-+    case XDR_ENCODE:
-+      return xdr_opaque (xdrs, sp, size);
-+
-+    case XDR_FREE:
-+      mem_free (sp, nodesize);
-+      *cpp = NULL;
-+      return TRUE;
-+    }
-+  return FALSE;
-+}
-+
-+/*
-+ * XDR long integers
-+ * The definition of xdr_long() is kept for backward
-+ * compatibility. Instead xdr_int() should be used.
-+ */
-+bool_t
-+xdr_long (XDR *xdrs, long *lp)
-+{
-+  if (xdrs->x_op == XDR_ENCODE
-+      && (sizeof (int32_t) == sizeof (long)
-+	  || (int32_t) *lp == *lp))
-+    return XDR_PUTLONG (xdrs, lp);
-+
-+  if (xdrs->x_op == XDR_DECODE)
-+    return XDR_GETLONG (xdrs, lp);
-+
-+  if (xdrs->x_op == XDR_FREE)
-+    return TRUE;
-+
-+  return FALSE;
-+}
-+
-+/*
-+ * XDR unsigned integers
-+ */
-+bool_t
-+xdr_u_int (XDR *xdrs, u_int *up)
-+{
-+#if UINT_MAX < ULONG_MAX
-+  u_long l;
-+
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_ENCODE:
-+      l = (u_long) * up;
-+      return XDR_PUTLONG (xdrs, (long *) &l);
-+
-+    case XDR_DECODE:
-+      if (!XDR_GETLONG (xdrs, (long *) &l))
-+	{
-+	  return FALSE;
-+	}
-+      *up = (u_int) l;
-+    case XDR_FREE:
-+      return TRUE;
-+    }
-+  return FALSE;
-+#elif UINT_MAX == ULONG_MAX
-+  return xdr_u_long (xdrs, (u_long *) up);
-+#elif UINT_MAX == USHRT_MAX
-+  return xdr_short (xdrs, (short *) up);
-+#else
-+#error unexpected integer sizes in xdr_u_int()
-+#endif
-+}
-+
-+/*
-+ * XDR opaque data
-+ * Allows the specification of a fixed size sequence of opaque bytes.
-+ * cp points to the opaque object and cnt gives the byte length.
-+ */
-+bool_t
-+xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
-+{
-+  u_int rndup;
-+  static char crud[BYTES_PER_XDR_UNIT];
-+
-+  /*
-+   * if no data we are done
-+   */
-+  if (cnt == 0)
-+    return TRUE;
-+
-+  /*
-+   * round byte count to full xdr units
-+   */
-+  rndup = cnt % BYTES_PER_XDR_UNIT;
-+  if (rndup > 0)
-+    rndup = BYTES_PER_XDR_UNIT - rndup;
-+
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_DECODE:
-+      if (!XDR_GETBYTES (xdrs, cp, cnt))
-+	{
-+	  return FALSE;
-+	}
-+      if (rndup == 0)
-+	return TRUE;
-+      return XDR_GETBYTES (xdrs, (caddr_t)crud, rndup);
-+
-+    case XDR_ENCODE:
-+      if (!XDR_PUTBYTES (xdrs, cp, cnt))
-+	{
-+	  return FALSE;
-+	}
-+      if (rndup == 0)
-+	return TRUE;
-+      return XDR_PUTBYTES (xdrs, xdr_zero, rndup);
-+
-+    case XDR_FREE:
-+      return TRUE;
-+    }
-+  return FALSE;
-+}
-+
-+/*
-+ * XDR unsigned long integers
-+ * The definition of xdr_u_long() is kept for backward
-+ * compatibility. Instead xdr_u_int() should be used.
-+ */
-+bool_t
-+xdr_u_long (XDR *xdrs, u_long *ulp)
-+{
-+  switch (xdrs->x_op)
-+    {
-+    case XDR_DECODE:
-+      {
-+	long int tmp;
-+
-+	if (XDR_GETLONG (xdrs, &tmp) == FALSE)
-+	  return FALSE;
-+
-+	*ulp = (uint32_t) tmp;
-+	return TRUE;
-+      }
-+
-+    case XDR_ENCODE:
-+      if (sizeof (uint32_t) != sizeof (u_long)
-+	  && (uint32_t) *ulp != *ulp)
-+	return FALSE;
-+
-+      return XDR_PUTLONG (xdrs, (long *) ulp);
-+
-+    case XDR_FREE:
-+      return TRUE;
-+    }
-+  return FALSE;
-+}
-+
-+#endif /* UCLIBC */
-+
- bool_t
- xdr_xpasswd(XDR * xdrs, xpasswd * objp)
- {
diff --git a/trunk/package/feeds/packages/libpam/patches/007-cve-2014-2583.patch b/trunk/package/feeds/packages/libpam/patches/007-cve-2014-2583.patch
deleted file mode 100644
index 8d24bead..00000000
--- a/trunk/package/feeds/packages/libpam/patches/007-cve-2014-2583.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Wed, 26 Mar 2014 22:17:23 +0000
-Subject: pam_timestamp: fix potential directory traversal issue (ticket #27)
-
-pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
-the timestamp pathname it creates, so extra care should be taken to
-avoid potential directory traversal issues.
-
-* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
-"." and ".." tty values as invalid.
-(get_ruser): Treat "." and ".." ruser values, as well as any ruser
-value containing '/', as invalid.
-
-Fixes CVE-2014-2583.
-
-Reported-by: Sebastian Krahmer <krahmer@suse.de>
-
-diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c
-index 5193733..b3f08b1 100644
---- a/modules/pam_timestamp/pam_timestamp.c
-+++ b/modules/pam_timestamp/pam_timestamp.c
-@@ -158,7 +158,7 @@ check_tty(const char *tty)
- 		tty = strrchr(tty, '/') + 1;
- 	}
- 	/* Make sure the tty wasn't actually a directory (no basename). */
--	if (strlen(tty) == 0) {
-+	if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
- 		return NULL;
- 	}
- 	return tty;
-@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen)
- 		if (pwd != NULL) {
- 			ruser = pwd->pw_name;
- 		}
-+	} else {
-+		/*
-+		 * This ruser is used by format_timestamp_name as a component
-+		 * of constructed timestamp pathname, so ".", "..", and '/'
-+		 * are disallowed to avoid potential path traversal issues.
-+		 */
-+		if (!strcmp(ruser, ".") ||
-+		    !strcmp(ruser, "..") ||
-+		    strchr(ruser, '/')) {
-+			ruser = NULL;
-+		}
- 	}
- 	if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
- 		*ruserbuf = '\0';
--- 
-cgit v0.10.2
-
diff --git a/trunk/package/feeds/packages/libplist/Makefile b/trunk/package/feeds/packages/libplist/Makefile
deleted file mode 100644
index 4d7cb9c8..00000000
--- a/trunk/package/feeds/packages/libplist/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libplist
-PKG_VERSION:=1.13
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LESSER
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/libimobiledevice/libplist.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cc907c0f162ee84e5698b9c27ac6fb0be8bb9bc0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libplist/Default
-  TITLE:=Apple property list
-  URL:=http://www.libimobiledevice.org/
-endef
-
-define Package/libplist/Default/description
-  A library to handle Apple Property List format whereas it's binary or XML
-endef
-
-define Package/libplist
-  $(call Package/libplist/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxml2
-  TITLE+= library
-endef
-
-define Package/libplist/description
-  $(call Package/libplist/Default/description)
-endef
-
-define Package/libplistcxx
-  $(call Package/libplist/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libplist +libstdcpp
-  TITLE+= C++ library
-endef
-
-define Package/libplistcxx/description
-  $(call Package/libplist/Default/description)
-  This package contains the libplist C++ shared library.
-endef
-
-define Package/libplist-utils
-  $(call Package/libplist/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libplist
-  TITLE+= converter
-endef
-
-define Package/libplist-utils/description
-  $(call Package/libplist/Default/description)
-  This package contains the libplist utilities.
-endef
-
-CONFIGURE_ARGS += \
-	--without-cython
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/plist $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist*.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libplist/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist.so.* $(1)/usr/lib/
-endef
-
-define Package/libplistcxx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++.so.* $(1)/usr/lib/
-endef
-
-define Package/libplist-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/plistutil $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libplist))
-$(eval $(call BuildPackage,libplistcxx))
-$(eval $(call BuildPackage,libplist-utils))
diff --git a/trunk/package/feeds/packages/libpng/Makefile b/trunk/package/feeds/packages/libpng/Makefile
deleted file mode 100644
index 40404588..00000000
--- a/trunk/package/feeds/packages/libpng/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libpng
-PKG_VERSION:=1.2.52
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@SF/libpng
-PKG_MD5SUM:=49d5c71929bf69a172147c47b9309fbe
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_LICENSE:=Libpng GPL-2.0+ BSD-3-Clause
-PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libpng
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib
-  TITLE:=A PNG format files handling library
-  URL:=http://www.libpng.org/pub/png/libpng.html
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(1)/usr/bin/libpng{,12}-config
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DIR) $(2)/bin
-	for f in libpng{,12}-config; do \
-		$(LN) ../../usr/bin/$$$$f $(2)/bin/ ; \
-	done
-endef
-
-define Package/libpng/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libpng))
diff --git a/trunk/package/feeds/packages/libpng/patches/100-config_fix.patch b/trunk/package/feeds/packages/libpng/patches/100-config_fix.patch
deleted file mode 100644
index 3cb6d8a1..00000000
--- a/trunk/package/feeds/packages/libpng/patches/100-config_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scripts/libpng-config-body.in
-+++ b/scripts/libpng-config-body.in
-@@ -83,6 +83,7 @@ while test $# -gt 0; do
- 
-     --static)
-         R_opts=""
-+        libs=${all_libs}
-         ;;
- 
-     *)
diff --git a/trunk/package/feeds/packages/libsamplerate/Makefile b/trunk/package/feeds/packages/libsamplerate/Makefile
deleted file mode 100644
index a7619148..00000000
--- a/trunk/package/feeds/packages/libsamplerate/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsamplerate
-PKG_VERSION:=0.1.8
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/
-PKG_MD5SUM:=1c7fb25191b4e6e3628d198a66a84f47
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsamplerate
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libsndfile
-  TITLE:=Sample Rate Converter
-  URL:=http://www.mega-nerd.com/SRC/index.html
-endef
-
-define Package/libsamplerate/description
- Secret Rabbit Code (aka libsamplerate) is a Sample Rate
- Converter for audio.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--disable-fftw \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/libsamplerate/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsamplerate.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsamplerate))
diff --git a/trunk/package/feeds/packages/libsearpc/Makefile b/trunk/package/feeds/packages/libsearpc/Makefile
deleted file mode 100644
index 4ec9e93a..00000000
--- a/trunk/package/feeds/packages/libsearpc/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsearpc
-PKG_VERSION:=3.1.7
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_LICENSE:=GPL-3.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/haiwen/libsearpc.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8998e7b2c5587f0b94c48db24e2952d08def5add
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libsearpc
-    SECTION:=libs
-    CATEGORY:=Libraries
-    TITLE:=Seafile RPC Library
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=http://seafile.com/
-    DEPENDS:=+glib2 +jansson +python $(ICONV_DEPENDS)
-endef
-
-define Package/libsearpc/description
-    Searpc is a simple C language RPC framework based on GObject system.
-    Searpc handles the serialization/deserialization part of RPC,
-    the transport part is left to users.
-endef
-
-CONFIGURE_ARGS += --enable-compile-demo=no \
-		    --disable-server-pkg
-
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Configure
-endef
-
-define Host/Compile
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/searpc-codegen.py $(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{bin,include}
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsearpc.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/searpc* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsearpc.pc $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/searpc-codegen.py $(1)/usr/bin/
-endef
-
-define Package/libsearpc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsearpc.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/pysearpc $(1)/usr/lib/python2.7/site-packages/
-endef
-
-$(eval $(call BuildPackage,libsearpc))
diff --git a/trunk/package/feeds/packages/libseccomp/Makefile b/trunk/package/feeds/packages/libseccomp/Makefile
deleted file mode 100644
index 8c40fdcb..00000000
--- a/trunk/package/feeds/packages/libseccomp/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2005-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libseccomp
-PKG_VERSION:=2.2.0
-PKG_RELEASE:=2
-PKG_USE_MIPS16:=0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/seccomp/libseccomp/releases/download/v$(PKG_VERSION)/
-PKG_MD5SUM:=e9509301a1fc024cd10127ac1f31792a
-PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
-
-PKG_INSTALL:=1
-PKG_LIBTOOL_PATHS:=. lib
-PKG_CHECK_FORMAT_SECURITY:=0
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_KERNEL_SECCOMP
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libseccomp/Default
-  SUBMENU:=
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=seccomp
-  URL:=https://github.com/seccomp/libseccomp/wiki
-endef
-
-define Package/libseccomp/Default/description
- The libseccomp library provides an easy to use, platform independent, interface
- to the Linux Kernel's syscall filtering mechanism.  The libseccomp API is
- designed to abstract away the underlying BPF based syscall filter language and
- present a more conventional function-call based filtering interface that should
- be familiar to, and easily adopted by, application developers.
-endef
-
-define Package/libseccomp
-$(call Package/libseccomp/Default)
-  TITLE+= (library)
-  DEPENDS+=
-endef
-
-define Package/libseccomp/description
- This package contains the seccomp library.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/seccomp.h \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libseccomp.{a,so*} \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libseccomp.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libseccomp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libseccomp.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libseccomp))
diff --git a/trunk/package/feeds/packages/libshout/Makefile b/trunk/package/feeds/packages/libshout/Makefile
deleted file mode 100644
index ee96b17f..00000000
--- a/trunk/package/feeds/packages/libshout/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libshout
-PKG_VERSION:=2.3.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/
-PKG_MD5SUM:=11765b2592e7ea623ccd93d3f8df172c
-
-PKG_LICENSE:=LGPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libshout
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library which can be used to write a source client like ices
-  URL:=http://www.icecast.org/download.php
-  DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread
-endef
-
-define Package/libshout/description
- libshout allows applications to easily communicate and broadcast
- to an Icecast streaming media server. It handles the socket connections,
- metadata communication, and data streaming for the calling application,
- and lets developers focus on feature sets instead of implementation
- details.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-CONFIGURE_VARS += \
-	VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \
-	VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \
-
-TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link="$(STAGING_DIR)/usr/lib"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/shout $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's| -I/usr/include||' $(1)/usr/lib/pkgconfig/shout.pc
-endef
-
-define Package/libshout/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libshout))
diff --git a/trunk/package/feeds/packages/libshout/patches/120-vorbis-c.patch b/trunk/package/feeds/packages/libshout/patches/120-vorbis-c.patch
deleted file mode 100644
index a9e41f93..00000000
--- a/trunk/package/feeds/packages/libshout/patches/120-vorbis-c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/vorbis.c
-+++ b/src/vorbis.c
-@@ -28,7 +28,7 @@
- #endif
- #include <stdlib.h>
- 
--#include <vorbis/codec.h>
-+#include <tremor/ivorbiscodec.h>
- 
- #include "shout_private.h"
- #include "shout_ogg.h"
diff --git a/trunk/package/feeds/packages/libshout/patches/140-no_example_doc_win32.patch b/trunk/package/feeds/packages/libshout/patches/140-no_example_doc_win32.patch
deleted file mode 100644
index 9e8b5a35..00000000
--- a/trunk/package/feeds/packages/libshout/patches/140-no_example_doc_win32.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -288,12 +288,12 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 foreign
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = include src examples debian doc win32
-+SUBDIRS = include src debian
- EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
- 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
- 	m4/xiph_types.m4
- 
--doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
-+doc_DATA = COPYING NEWS README
- m4datadir = $(datadir)/aclocal
- m4data_DATA = m4/shout.m4
- @HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig
diff --git a/trunk/package/feeds/packages/libsigc++/Makefile b/trunk/package/feeds/packages/libsigc++/Makefile
deleted file mode 100644
index fbb0a561..00000000
--- a/trunk/package/feeds/packages/libsigc++/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsigc++
-PKG_VERSION:=2.4.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libsigc++/2.4
-PKG_MD5SUM:=55945ba6e1652f89999e910f6b52047c
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=LGPL-2.1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsigcxx
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=typesafe callback system for standard C++
-  URL:=http://libsigc.sourceforge.net/
-  DEPENDS:=+libstdcpp
-endef
-
-define Package/libsigcxx/description
- It allows you to define signals and to connect those signals to any
- callback function, either global or a member function, regardless of
- whether it is static or virtual.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-TARGET_CPPFLAGS +=  \
-	-fno-strict-aliasing -fno-inline \
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sigc++-2.0 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libsigcxx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsigcxx))
diff --git a/trunk/package/feeds/packages/libsigc++/patches/001-no_doc_tests_examples.patch b/trunk/package/feeds/packages/libsigc++/patches/001-no_doc_tests_examples.patch
deleted file mode 100644
index f2c22c3b..00000000
--- a/trunk/package/feeds/packages/libsigc++/patches/001-no_doc_tests_examples.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,7 +22,7 @@ doc_subdirs = docs
- else
- doc_subdirs =
- endif
--SUBDIRS = sigc++ tests examples $(doc_subdirs)
-+SUBDIRS = sigc++
- 
- sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
- nodist_sigc_config_HEADERS = sigc++config.h
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -204,7 +204,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = sigc++ tests examples docs
-+DIST_SUBDIRS = sigc++
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
diff --git a/trunk/package/feeds/packages/libsndfile/Makefile b/trunk/package/feeds/packages/libsndfile/Makefile
deleted file mode 100644
index 9e9809de..00000000
--- a/trunk/package/feeds/packages/libsndfile/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsndfile
-PKG_VERSION:=1.0.25
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.mega-nerd.com/libsndfile/files/
-PKG_MD5SUM:=e2b7bb637e01022c7d20f95f9c3990a2
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsndfile
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for reading/writing audio files
-  URL:=http://www.mega-nerd.com/libsndfile/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  DEPENDS:=@!avr32
-endef
-
-define Package/libsndfile/description
- libsndfile is a library of C routines for reading and writing files
- containing sampled audio data.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-alsa \
-	--disable-external-libs \
-	--disable-sqlite
-
-CONFIGURE_VARS += \
-	ac_cv_sys_file_offset_bits=64 \
-	ac_cv_sys_large_files=yes \
-	ac_cv_sys_largefile_CFLAGS=-D_LARGFILE_SOURCE \
-	ac_cv_sys_largefile_LDFLAGS= \
-	ac_cv_sys_largefile_LIBS= \
-	ac_cv_sys_largefile_source=yes
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-define Package/libsndfile/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsndfile))
diff --git a/trunk/package/feeds/packages/libsndfile/patches/001-automake-compat.patch b/trunk/package/feeds/packages/libsndfile/patches/001-automake-compat.patch
deleted file mode 100644
index 2df32ae4..00000000
--- a/trunk/package/feeds/packages/libsndfile/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
-+ACLOCAL_AMFLAGS = -I M4
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
- if BUILD_OCTAVE_MOD
diff --git a/trunk/package/feeds/packages/libsodium/Makefile b/trunk/package/feeds/packages/libsodium/Makefile
deleted file mode 100644
index bd4cb9f3..00000000
--- a/trunk/package/feeds/packages/libsodium/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsodium
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://download.libsodium.org/libsodium/releases
-PKG_MD5SUM:=dc40eb23e293448c6fc908757738003f
-
-PKG_FIXUP:=libtool autoreconf
-PKG_USE_MIPS16:=0
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
-PKG_LICENSE:=ISC
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsodium
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=P(ortable|ackageable) NaCl-based crypto library
-  URL:=https://github.com/jedisct1/libsodium
-  MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
-endef
-
-define Package/libsodium/description
-  NaCl (pronounced "salt") is a new easy-to-use high-speed software library for network communication, encryption, decryption, signatures, etc.
-  NaCl's goal is to provide all of the core operations needed to build higher-level cryptographic tools.
-  Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API.
-  The design choices, particularly in regard to the Curve25519 Diffie-Hellman function, emphasize security (whereas NIST curves emphasize "performance" at the cost of security), and "magic constants" in NaCl/Sodium have clear rationales.
-  The same cannot be said of NIST curves, where the specific origins of certain constants are not described by the standards.
-  And despite the emphasis on higher security, primitives are faster across-the-board than most implementations of the NIST standards.
-endef
-
-define Package/libsodium/config
-menu "Configuration"
-	depends on PACKAGE_libsodium
-	config LIBSODIUM_MINIMAL
-		bool "Compile only what is required for the high-level API (no aes128ctr), should be fine in most cases."
-		default y
-endmenu
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-ssp \
-	$(if $(CONFIG_LIBSODIUM_MINIMAL),--enable-minimal=yes,--enable-minimal=no)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/sodium
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sodium.h $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sodium/*.h $(1)/usr/include/sodium
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsodium.{a,so*} $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsodium.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libsodium/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsodium.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsodium))
diff --git a/trunk/package/feeds/packages/libsoup/Makefile b/trunk/package/feeds/packages/libsoup/Makefile
deleted file mode 100644
index a482b5ed..00000000
--- a/trunk/package/feeds/packages/libsoup/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsoup
-PKG_VERSION:=2.44.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.44
-PKG_MD5SUM:=92aa3667357157e8f3489bcca287f2fa
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
-
-define Package/libsoup
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libsoup
-  URL:=http://live.gnome.org/LibSoup
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 $(ICONV_DEPENDS) $(INTL_DEPENDS)
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-ssl \
-		--disable-glibtest \
-		--without-apache-httpd \
-		--without-gnome \
-	)
-endef
-
-define package/libsoup/decription
-Libsoup is an HTTP library implementation in C
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup}
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.{so*,la,a} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/libsoup/*.h \
-		$(1)/usr/include/libsoup-2.4/libsoup/
-endef
-
-define Package/libsoup/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsoup))
diff --git a/trunk/package/feeds/packages/libsoxr/Makefile b/trunk/package/feeds/packages/libsoxr/Makefile
deleted file mode 100644
index 8f69803f..00000000
--- a/trunk/package/feeds/packages/libsoxr/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org  
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# updated to work with latest source from abrasive
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsoxr
-PKG_VERSION:=0.1.1
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.code.sf.net/p/soxr/code
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=LICENCE
-
-PKG_FIXUP:=libtool
-PKG_REMOVE_FILES:=autogen.sh
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libsoxr
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=The SoX Resampler library
-  URL:=http://sourceforge.net/projects/soxr/
-  MAINTAINER:=Mike Brady <mikebrady@eircom.net>
-  DEPENDS:= +libpthread
-endef
-
-define Package/libsoxr/description
-  The SoX Resampler library
-  High quality, one-dimensional sample-rate conversion library
-endef
-
-CMAKE_OPTIONS:= -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=0 -DBUILD_EXAMPLES=0
-CMAKE_OPTIONS+= -DHAVE_WORDS_BIGENDIAN_EXITCODE=$(if $(CONFIG_BIG_ENDIAN),0,1)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/soxr.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/*.a $(1)/usr/lib/
-endef
-
-define Package/libsoxr/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/*.a $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,libsoxr))
diff --git a/trunk/package/feeds/packages/libssh2/Makefile b/trunk/package/feeds/packages/libssh2/Makefile
deleted file mode 100644
index 4497f389..00000000
--- a/trunk/package/feeds/packages/libssh2/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libssh2
-PKG_VERSION:=1.4.3
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.libssh2.org/download
-PKG_MD5SUM:=071004c60c5d6f90354ad1b701013a0b
-
-PKG_INSTALL:=1
-
-PKG_LICENSE:=BSD
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libssh2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=SSH2 library
-  URL:=http://www.libssh2.org/
-  DEPENDS:=+libopenssl +zlib
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
-endef
-
-define Package/libssh2/description
- libssh2 is a client-side C library implementing the SSH2 protocol.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--disable-examples-build \
-	--with-libssl-prefix=$(STAGING_DIR)/usr
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libssh2.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libssh2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libssh2))
diff --git a/trunk/package/feeds/packages/libtasn1/Makefile b/trunk/package/feeds/packages/libtasn1/Makefile
deleted file mode 100644
index 2b5a2d4b..00000000
--- a/trunk/package/feeds/packages/libtasn1/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2005-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libtasn1
-PKG_VERSION:=4.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/libtasn1
-PKG_MD5SUM:=c26d76d1309dd339365c563076599912
-
-#PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libtasn1
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=An ASN.1 and DER structures manipulation library
-  MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  URL:=ftp://ftp.gnu.org/gnu/libtasn1/
-endef
-
-define Package/libtasn1/description
- This is a library for Abstract Syntax Notation One (ASN.1) and
- Distinguish Encoding Rules (DER) manipulation.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-		--enable-shared \
-		--enable-static
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtasn1*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libtasn1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtasn1))
diff --git a/trunk/package/feeds/packages/libtheora/Makefile b/trunk/package/feeds/packages/libtheora/Makefile
deleted file mode 100644
index d5db86c7..00000000
--- a/trunk/package/feeds/packages/libtheora/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2008-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libtheora
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/
-PKG_MD5SUM:=292ab65cedd5021d6b7ddd117e07cd8e
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING LICENSE
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_DEPENDS:=libvorbis
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/libtheora
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libtheora
-  URL:=http://xiph.org/theora/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+libogg
-endef
-
-define Package/libtheora/description
-Theora is Xiph.Org's first publicly released video codec, intended
-for use within the Foundation's Ogg multimedia streaming system.
-Theora is derived directly from On2's VP3 codec; Currently the
-encoders are nearly identical, but Theora will make use of new
-features supported by the decoder to improve over what is
-is possible with VP3.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-examples \
-		--disable-oggtest \
-		--disable-vorbistest \
-		--disable-sdltest \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/theora/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/theora/* $(1)/usr/include/theora/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libtheora/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtheora))
diff --git a/trunk/package/feeds/packages/libtheora/patches/001-no_docs_tests.patch b/trunk/package/feeds/packages/libtheora/patches/001-no_docs_tests.patch
deleted file mode 100644
index 4a45b8b5..00000000
--- a/trunk/package/feeds/packages/libtheora/patches/001-no_docs_tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am
---- libtheora-1.1.1/Makefile.am	2009-07-14 01:55:02.000000000 +0200
-+++ libtheora-1.1.1.new/Makefile.am	2012-12-05 14:21:06.103521554 +0100
-@@ -8,7 +8,7 @@
- EXAMPLES_DIR =
- endif
- 
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+SUBDIRS = lib include m4 $(EXAMPLES_DIR)
- 
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
-diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in
---- libtheora-1.1.1/Makefile.in	2009-10-01 20:04:07.000000000 +0200
-+++ libtheora-1.1.1.new/Makefile.in	2012-12-05 14:21:18.239521864 +0100
-@@ -164,7 +164,7 @@
- @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
- @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = 
- 
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+SUBDIRS = lib include m4 $(EXAMPLES_DIR)
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
- # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
-@@ -200,7 +200,7 @@
- 	missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
- 	theoradec-uninstalled.pc.in theoradec.pc.in \
- 	theoraenc-uninstalled.pc.in theoraenc.pc.in
--DIST_SUBDIRS = lib include doc tests m4 examples
-+DIST_SUBDIRS = lib include m4 examples
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/trunk/package/feeds/packages/libtheora/patches/002-no_sdl_check.patch b/trunk/package/feeds/packages/libtheora/patches/002-no_sdl_check.patch
deleted file mode 100644
index a1e7256b..00000000
--- a/trunk/package/feeds/packages/libtheora/patches/002-no_sdl_check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libtheora-1.1.1/configure.ac	2009-10-01 20:00:33.000000000 +0200
-+++ libtheora-1.1.1.new/configure.ac	2012-12-05 14:22:26.319523608 +0100
-@@ -313,11 +313,6 @@
- dnl check for SDL
- HAVE_SDL=no
- 
--AM_PATH_SDL(,[
--  HAVE_SDL=yes
--  SDL_LIBS=`$SDL_CONFIG --libs`
--],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
--
- dnl check for OSS
- HAVE_OSS=no
- AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
diff --git a/trunk/package/feeds/packages/libtorrent/Makefile b/trunk/package/feeds/packages/libtorrent/Makefile
deleted file mode 100644
index f6673aca..00000000
--- a/trunk/package/feeds/packages/libtorrent/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2007-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libtorrent
-PKG_VERSION:=0.13.4-git-0
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=72e908707f01ee01a9b4918436c64348878b63f7
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libtorrent
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Rakshasa's BitTorrent library
-  URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libopenssl +libsigcxx
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/libtorrent/description
- LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on
- high performance and good code. The library differentiates itself from other
- implementations by transfering directly from file pages to the network stack.
- On high-bandwidth connections it is able to seed at 3 times the speed of the
- official client.
-endef
-
-TARGET_LDFLAGS += $(LIBGCC_S)
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--enable-aligned \
-	--disable-debug \
-	--enable-openssl \
-	--disable-instrumentation \
-	--with-zlib=$(STAGING_DIR)/usr
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libtorrent/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtorrent))
diff --git a/trunk/package/feeds/packages/libtorrent/patches/100-fix_cross_compile.patch b/trunk/package/feeds/packages/libtorrent/patches/100-fix_cross_compile.patch
deleted file mode 100644
index a0969465..00000000
--- a/trunk/package/feeds/packages/libtorrent/patches/100-fix_cross_compile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- 
---- a/scripts/checks.m4
-+++ b/scripts/checks.m4
-@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
- AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
-   AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <fcntl.h>
-       #include <stdlib.h>
-       #include <unistd.h>
---- a/scripts/common.m4
-+++ b/scripts/common.m4
-@@ -153,7 +153,7 @@ dnl   Need to fix this so that it uses t
- AC_DEFUN([TORRENT_CHECK_EXECINFO], [
-   AC_MSG_CHECKING(for execinfo.h)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <execinfo.h>
-       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
-       ])],
-@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
- AC_DEFUN([TORRENT_CHECK_ALIGNED], [
-   AC_MSG_CHECKING(the byte alignment)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <inttypes.h>
-       int main() {
-         char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
diff --git a/trunk/package/feeds/packages/libtorrent/patches/120-fix-ipv6_socket_datagram.patch b/trunk/package/feeds/packages/libtorrent/patches/120-fix-ipv6_socket_datagram.patch
deleted file mode 100644
index 1a466270..00000000
--- a/trunk/package/feeds/packages/libtorrent/patches/120-fix-ipv6_socket_datagram.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/net/socket_datagram.cc
-+++ b/src/net/socket_datagram.cc
-@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi
-   int r;
- 
-   if (sa != NULL) {
-+#ifdef RAK_USE_INET6
-+    if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) {
-+      uint32_t addr32[4];
-+      sockaddr_in6 mapped_addr;
-+      memset(&mapped_addr, 0, sizeof(mapped_addr));
-+      mapped_addr.sin6_family = AF_INET6;
-+      addr32[0] = 0;
-+      addr32[1] = 0;
-+      addr32[2] = htonl(0xffff);
-+      addr32[3] = sa->sa_inet()->address_n();
-+      memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4);
-+      mapped_addr.sin6_port = sa->sa_inet()->port_n();
-+      r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr));
-+    } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) {
-+      r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6));
-+    } else
-+#endif
-     r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet));
-   } else {
-     r = ::send(m_fileDesc, buffer, length, 0);
diff --git a/trunk/package/feeds/packages/libuecc/Makefile b/trunk/package/feeds/packages/libuecc/Makefile
deleted file mode 100644
index 63b6ebe2..00000000
--- a/trunk/package/feeds/packages/libuecc/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libuecc
-PKG_VERSION:=5
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/80
-PKG_MD5SUM:=cd03c947931c2f4b0eea0bf45654bd34
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYRIGHT
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libuecc
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Very small Elliptic Curve Cryptography library
-  URL:=http://git.universe-factory.net/libuecc/
-endef
-
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
-
-CMAKE_OPTIONS += \
-	-DCMAKE_BUILD_TYPE:String="MINSIZEREL"
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libuecc-$(PKG_VERSION) $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.a $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuecc.pc $(1)/usr/lib/pkgconfig/
-endef
-
-$(eval $(call BuildPackage,libuecc))
diff --git a/trunk/package/feeds/packages/libugpio/Makefile b/trunk/package/feeds/packages/libugpio/Makefile
deleted file mode 100644
index 66168c1e..00000000
--- a/trunk/package/feeds/packages/libugpio/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libugpio
-PKG_VERSION:=0.0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://github.com/mhei/libugpio/releases/download/v$(PKG_VERSION)
-PKG_MD5SUM:=09c35abbc25f7ebff125bc43ff21ac35
-
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LESSER
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libugpio
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=https://github.com/mhei/libugpio
-  TITLE:=Library for using sysfs gpio interface from C programs
-  DEPENDS:=@GPIO_SUPPORT
-endef
-
-define Package/libugpio/description
-  libugpio is a library to ease the use of linux kernel's sysfs
-  gpio interface from C programs and/or other libraries.
-endef
-
-define Package/gpioctl-sysfs
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Tool for controlling gpio pins
-  DEPENDS:=+libugpio
-endef
-
-define Package/gpioctl-sysfs/description
-  Tool for controlling gpio pins using the sysfs api provided by the kernel.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ugpio $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.{so*,a} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libugpio.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libugpio/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.so* $(1)/usr/lib/
-endef
-
-define Package/gpioctl-sysfs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpioctl $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libugpio))
-$(eval $(call BuildPackage,gpioctl-sysfs))
diff --git a/trunk/package/feeds/packages/libunistring/Makefile b/trunk/package/feeds/packages/libunistring/Makefile
deleted file mode 100644
index 1abd5fc7..00000000
--- a/trunk/package/feeds/packages/libunistring/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libunistring
-PKG_VERSION:=0.9.5
-PKG_RELEASE:=1
-PKG_MD5SUM:=1a705bcdcb83799d544137617b377cfd
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/libunistring
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libunistring
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libunistring
-  URL:=http://www.gnu.org/software/libunistring/
-endef
-
-define Package/libunistring/description
-  This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--without-libiconv-prefix \
-	--without-libpth-prefix
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/include/unistring
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/unistring/*.h $(1)/usr/include/unistring/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libunistring/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libunistring))
diff --git a/trunk/package/feeds/packages/libupnp/Makefile b/trunk/package/feeds/packages/libupnp/Makefile
deleted file mode 100644
index ad49703a..00000000
--- a/trunk/package/feeds/packages/libupnp/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libupnp
-PKG_VERSION:=1.6.19
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/pupnp
-PKG_MD5SUM:=ee16e5d33a3ea7506f38d71facc057dd
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libupnp/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://pupnp.sourceforge.net/
-endef
-
-define Package/libupnp
-  $(call Package/libupnp/Default)
-  DEPENDS:=+libpthread
-  TITLE:=UPnP SDK library
-  MENU:=1
-endef
-
-define Package/libupnp/description
-The portable SDK for UPnP Devices (libupnp) provides developers with an API and
-open source code for building control points, devices, and bridges that are
-compliant with Version 1.0 of the  Universal Plug and Play Device Architecture
-Specification.
-endef
-
-define Package/libupnp-sample
-  $(call Package/libupnp/Default)
-  DEPENDS:=libupnp
-  TITLE:=UPnP sample applications
-endef
-
-define Package/libupnp-sample/description
-TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libupnp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.* $(1)/usr/lib/
-endef
-
-define Package/libupnp-sample/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
-endef
-
-$(eval $(call BuildPackage,libupnp))
-$(eval $(call BuildPackage,libupnp-sample))
diff --git a/trunk/package/feeds/packages/libupnpp/Makefile b/trunk/package/feeds/packages/libupnpp/Makefile
deleted file mode 100644
index 8c9071db..00000000
--- a/trunk/package/feeds/packages/libupnpp/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libupnpp
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_MD5SUM:=ff218bbe2df6cf70b73843d951ef838e
-PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libupnpp
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://www.lesbonscomptes.com/upmpdcli
-  DEPENDS+= +libstdcpp +libexpat +librt +libcurl +libupnp
-  TITLE:=The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
-endef
-
-define Package/libupnpp/description
-libupnpp defines useful objects over libupnp and can be used to create both devices
-and control points. It is shared by upmpdcli and upplay.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libupnpp $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp-$(PKG_VERSION).so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.{so,la} $(1)/usr/lib/
-endef
-
-define Package/libupnpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp-$(PKG_VERSION).so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libupnpp))
diff --git a/trunk/package/feeds/packages/liburcu/Makefile b/trunk/package/feeds/packages/liburcu/Makefile
deleted file mode 100644
index 2b2c6a85..00000000
--- a/trunk/package/feeds/packages/liburcu/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=liburcu
-PKG_VERSION:=0.8.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=userspace-rcu-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://lttng.org/files/urcu/
-PKG_MD5SUM:=834d91d939dd55108a05763be9879856
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/liburcu
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=User-space Read-Copy-Update library
-	URL:=https://lttng.org/
-	MAINTAINER:=daniel.salzman@nic.cz
-	DEPENDS:=+libpthread
-endef
-
-define Package/liburcu/description
-	Userspace Read-Copy-Update library.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR)						$(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/urcu*		$(1)/usr/include/
-	$(INSTALL_DIR)						$(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liburcu*.{a,so*}	$(1)/usr/lib/
-endef
-
-define Package/liburcu/install
-	$(INSTALL_DIR)					$(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liburcu*.so.*	$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,liburcu))
diff --git a/trunk/package/feeds/packages/libusbmuxd/Makefile b/trunk/package/feeds/packages/libusbmuxd/Makefile
deleted file mode 100644
index ec15bc2d..00000000
--- a/trunk/package/feeds/packages/libusbmuxd/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libusbmuxd
-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LGPLv2.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/libimobiledevice/libusbmuxd.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f347085157006523622b0a7160be68d14f037c00
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libusbmuxd/Default
-  TITLE:=USB multiplexing daemon
-  URL:=http://www.libimobiledevice.org/
-endef
-
-define Package/libusbmuxd/Default/description
-  This daemon is in charge of multiplexing connections over USB to an iPhone or
-  iPod touch. To users, it means you can sync your music, contacts, photos, etc.
-  over USB. To developers, it means you can connect to any listening localhost
-  socket on the device. usbmuxd is not used for tethering data transfer, which
-  uses a dedicated USB interface as a virtual network device.
-endef
-
-define Package/libusbmuxd
-  $(call Package/libusbmuxd/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+libplist +libpthread +libxml2 +zlib
-endef
-
-define Package/libusbmuxd/description
-  $(call Package/libusbmuxd/Default/description)
-  This package contains the libusbmuxd shared library.
-endef
-
-define Package/libusbmuxd-utils
-  $(call Package/libusbmuxd/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilies
-  DEPENDS:=+libusbmuxd
-endef
-
-define Package/libusbmuxd-utils/description
-  $(call Package/libusbmuxd/Default/description)
-  This package contains the libusbmuxd utilities.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libusbmuxd/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so.* $(1)/usr/lib/
-endef
-
-define Package/libusbmuxd-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libusbmuxd))
-$(eval $(call BuildPackage,libusbmuxd-utils))
diff --git a/trunk/package/feeds/packages/libuv/Makefile b/trunk/package/feeds/packages/libuv/Makefile
deleted file mode 100644
index 6452f1af..00000000
--- a/trunk/package/feeds/packages/libuv/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libuv
-PKG_VERSION:=1.4.2
-PKG_RELEASE:=1
-
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libuv.org/dist/v$(PKG_VERSION)/
-PKG_MD5SUM:=d116fbe695157b799fb8805477e24eff
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libuv
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Cross-platform asychronous I/O library
-  URL:=https://github.com/libuv/libuv
-  DEPENDS:=+libpthread +librt
-endef
-
-define Package/libuv/description
- libuv is a multi-platform support library with a focus on asynchronous I/O. It
- was primarily developed for use by Node.js, but it's also used by Luvit, Julia,
- pyuv, and others.
-endef
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); ./autogen.sh )
-	$(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libuv.so* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuv.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libuv/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libuv.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libuv))
diff --git a/trunk/package/feeds/packages/libuvc/Makefile b/trunk/package/feeds/packages/libuvc/Makefile
deleted file mode 100644
index 3c9b8b9c..00000000
--- a/trunk/package/feeds/packages/libuvc/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libuvc
-
-PKG_VERSION=0.0.5-20140812-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/ktossell/libuvc.git
-PKG_SOURCE_VERSION:=2c6403405872aa865999b95ba15944295adf6c38
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_LICENSE:=BSD
-
-PKG_INSTALL:=1
-CMAKE_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libuvc
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=libuvc
-	DEPENDS:=+libusb-1.0 +libjpeg
-       URL:=https://int80k.com/libuvc
-endef
-
-define Package/libuvc/description
- This package contains libuvc is a cross-platform library for USB video devices, 
- built atop libusb.
-endef
-
-define Package/libuvc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuvc.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{include,lib}
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuvc.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libuvc))
diff --git a/trunk/package/feeds/packages/libv4l/Makefile b/trunk/package/feeds/packages/libv4l/Makefile
deleted file mode 100644
index baf3c7d7..00000000
--- a/trunk/package/feeds/packages/libv4l/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Copyright (C) 2009-2015 OpenWrt.org
-# Copyright (C) 2009 David Cooper <dave@kupesoft.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=v4l-utils
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils
-PKG_MD5SUM:=9cb3c178f937954e65bf30920af433ef
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0 LGPL-2.1
-PKG_LICENSE_FILES:=COPYING COPYING.libv4l
-
-PKG_USE_MIPS16:=0
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:=argp-standalone
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libv4l/Default
-  TITLE:=Video 4 Linux
-  URL:=http://www.linuxtv.org/
-endef
-
-define Package/libv4l/Default/description
-  libv4l is a collection of libraries which adds a thin abstraction layer on
-  top of video4linux2 devices. The purpose of this (thin) layer is to make it
-  easy for application writers to support a wide variety of devices without
-  having to write separate code for different devices in the same class. libv4l
-  consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
-  libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
-  of the drivers for those devices supporting v4l1 compatibility (which many
-  v4l2 drivers do not).
-
-  libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
-  application transparent libv4lconvert conversion where necessary.
-endef
-
-define Package/libv4l
-  $(call Package/libv4l/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= wrapper libraries
-  DEPENDS := +libpthread +librt $(ICONV_DEPENDS)
-endef
-
-define Package/libv4l/description
-  $(call Package/libv4l/Default/description)
-endef
-
-define Package/v4l-utils
-  $(call Package/libv4l/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS := +libv4l $(CXX_DEPENDS) $(ICONV_DEPENDS)
-endef
-
-define Package/v4l-utils/description
-  $(call Package/libv4l/Default/description)
-  This package contains the video4linux utilities.
-endef
-
-TARGET_CFLAGS += $(FPIC) -std=gnu99
-TARGET_LDFLAGS += -largp
-
-CONFIGURE_ARGS+= \
-	--disable-doxygen-doc \
-	--disable-libdvbv5 \
-	--disable-qv4l2 \
-	--without-jpeg \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert}.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libv4l/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/libv4l
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l/v4l{1compat,2convert}.so $(1)/usr/lib/libv4l/
-endef
-
-define Package/v4l-utils/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/rc_maps.cfg $(1)/etc/
-	$(CP) $(PKG_INSTALL_DIR)/etc/rc_keymaps $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{cx18,ivtv}-ctl $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/decode_tm6000 $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ir-keytable $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/v4l2-{compliance,ctl,sysfs-path} $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libv4l))
-$(eval $(call BuildPackage,v4l-utils))
diff --git a/trunk/package/feeds/packages/libv4l/patches/001-no-shm_open-fix.patch b/trunk/package/feeds/packages/libv4l/patches/001-no-shm_open-fix.patch
deleted file mode 100644
index 382f5c7e..00000000
--- a/trunk/package/feeds/packages/libv4l/patches/001-no-shm_open-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -570,7 +570,7 @@ static void v4lcontrol_get_flags_from_db
- struct v4lcontrol_data *v4lcontrol_create(int fd, void *dev_ops_priv,
- 	const struct libv4l_dev_ops *dev_ops, int always_needs_conversion)
- {
--	int shm_fd;
-+	int shm_fd, fdflags;
- 	int i, rc, got_usb_info, speed, init = 0;
- 	char *s, shm_name[256], pwd_buf[1024];
- 	struct v4l2_capability cap;
-@@ -695,33 +695,38 @@ struct v4lcontrol_data *v4lcontrol_creat
- 
- 	if (getpwuid_r(geteuid(), &pwd, pwd_buf, sizeof(pwd_buf), &pwd_p) == 0) {
- 		if (got_usb_info)
--			snprintf(shm_name, 256, "/libv4l-%s:%s:%04x:%04x:%s", pwd.pw_name,
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%s:%s:%04x:%04x:%s", pwd.pw_name,
- 					cap.bus_info, (int)vendor_id, (int)product_id, cap.card);
- 		else
--			snprintf(shm_name, 256, "/libv4l-%s:%s:%s", pwd.pw_name,
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%s:%s:%s", pwd.pw_name,
- 					cap.bus_info, cap.card);
- 	} else {
- 		perror("libv4lcontrol: error getting username using uid instead");
- 		if (got_usb_info)
--			snprintf(shm_name, 256, "/libv4l-%lu:%s:%04x:%04x:%s",
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%lu:%s:%04x:%04x:%s",
- 					(unsigned long)geteuid(), cap.bus_info,
- 					(int)vendor_id, (int)product_id, cap.card);
- 		else
--			snprintf(shm_name, 256, "/libv4l-%lu:%s:%s", (unsigned long)geteuid(),
-+			snprintf(shm_name, 256, "/dev/shm/libv4l-%lu:%s:%s", (unsigned long)geteuid(),
- 					cap.bus_info, cap.card);
- 	}
- 
- 	/* / is not allowed inside shm names */
--	for (i = 1; shm_name[i]; i++)
-+	for (i = 9; shm_name[i]; i++) /* start after "/dev/shm", i = 9 */
- 		if (shm_name[i] == '/')
- 			shm_name[i] = '-';
- 
- 	/* Open the shared memory object identified by shm_name */
--	shm_fd = shm_open(shm_name, (O_CREAT | O_EXCL | O_RDWR), (S_IREAD | S_IWRITE));
-+	shm_fd = open(shm_name, (O_CREAT | O_EXCL | O_RDWR), (S_IREAD | S_IWRITE));
- 	if (shm_fd >= 0)
- 		init = 1;
- 	else
--		shm_fd = shm_open(shm_name, O_RDWR, (S_IREAD | S_IWRITE));
-+		shm_fd = open(shm_name, O_RDWR, (S_IREAD | S_IWRITE));
-+
-+	/* This is all uClibc > 0.9.30 seems to do for shm_open() in librt/shm.c */
-+	fdflags = fcntl(shm_fd, F_GETFD, 0);
-+	if (fdflags >= 0)
-+		fdflags = fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
- 
- 	if (shm_fd >= 0) {
- 		/* Set the shared memory size */
diff --git a/trunk/package/feeds/packages/libv4l/patches/020-add-missing-includes.patch b/trunk/package/feeds/packages/libv4l/patches/020-add-missing-includes.patch
deleted file mode 100644
index 70107d39..00000000
--- a/trunk/package/feeds/packages/libv4l/patches/020-add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/utils/rds-ctl/rds-ctl.cpp
-+++ b/utils/rds-ctl/rds-ctl.cpp
-@@ -29,6 +29,7 @@
- #include <inttypes.h>
- #include <getopt.h>
- #include <sys/types.h>
-+#include <ctype.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/ioctl.h>
diff --git a/trunk/package/feeds/packages/libvorbis/Makefile b/trunk/package/feeds/packages/libvorbis/Makefile
deleted file mode 100644
index 6ce3734f..00000000
--- a/trunk/package/feeds/packages/libvorbis/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libvorbis
-PKG_VERSION:=1.3.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
-PKG_MD5SUM:=55f2288055e44754275a17c9a2497391
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libvorbis
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libvorbis
-  URL:=http://xiph.org/vorbis/
-  DEPENDS:=+libogg
-endef
-
-define Package/libvorbis/description
-Vorbis is a general purpose audio and music encoding format
-contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
-MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
-proprietary formats such as RealAudio G2 and Windows' flavor of the
-month), the Vorbis CODEC specification belongs to the public domain.
-All the technical details are published and documented, and any
-software entity may make full use of the format without license
-fee, royalty or patent concerns.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-oggtest \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/vorbis/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/vorbis/* $(1)/usr/include/vorbis/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DIR) $(1)/usr/share/aclocal/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
-endef
-
-define Package/libvorbis/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libvorbis))
diff --git a/trunk/package/feeds/packages/libvorbisidec/Makefile b/trunk/package/feeds/packages/libvorbisidec/Makefile
deleted file mode 100644
index dce10900..00000000
--- a/trunk/package/feeds/packages/libvorbisidec/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libvorbisidec
-PKG_REV:=20150104
-PKG_VERSION:=1.0.3-$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.xiph.org/tremor.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b56ffce0c0773ec5ca04c466bc00b1bbcaf65aef
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libvorbisidec
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A fixed-point Ogg/Vorbis decoder library
-  DEPENDS:= +libogg
-  URL:=http://wiki.xiph.org/index.php/Tremor
-endef
-
-define Package/libvorbisidec/description
-	libvorbisidec is "tremor", a fixed-point implementation of libvorbis.
-	It also has libogg built-in. It is suitable as a replacement for
-	libvorbis and libogg in tremor-aware applications.
-	Tremor is a decoder only.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-CONFIGURE_ARGS += --enable-shared --enable-static
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libvorbisidec/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libvorbisidec))
diff --git a/trunk/package/feeds/packages/libvpx/Makefile b/trunk/package/feeds/packages/libvpx/Makefile
deleted file mode 100644
index ae25bddf..00000000
--- a/trunk/package/feeds/packages/libvpx/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libvpx
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=1
-
-PKG_REV:=v$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
-PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libvpx
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libvpx
-  URL:=http://www.webmproject.org/
-  DEPENDS:=+libpthread
-endef
-
-define Package/libvpx/description
-   libvpx is a VP8/VP9 Codec SDK.
-endef
-
-CONFIGURE_ARGS = \
-		--target=generic-gnu \
-		--prefix=$(CONFIGURE_PREFIX) \
-		--libdir=/usr/lib \
-		--enable-static \
-		--enable-shared \
-        --disable-examples \
-        --disable-docs \
-        --disable-unit-tests \
-
-# Add --enable-small as openwrt gcc flags are overwritten
-ifneq ($(findstring -Os,$(TARGET_CFLAGS)),)
-CONFIGURE_ARGS += --enable-small
-endif
-
-# libvpx expects gcc as linker but uses $LD if provided
-# However, OpenWRT defines LD as *-uclibc-ld and not *-gcc
-CONFIGURE_VARS += \
-    CROSS=$(GNU_TARGET_NAME) \
-	LD="$(TARGET_CC)" \
-
-MAKE_FLAGS += \
-	LD="$(TARGET_CC)" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/vpx/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/vpx/* $(1)/usr/include/vpx/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libvpx/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libvpx))
diff --git a/trunk/package/feeds/packages/libwebsockets/Makefile b/trunk/package/feeds/packages/libwebsockets/Makefile
deleted file mode 100644
index e82e0720..00000000
--- a/trunk/package/feeds/packages/libwebsockets/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libwebsockets
-
-PKG_VERSION:=1.3-chrome37-firefox30
-PKG_RELEASE:=1
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/warmcat/$(PKG_NAME)/archive/
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
-PKG_LICENSE:=LGPL-2.1+exception
-PKG_LICENSE_FILES:=LICENSE
-
-CMAKE_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_OPTIONS += $(if $(CONFIG_PACKAGE_kmod-ipv6),,-DLWS_IPV6=)
-
-CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON
-
-# other options worth noting
-# CMAKE_OPTIONS += -DLWS_WITHOUT_EXTENSIONS=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_DAEMONIZE=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_SERVER=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_DEBUG=ON
-
-
-define Package/$(PKG_NAME)/Default
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=libwebsockets
-	DEPENDS:=+zlib
-endef
-
-define Package/libwebsockets-openssl
-	$(call Package/$(PKG_NAME)/Default)
-	TITLE += (OpenSSL)
-	DEPENDS += +libopenssl
-	VARIANT:=openssl
-endef
-
-define Package/libwebsockets-cyassl
-	$(call Package/$(PKG_NAME)/Default)
-	TITLE += (CyaSSL)
-	DEPENDS += +libcyassl
-	VARIANT:=cyassl
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-    CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
-    CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
-    CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),cyassl)
-    CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
-    CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
-    CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
-# for cyassl, edit package/libs/cyassl/Makefile to include --enable-opensslextra
-# NOTE: it will compile without it, untested whether it it's needed?!
-    CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
-    CMAKE_OPTIONS += -DLWS_CYASSL_LIB=$(STAGING_DIR)/usr/lib/libcyassl.so
-    CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
-endif
-
-define Package/libwebsockets/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
-endef
-
-Package/$(PKG_NAME)-cyassl/install = $(Package/$(PKG_NAME)/install)
-Package/$(PKG_NAME)-openssl/install = $(Package/$(PKG_NAME)/install)
-
-$(eval $(call BuildPackage,libwebsockets-openssl))
-$(eval $(call BuildPackage,libwebsockets-cyassl))
diff --git a/trunk/package/feeds/packages/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch b/trunk/package/feeds/packages/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch
deleted file mode 100644
index 4413ac92..00000000
--- a/trunk/package/feeds/packages/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4fb4a2353db521667d1ec61480bf8179bf585d5f Mon Sep 17 00:00:00 2001
-From: Karl Palsson <karlp@remake.is>
-Date: Thu, 14 Aug 2014 16:30:48 +0000
-Subject: [PATCH] cyassl: correct include path for 3.1.x
-
----
- lib/private-libwebsockets.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
-index 4194498..fbd22b5 100755
---- a/lib/private-libwebsockets.h
-+++ b/lib/private-libwebsockets.h
-@@ -155,7 +155,7 @@
- #ifdef LWS_OPENSSL_SUPPORT
- #ifdef USE_CYASSL
- #include <cyassl/openssl/ssl.h>
--#include <cyassl/error.h>
-+#include <cyassl/error-ssl.h>
- unsigned char *
- SHA1(const unsigned char *d, size_t n, unsigned char *md);
- #else
--- 
-1.8.3.1
-
diff --git a/trunk/package/feeds/packages/libxerces-c/Makefile b/trunk/package/feeds/packages/libxerces-c/Makefile
deleted file mode 100644
index e892084e..00000000
--- a/trunk/package/feeds/packages/libxerces-c/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libxerces-c
-PKG_VERSION:=3.1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.apache.org/xerces-c.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=Xerces-C_3_1_2
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += \
-	--disable-pretty-make \
-	--enable-transcoder-iconv \
-	--enable-netaccessor-socket \
-	--enable-msgloader-inmemory
-
-TARGET_LDFLAGS += \
-	-lm
-
-define Package/libxerces-c
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Validating XML parser library for C++
-  URL:=http://xerces.apache.org/
-  DEPENDS:=$(CXX_DEPENDS) $(ICONV_DEPENDS) +libc +libpthread
-endef
-
-define Package/libxerces-c-samples
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Validating XML parser library for C++ (samples)
-  URL:=http://xerces.apache.org/
-  DEPENDS:=+libxerces-c
-endef
-
-define Package/libxerces-c/description
-  Xerces-C++ is a validating XML parser written in a portable subset of
-  C++. Xerces-C++ makes it easy to give your application the ability
-  to read and write XML data. A shared library is provided for parsing,
-  generating, manipulating, and validating XML documents. Xerces-C++ is
-  faithful to the XML 1.0 recommendation and associated standards (DOM
-  1.0, DOM 2.0, SAX 1.0, SAX 2.0, Namespaces, XML Schema Part 1 and
-  Part 2). It also provides experimental implementations of XML 1.1
-  and DOM Level 3.0. The parser provides high performance, modularity,
-  and scalability.
-endef
-
-define Package/libxerces-c-samples/description
-  Validating XML parser library for C++ (samples)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/xercesc/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/xercesc/* $(1)/usr/include/xercesc/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c.a,libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xerces-c.pc $(1)/usr/lib/pkgconfig/xerces-c.pc
-endef
-
-define Package/libxerces-c/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/
-endef
-
-define Package/libxerces-c-samples/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libxerces-c))
-$(eval $(call BuildPackage,libxerces-c-samples))
diff --git a/trunk/package/feeds/packages/libxml2/Makefile b/trunk/package/feeds/packages/libxml2/Makefile
deleted file mode 100644
index c83b7c02..00000000
--- a/trunk/package/feeds/packages/libxml2/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libxml2
-PKG_VERSION:=2.9.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://gd.tuwien.ac.at/languages/libxml/ \
-	http://xmlsoft.org/sources/ \
-	ftp://fr.rpmfind.net/pub/libxml/
-PKG_MD5SUM:=9e6a9aca9d155737868b3dc5fd82f788
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libxml2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Gnome XML library
-  URL:=http://xmlsoft.org/
-  DEPENDS:=+libpthread +zlib
-endef
-
-define Package/libxml2/description
-  A library for manipulating XML and HTML resources.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-c14n \
-	--without-catalog \
-	--with-debug \
-	--without-docbook \
-	--with-html \
-	--without-ftp \
-	--without-http \
-	--without-iconv \
-	--without-iso8859x \
-	--without-legacy \
-	--with-output \
-	--without-pattern \
-	--without-push \
-	--without-python \
-	--with-reader \
-	--without-readline \
-	--without-regexps \
-	--with-sax1 \
-	--with-schemas \
-	--with-threads \
-	--with-tree \
-	--with-valid \
-	--with-writer \
-	--with-xinclude \
-	--with-xpath \
-	--with-xptr \
-	--with-zlib=$(STAGING_DIR)/usr \
-	--without-lzma
-
-HOST_CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-c14n \
-	--without-catalog \
-	--with-debug \
-	--without-docbook \
-	--with-html \
-	--without-ftp \
-	--without-http \
-	--without-iconv \
-	--without-iso8859x \
-	--without-legacy \
-	--with-output \
-	--without-pattern \
-	--without-push \
-	--without-python \
-	--with-reader \
-	--without-readline \
-	--without-regexps \
-	--with-sax1 \
-	--with-schemas \
-	--with-threads \
-	--with-tree \
-	--with-valid \
-	--with-writer \
-	--with-xinclude \
-	--with-xpath \
-	--with-xptr \
-	--with-zlib \
-	--without-lzma
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(2)/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(2)/bin/xml2-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{la,a,so*} $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(2)/share/aclocal/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(2)/share/aclocal
-endef
-
-define Package/libxml2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libxml2))
diff --git a/trunk/package/feeds/packages/libxml2/patches/0001-threads-use-forward-declarations-only-for-glibc-fixe.patch b/trunk/package/feeds/packages/libxml2/patches/0001-threads-use-forward-declarations-only-for-glibc-fixe.patch
deleted file mode 100644
index e6c3fbe4..00000000
--- a/trunk/package/feeds/packages/libxml2/patches/0001-threads-use-forward-declarations-only-for-glibc-fixe.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e3e04d254fb6bac49a285775b729e28b0500476c Mon Sep 17 00:00:00 2001
-From: Michael Heimpold <mhei@heimpold.de>
-Date: Sun, 21 Dec 2014 01:03:49 +0100
-Subject: [PATCH] threads: use forward declarations only for glibc (fixes
- #704908)
-
-The declarations of pthread functions, used to generate weak references
-to them, fail to suppress macros. Thus, if any pthread function has
-been provided as a macro, compiling threads.c will fail.
-This breaks on musl libc, which defines pthread_equal as a macro (in
-addition to providing the function, as required).
-
-Prevent the declarations for e.g. musl libc by refining the condition.
-
-The idea for this solution was borrowed from the alpine linux guys, see
-http://git.alpinelinux.org/cgit/aports/tree/main/libxml2/libxml2-pthread.patch
-
-Signed-off-by: Michael Heimpold <mhei@heimpold.de>
----
- threads.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/threads.c
-+++ b/threads.c
-@@ -47,7 +47,7 @@
- #ifdef HAVE_PTHREAD_H
- 
- static int libxml_is_threaded = -1;
--#ifdef __GNUC__
-+#if defined(__GNUC__) && defined(__GLIBC__)
- #ifdef linux
- #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
- extern int pthread_once (pthread_once_t *__once_control,
-@@ -89,7 +89,7 @@ extern int pthread_cond_signal ()
- 	   __attribute((weak));
- #endif
- #endif /* linux */
--#endif /* __GNUC__ */
-+#endif /* defined(__GNUC__) && defined(__GLIBC__) */
- #endif /* HAVE_PTHREAD_H */
- 
- /*
diff --git a/trunk/package/feeds/packages/libxslt/Makefile b/trunk/package/feeds/packages/libxslt/Makefile
deleted file mode 100644
index df80b65b..00000000
--- a/trunk/package/feeds/packages/libxslt/Makefile
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libxslt
-PKG_VERSION:=1.1.28
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	http://xmlsoft.org/sources/ \
-	ftp://fr.rpmfind.net/pub/libxml/
-PKG_MD5SUM:=9667bf6f9310b957254fdcf6596600b7
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libxslt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxml2
-  TITLE:=Gnome XSLT library
-  URL:=http://xmlsoft.org/XSLT/
-endef
-
-define Package/libxslt/description
- A library for XML transformation using XSLT.
-endef
-
-define Package/libexslt
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxslt
-  TITLE:=Gnome XSLT library Extention
-  URL:=http://xmlsoft.org/XSLT/EXSLT/
-endef
-
-define Package/libexslt/description
- An extension for XSLT.
-endef
-
-define Package/xsltproc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libxml2 +libxslt +libexslt
-  TITLE:=Gnome XSLT xsltproc Utility
-  URL:=http://xmlsoft.org/XSLT/
-endef
-
-define Package/xsltproc/description
- XSLT XML transformation utility.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--without-python \
-	--without-crypto \
-	--without-debug \
-	--without-mem-debug \
-	--without-debugger \
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev/Xslt
-	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \
-		$(1)/usr/include/libexslt $(1)/usr/lib \
-		$(1)/usr/lib/pkgconfig $(2)/share/aclocal
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xslt-config \
-		$(2)/bin/
-
-	ln -sf $(STAGING_DIR)/host/bin/xslt-config $(1)/usr/bin/xslt-config
-
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/xslt-config
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libxslt/* \
-		$(1)/usr/include/libxslt/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/aclocal/* \
-		$(2)/share/aclocal
-endef
-
-define Build/InstallDev/Exslt
-	$(INSTALL_DIR) $(1)/usr/include/libexslt $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/libexslt/* \
-		$(1)/usr/include/libexslt/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libexslt.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libexslt.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Build/InstallDev
-	 $(if $(CONFIG_PACKAGE_libxslt),$(call Build/InstallDev/Xslt,$(1),$(2)))
-	 $(if $(CONFIG_PACKAGE_libexslt),$(call Build/InstallDev/Exslt,$(1),$(2)))
-endef
-
-define Package/libxslt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \
-		$(1)/usr/lib/
-endef
-
-define Package/libexslt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libexslt.so.* \
-		$(1)/usr/lib/
-endef
-
-define Package/xsltproc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xsltproc \
-		$(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libxslt))
-$(eval $(call BuildPackage,libexslt))
-$(eval $(call BuildPackage,xsltproc))
diff --git a/trunk/package/feeds/packages/libzdb/Makefile b/trunk/package/feeds/packages/libzdb/Makefile
deleted file mode 100644
index 96bf3a62..00000000
--- a/trunk/package/feeds/packages/libzdb/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libzdb
-PKG_VERSION:=3.0
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-3.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.tildeslash.com/libzdb/dist/
-PKG_MD5SUM:=3bb9efff10a1f3ebc5b76c1055c48635
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:=libzdb/host
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libzdb
-    SECTION:=libs
-    CATEGORY:=Libraries
-    TITLE:=A thread-safe multi database connection pool library
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=http://www.tildeslash.com/libzdb/
-    DEPENDS:=+libsqlite3 +libpq +libmysqlclient +zlib +libpthread +libopenssl
-endef
-
-define Package/libzdb/description
-   zdb is a database library with thread-safe connection pooling. The library can connect
-   transparently to multiple database systems. It has zero runtime configuration and connections
-   are specified via a URL scheme. A modern object-oriented API is provided.
-   zdb supports MySQL, PostgreSQL, SQLite, and Oracle.
-   NOTE: This package does not include Oracle support.
-endef
-
-CONFIGURE_ARGS += --disable-profiling \
-		    --enable-optimized \
-		    --with-mysql \
-		    --with-postgresql \
-		    --with-sqlite \
-		    --enable-sqliteunlock \
-		    --enable-openssl
-
-TARGET_CPPFLAGS += -std=c99
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Hooks/HostConfigure/Pre
-endef
-
-define Host/Configure
-endef
-
-define Host/Compile
-	$(HOSTCC) $(HOST_BUILD_DIR)/tools/filterh/lex.yy.c -o $(HOST_BUILD_DIR)/tools/bin/filterh
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
-define Build/Compile
-	$(call Build/Compile/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/zdb
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/zdb/ $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zdb.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libzdb/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libzdb))
diff --git a/trunk/package/feeds/packages/libzdb/patches/010-cross-compile-fixes.patch b/trunk/package/feeds/packages/libzdb/patches/010-cross-compile-fixes.patch
deleted file mode 100644
index 18507da8..00000000
--- a/trunk/package/feeds/packages/libzdb/patches/010-cross-compile-fixes.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
---- libzdb-3.0.orig/configure.ac	2014-01-06 22:17:57.000000000 +0100
-+++ libzdb-3.0/configure.ac	2014-11-20 13:59:27.456957651 +0100
-@@ -196,15 +196,6 @@ AC_SEARCH_LIBS([pthread_create], [pthrea
- # Database Libraries 
- 
- mysql="yes"
--check_mysql_config() 
--{
--        AC_PATH_PROG([MYSQLCONFIG], [mysql_config], [no], [$PATH:/usr/local/bin:/usr/local/mysql/bin])
--        if test "x$MYSQLCONFIG" = "xno" 
--        then
--                AC_MSG_WARN([mysql_config is required to build libzdb with mysql])
--                mysql="no"
--        fi
--}
- AC_MSG_CHECKING(for mysql)
- AC_ARG_WITH([mysql], 
-         AS_HELP_STRING([--with-mysql(=<path>)], 
-@@ -216,22 +207,20 @@ AC_ARG_WITH([mysql],
-                         mysql="no"
-                 else
-                         AC_MSG_RESULT([yes])
--                        AC_CHECK_FILE([$with_mysql], [MYSQLCONFIG=$with_mysql], [check_mysql_config])        
-                 fi
-         ],
-         [
-                 AC_MSG_RESULT([yes])
--                check_mysql_config
-         ])
- if test "xyes" = "x$mysql"; then
-         svd_CPPFLAGS=$CPPFLAGS
-         svd_LDFLAGS=$LDFLAGS
--        CPPFLAGS="`$MYSQLCONFIG --include` $CPPFLAGS"
--        LDFLAGS="`$MYSQLCONFIG --libs` $LDFLAGS"
-+        CPPFLAGS="-I$STAGING_DIR/usr/include/mysql $CPPFLAGS"
-+        LDFLAGS="-L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib $LDFLAGS"
-         AC_CHECK_HEADERS([mysql.h], [], [mysql="no"])
-         if test "xyes" = "x$mysql"; then
--                DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`"
--                DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`"
-+                DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/mysql"
-+                DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lnsl -lm"
-                 AC_DEFINE([HAVE_LIBMYSQLCLIENT], 1, [Define to 1 to enable mysql])
-         else
-                 CPPFLAGS=$svd_CPPFLAGS
-@@ -241,15 +230,6 @@ fi
- AM_CONDITIONAL([WITH_MYSQL], test "xyes" = "x$mysql")
- 
- postgresql="yes"
--check_postgres_config() 
--{
--        AC_PATH_PROG([PGCONFIG], [pg_config], [no], [$PATH:/usr/local/bin:/usr/local/pgsql/bin])
--        if test "x$PGCONFIG" = "xno"
--        then
--                AC_MSG_WARN([pg_config is required to build libzdb with postgresql])
--                postgresql="no"
--        fi
--}
- AC_MSG_CHECKING(for postgresql)
- AC_ARG_WITH([postgresql], 
-         AS_HELP_STRING([--with-postgresql(=<path>)], 
-@@ -261,22 +241,20 @@ AC_ARG_WITH([postgresql],
-                         postgresql="no"
-                 else
-                         AC_MSG_RESULT([yes])
--                        AC_CHECK_FILE([$with_postgresql], [PGCONFIG=$with_postgresql],[check_postgres_config])
-                 fi
-         ],
-         [
-                 AC_MSG_RESULT([yes])
--                check_postgres_config
-         ])
- if test "xyes" = "x$postgresql"; then
-         svd_CPPFLAGS=$CPPFLAGS
-         svd_LDFLAGS=$LDFLAGS
--        CPPFLAGS="-I`$PGCONFIG --includedir` $CPPFLAGS"
--        LDFLAGS="-L`$PGCONFIG --libdir` $LDFLAGS"
-+        CPPFLAGS="-I$STAGING_DIR/usr/include/postgresql -I$STAGING_DIR/usr/include $CPPFLAGS"
-+        LDFLAGS="-L$STAGING_DIR/usr/lib $LDFLAGS"
-         AC_CHECK_HEADERS([libpq-fe.h], [], [postgresql="no"])
-         if test "xyes" = "x$postgresql"; then
--                DBCPPFLAGS="$DBCPPFLAGS -I`$PGCONFIG --includedir`"
--                DBLDFLAGS="$DBLDFLAGS -L`$PGCONFIG --libdir` -lpq"
-+                DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/postgresql -I$STAGING_DIR/usr/include"
-+                DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib -lpq"
-                 AC_DEFINE([HAVE_LIBPQ], 1, [Define to 1 to enable postgresql])
-         else
-                 CPPFLAGS=$svd_CPPFLAGS
-@@ -298,22 +276,7 @@ AC_ARG_WITH([sqlite],
-                         sqlite="no"
-                 else
-                         AC_MSG_RESULT([yes])
--                        AC_CHECK_FILE([$with_sqlite],
--                        [
--                                svd_LDFLAGS=$LDFLAGS
--                                svd_CPPFLAGS=$CPPFLAGS
--                                LDFLAGS="-L$with_sqlite/lib $LDFLAGS -lsqlite3"
--                                CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
--                                AC_SEARCH_LIBS([sqlite3_open], [sqlite3],
--                                [
--                                        DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
--                                        DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
--                                ],[sqlite="no"])
--                                LDFLAGS=$svd_LDFLAGS
--                                CPPFLAGS=$svd_CPPFLAGS
--   
--                        ],
--                        AC_SEARCH_LIBS([sqlite3_open], [sqlite3], [], [sqlite="no"]))
-+                        AC_SEARCH_LIBS([sqlite3_open], [sqlite3], [], [sqlite="no"])
-                 fi
-         ], 
-         [
-@@ -328,20 +291,8 @@ if test "xyes" = "x$sqlite"; then
- fi
- AM_CONDITIONAL([WITH_SQLITE], test "xyes" = "x$sqlite")
- 
--oracle="yes"
--AC_MSG_CHECKING(for oracle)
--AX_LIB_ORACLE_OCI
--if test -n "$ORACLE_OCI_CFLAGS" -a -n "$ORACLE_OCI_LDFLAGS"; then
--        DBCPPFLAGS="$DBCPPFLAGS $ORACLE_OCI_CFLAGS"
--        DBLDFLAGS="$DBLDFLAGS $ORACLE_OCI_LDFLAGS"
--        AC_DEFINE([HAVE_ORACLE], 1, [Define to 1 to enable oracle])
--else
--        oracle="no"
--fi
--AM_CONDITIONAL([WITH_ORACLE], test "xyes" = "x$oracle")
--
- # Test if any database system was found
--if test "xno" = "x$postgresql" -a "xno" = "x$mysql" -a "xno" = "x$sqlite" -a "xno" = "x$oracle"; then
-+if test "xno" = "x$postgresql" -a "xno" = "x$mysql" -a "xno" = "x$sqlite"; then
-         AC_MSG_ERROR([No available database found or selected. Try configure --help])
- fi
- 
-@@ -358,23 +309,6 @@ AC_HEADER_STDC
- # Functions 
- # ------------------------------------------------------------------------
- 
--# Require a working setjmp
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[
--        #include <setjmp.h>
--        ]],
--        [[jmp_buf env; setjmp(env);]])], 
--        [], [AC_MSG_FAILURE([setjmp is required])]
--)
--
--# Require that we have vsnprintf that conforms to c99. I.e. does bounds check
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[
--        #include <stdarg.h> 
--        #include <stdio.h>
--        ]],
--        [[char t[1]; va_list ap; int n = vsnprintf(t, 1, "hello", ap); if(n == 5) return 0;return 1;]])], 
--        [], [AC_MSG_FAILURE([vsnprintf does not conform to c99])]
--)
--
- AC_CHECK_FUNCS([timegm])
- 
- 
-@@ -487,11 +421,6 @@ echo "|   PostgreSQL:
- else
- echo "|   PostgreSQL:                                   DISABLED   |"
- fi
--if test "xyes" = "x$oracle"; then
--echo "|   Oracle:                                       ENABLED    |"
--else
--echo "|   Oracle:                                       DISABLED   |"
--fi
- echo "+------------------------------------------------------------+"
- 
- 
-diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
---- libzdb-3.0.orig/Makefile.am	2014-01-06 22:34:08.000000000 +0100
-+++ libzdb-3.0/Makefile.am	2014-11-20 13:51:22.508204689 +0100
-@@ -45,11 +45,6 @@ libzdb_la_SOURCES += src/db/sqlite/SQLit
-                      src/db/sqlite/SQLiteResultSet.c \
-                      src/db/sqlite/SQLitePreparedStatement.c
- endif
--if WITH_ORACLE
--libzdb_la_SOURCES += src/db/oracle/OracleConnection.c \
--                     src/db/oracle/OracleResultSet.c \
--                     src/db/oracle/OraclePreparedStatement.c
--endif
- 
- API_INTERFACES  = src/zdb.h src/db/ConnectionPool.h src/db/Connection.h \
-                   src/db/ResultSet.h src/net/URL.h src/db/PreparedStatement.h \
diff --git a/trunk/package/feeds/packages/libzdb/patches/020-filterh-use-host-built-version.patch b/trunk/package/feeds/packages/libzdb/patches/020-filterh-use-host-built-version.patch
deleted file mode 100644
index 74c166a6..00000000
--- a/trunk/package/feeds/packages/libzdb/patches/020-filterh-use-host-built-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
---- libzdb-3.0.orig/Makefile.am	2014-01-06 22:34:08.000000000 +0100
-+++ libzdb-3.0/Makefile.am	2014-11-19 20:26:20.588547729 +0100
-@@ -1,5 +1,7 @@
- # Copyright (C) Tildeslash Ltd. All rights reserved.
- 
-+include $(TOPDIR)/rules.mk
-+
- AUTOMAKE_OPTIONS = foreign no-dependencies subdir-objects
- ACLOCAL_AMFLAGS  = -I m4
- 
-@@ -12,7 +14,7 @@ LIBRARY_NAME    = zdb
- 
- RE2C		= @RE2C@
- RE2CFLAGS       = -b
--FILTERH         = ./tools/bin/filterh
-+FILTERH         = $(STAGING_DIR_HOST)/bin/filterh
- 
- AM_CPPFLAGS     = $(CPPFLAGS) $(DBCPPFLAGS)
- AM_CPPFLAGS     += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions
diff --git a/trunk/package/feeds/packages/lighttpd/Makefile b/trunk/package/feeds/packages/lighttpd/Makefile
deleted file mode 100644
index 932fc2a7..00000000
--- a/trunk/package/feeds/packages/lighttpd/Makefile
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# Copyright (C) 2006-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.35
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_MD5SUM:=c7ae774eab4cb7ac85e41b712f4ee9ba
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lighttpd/Default
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.lighttpd.net/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/lighttpd
-  $(call Package/lighttpd/Default)
-  MENU:=1
-  DEPENDS:=+LIGHTTPD_SSL:libopenssl +libpcre +libpthread
-  TITLE:=A flexible and lightweight web server
-endef
-
-define Package/lighttpd/config
-config LIGHTTPD_SSL
-	bool "SSL support"
-	depends on PACKAGE_lighttpd
-	default y
-	help
-	  Implements SSL support in lighttpd (using libopenssl). This
-	  option is required if you enable the SSL engine in your
-	  lighttpd confguration file.
-endef
-
-CONFIGURE_ARGS+= \
-	--libdir=/usr/lib/lighttpd \
-	--sysconfdir=/etc/lighttpd \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-attr \
-	--without-bzip2 \
-	--without-fam \
-	--without-gdbm \
-	--without-ldap \
-	--without-lua \
-	--without-memcache \
-	--with-pcre \
-	--without-valgrind \
-	 $(call autoconf_bool,CONFIG_IPV6,ipv6)
-
-CONFIGURE_VARS+= \
-	PCRE_LIB="-lpcre" \
-
-ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),)
-  CONFIGURE_ARGS+= \
-	--with-openssl="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-	--without-openssl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-mysql-vhost),)
-  CONFIGURE_ARGS+= \
-	--with-mysql
-else
-  CONFIGURE_ARGS+= \
-	--without-mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-webdav),)
-  CONFIGURE_ARGS+= \
-	--with-webdav-locks \
-	--with-webdav-props
-  # XXX: needed by sqlite3 to prevent segfaults in mod_webdav.so
-  CONFIGURE_VARS+= \
-	LIBS="-lpthread"
-else
-  CONFIGURE_ARGS+= \
-	--without-webdav-locks \
-	--without-webdav-props
-endif
-
-define Build/Configure
-$(call Build/Configure/Default)
-	# XXX: override pcre (mis)detection by ./configure when cross-compiling
-	echo "#define HAVE_LIBPCRE 1" >>$(PKG_BUILD_DIR)/config.h
-	echo "#define HAVE_PCRE_H 1" >>$(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/lighttpd/conffiles
-/etc/lighttpd/lighttpd.conf
-endef
-
-define Package/lighttpd/install
-	$(INSTALL_DIR) $(1)/etc/lighttpd
-	$(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/config/conf.d/mime.conf $(1)/etc/lighttpd/
-	$(INSTALL_DIR) $(1)/etc/lighttpd/conf.d
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd
-	$(INSTALL_DIR) $(1)/usr/lib/lighttpd
-	for m in dirlisting indexfile staticfile; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/
-endef
-
-define BuildPlugin
-  define Package/lighttpd-mod-$(1)
-    $(call Package/lighttpd/Default)
-    DEPENDS:=lighttpd
-    ifneq ($(3),)
-      DEPENDS+= $(3)
-    endif
-    TITLE:=$(2) module
-  endef
-
-  define Package/lighttpd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/lighttpd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$(1).so $$(1)/usr/lib/lighttpd
-	$(INSTALL_DIR) $$(1)/etc/lighttpd/conf.d
-	if [ -f $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf ]; then \
-		$(CP) $(PKG_BUILD_DIR)/doc/config/conf.d/$(1).conf $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
-	else \
-		echo 'server.modules += ( "mod_$(1)" )' > $$(1)/etc/lighttpd/conf.d/$(4)-$(1).conf ; \
-	fi
-  endef
-
-  $$(eval $$(call BuildPackage,lighttpd-mod-$(1)))
-endef
-
-$(eval $(call BuildPackage,lighttpd))
-
-# First, permit redirect from HTTP to HTTPS.
-$(eval $(call BuildPlugin,redirect,URL redirection,+PACKAGE_lighttpd-mod-redirect:libpcre,10))
-
-# Next, permit authentication.
-$(eval $(call BuildPlugin,auth,Authentication,,20))
-
-# Finally, everything else.
-$(eval $(call BuildPlugin,access,Access restrictions,,30))
-$(eval $(call BuildPlugin,accesslog,Access logging,,30))
-$(eval $(call BuildPlugin,alias,Directory alias,,30))
-$(eval $(call BuildPlugin,cgi,CGI,,30))
-$(eval $(call BuildPlugin,cml,Cache Meta Language,,30))
-$(eval $(call BuildPlugin,compress,Compress output,+PACKAGE_lighttpd-mod-compress:zlib,30))
-$(eval $(call BuildPlugin,evasive,Evasive,,30))
-$(eval $(call BuildPlugin,evhost,Exnhanced Virtual-Hosting,,30))
-$(eval $(call BuildPlugin,expire,Expire,,30))
-$(eval $(call BuildPlugin,extforward,Extract client,,30))
-$(eval $(call BuildPlugin,fastcgi,FastCGI,,30))
-$(eval $(call BuildPlugin,flv_streaming,FLV streaming,,30))
-$(eval $(call BuildPlugin,magnet,Magnet,,30))
-$(eval $(call BuildPlugin,mysql_vhost,Mysql virtual hosting,+PACKAGE_lighttpd-mod-mysql_vhost:libmysqlclient,30))
-$(eval $(call BuildPlugin,proxy,Proxy,,30))
-$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre,30))
-$(eval $(call BuildPlugin,rrdtool,RRDtool,,30))
-$(eval $(call BuildPlugin,scgi,SCGI,,30))
-$(eval $(call BuildPlugin,secdownload,Secure and fast download,,30))
-$(eval $(call BuildPlugin,setenv,Environment variable setting,,30))
-$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,30))
-$(eval $(call BuildPlugin,ssi,SSI,+libpcre,30))
-$(eval $(call BuildPlugin,status,Server status display,,30))
-$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre,30))
-$(eval $(call BuildPlugin,userdir,User directory,,30))
-$(eval $(call BuildPlugin,usertrack,User tracking,,30))
-$(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,30))
-
diff --git a/trunk/package/feeds/packages/lighttpd/files/lighttpd.conf b/trunk/package/feeds/packages/lighttpd/files/lighttpd.conf
deleted file mode 100644
index 04b06bc3..00000000
--- a/trunk/package/feeds/packages/lighttpd/files/lighttpd.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-server.modules = (
-)
-
-server.document-root        = "/www"
-server.upload-dirs          = ( "/tmp" )
-server.errorlog             = "/var/log/lighttpd/error.log"
-server.pid-file             = "/var/run/lighttpd.pid"
-server.username             = "http"
-server.groupname            = "www-data"
-
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm",
-                                "index.lighttpd.html" )
-
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-### Options that are useful but not always necessary:
-#server.chroot               = "/"
-#server.port                 = 81
-#server.bind                 = "localhost"
-#server.tag                  = "lighttpd"
-#server.errorlog-use-syslog  = "enable"
-#server.network-backend      = "write"
-
-### Use IPv6 if available
-#include_shell "/usr/share/lighttpd/use-ipv6.pl"
-
-#dir-listing.encoding        = "utf-8"
-#server.dir-listing          = "enable"
-
-include       "/etc/lighttpd/mime.conf"
-include_shell "cat /etc/lighttpd/conf.d/*.conf"
diff --git a/trunk/package/feeds/packages/lighttpd/files/lighttpd.init b/trunk/package/feeds/packages/lighttpd/files/lighttpd.init
deleted file mode 100644
index 936c7f6c..00000000
--- a/trunk/package/feeds/packages/lighttpd/files/lighttpd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-SERVICE_USE_PID=1
-
-START=50
-
-start() {
-	user_exists http || user_add http
-	[ -d /var/log/lighttpd ] || {
-		mkdir -m 0775 -p /var/log/lighttpd
-		chgrp www-data /var/log/lighttpd
-	}
-	service_start /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
-}
-
-stop() {
-	service_stop /usr/sbin/lighttpd
-}
-
diff --git a/trunk/package/feeds/packages/linknx/Makefile b/trunk/package/feeds/packages/linknx/Makefile
deleted file mode 100644
index 06083fc9..00000000
--- a/trunk/package/feeds/packages/linknx/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=linknx
-PKG_VERSION:=0.0.1.32
-PKG_RELEASE:=6
-PKG_MD5SUM:=7ecc1208f59bceb05068c752b2250b63
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE_URL:=@SF/linknx
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DEPENDS:=argp-standalone
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/linknx
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=KNX home automation platform
-  URL:=http://sourceforge.net/projects/linknx/
-  DEPENDS:=+pthsem +lua +luac +libstdcpp +libcurl +libesmtp
-endef
-
-CONFIGURE_ARGS+= \
-	--verbose \
-	--without-pth-test \
-	--without-log4cpp \
-	--with-lua \
-	--with-libcurl \
-	--without-mysql
-
-EXTRA_LDFLAGS+= \
-	-fno-builtin
-
-define Package/linknx/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/linknx $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/linknx.init $(1)/etc/init.d/linknx
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/linknx.config $(1)/etc/config/linknx
-	$(INSTALL_DATA) ./files/linknx.xml.dist $(1)/etc/linknx.xml.dist
-	$(INSTALL_DIR) $(1)/tmp/linknx/persist
-endef
-
-define Package/linknx/conffiles
-/etc/config/linknx
-/etc/linknx.xml.dist
-endef
-
-$(eval $(call BuildPackage,linknx))
diff --git a/trunk/package/feeds/packages/linknx/files/linknx.config b/trunk/package/feeds/packages/linknx/files/linknx.config
deleted file mode 100644
index d2f05628..00000000
--- a/trunk/package/feeds/packages/linknx/files/linknx.config
+++ /dev/null
@@ -1,8 +0,0 @@
-config daemon args
-        # daemon is started as 'linknx --config=$conf $options'
-        # use 'linknx --help' to get all possible options'
-        #
-        # typical example
-        option conf '/etc/linknx.xml'
-        option options '-w --daemon=/tmp/linknx/linknx.log --pid-file=/var/run/linknx.pid'
-
diff --git a/trunk/package/feeds/packages/linknx/files/linknx.init b/trunk/package/feeds/packages/linknx/files/linknx.init
deleted file mode 100644
index d38f194d..00000000
--- a/trunk/package/feeds/packages/linknx/files/linknx.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=98
-STOP=10
-NAME=linknx
-PROG=/usr/bin/$NAME
-
-. /lib/functions.sh
-
-start() {
-        local conf options
-        config_load "$NAME"
-        config_get conf args conf '/etc/linknx.xml'
-        config_get options args options ''
-        test -f $conf || cp -p /etc/linknx.xml.dist $conf
-        mkdir -p /tmp/$NAME/persist
-        service_start $PROG --config=$conf $options
-}
-
-stop() {
-        service_stop $PROG
-}
diff --git a/trunk/package/feeds/packages/linknx/files/linknx.xml.dist b/trunk/package/feeds/packages/linknx/files/linknx.xml.dist
deleted file mode 100644
index 55eb41d8..00000000
--- a/trunk/package/feeds/packages/linknx/files/linknx.xml.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-<config>
-  <objects>
-  </objects>
-
-  <rules>
-  </rules>
-
-  <services>
-    <xmlserver type="inet" port="1028"/>
-    <knxconnection url="ip:localhost"/>
-    <persistence type="file" path="/tmp/linknx/persist"/>
-    <emailserver type="smtp" host="localhost:25" from="linknx@local.local" />
-  </services>
-  <logging format="basic" level="INFO" />
-
-</config>
diff --git a/trunk/package/feeds/packages/lispmob/Makefile b/trunk/package/feeds/packages/lispmob/Makefile
deleted file mode 100644
index 4742deeb..00000000
--- a/trunk/package/feeds/packages/lispmob/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lispmob
-PKG_REV:=180aa39d338a00bb532e421de7f8513492cf2e8b
-PKG_VERSION:=0.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://github.com/LISPmob/lispmob.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lispd/default
-  MAINTAINER:=Vasileios Lakafosis <lakafv@gmail.com>
-  URL:=http://lisp.cisco.com/
-endef
-
-define Package/lispd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Locator/ID separation protocol (using TUN)
-  URL:=https://github.com/LISPmob
-  DEPENDS:= +librt +libopenssl +confuse +kmod-tun +uci +kmod-ipv6
-  $(call Package/lispd/default)
-endef
-
-define Package/lispd/description
-  This packet provides support for the Locator-ID Seperation Protocol.
-endef
-
-MAKE_FLAGS += \
-	platform=openwrt
-
-define Package/lispd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lispd/lispd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/openWRT/lispd.uci.example $(1)/etc/config/lispd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openWRT/openwrt.init.script $(1)/etc/init.d/lisp
-endef
-
-$(eval $(call BuildPackage,lispd))
diff --git a/trunk/package/feeds/packages/lm-sensors/Makefile b/trunk/package/feeds/packages/lm-sensors/Makefile
deleted file mode 100644
index 02faccb1..00000000
--- a/trunk/package/feeds/packages/lm-sensors/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lm-sensors
-PKG_VERSION:=3.3.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases
-PKG_MD5SUM:=da506dedceb41822e64865f6ba34828a
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lm-sensors/Default
-  DEPENDS:=+sysfsutils
-  URL:=http://www.lm-sensors.org/
-endef
-
-define Package/lm-sensors
-  $(call Package/lm-sensors/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=lm-sensors
-  DEPENDS+=+libsensors
-endef
-
-define Package/lm-sensors-detect
-  $(call Package/lm-sensors/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=lm-sensors-detect
-  DEPENDS+=+lm-sensors +perl +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-xsloader
-endef
-
-define Package/libsensors
-  $(call Package/lm-sensors/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libsensors
-endef
-
-define Package/lm-sensors/description
- utility to read hardware sensor data
-endef
-
-define Package/lm-sensors-detect/description
- script to autodetect sensor hardware
-endef
-
-define Package/libsensors/description
- lm-sensors libraries
-endef
-
-define Package/lm-sensors/conffiles
-/etc/sensors.conf
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		KERNELVERSION="$(LINUX_VERSION)" \
-		LINUX="$(LINUX_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		PREFIX="/usr" \
-		MACHINE="$(ARCH)" \
-		EXLDFLAGS="" \
-		user
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/sensors
-	$(CP) \
-		$(PKG_BUILD_DIR)/lib/sensors.h \
-		$(1)/usr/include/sensors
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
-		$(1)/usr/lib
-endef
-
-define Package/lm-sensors/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin
-ifeq ($(ARCH),i386)
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/sensors.conf $(1)/etc/sensors.conf
-endif
-endef
-
-define Package/lm-sensors-detect/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin
-endef
-
-define Package/libsensors/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,lm-sensors))
-$(eval $(call BuildPackage,lm-sensors-detect))
-$(eval $(call BuildPackage,libsensors))
diff --git a/trunk/package/feeds/packages/lm-sensors/files/sensors.conf b/trunk/package/feeds/packages/lm-sensors/files/sensors.conf
deleted file mode 100644
index 505b9d97..00000000
--- a/trunk/package/feeds/packages/lm-sensors/files/sensors.conf
+++ /dev/null
@@ -1,117 +0,0 @@
-chip "pc87366-*"
-
-# Soekris net4801 configuration
-
-# Written by Henrik Brix Andersen <henrik@brixandersen.dk>
-# Latest version can be found at http://www.brixandersen.dk/
-
-# The configuration is partly based on the PC87366 datasheet and
-# partly borrowed from the env4801 utility by Poul-Henning
-# Kamp <phk@phk.freebsd.dk>
-
-# Datasheet: http://www.winbond.com/PDF/APCsheet/PC87366.pdf
-# env4801:   http://phk.freebsd.dk/soekris/env4801/
-
-
-# Voltage inputs
-  ignore vid
-
-  # Unknown
-  # label in0     "avi0"
-  ignore in0
-
-
-  # Core Voltage, +2.0V
-  label in1     "VCORE"
-  set in1_min   1.9
-  set in1_max   2.1
-
-
-  # VCC, +5.0V
-  label in2     "VCC"
-  compute in2   @*2, @/2
-
-
-  # Power Supply Input, +6.0V - +28.0V
-  label in3     "VPWR"
-  compute in3   @*20.1, @/20.1
-  set in3_min    6.0
-  set in3_max   28.0
-
-
-  # +12V
-  label in4     "+12V"
-  compute in4   @*4.83, @/4.83
-  set in4_min   11
-  set in4_max   13
-
-
-  # -12V
-  label in5     "-12V"
-  # If in10 on your net4801 doesn't have the 3.3V reference, use this
-  # compute line instead:
-  # compute in5   (@-3.3)*19.2+3.3, (@-3.3)/19.2+3.3
-  compute in5   (@-in10)*19.2+in10, (@-in10)/19.2+in10
-  set in5_min   -13
-  set in5_max   -11
-
-
-  # GND, 0V
-  label in6     "GND"
-  set in6_min   0
-  set in6_max   0
-
-
-  # Standby Voltage, +3.3V
-  # Internally divided by 2
-  label in7     "Vsb"
-  compute in7   @*2, @/2
-  set in7_min    3.0
-  set in7_max    3.6
-
-
-  # Supply Voltage, +3.3V
-  # Internally divided by 2
-  label in8     "Vdd"
-  compute in8   @*2, @/2
-  set in8_min    3.0
-  set in8_max    3.6
-
-
-  # Battery Backup Supply Voltage, +3.0V
-  label in9     "Vbat"
-  set in9_min    2.4
-  set in9_max    3.6
-
-
-  # Analog Supply Voltage, +3.3V
-  # Internally divided by 2
-  label in10    "AVdd"
-  compute in10  @*2, @/2
-  set in10_min   3.0
-  set in10_max   3.6
-
-
-# Temperature inputs
-  ignore temp1
-  ignore temp2
-
-  # PC87366 Internal Temperature
-  # PC87366 Recommended Operating Conditions: 0 - 70C
-  # SC1100  Recommended Operating Conditions: 0 - 85C
-  label temp3       "Temp"
-  label temp3_crit  "Critical"
-  set temp3_min      0
-  set temp3_max     70
-  set temp3_crit    85
-
-
-  ignore temp4
-  ignore temp5
-  ignore temp6
-
-
-# Fan inputs
-  ignore fan1
-  ignore fan2
-  ignore fan3
diff --git a/trunk/package/feeds/packages/lsof/Makefile b/trunk/package/feeds/packages/lsof/Makefile
deleted file mode 100644
index 75b2c547..00000000
--- a/trunk/package/feeds/packages/lsof/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=lsof
-PKG_VERSION:=4.86
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)+dfsg.orig.tar.gz
-PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof
-PKG_MD5SUM:=23420509564a897b76055f9d84d19068
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=Unique
-PKG_LICENSE_FILES:=00README
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS += $(LIBRPC)
-
-define Package/lsof
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=$(LIBRPC_DEPENDS)
-  TITLE:=LiSt Open Files - a diagnostic tool
-  URL:=http://people.freebsd.org/~abe/
-endef
-
-define Build/Configure
-	cd $(PKG_BUILD_DIR); \
-		LINUX_CLIB="-DGLIBCV=2" \
-		LSOF_CC="$(TARGET_CC)" \
-		LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \
-		LSOF_VSTR="$(LINUX_VERSION)" \
-		LSOF_CFGF="$(TARGET_CFLAGS)" \
-		LSOF_CFGL="$(TARGET_LDFLAGS)" \
-		LSOF_AR="$(TARGET_CROSS)ar cr" \
-		LSOF_RANLIB="$(TARGET_CROSS)ranlib" \
-		./Configure -n linux
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Package/lsof/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lsof $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,lsof))
diff --git a/trunk/package/feeds/packages/lsof/patches/001-lsof_makefile.patch b/trunk/package/feeds/packages/lsof/patches/001-lsof_makefile.patch
deleted file mode 100644
index eb2b7351..00000000
--- a/trunk/package/feeds/packages/lsof/patches/001-lsof_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/Makefile.skel
-+++ b/lib/Makefile.skel
-@@ -21,8 +21,8 @@ OBJ=	ckkv.o cvfs.o dvch.o fino.o isfn.o
- all:	${LIB}
- 
- ${LIB}:	${OBJ}
--	${AR}
--	${RANLIB}
-+	${AR} ${LIB} ${OBJ}
-+	${RANLIB} ${LIB}
- 
- clean:	FRC
- 	rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core
diff --git a/trunk/package/feeds/packages/lsof/patches/002-lsof_noportmap.patch b/trunk/package/feeds/packages/lsof/patches/002-lsof_noportmap.patch
deleted file mode 100644
index d0e88893..00000000
--- a/trunk/package/feeds/packages/lsof/patches/002-lsof_noportmap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/print.c
-+++ b/print.c
-@@ -161,6 +161,7 @@ endnm(sz)
- static void
- fill_portmap()
- {
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__)
- 	char buf[128], *cp, *nm;
- 	CLIENT *c;
- 	int h, port, pr;
-@@ -279,6 +280,7 @@ fill_portmap()
- 	    Pth[pr][h] = pt;
- 	}
- 	clnt_destroy(c);
-+#endif
- }
- #endif	/* !defined(HASNORPC_H) */
- 
diff --git a/trunk/package/feeds/packages/lsof/patches/003-lsof_selinux.patch b/trunk/package/feeds/packages/lsof/patches/003-lsof_selinux.patch
deleted file mode 100644
index c74c1e3f..00000000
--- a/trunk/package/feeds/packages/lsof/patches/003-lsof_selinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -2806,7 +2806,7 @@ return(0); }
- 	LSOF_TMP1=1
-       fi	# }
-     fi	# }
--    if test $LSOF_TMP1 -eq 1	# {
-+    if test 0 -eq 1	# {
-     then
-       LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
-       LSOF_CFGL="$LSOF_CFGL -lselinux"
diff --git a/trunk/package/feeds/packages/lsof/patches/004-lsof_ccv.patch b/trunk/package/feeds/packages/lsof/patches/004-lsof_ccv.patch
deleted file mode 100644
index 8f1867dc..00000000
--- a/trunk/package/feeds/packages/lsof/patches/004-lsof_ccv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -2682,6 +2682,9 @@ LOCKF_OWNER4
-     if test "X$LSOF_CC" = "X"	# {
-     then
-       LSOF_CC=cc
-+    fi	# }
-+    if test "X$LSOF_CCV" = "X"	# {
-+    then
-       LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
-     fi	# }
-     if test "X$LINUX_CONF_CC" = "X"	# {
diff --git a/trunk/package/feeds/packages/lttng-modules/Makefile b/trunk/package/feeds/packages/lttng-modules/Makefile
deleted file mode 100644
index 355f3250..00000000
--- a/trunk/package/feeds/packages/lttng-modules/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lttng-modules
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_MD5SUM:=a058ab037daaca293a54934d7b9f9c98
-
-PKG_LICENSE:=LGPL-2.1 GPL-2.0 MIT
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/lttng
-  SUBMENU:=Other modules
-  TITLE:=Linux Trace Toolkit: next generation (kernel modules)
-  URL:=https://lttng.org/
-  DEPENDS:= @!TARGET_uml @KERNEL_FTRACE
-  FILES:= \
-	$(PKG_BUILD_DIR)/lttng-*.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/lib/lttng-*.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/probes/lttng-*.$(LINUX_KMOD_SUFFIX)
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		V="$(V)" \
-		modules
-endef
-
-$(eval $(call KernelPackage,lttng))
diff --git a/trunk/package/feeds/packages/lttng-modules/patches/001-mm_page_alloc_extfrag.patch b/trunk/package/feeds/packages/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
deleted file mode 100644
index 183f7d11..00000000
--- a/trunk/package/feeds/packages/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/instrumentation/events/lttng-module/kmem.h
-+++ b/instrumentation/events/lttng-module/kmem.h
-@@ -286,7 +286,94 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm
- 		__entry->order, __entry->migratetype)
- )
- 
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)	\
-+	|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
-+	|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0))
-+
-+LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
-+
-+	TP_PROTO(struct page *page,
-+		int alloc_order, int fallback_order,
-+		int alloc_migratetype, int fallback_migratetype),
-+
-+	TP_ARGS(page,
-+		alloc_order, fallback_order,
-+		alloc_migratetype, fallback_migratetype),
-+
-+	TP_STRUCT__entry(
-+		__field_hex(	struct page *,	page			)
-+		__field(	int,		alloc_order		)
-+		__field(	int,		fallback_order		)
-+		__field(	int,		alloc_migratetype	)
-+		__field(	int,		fallback_migratetype	)
-+		__field(	int,		change_ownership	)
-+	),
-+
-+	TP_fast_assign(
-+		tp_assign(page, page)
-+		tp_assign(alloc_order, alloc_order)
-+		tp_assign(fallback_order, fallback_order)
-+		tp_assign(alloc_migratetype, alloc_migratetype)
-+		tp_assign(fallback_migratetype, fallback_migratetype)
-+		tp_assign(change_ownership,
-+			(alloc_migratetype == get_pageblock_migratetype(page)))
-+	),
-+
-+	TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-+		__entry->page,
-+		page_to_pfn(__entry->page),
-+		__entry->alloc_order,
-+		__entry->fallback_order,
-+		pageblock_order,
-+		__entry->alloc_migratetype,
-+		__entry->fallback_migratetype,
-+		__entry->fallback_order < pageblock_order,
-+		__entry->change_ownership)
-+)
-+
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30))
-+
-+LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
-+
-+	TP_PROTO(struct page *page,
-+		int alloc_order, int fallback_order,
-+		int alloc_migratetype, int fallback_migratetype, int new_migratetype),
-+
-+	TP_ARGS(page,
-+		alloc_order, fallback_order,
-+		alloc_migratetype, fallback_migratetype, new_migratetype),
-+
-+	TP_STRUCT__entry(
-+		__field_hex(	struct page *,	page			)
-+		__field(	int,		alloc_order		)
-+		__field(	int,		fallback_order		)
-+		__field(	int,		alloc_migratetype	)
-+		__field(	int,		fallback_migratetype	)
-+		__field(	int,		change_ownership	)
-+	),
-+
-+	TP_fast_assign(
-+		tp_assign(page, page)
-+		tp_assign(alloc_order, alloc_order)
-+		tp_assign(fallback_order, fallback_order)
-+		tp_assign(alloc_migratetype, alloc_migratetype)
-+		tp_assign(fallback_migratetype, fallback_migratetype)
-+		tp_assign(change_ownership, (new_migratetype == alloc_migratetype))
-+	),
-+
-+	TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-+		__entry->page,
-+		page_to_pfn(__entry->page),
-+		__entry->alloc_order,
-+		__entry->fallback_order,
-+		pageblock_order,
-+		__entry->alloc_migratetype,
-+		__entry->fallback_migratetype,
-+		__entry->fallback_order < pageblock_order,
-+		__entry->change_ownership)
-+)
-+
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
- 
- LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
- 
diff --git a/trunk/package/feeds/packages/lttng-tools/Makefile b/trunk/package/feeds/packages/lttng-tools/Makefile
deleted file mode 100644
index 6c902dfc..00000000
--- a/trunk/package/feeds/packages/lttng-tools/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lttng-tools
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_MD5SUM:=0478f60395f9564b4a19f45ce7b7f3df
-
-PKG_LICENSE:=LGPL-2.1 GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lttng-tools
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=Linux Trace Toolkit: next generation (tools)
-  URL:=https://lttng.org/
-  DEPENDS:= +lttng-ust +libpopt +libxml2
-endef
-
-CONFIGURE_ARGS += --disable-kmod
-
-TARGET_LDFLAGS += -lurcu-bp
-
-MAKE_FLAGS += V="$(V)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lttng $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ctl*.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lttng-ctl.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/lttng-tools/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ctl*.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lttng $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lttng* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,lttng-tools))
diff --git a/trunk/package/feeds/packages/lttng-ust/Makefile b/trunk/package/feeds/packages/lttng-ust/Makefile
deleted file mode 100644
index dc9c8920..00000000
--- a/trunk/package/feeds/packages/lttng-ust/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lttng-ust
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_MD5SUM:=74ad4826eac76c9dbf50fd3e46523191
-
-PKG_LICENSE:=LGPL-2.1 GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lttng-ust
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Linux Trace Toolkit: next generation (library)
-  URL:=https://lttng.org/
-  DEPENDS:= +liburcu +libuuid +librt
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lttng $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lttng-ust.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/lttng-ust/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,lttng-ust))
diff --git a/trunk/package/feeds/packages/lttng-ust/patches/001-no_docs_tests.patch b/trunk/package/feeds/packages/lttng-ust/patches/001-no_docs_tests.patch
deleted file mode 100644
index e1c20c6e..00000000
--- a/trunk/package/feeds/packages/lttng-ust/patches/001-no_docs_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,8 +20,6 @@ if BUILD_JAVA_AGENT
- SUBDIRS += liblttng-ust-java-agent
- endif
- 
--SUBDIRS += tests doc
--
- #temporarily disabled
- # liblttng-ust-malloc
- 
diff --git a/trunk/package/feeds/packages/lttng-ust/patches/002-examples.patch b/trunk/package/feeds/packages/lttng-ust/patches/002-examples.patch
deleted file mode 100644
index 46449b78..00000000
--- a/trunk/package/feeds/packages/lttng-ust/patches/002-examples.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -350,7 +350,14 @@ AC_ARG_WITH([lttng-system-rundir],
- AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
- 	[LTTng system runtime directory])
- 
--AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:])
-+AC_ARG_ENABLE([examples],
-+	[AS_HELP_STRING([--enable-examples],[build examples [default=no]])],
-+	[enable_examples=$enableval],
-+	[enable_examples=no]
-+)
-+if test "x$enable_examples" = "xyes"; then
-+  AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:])
-+fi
- AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp])
- 
- AC_CONFIG_FILES([
diff --git a/trunk/package/feeds/packages/lua-bencode/Makefile b/trunk/package/feeds/packages/lua-bencode/Makefile
deleted file mode 100644
index 0b320560..00000000
--- a/trunk/package/feeds/packages/lua-bencode/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 20013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lua-bencode
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://bitbucket.org/wilhelmy/lua-bencode
-PKG_SOURCE_PROTO:=hg
-PKG_SOURCE_VERSION:=500243383cb6acbddd3cf12aee6e4667aab53324
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lua-bencode
-	SUBMENU:=Lua
-	SECTION:=lang
-	CATEGORY:=Languages
-	TITLE:=lua-bencode
-	URL:=https://bitbucket.org/wilhelmy/lua-bencode
-	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+lua
-endef
-
-define Package/lua-bencode/description
-	This is a module for the lua programming language for decoding and encoding
-	bencoded data which can be used to read and write torrent files for bittorrent.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-
-define Package/lua-bencode/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/bencode.lua $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,lua-bencode))
diff --git a/trunk/package/feeds/packages/lua-mosquitto/Makefile b/trunk/package/feeds/packages/lua-mosquitto/Makefile
deleted file mode 100644
index a8d625f1..00000000
--- a/trunk/package/feeds/packages/lua-mosquitto/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lua-mosquitto
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://github.com/flukso/$(PKG_NAME)/archive/
-PKG_MD5SUM:=fd26fa08fc855ba4a66ce521fe5aae13
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-    SUBMENU:=Lua
-    SECTION:=lang
-    CATEGORY:=Languages
-    TITLE:=Lua-mosquitto
-    DEPENDS:=+libmosquitto +lua
-    MAINTAINER:=Karl Palsson <karlp@remake.is>
-endef
-
-define Package/$(PKG_NAME)/description
-	Lua bindings to libmosquitto
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto.so $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/trunk/package/feeds/packages/lua-penlight/Makefile b/trunk/package/feeds/packages/lua-penlight/Makefile
deleted file mode 100644
index 89192e29..00000000
--- a/trunk/package/feeds/packages/lua-penlight/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lua-penlight
-PKG_VERSION:=1.3.2
-PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/Penlight-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/stevedonovan/Penlight/archive/
-PKG_MD5SUM:=0315a39834bb6fab07741ec04ede1bf4
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILE:=LICENSE.md
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Penlight
-  URL:=http://stevedonovan.github.io/Penlight/api/manual/01-introduction.md.html
-  DEPENDS:=+luafilesystem
-  MAINTAINER:= Karl Palsson <karlp@remake.is>
-endef
-
-define Package/$(PKG_NAME)/description
-  It is often said of Lua that it does not include batteries.
-  Penlight is the batteries.
-endef
-
-define Build/Compile
-	echo "Nothing to compile, pure lua package"
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(CP) $(PKG_BUILD_DIR)/lua/pl $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/trunk/package/feeds/packages/lua-sha2/Makefile b/trunk/package/feeds/packages/lua-sha2/Makefile
deleted file mode 100644
index 6a82334e..00000000
--- a/trunk/package/feeds/packages/lua-sha2/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 20013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lua-sha2
-PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://code.google.com/p/sha2/
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02bd4bfdc806
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lua-sha2
-	SUBMENU:=Lua
-	SECTION:=lang
-	CATEGORY:=Languages
-	TITLE:=Lua binding for Aaron Gifford's SHA-2 implementation
-	URL:=https://code.google.com/p/sha2/
-	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=+lua
-endef
-
-define Package/lua-sha2/description
-	Lua Binding for the SHA-2 (SHA-256/384/512) BSD-licensed C implementation by Aaron Gifford.
-	Also contains a HMAC implementation in Lua.
-endef
-
-TARGET_CFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
-TARGET_LDFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
-
-define Build/Configure
-endef
-
-define Package/lua-sha2/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/hmac
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/sha2.so $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac.lua $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/sha2.lua $(1)/usr/lib/lua/hmac
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/md5.lua $(1)/usr/lib/lua/hmac
-endef
-
-$(eval $(call BuildPackage,lua-sha2))
diff --git a/trunk/package/feeds/packages/lua-sha2/patches/001-makefile.patch b/trunk/package/feeds/packages/lua-sha2/patches/001-makefile.patch
deleted file mode 100644
index e395044e..00000000
--- a/trunk/package/feeds/packages/lua-sha2/patches/001-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Lars Gierth <larsg@systemli.org>
-Date: Tue, 2 Sep 2014 00:05:39 +0200
-
-    Add rump Makefile
-
-new file mode 100644
-index 0000000..f081d38
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,4 @@
-+all: sha2.o sha2lib.o
-+	$(CC) -shared -o sha2.so sha2.o sha2lib.o
-+
-+.PHONY: all
diff --git a/trunk/package/feeds/packages/luabitop/Makefile b/trunk/package/feeds/packages/luabitop/Makefile
deleted file mode 100644
index eda6f9b8..00000000
--- a/trunk/package/feeds/packages/luabitop/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luabitop
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
-
-_BASENAME:=LuaBitOp
-
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_SOURCE:=$(_BASENAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://bitop.luajit.org/download/
-PKG_MD5SUM:=d0c1080fe0c844e8477279668e2d0d06
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(_BASENAME)-$(PKG_VERSION)
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luabitop
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=luabitop
-  URL:=http://bitop.luajit.org/
-  DEPENDS:=+lua
-endef
-
-define Package/luabitop/description
-Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise operations on numbers.
-endef
-
-define Build/Configure
-endef
-
-
-TARGET_CFLAGS += $(FPIC) -DLUA_USE_LINUX -DLUA_NUMBER_DOUBLE
-
-define Build/Compile
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -std=gnu99 $(FPIC) -DLUA_USE_LINUX -shared -o $(PKG_BUILD_DIR)/bit.so $(PKG_BUILD_DIR)/bit.c
-endef
-
-define Package/luabitop/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bit.so $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,luabitop))
diff --git a/trunk/package/feeds/packages/luaexpat/Makefile b/trunk/package/feeds/packages/luaexpat/Makefile
deleted file mode 100644
index 6b73254d..00000000
--- a/trunk/package/feeds/packages/luaexpat/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# 
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luaexpat
-PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat
-PKG_MD5SUM:=3c20b5795e7107f847f8da844fbfe2da
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luaexpat
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaExpat 
-  URL:=http://www.keplerproject.org/luaexpat/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+lua +libexpat
-endef
-
-define Package/luaexpat/description
-  LuaExpat is a SAX XML parser based on the Expat library.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	EXPAT_INC="-I$(STAGING_DIR)/usr/include/" \
-	LUA_INC="-I$(STAGING_DIR)/usr/include/" \
-	LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
-	COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
-	LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
-	CC="$(TARGET_CC) $(TARGET_CFLAGS) $(FPIC) -std=c99" \
-	LD="$(TARGET_CROSS)ld -shared" 
-endef
-
-define Package/luaexpat/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so $(1)/usr/lib/lua/lxp.so
-	$(INSTALL_DIR) $(1)/usr/lib/lua/lxp
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp
-endef
-
-$(eval $(call BuildPackage,luaexpat))
diff --git a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.c b/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.c
deleted file mode 100644
index 6fdb8b7b..00000000
--- a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-** Compat-5.1
-** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
-** $Id: compat-5.1.c,v 1.13 2006/02/20 21:12:47 carregal Exp $
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include "lua.h"
-#include "lauxlib.h"
-#include "compat-5.1.h"
-
-static void getfield(lua_State *L, int idx, const char *name) {
-    const char *end = strchr(name, '.');
-    lua_pushvalue(L, idx);
-    while (end) {
-        lua_pushlstring(L, name, end - name);
-        lua_gettable(L, -2);
-        lua_remove(L, -2);
-        if (lua_isnil(L, -1)) return;
-        name = end+1;
-        end = strchr(name, '.');
-    }
-    lua_pushstring(L, name);
-    lua_gettable(L, -2);
-    lua_remove(L, -2);
-}
-
-static void setfield(lua_State *L, int idx, const char *name) {
-    const char *end = strchr(name, '.');
-    lua_pushvalue(L, idx);
-    while (end) {
-        lua_pushlstring(L, name, end - name);
-        lua_gettable(L, -2);
-        /* create table if not found */
-        if (lua_isnil(L, -1)) {
-            lua_pop(L, 1);
-            lua_newtable(L);
-            lua_pushlstring(L, name, end - name);
-            lua_pushvalue(L, -2);
-            lua_settable(L, -4);
-        }
-        lua_remove(L, -2);
-        name = end+1;
-        end = strchr(name, '.');
-    }
-    lua_pushstring(L, name);
-    lua_pushvalue(L, -3);
-    lua_settable(L, -3);
-    lua_pop(L, 2);
-}
-
-LUALIB_API void luaL_module(lua_State *L, const char *libname,
-                              const luaL_reg *l, int nup) {
-  if (libname) {
-    getfield(L, LUA_GLOBALSINDEX, libname);  /* check whether lib already exists */
-    if (lua_isnil(L, -1)) { 
-      int env, ns;
-      lua_pop(L, 1); /* get rid of nil */
-      lua_pushliteral(L, "require");
-      lua_gettable(L, LUA_GLOBALSINDEX); /* look for require */
-      lua_getfenv(L, -1); /* getfenv(require) */
-      lua_remove(L, -2); /* remove function require */
-      env = lua_gettop(L);
-
-      lua_newtable(L); /* create namespace for lib */
-      ns = lua_gettop(L);
-      getfield(L, env, "package.loaded"); /* get package.loaded table */
-      if (lua_isnil(L, -1)) { /* create package.loaded table */
-          lua_pop(L, 1); /* remove previous result */
-          lua_newtable(L);
-          lua_pushvalue(L, -1);
-          setfield(L, env, "package.loaded");
-      }
-      else if (!lua_istable(L, -1))
-        luaL_error(L, "name conflict for library `%s'", libname);
-      lua_pushstring(L, libname);
-      lua_pushvalue(L, ns); 
-      lua_settable(L, -3); /* package.loaded[libname] = ns */
-      lua_pop(L, 1); /* get rid of package.loaded table */
-      lua_pushvalue(L, ns); /* copy namespace */
-      setfield(L, LUA_GLOBALSINDEX, libname);
-      lua_remove (L, env); /* remove env */
-    }
-    lua_insert(L, -(nup+1));  /* move library table to below upvalues */
-  }
-  for (; l->name; l++) {
-    int i;
-    lua_pushstring(L, l->name);
-    for (i=0; i<nup; i++)  /* copy upvalues to the top */
-      lua_pushvalue(L, -(nup+1));
-    lua_pushcclosure(L, l->func, nup);
-    lua_settable(L, -(nup+3));
-  }
-  lua_pop(L, nup);  /* remove upvalues */
-}
-
diff --git a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.h b/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.h
deleted file mode 100644
index 97570d9c..00000000
--- a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-** Compat-5.1
-** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat/)
-** $Id: compat-5.1.h,v 1.8 2006/02/20 21:12:47 carregal Exp $
-*/
-
-#ifndef COMPAT_H
-
-LUALIB_API void luaL_module(lua_State *L, const char *libname,
-                                       const luaL_reg *l, int nup);
-#define luaL_openlib luaL_module
-
-#endif
diff --git a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.lua b/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.lua
deleted file mode 100644
index 0938d56a..00000000
--- a/trunk/package/feeds/packages/luaexpat/files/compat-5.1r5/compat-5.1.lua
+++ /dev/null
@@ -1,267 +0,0 @@
---
--- Compat-5.1
--- Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
--- According to Lua 5.1
--- $Id: compat-5.1.lua,v 1.22 2006/02/20 21:12:47 carregal Exp $
---
-
-_COMPAT51 = "Compat-5.1 R5"
-
-local LUA_DIRSEP = '/'
-local LUA_OFSEP = '_'
-local OLD_LUA_OFSEP = ''
-local POF = 'luaopen_'
-local LUA_PATH_MARK = '?'
-local LUA_IGMARK = ':'
-
-local assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type = assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type
-local find, format, gfind, gsub, sub = string.find, string.format, string.gfind, string.gsub, string.sub
-
---
--- avoid overwriting the package table if it's already there
---
-package = package or {}
-local _PACKAGE = package
-
-package.path = LUA_PATH or os.getenv("LUA_PATH") or
-             ("./?.lua;" ..
-              "/usr/local/share/lua/5.0/?.lua;" ..
-              "/usr/local/share/lua/5.0/?/?.lua;" ..
-              "/usr/local/share/lua/5.0/?/init.lua" )
- 
-package.cpath = LUA_CPATH or os.getenv("LUA_CPATH") or
-             "./?.so;" ..
-             "./l?.so;" ..
-             "/usr/local/lib/lua/5.0/?.so;" ..
-             "/usr/local/lib/lua/5.0/l?.so"
-
---
--- make sure require works with standard libraries
---
-package.loaded = package.loaded or {}
-package.loaded.debug = debug
-package.loaded.string = string
-package.loaded.math = math
-package.loaded.io = io
-package.loaded.os = os
-package.loaded.table = table 
-package.loaded.base = _G
-package.loaded.coroutine = coroutine
-local _LOADED = package.loaded
-
---
--- avoid overwriting the package.preload table if it's already there
---
-package.preload = package.preload or {}
-local _PRELOAD = package.preload
-
-
---
--- looks for a file `name' in given path
---
-local function findfile (name, pname)
-	name = gsub (name, "%.", LUA_DIRSEP)
-	local path = _PACKAGE[pname]
-	assert (type(path) == "string", format ("package.%s must be a string", pname))
-	for c in gfind (path, "[^;]+") do
-		c = gsub (c, "%"..LUA_PATH_MARK, name)
-		local f = io.open (c)
-		if f then
-			f:close ()
-			return c
-		end
-	end
-	return nil -- not found
-end
-
-
---
--- check whether library is already loaded
---
-local function loader_preload (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	assert (type(_PRELOAD) == "table", "`package.preload' must be a table")
-	return _PRELOAD[name]
-end
-
-
---
--- Lua library loader
---
-local function loader_Lua (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local filename = findfile (name, "path")
-	if not filename then
-		return false
-	end
-	local f, err = loadfile (filename)
-	if not f then
-		error (format ("error loading module `%s' (%s)", name, err))
-	end
-	return f
-end
-
-
-local function mkfuncname (name)
-	name = gsub (name, "^.*%"..LUA_IGMARK, "")
-	name = gsub (name, "%.", LUA_OFSEP)
-	return POF..name
-end
-
-local function old_mkfuncname (name)
-	--name = gsub (name, "^.*%"..LUA_IGMARK, "")
-	name = gsub (name, "%.", OLD_LUA_OFSEP)
-	return POF..name
-end
-
---
--- C library loader
---
-local function loader_C (name)
-	assert (type(name) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local filename = findfile (name, "cpath")
-	if not filename then
-		return false
-	end
-	local funcname = mkfuncname (name)
-	local f, err = loadlib (filename, funcname)
-	if not f then
-		funcname = old_mkfuncname (name)
-		f, err = loadlib (filename, funcname)
-		if not f then
-			error (format ("error loading module `%s' (%s)", name, err))
-		end
-	end
-	return f
-end
-
-
-local function loader_Croot (name)
-	local p = gsub (name, "^([^.]*).-$", "%1")
-	if p == "" then
-		return
-	end
-	local filename = findfile (p, "cpath")
-	if not filename then
-		return
-	end
-	local funcname = mkfuncname (name)
-	local f, err, where = loadlib (filename, funcname)
-	if f then
-		return f
-	elseif where ~= "init" then
-		error (format ("error loading module `%s' (%s)", name, err))
-	end
-end
-
--- create `loaders' table
-package.loaders = package.loaders or { loader_preload, loader_Lua, loader_C, loader_Croot, }
-local _LOADERS = package.loaders
-
-
---
--- iterate over available loaders
---
-local function load (name, loaders)
-	-- iterate over available loaders
-	assert (type (loaders) == "table", "`package.loaders' must be a table")
-	for i, loader in ipairs (loaders) do
-		local f = loader (name)
-		if f then
-			return f
-		end
-	end
-	error (format ("module `%s' not found", name))
-end
-
--- sentinel
-local sentinel = function () end
-
---
--- new require
---
-function _G.require (modname)
-	assert (type(modname) == "string", format (
-		"bad argument #1 to `require' (string expected, got %s)", type(name)))
-	local p = _LOADED[modname]
-	if p then -- is it there?
-		if p == sentinel then
-			error (format ("loop or previous error loading module '%s'", modname))
-		end
-		return p -- package is already loaded
-	end
-	local init = load (modname, _LOADERS)
-	_LOADED[modname] = sentinel
-	local actual_arg = _G.arg
-	_G.arg = { modname }
-	local res = init (modname)
-	if res then
-		_LOADED[modname] = res
-	end
-	_G.arg = actual_arg
-	if _LOADED[modname] == sentinel then
-		_LOADED[modname] = true
-	end
-	return _LOADED[modname]
-end
-
-
--- findtable
-local function findtable (t, f)
-	assert (type(f)=="string", "not a valid field name ("..tostring(f)..")")
-	local ff = f.."."
-	local ok, e, w = find (ff, '(.-)%.', 1)
-	while ok do
-		local nt = rawget (t, w)
-		if not nt then
-			nt = {}
-			t[w] = nt
-		elseif type(t) ~= "table" then
-			return sub (f, e+1)
-		end
-		t = nt
-		ok, e, w = find (ff, '(.-)%.', e+1)
-	end
-	return t
-end
-
---
--- new package.seeall function
---
-function _PACKAGE.seeall (module)
-	local t = type(module)
-	assert (t == "table", "bad argument #1 to package.seeall (table expected, got "..t..")")
-	local meta = getmetatable (module)
-	if not meta then
-		meta = {}
-		setmetatable (module, meta)
-	end
-	meta.__index = _G
-end
-
-
---
--- new module function
---
-function _G.module (modname, ...)
-	local ns = _LOADED[modname]
-	if type(ns) ~= "table" then
-		ns = findtable (_G, modname)
-		if not ns then
-			error (string.format ("name conflict for module '%s'", modname))
-		end
-		_LOADED[modname] = ns
-	end
-	if not ns._NAME then
-		ns._NAME = modname
-		ns._M = ns
-		ns._PACKAGE = gsub (modname, "[^.]*$", "")
-	end
-	setfenv (2, ns)
-	for i, f in ipairs (arg) do
-		f (ns)
-	end
-end
diff --git a/trunk/package/feeds/packages/luafilesystem/Makefile b/trunk/package/feeds/packages/luafilesystem/Makefile
deleted file mode 100644
index 13abef6a..00000000
--- a/trunk/package/feeds/packages/luafilesystem/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luafilesystem
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/keplerproject/luafilesystem.git
-PKG_SOURCE_VERSION:=2fd989cd6c777583be1c93616018c55b2cbb1bcf
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luafilesystem
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaFileSystem
-  URL:=http://keplerproject.github.com/luafilesystem/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+liblua
-endef
-
-define Package/luafilesystem/description
- This package contains the LuaFileSystem library, a set of portable
- functions for directory creation, listing and deletion and for file
- locking.
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
-
-TARGET_LDFLAGS += -llua
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
-		LDFLAGS="$(TARGET_LDFLAGS)"
-	$(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua
-endef
-
-define Package/luafilesystem/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so
-endef
-
-$(eval $(call BuildPackage,luafilesystem))
diff --git a/trunk/package/feeds/packages/luai2c/Makefile b/trunk/package/feeds/packages/luai2c/Makefile
deleted file mode 100755
index 2a7dbbfb..00000000
--- a/trunk/package/feeds/packages/luai2c/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luai2c
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=2
-PKG_MAINTAINER:=Frank Edelhaeuser <fedel@users.sourceforge.net>
-
-PKG_SOURCE_NAME:=i2c-lua
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_SOURCE_NAME)
-PKG_MD5SUM:=7098577f101410b201cd43a7467e408d
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luai2c
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Lua I2C binding
-  URL:=http://sourceforge.net/projects/i2c-lua/
-  DEPENDS:=+liblua +kmod-i2c-core
-  MAINTAINER:=Frank Edelhaeuser <fedel@users.sourceforge.net>
-endef
-
-define Package/luai2c/description
-	This is the Lua binding for I2C. It provides access to I2C slaves supported by the kernel.
-endef
-
-define Package/luai2c/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/i2c.so $(1)/usr/lib/lua
-	$(INSTALL_DIR) $(1)/usr/lib/lua/i2c
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/* $(1)/usr/lib/lua/i2c
-endef
-
-$(eval $(call BuildPackage,luai2c))
diff --git a/trunk/package/feeds/packages/lualanes/Makefile b/trunk/package/feeds/packages/lualanes/Makefile
deleted file mode 100644
index 06bc1e28..00000000
--- a/trunk/package/feeds/packages/lualanes/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lualanes
-PKG_REV:=aa9bfcf2dd49f55f11b27e7c21d5b75d81ccfc7e
-PKG_VERSION:=3.9.4
-PKG_RELEASE=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
-PKG_SOURCE_URL:=https://github.com/LuaLanes/lanes.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-PKG_BUILD_DEPENDS:=lua/host luac/host
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lualanes
-	SUBMENU:=Lua
-	SECTION:=lang
-	CATEGORY:=Languages
-	TITLE:=LuaLanes
-	URL:=http://luaforge.net/projects/lanes/
-	DEPENDS:=+lua +luac +liblua +libpthread
-	MAINTAINER:=Vladimir Malyutin <first-leon@yandex.ru>
-endef
-
-define Package/lualanes/description
-	Lanes is a lightweight, native, lazy evaluating multithreading library for Lua 5.1 and 5.2.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all \
-        CC="$(TARGET_CC)" \
-        LUA="$(STAGING_DIR_HOST)/bin/lua" \
-        LUAC="$(STAGING_DIR_HOST)/bin/luac" \
-        OPT_FLAGS="$(TARGET_CFLAGS) --std=c99 -Dpthread_yield=sched_yield"
-endef
-
-define Package/lualanes/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lanes.lua $(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/lanes
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lanes/core.so $(1)/usr/lib/lua/lanes/core.so
-endef
-
-$(eval $(call BuildPackage,lualanes))
diff --git a/trunk/package/feeds/packages/luaposix/Makefile b/trunk/package/feeds/packages/luaposix/Makefile
deleted file mode 100644
index 40cddc05..00000000
--- a/trunk/package/feeds/packages/luaposix/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luaposix
-PKG_VERSION:=v33.2.1
-PKG_RELEASE:=4
-
-PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/
-PKG_MD5SUM:=aa68b5c07ab1ecea81bb466c81e88056
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
-PKG_REMOVE_FILES:=aclocal.m4
-PKG_FIXUP:=autoreconf
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luaposix
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=luaposix
-  URL:=http://luaforge.net/projects/luaposix/
-  DEPENDS:=+lua +librt
-  PKG_BUILD_DEPENDS:=+lua/host
-endef
-
-define Package/luaposix/description
-  luaposix is a general POSIX library for Lua providing access
-  to various low level libc functions.
-endef
-
-CONFIGURE_VARS += ac_cv_path_LDOC=""
-
-TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99
-
-ifneq ($(CONFIG_USE_GLIBC),)
-  ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
-    TARGET_CFLAGS += -DNO_GETLOGIN
-  endif
-endif
-
-
-define Package/luaposix/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/posix
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/posix/.libs/posix.so $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/posix.lua $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,luaposix))
diff --git a/trunk/package/feeds/packages/luaposix/patches/100-eglibc-compat.patch b/trunk/package/feeds/packages/luaposix/patches/100-eglibc-compat.patch
deleted file mode 100644
index e4df63bf..00000000
--- a/trunk/package/feeds/packages/luaposix/patches/100-eglibc-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/ext/posix/unistd.c b/ext/posix/unistd.c
-index 9276640..69c8cef 100644
---- a/ext/posix/unistd.c
-+++ b/ext/posix/unistd.c
-@@ -525,6 +525,7 @@ Pgetgroups(lua_State *L)
- #endif
- 
- 
-+#ifndef NO_GETLOGIN
- /***
- Current logged-in user.
- @treturn[1] string username, if successful
-@@ -537,6 +538,7 @@ Pgetlogin(lua_State *L)
- 	checknargs(L, 0);
- 	return pushstringresult(getlogin());
- }
-+#endif
- 
- 
- /***
-@@ -1044,7 +1046,9 @@ static const luaL_Reg posix_unistd_fns[] =
- 	LPOSIX_FUNC( Pgetegid		),
- 	LPOSIX_FUNC( Pgeteuid		),
- 	LPOSIX_FUNC( Pgetgid		),
-+#ifndef NO_GETLOGIN
- 	LPOSIX_FUNC( Pgetlogin		),
-+#endif
- 	LPOSIX_FUNC( Pgetpgrp		),
- 	LPOSIX_FUNC( Pgetpid		),
- 	LPOSIX_FUNC( Pgetppid		),
diff --git a/trunk/package/feeds/packages/luaposix/patches/101-disable-curses.patch b/trunk/package/feeds/packages/luaposix/patches/101-disable-curses.patch
deleted file mode 100644
index 6412799b..00000000
--- a/trunk/package/feeds/packages/luaposix/patches/101-disable-curses.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dfd4199..19924d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -153,15 +153,6 @@ AC_CHECK_LIB([rt], [clock_gettime])
- AC_SUBST([LIBRT], [$LIBS])
- LIBS=$save_LIBS
- 
--## Curses
--AX_WITH_CURSES
--AC_ARG_VAR(CURSES_LIB, [linker flags for curses library])
--
--save_LIBS=$LIBS
--LIBS="$CURSES_LIB $LIBS"
--AC_CHECK_FUNCS([resizeterm])
--LIBS=$save_LIBS
--
- ## Use system implementation, or bundled replacement?
- AC_CHECK_FUNCS([strlcpy])
- 
-diff --git a/ext/posix/posix.c b/ext/posix/posix.c
-index 6019df0..2d75487 100644
---- a/ext/posix/posix.c
-+++ b/ext/posix/posix.c
-@@ -12,7 +12,6 @@
- 
- #include "bit32.c"
- #include "ctype.c"
--#include "curses.c"
- #include "dirent.c"
- #include "errno.c"
- #include "fcntl.c"
diff --git a/trunk/package/feeds/packages/luaposix/patches/102-disable-compat-deprecated.diff b/trunk/package/feeds/packages/luaposix/patches/102-disable-compat-deprecated.diff
deleted file mode 100644
index 7c58be48..00000000
--- a/trunk/package/feeds/packages/luaposix/patches/102-disable-compat-deprecated.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/lib/posix.lua.in b/lib/posix.lua.in
-index 17ef39a..a248d9b 100644
---- a/lib/posix.lua.in
-+++ b/lib/posix.lua.in
-@@ -35,15 +35,6 @@ for _, sub in ipairs {
-   end
- end
- 
--
---- Inject deprecated APIs (overwriting submodules) for backwards compatibility.
--for k, v in pairs (require "posix.deprecated") do
--  M[k] = v
--end
--for k, v in pairs (require "posix.compat") do
--  M[k] = v
--end
--
- M.version = "posix for " .. _VERSION .. " / @PACKAGE_STRING@"
- 
- 
diff --git a/trunk/package/feeds/packages/luarocks/Makefile b/trunk/package/feeds/packages/luarocks/Makefile
deleted file mode 100644
index 15643ff5..00000000
--- a/trunk/package/feeds/packages/luarocks/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luarocks
-PKG_VERSION:=2.2.0-rc1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/keplerproject/$(PKG_NAME)/archive/
-PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
-PKG_INSTALL=1
-PKG_BUILD_DEPENDS:=lua/host luac/host
-PKG_LICENSE=GPL
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luarocks
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=luarocks
-  URL:=https://github.com/keplerproject/luarocks
-  DEPENDS:=+lua +luac +liblua +luasocket +unzip +curl +luasec
-endef
-
-define Package/luarocks/description
-	LuaRocks is a deployment and management system for Lua modules.
-endef
-
-# My custom args, copied and modified from SDK_ROOT/include/package-defaults.mk
-CONFIGURE_ARGS = \
-    --prefix=$(CONFIGURE_PREFIX) \
-    --sysconfdir=/etc \
-    --with-lua=$(STAGING_DIR_HOST)
-
-define Build/Compile
-	$(call Build/Compile/Default,build)
-endef
-
-define Package/luarocks/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luarocks-5.1 $(1)/usr/bin/luarocks
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luarocks-admin-5.1 $(1)/usr/bin/luarocks-admin
-	$(CP) $(PKG_INSTALL_DIR)/usr/share $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/etc $(1)/etc
-endef
-
-$(eval $(call BuildPackage,luarocks))
diff --git a/trunk/package/feeds/packages/luarocks/patches/01_dont_modify_bin_shebang.diff b/trunk/package/feeds/packages/luarocks/patches/01_dont_modify_bin_shebang.diff
deleted file mode 100644
index a1bad215..00000000
--- a/trunk/package/feeds/packages/luarocks/patches/01_dont_modify_bin_shebang.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN luarocks/Makefile luarocks.new/Makefile
---- luarocks/Makefile	2015-02-19 13:24:07.027310956 +0200
-+++ luarocks.new/Makefile	2015-02-22 13:28:24.497353543 +0200
-@@ -104,7 +104,7 @@ build_bins: cleanup_bins
- 	for f in $(BIN_FILES) ;\
- 	do \
- 	   sed "1d" src/bin/$$f > src/bin/$$f.bak ;\
--	   echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
-+	   echo "#!/usr/bin/env lua" > src/bin/$$f ;\
- 	   echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
- 	   cat src/bin/$$f.bak >> src/bin/$$f ;\
- 	   chmod +x src/bin/$$f ;\
-Binary files luarocks/src/bin/.luarocks.swp and luarocks.new/src/bin/.luarocks.swp differ
diff --git a/trunk/package/feeds/packages/luasec/Makefile b/trunk/package/feeds/packages/luasec/Makefile
deleted file mode 100644
index 9ed69d24..00000000
--- a/trunk/package/feeds/packages/luasec/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luasec
-PKG_VERSION:=0.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
-PKG_MD5SUM:=0518f4524f399f33424c6f450e1d06db
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
-
-MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasec
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaSec
-  URL:=https://github.com/brunoos/luasec
-  DEPENDS:=+lua +libopenssl +luasocket
-endef
-
-define Package/luasec/description
-  LuaSec is a binding for OpenSSL library to provide TLS/SSL communication.
-endef
-
-define Build/Configure
-endef
-
-MAKE_FLAGS += \
-	INCDIR="$(TARGET_CPPFLAGS) -I." \
-	LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
-	LUACPATH="/usr/lib/lua" \
-	LUAPATH="/usr/lib/lua"
-
-define Build/Compile
-$(call Build/Compile/Default,linux)
-endef
-
-define Package/luasec/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.so $(1)/usr/lib/lua/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.lua $(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/ssl
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl/https.lua $(1)/usr/lib/lua/ssl/
-endef
-
-$(eval $(call BuildPackage,luasec))
diff --git a/trunk/package/feeds/packages/luasec/patches/100-luasocket-Makefile.patch b/trunk/package/feeds/packages/luasec/patches/100-luasocket-Makefile.patch
deleted file mode 100644
index 24de7fc7..00000000
--- a/trunk/package/feeds/packages/luasec/patches/100-luasocket-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- luasec-luasec-0.5-old/src/luasocket/Makefile	2014-01-29 21:43:33.000000000 +0100
-+++ luasec-luasec-0.5/src/luasocket/Makefile	2014-11-30 13:07:44.850051000 +0100
-@@ -6,7 +6,7 @@
- 
- CC	?= cc
- CFLAGS	+= $(MYCFLAGS) -DLUASOCKET_DEBUG
--AR	:= ar rcu
-+AR	?= ar
- RANLIB	?= ranlib
- 
- .PHONY: all clean
-@@ -14,7 +14,7 @@
- all: libluasocket.a
- 
- libluasocket.a: $(OBJS)
--	$(AR) $@ $(OBJS)
-+	$(AR) rcu $@ $(OBJS)
- 	$(RANLIB) $@
- 
- clean:
diff --git a/trunk/package/feeds/packages/luasoap/Makefile b/trunk/package/feeds/packages/luasoap/Makefile
deleted file mode 100644
index 6ebf03b7..00000000
--- a/trunk/package/feeds/packages/luasoap/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luasoap
-PKG_VERSION:=2014-08-21
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/tomasguisasola/luasoap.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=af1e100281cee4b972df10121e37e51d53367a98
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=
-
-PKG_MAINTAINER:=Liu Peng <pengliu@credosemi.com>
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasoap
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaSOAP
-  URL:=https://github.com/tomasguisasola/luasoap
-  DEPENDS:=+lua +luaexpat +luasec +luasocket
-endef
-
-define Package/luasoap/description
-  LuaSOAP is a library of functions to deal with SOAP.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luasoap/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/soap.lua $(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/soap
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{client,server}.lua $(1)/usr/lib/lua/soap/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/soap/client
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/client/https.lua $(1)/usr/lib/lua/soap/client/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/soap/tests
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/test{,-http,-server}.lua $(1)/usr/lib/lua/soap/tests/
-endef
-
-$(eval $(call BuildPackage,luasoap))
diff --git a/trunk/package/feeds/packages/luasocket/Makefile b/trunk/package/feeds/packages/luasocket/Makefile
deleted file mode 100644
index 5e7c9830..00000000
--- a/trunk/package/feeds/packages/luasocket/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2009-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luasocket
-PKG_SOURCE_VERSION:=6d5e40c324c84d9c1453ae88e0ad5bdd0a631448
-PKG_VERSION:=3.0-rc1-20130909
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://github.com/diegonehab/luasocket.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasocket
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=LuaSocket
-  URL:=http://luasocket.luaforge.net/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+lua
-endef
-
-define Package/luasocket/description
-  LuaSocket is the most comprehensive networking support
-  library for the Lua language. It provides easy access to
-  TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/ \
-		LIBDIR="$(TARGET_LDFLAGS)" \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
-		LD="$(TARGET_CROSS)ld -shared" \
-		all
-endef
-
-
-define Package/luasocket/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.3 $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.3.0-rc1 $(1)/usr/lib/lua
-	$(INSTALL_DIR) $(1)/usr/lib/lua/mime
-	ln -sf ../mime.so.1.0.3 $(1)/usr/lib/lua/mime/core.so
-	$(INSTALL_DIR) $(1)/usr/lib/lua/socket
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url,headers}.lua $(1)/usr/lib/lua/socket
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/unix.so $(1)/usr/lib/lua/socket
-	ln -sf ../socket.so.3.0-rc1 $(1)/usr/lib/lua/socket/core.so
-endef
-
-$(eval $(call BuildPackage,luasocket))
diff --git a/trunk/package/feeds/packages/luasocket/patches/0001-Add-interface-support.patch b/trunk/package/feeds/packages/luasocket/patches/0001-Add-interface-support.patch
deleted file mode 100644
index 3be42ed5..00000000
--- a/trunk/package/feeds/packages/luasocket/patches/0001-Add-interface-support.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From 96fdf07acf78ecfc9be76a8b0591f38fe6f1a875 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Sat, 9 Nov 2013 12:01:42 +0100
-Subject: [PATCH] Add interface resolving
-
----
- src/if.c        | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/if.h        |  27 ++++++++++++++
- src/luasocket.c |   2 +
- src/makefile    |   2 +
- src/options.c   |   9 +++++
- 5 files changed, 153 insertions(+)
- create mode 100644 src/if.c
- create mode 100644 src/if.h
-
-diff --git a/src/if.c b/src/if.c
-new file mode 100644
-index 0000000..db231aa
---- /dev/null
-+++ b/src/if.c
-@@ -0,0 +1,113 @@
-+/*
-+ * $Id: if.c $
-+ *
-+ * Author: Markus Stenberg <fingon@iki.fi>
-+ *
-+ * Copyright (c) 2012 cisco Systems, Inc.
-+ *
-+ * Created:       Tue Dec  4 14:50:34 2012 mstenber
-+ * Last modified: Wed Dec  5 18:51:08 2012 mstenber
-+ * Edit time:     24 min
-+ *
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+
-+#include "if.h"
-+
-+#include "lauxlib.h"
-+
-+static int if_global_indextoname(lua_State *L);
-+static int if_global_nametoindex(lua_State *L);
-+static int if_global_nameindex(lua_State *L);
-+
-+static luaL_Reg func[] = {
-+    { "indextoname", if_global_indextoname},
-+    { "nametoindex", if_global_nametoindex},
-+    { "nameindex", if_global_nameindex},
-+    { NULL, NULL}
-+};
-+
-+int if_open(lua_State *L)
-+{
-+    lua_pushstring(L, "iface");
-+    lua_newtable(L);
-+    luaL_openlib(L, NULL, func, 0);
-+    lua_settable(L, -3);
-+    return 0;
-+}
-+
-+int if_global_indextoname(lua_State *L)
-+{
-+  unsigned int ifnumber;
-+  const char *name;
-+  char buf[IF_NAMESIZE+1];
-+
-+  if (!lua_isnumber(L, 1))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "indextoname expects only number argument");
-+      return 2;
-+    }
-+  ifnumber = lua_tonumber(L, 1);
-+  if (!(name = if_indextoname(ifnumber, buf)))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nonexistent interface");
-+      return 2;
-+    }
-+  lua_pushstring(L, name);
-+  return 1;
-+}
-+
-+int if_global_nametoindex(lua_State *L)
-+{
-+  unsigned int ifnumber;
-+  if (!lua_isstring(L, 1))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nametoindex expects only string argument");
-+      return 2;
-+    }
-+  if (!(ifnumber = if_nametoindex(lua_tostring(L, 1))))
-+    {
-+      lua_pushnil(L);
-+      lua_pushstring(L, "nonexistent interface");
-+      return 2;
-+    }
-+  lua_pushnumber(L, ifnumber);
-+  return 1;
-+}
-+
-+int if_global_nameindex(lua_State *L)
-+{
-+  struct if_nameindex *ni, *oni;
-+  int i = 1;
-+  oni = ni = if_nameindex();
-+  lua_newtable(L);
-+  while (ni && ni->if_index && *(ni->if_name))
-+    {
-+      /* at result[i], we store.. */
-+      lua_pushnumber(L, i);
-+
-+      /* new table with two items - index, name*/
-+      lua_newtable(L);
-+      lua_pushstring(L, "index");
-+      lua_pushnumber(L, ni->if_index);
-+      lua_settable(L, -3);
-+
-+      lua_pushstring(L, "name");
-+      lua_pushstring(L, ni->if_name);
-+      lua_settable(L, -3);
-+
-+      /* Then, actually store it */
-+      lua_settable(L, -3);
-+
-+      i++;
-+      ni++;
-+    }
-+  if_freenameindex(oni);
-+  return 1;
-+}
-diff --git a/src/if.h b/src/if.h
-new file mode 100644
-index 0000000..dc7faf8
---- /dev/null
-+++ b/src/if.h
-@@ -0,0 +1,27 @@
-+/*
-+ * $Id: if.h $
-+ *
-+ * Author: Markus Stenberg <fingon@iki.fi>
-+ *
-+ *  Copyright (c) 2012 cisco Systems, Inc.
-+ *
-+ * Created:       Tue Dec  4 14:37:24 2012 mstenber
-+ * Last modified: Tue Dec  4 14:51:43 2012 mstenber
-+ * Edit time:     7 min
-+ *
-+ */
-+
-+/* This module provides Lua wrapping for the advanced socket API
-+ * defined in RFC3542, or mainly, the access to the system's interface
-+ * list. It is necessary for use of recvmsg/sendmsg.
-+ *
-+ * TODO - Do something clever with Windows?
-+ */
-+#ifndef IF_H
-+#define IF_H
-+
-+#include "lua.h"
-+
-+int if_open(lua_State *L);
-+
-+#endif /* IF_H */
-diff --git a/src/luasocket.c b/src/luasocket.c
-index e6ee747..85d41a6 100644
---- a/src/luasocket.c
-+++ b/src/luasocket.c
-@@ -31,6 +31,7 @@
- #include "tcp.h"
- #include "udp.h"
- #include "select.h"
-+#include "if.h"
- 
- /*-------------------------------------------------------------------------*\
- * Internal function prototypes
-@@ -51,6 +52,7 @@ static const luaL_Reg mod[] = {
-     {"tcp", tcp_open},
-     {"udp", udp_open},
-     {"select", select_open},
-+    {"iface", if_open},
-     {NULL, NULL}
- };
- 
-diff --git a/src/makefile b/src/makefile
-index 8d3521e..09d4882 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -262,6 +262,7 @@ SOCKET_OBJS= \
- 	auxiliar.$(O) \
- 	options.$(O) \
- 	inet.$(O) \
-+	if.$(O) \
- 	$(SOCKET) \
- 	except.$(O) \
- 	select.$(O) \
-@@ -387,6 +388,7 @@ auxiliar.$(O): auxiliar.c auxiliar.h
- buffer.$(O): buffer.c buffer.h io.h timeout.h
- except.$(O): except.c except.h
- inet.$(O): inet.c inet.h socket.h io.h timeout.h usocket.h
-+if.$(O): if.c if.h
- io.$(O): io.c io.h timeout.h
- luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \
- 	timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \
-diff --git a/src/options.c b/src/options.c
-index 8ac2a14..1c73e6f 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -3,6 +3,9 @@
- * LuaSocket toolkit
- \*=========================================================================*/
- #include <string.h> 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
- 
- #include "lauxlib.h"
- 
-@@ -285,6 +288,12 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
-     if (!lua_isnil(L, -1)) {
-         if (lua_isnumber(L, -1)) {
-             val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1);
-+        } else if (lua_isstring(L, -1)) {
-+            if (!(val.ipv6mr_interface = if_nametoindex(lua_tostring(L, -1)))) {
-+                lua_pushnil(L);
-+                lua_pushstring(L, "nonexistent interface");
-+                return 2;
-+            }
-         } else
-           luaL_argerror(L, -1, "number 'interface' field expected");
-     }
--- 
-1.8.4.rc3
-
diff --git a/trunk/package/feeds/packages/luasql/Makefile b/trunk/package/feeds/packages/luasql/Makefile
deleted file mode 100644
index 6df105dc..00000000
--- a/trunk/package/feeds/packages/luasql/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luasql
-PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/keplerproject/luasql/archive/
-PKG_MD5SUM:=af9f0f3a2313a1fcf88c40700092048d
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=docs/us/license.html
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luasql/Default
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Lua SQL binding
-  URL:=http://www.keplerproject.org/luasql/
-  DEPENDS:= +lua
-endef
-
-define Package/luasql/Default/description
- LuaSQL is a simple interface from Lua to a DBMS.
-endef
-
-
-define Package/luasql-mysql
-$(call Package/luasql/Default)
-  TITLE+= for MySQL
-  DEPENDS+= +libmysqlclient
-  VARIANT:=mysql
-endef
-
-define Package/luasql-mysql/description
-$(call Package/luasql/Default/description)
- .
- This package contains the MySQL binding.
-endef
-
-
-define Package/luasql-pgsql
-$(call Package/luasql/Default)
-  TITLE+= for PostgreSQL
-  DEPENDS+= +libpq
-  VARIANT:=postgres
-endef
-
-define Package/luasql-pgsql/description
-$(call Package/luasql/Default/description)
- .
- This package contains the PostgreSQL binding.
-endef
-
-
-define Package/luasql-sqlite3
-$(call Package/luasql/Default)
-  TITLE+= for SQLite 3
-  DEPENDS+= +libsqlite3
-  VARIANT:=sqlite3
-endef
-
-define Package/luasql-sqlite3/description
-$(call Package/luasql/Default/description)
- .
- This package contains the SQLite 3 binding.
-endef
-
-
-TARGET_CFLAGS += $(FPIC) -std=gnu99
-TARGET_CPPFLAGS += -DLUA_USE_LINUX
-
-ifeq ($(BUILD_VARIANT),mysql)
-  TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/mysql
-  TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
-endif
-
-ifeq ($(BUILD_VARIANT),postgres)
-  TARGET_LDFLAGS += -lpq
-endif
-
-ifeq ($(BUILD_VARIANT),sqlite3)
-  TARGET_LDFLAGS += -lsqlite3 -lpthread
-endif
-
-MAKE_FLAGS += \
-	T="$(BUILD_VARIANT)" \
-	DRIVER_INCS="$(TARGET_CPPFLAGS)" \
-	DRIVER_LIBS="$(TARGET_LDFLAGS)" \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	lib
-
-define Package/Install/Default
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luasql
-	$(CP) $(PKG_BUILD_DIR)/src/*.so $(1)/usr/lib/lua/luasql/
-endef
-
-Package/luasql-mysql/install = $(Package/Install/Default)
-Package/luasql-pgsql/install = $(Package/Install/Default)
-Package/luasql-sqlite3/install = $(Package/Install/Default)
-
-$(eval $(call BuildPackage,luasql-mysql))
-$(eval $(call BuildPackage,luasql-pgsql))
-$(eval $(call BuildPackage,luasql-sqlite3))
diff --git a/trunk/package/feeds/packages/luci-app-bcp38/Makefile b/trunk/package/feeds/packages/luci-app-bcp38/Makefile
deleted file mode 100644
index d42916cf..00000000
--- a/trunk/package/feeds/packages/luci-app-bcp38/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-bcp38
-PKG_VERSION:=2
-PKG_RELEASE:=1
-PKG_LICENSE:=Apache-2.0
-LUCI_DIR:=/usr/lib/lua/luci
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-bcp38
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=BCP38 LuCI interface
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  PKGARCH:=all
-  DEPENDS:= lua luci-base +bcp38
-  SUBMENU:=3. Applications
-endef
-
-define Package/luci-app-bcp38/description
-	Control BCP38 subnet blocking
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/luci-app-bcp38/install
-	$(INSTALL_DIR) $(1)$(LUCI_DIR)/controller $(1)$(LUCI_DIR)/model/cbi
-	$(INSTALL_DATA) ./files/bcp38-controller.lua $(1)$(LUCI_DIR)/controller/bcp38.lua
-	$(INSTALL_DATA) ./files/bcp38-cbi.lua $(1)$(LUCI_DIR)/model/cbi/bcp38.lua
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/uci-defaults-bcp38 $(1)/etc/uci-defaults/luci-bcp38
-endef
-
-define Package/luci-app-bcp38/postinst
-#!/bin/sh
-[ -x /etc/uci-defaults/luci-bcp38 ] && /etc/uci-defaults/luci-bcp38 || exit 0
-endef
-
-define Package/luci-app-bcp38/postrm
-#!/bin/sh
-uci delete ucitrack.@bcp38[0]
-uci commit
-endef
-
-$(eval $(call BuildPackage,luci-app-bcp38))
diff --git a/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-cbi.lua b/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-cbi.lua
deleted file mode 100644
index b0b8f387..00000000
--- a/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-cbi.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Toke Høiland-Jørgensen <toke@toke.dk>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local wa = require "luci.tools.webadmin"
-local net = require "luci.model.network".init()
-local ifaces = net:get_interfaces()
-
-m = Map("bcp38", translate("BCP38"),
-	translate("This function blocks packets with private address destinations " ..
-		"from going out onto the internet as per " ..
-		"<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>."))
-
-s = m:section(TypedSection, "bcp38", translate("BCP38 config"))
-s.anonymous = true
--- BASIC
-e = s:option(Flag, "enabled", translate("Enable"))
-e.rmempty = false
-
-a = s:option(Flag, "detect_upstream", translate("Auto-detect upstream IP"),
-				translate("Attempt to automatically detect if the upstream IP " ..
-					"will be blocked by the configuration, and add an exception if it will. " ..
-					"If this does not work correctly, you can add exceptions manually below."))
-a.rmempty = false
-
-n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " ..
-							"(should be the upstream WAN interface)."))
-for _, iface in ipairs(ifaces) do
-     if iface:is_up() then
-	n:value(iface:name())
-     end
-end
-n.rmempty = false
-
-ma = s:option(DynamicList, "match",
-	translate("Blocked IP ranges"))
-
-ma.datatype = "ip4addr"
-
-nm = s:option(DynamicList, "nomatch",
-	translate("Allowed IP ranges"), translate("Takes precedence over blocked ranges. "..
-						  "Use to whitelist your upstream network if you're behind a double NAT " ..
-						  "and the auto-detection doesn't work."))
-
-nm.datatype = "ip4addr"
-
-
-return m
diff --git a/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-controller.lua b/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-controller.lua
deleted file mode 100644
index 7ea22835..00000000
--- a/trunk/package/feeds/packages/luci-app-bcp38/files/bcp38-controller.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-module("luci.controller.bcp38", package.seeall)
-
-function index()
-	entry({"admin", "network", "firewall", "bcp38"},
-		cbi("bcp38"),
-		_("BCP38"), 50).dependent = false
-end
diff --git a/trunk/package/feeds/packages/luci-app-bcp38/files/uci-defaults-bcp38 b/trunk/package/feeds/packages/luci-app-bcp38/files/uci-defaults-bcp38
deleted file mode 100755
index c204236e..00000000
--- a/trunk/package/feeds/packages/luci-app-bcp38/files/uci-defaults-bcp38
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@bcp38[-1]
-	add ucitrack bcp38
-        add_list ucitrack.@bcp38[0].affects=firewall
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/trunk/package/feeds/packages/luci-app-lxc/Makefile b/trunk/package/feeds/packages/luci-app-lxc/Makefile
deleted file mode 100644
index f08d81e1..00000000
--- a/trunk/package/feeds/packages/luci-app-lxc/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-lxc
-PKG_RELEASE:=20141012
-
-PKG_LICENSE:=Apache-2.0
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-lxc
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=LXC management Web UI
-  DEPENDS:=+luci-mod-admin-full +lxc +lxc-create +liblxc +rpcd-mod-lxc
-  MAINTAINER:=Petar Koretic <petar.koretic@sartura.hr>
-endef
-
-define Package/luci-app-lxc/description
- This package will install LXC management Web UI.
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-lxc/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-	$(INSTALL_BIN) \
-		./files/controller/lxc.lua \
-		$(1)/usr/lib/lua/luci/controller/
-
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/
-	$(INSTALL_DATA) \
-		./files/view/lxc.htm \
-		$(1)/usr/lib/lua/luci/view/
-
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/
-	$(INSTALL_BIN) \
-		./files/model/cbi/lxc.lua \
-		$(1)/usr/lib/lua/luci/model/cbi/
-
-	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_DATA) \
-		./files/lxc.config \
-		$(1)/etc/config/lxc
-
-	$(INSTALL_DIR) $(1)/www
-	$(CP) -R \
-		./files/www/* \
-		$(1)/www
-endef
-
-$(eval $(call BuildPackage,luci-app-lxc))
diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/controller/lxc.lua b/trunk/package/feeds/packages/luci-app-lxc/files/controller/lxc.lua
deleted file mode 100644
index f3f5d07b..00000000
--- a/trunk/package/feeds/packages/luci-app-lxc/files/controller/lxc.lua
+++ /dev/null
@@ -1,125 +0,0 @@
---[[
-
-LuCI LXC module
-
-Copyright (C) 2014, Cisco Systems, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Author: Petar Koretic <petar.koretic@sartura.hr>
-
-]]--
-
-module("luci.controller.lxc", package.seeall)
-
-require "ubus"
-local conn = ubus.connect()
-if not conn then
-    error("Failed to connect to ubus")
-end
-
-
-function fork_exec(command)
-	local pid = nixio.fork()
-	if pid > 0 then
-		return
-	elseif pid == 0 then
-		-- change to root dir
-		nixio.chdir("/")
-
-		-- patch stdin, out, err to /dev/null
-		local null = nixio.open("/dev/null", "w+")
-		if null then
-			nixio.dup(null, nixio.stderr)
-			nixio.dup(null, nixio.stdout)
-			nixio.dup(null, nixio.stdin)
-			if null:fileno() > 2 then
-				null:close()
-			end
-		end
-
-		-- replace with target command
-		nixio.exec("/bin/sh", "-c", command)
-	end
-end
-
-function index()
-	page = node("admin", "services", "lxc")
-	page.target = cbi("lxc")
-	page.title = _("LXC Containers")
-	page.order = 70
-
-	page = entry({"admin", "services", "lxc_create"}, call("lxc_create"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "services", "lxc_action"}, call("lxc_action"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "services", "lxc_configuration_get"}, call("lxc_configuration_get"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "services", "lxc_configuration_set"}, call("lxc_configuration_set"), nil)
-	page.leaf = true
-
-end
-
-function lxc_create(lxc_name, lxc_template)
-	luci.http.prepare_content("text/plain")
-
-	local uci = require("uci").cursor()
-
-	local url = uci:get("lxc", "lxc", "url")
-
-	if not pcall(dofile, "/etc/openwrt_release") then
-		return luci.http.write("1")
-	end
-
-	local target = _G.DISTRIB_TARGET:match('([^/]+)')
-
-	local data = conn:call("lxc", "create", { name = lxc_name, template = "download", args = { "--server", url,  "--no-validate", "--dist", lxc_template, "--release", "bb", "--arch", target } } )
-
-	luci.http.write(data)
-end
-
-function lxc_action(lxc_action, lxc_name)
-	luci.http.prepare_content("application/json")
-
-	local data, ec = conn:call("lxc", lxc_action, lxc_name and { name = lxc_name} or {} )
-
-	luci.http.write_json(ec and {} or data)
-end
-
-function lxc_configuration_get(lxc_name)
-	luci.http.prepare_content("text/plain")
-
-	local f = io.open("/lxc/" .. lxc_name .. "/config", "r")
-	local content = f:read("*all")
-	f:close()
-
-	luci.http.write(content)
-end
-
-function lxc_configuration_set(lxc_name)
-	luci.http.prepare_content("text/plain")
-
-	local lxc_configuration = luci.http.formvalue("lxc_configuration")
-
-	if lxc_configuration == nil then
-		return luci.http.write("1")
-	end
-
-	local f, err = io.open("/lxc/" .. lxc_name .. "/config","w+")
-	if not f then
-		return luci.http.write("2")
-	end
-
-	f:write(lxc_configuration)
-	f:close()
-
-	luci.http.write("0")
-end
-
diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/lxc.config b/trunk/package/feeds/packages/luci-app-lxc/files/lxc.config
deleted file mode 100644
index 5572c735..00000000
--- a/trunk/package/feeds/packages/luci-app-lxc/files/lxc.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# lxc uci configuration
-#
-
-config lxc 'lxc'
-	option url 'virtualwrt.org/containers/'
diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/model/cbi/lxc.lua b/trunk/package/feeds/packages/luci-app-lxc/files/model/cbi/lxc.lua
deleted file mode 100644
index ac0fdff3..00000000
--- a/trunk/package/feeds/packages/luci-app-lxc/files/model/cbi/lxc.lua
+++ /dev/null
@@ -1,31 +0,0 @@
---[[
-
-LuCI LXC module
-
-Copyright (C) 2014, Cisco Systems, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Author: Petar Koretic <petar.koretic@sartura.hr>
-
-]]--
-
-local fs = require "nixio.fs"
-
-m = Map("lxc", translate("LXC Containers"))
-
-if fs.access("/etc/config/lxc") then
-	m:section(SimpleSection).template = "lxc"
-
-	s = m:section(TypedSection, "lxc", translate("Options"))
-	s.anonymous = true
-	s.addremove = false
-
-	s:option(Value, "url", translate("Containers URL"))
-end
-
-return m
diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/view/lxc.htm b/trunk/package/feeds/packages/luci-app-lxc/files/view/lxc.htm
deleted file mode 100644
index 1376968e..00000000
--- a/trunk/package/feeds/packages/luci-app-lxc/files/view/lxc.htm
+++ /dev/null
@@ -1,441 +0,0 @@
-<%#
-
-LuCI LXC module
-
-Copyright (C) 2014, Cisco Systems, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Author: Petar Koretic <petar.koretic@sartura.hr>
-
--%>
-
-<fieldset class="cbi-section">
-	<legend><%:Available Containers%></legend>
-	<div class="cbi-section-node">
-		<table id="t_lxc_list" class="cbi-section-table">
-			<tr class="cbi-section-table-titles">
-				<th class="cbi-section-table-cell"><%:Name%></th>
-				<th class="cbi-section-table-cell"><%:Status%></th>
-				<th class="cbi-section-table-cell"><%:Actions%></th>
-			</tr>
-		</table>
-	</div>
-</fieldset>
-
-<fieldset class="cbi-section">
-	<span id="lxc-list-output"></span>
-</fieldset>
-
-<hr/>
-<fieldset class="cbi-section">
-	<legend><%:Create New Container%></legend>
-	<div class="cbi-section-node">
-		<table id="t_lxc_create" class="cbi-section-table">
-			<tr class="cbi-section-table-titles">
-				<th class="cbi-section-table-cell"><%:Name%></th>
-				<th class="cbi-section-table-cell"><%:Template%></th>
-				<th class="cbi-section-table-cell"><%:Actions%></th>
-			</tr>
-			<tr id="tr_holder">
-				<td>
-					<input type="text" id="tx_name" placeholder="<%:Enter new name%>" value='' />
-				</td>
-				<td>
-					<select id="s_template" class="cbi-input-select cbi-button">
-						<option value="openwrt">OpenWrt</option>
-					</select>
-				</td>
-				<td>
-					<input type="button" id="bt_create" value="<%:Create%>" onclick="lxc_create(tr_holder)" class="cbi-button cbi-button-add" />
-					<span id="lxc-add-loader" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>
-				</td>
-			</tr>
-		</table>
-	</div>
-</fieldset>
-
-<fieldset class="cbi-section">
-	<span id="lxc-add-output"></span>
-</fieldset>
-
-<hr/>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-
-	window.img = { "red" : "<%=resource%>/cbi/red.gif", "green" : "<%=resource%>/cbi/green.gif", "purple" : "<%=resource%>/cbi/purple.gif" }
-	window.states = {  "STOPPED" : "red", "RUNNING" : "green", "FROZEN" : "purple"}
-
-	var t_lxc_list = document.getElementById('t_lxc_list');
-	var loader_html = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" /> ';
-	var timeout_msg = 0
-	var output_list = document.getElementById("lxc-list-output")
-	var output_add = document.getElementById("lxc-add-output")
-	var loader_add = document.getElementById("lxc-add-loader")
-
-	function lxc_create(tr)
-	{
-		var lxc_name = tr.querySelector("#tx_name").value.trim()
-		var lxc_template = tr.querySelector("#s_template").value
-		var bt_create = tr.querySelector("#bt_create")
-
-		if (t_lxc_list.querySelector("[data-id='" + lxc_name + "']") != null)
-			return info_message(output_add, "Container with that name already exists!", 4000)
-
-		bt_create.disabled = true
-		output_add.innerHTML = ''
-
-		if (!lxc_name || !lxc_name.length)
-		{
-			bt_create.disabled = false
-			return info_message(output_add, "Name cannot be empty!", 4000)
-		}
-
-		loading(loader_add)
-
-		new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_create/' + '%h/%h'.format(lxc_name, lxc_template) , null,
-		function(x)
-		{
-			bt_create.disabled = false
-			loading(loader_add, 0)
-
-			if (!x)
-				info_message(output_add, "Container creation failed!")
-		})
-	}
-
-	function lxc_create_template(lxc_name, lxc_state)
-	{
-		var info_row = t_lxc_list.querySelector("#empty")
-		if (info_row)
-			t_lxc_list.deleteRow(1)
-
-		var actions = ''
-		actions += '<input type="button" onclick="action_handler(this)" data-action="start" value="<%:Start%>" class="cbi-button cbi-button-apply" />'
-		actions+= '<input type="button" onclick="action_handler(this)" data-action="stop" value="<%:Stop%>" class="cbi-button cbi-button-reset" />'
-		actions+= '<input type="button" onclick="action_handler(this)" data-action="destroy" value="<%:Delete%>" class="cbi-button cbi-button-remove" />'
-		actions+= ' <select class="cbi-input-select cbi-button" onchange="action_more_handler(this)">\
-						<option selected disabled>more</option>\
-						<option>configure</option>\
-						<option>freeze</option>\
-						<option>unfreeze</option>\
-						<option>reboot</option>\
-					</select>'
-		actions+= '<span data-loader style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>'
-
-		var row = t_lxc_list.insertRow(-1)
-		var cell = row.insertCell(-1)
-		cell.innerHTML = '%q%h%q'.format("<strong>", lxc_name, "</strong>")
-		cell.width = "30%"
-		cell.setAttribute("data-id", lxc_name)
-
-		cell = row.insertCell(-1)
-		cell.width = "20%"
-		cell.innerHTML = "<img src='"+window.img[lxc_state]+"'/>"
-
-		cell = row.insertCell(-1)
-		cell.width = "50%"
-		cell.innerHTML = actions
-	}
-
-	function action_handler(self)
-	{
-		var action = self.getAttribute("data-action");
-
-		var bt_action = self
-		var lxc_name = self.parentNode.parentNode.children[0].getAttribute('data-id')
-		var status_img = self.parentNode.parentNode.querySelector('img')
-		var loader = self.parentNode.querySelector('[data-loader]')
-
-		bt_action.disabled = true
-
-		if (action == "stop")
-		{
-			loading(loader)
-
-			new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(action, lxc_name), null,
-			function(x, ec)
-			{
-				loading(loader, 0)
-				bt_action.disabled = false
-
-				if (!x || ec)
-					return info_message(output_list,"Action failed!")
-
-				set_status(status_img, "red")
-
-			});
-		}
-
-		else if (action == "start")
-		{
-			loading(loader)
-
-			new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(action, lxc_name), null,
-			function(x, data)
-			{
-				loading(loader, 0)
-				bt_action.disabled = false
-
-				//FIXME: uncomment after fixing 'lxc-start'
-				if (!x /*|| ec */)
-					return info_message(output_list,"Action failed!")
-
-				//FIXME: uncomment after fixing 'lxc-start'
-				//set_status(status_img, "green")
-			});
-		}
-
-		else if (action == "destroy")
-		{
-			if (!confirm("This will completely remove LXC container from the disk. Are you sure? (container will be stopped if running)"))
-				return
-
-			loading(loader)
-
-			new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(action, lxc_name), null,
-			function(x, ec)
-			{
-				loading(loader, 0)
-				bt_action.disabled = false
-
-				if (!x || ec)
-					return info_message(output_list,"Action failed!")
-
-				var row = self.parentNode.parentNode
-				row.parentNode.removeChild(row)
-
-			});
-		}
-	}
-
-	function lxc_configure_handler(self)
-	{
-		var td = self.parentNode
-		var textarea = td.querySelector('[data-id]')
-		var lxc_name = textarea.getAttribute('data-id')
-		var lxc_configuration = textarea.value
-
-		new XHR().post('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_configuration_set/' + lxc_name, "lxc_configuration=" + encodeURIComponent(lxc_configuration) ,
-		function(x)
-		{
-			if (!x || x.responseText != "0")
-				return info_message(output_list,"Action failed!")
-
-			info_message(output_list,"LXC configuration updated")
-			var row = td.parentNode
-			row.parentNode.removeChild(row)
-		})
-	}
-
-	function lxc_rename_template(lxc_name)
-	{
-		var h = '\
-			<input data-id="'+ lxc_name + '" type="text" placeholder="Enter new name" /> \
-			<input data-id="bt_confirm" onclick="lxc_rename_handler(this)" type="button" class="cbi-button" value="Confirm" />'
-
-		return h
-	}
-
-	function lxc_configure_template(lxc_name, lxc_configuration)
-	{
-		var h = '\
-			<textarea data-id="'+ lxc_name + '" rows="20" style="width:100%">'+ lxc_configuration +'</textarea> \
-			<input data-id="bt_confirm" onclick="lxc_configure_handler(this)" type="button" class="cbi-button" value="Confirm" />'
-
-		return h
-	}
-
-	function action_more_handler(self)
-	{
-		var lxc_name = self.parentNode.parentNode.querySelector('[data-id]').getAttribute('data-id')
-		var loader = self.parentNode.parentNode.querySelector('[data-loader]')
-
-		var option = self.options[self.selectedIndex].text
-
-		self.value = "more"
-
-		switch (option)
-		{
-			case "configure":
-				var tr = document.createElement('tr')
-				var row = self.parentNode.parentNode
-				var next_row = row.nextSibling
-				if (next_row && next_row.getAttribute('data-action') !== null)
-					row.parentNode.removeChild(next_row)
-
-				new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_configuration_get/' + lxc_name, null,
-				function(x)
-				{
-					tr.innerHTML="<td colspan='" + row.cells.length + "'>" + lxc_configure_template(lxc_name, x.responseText) + "</td>"
-					tr.setAttribute('data-action','')
-					row.parentNode.insertBefore(tr, row.nextSibling)
-				})
-
-			break
-
-			case "freeze":
-				var tr = self.parentNode.parentNode
-				var img = tr.querySelector('img')
-				if(img.getAttribute('src') != window.img["green"])
-					return info_message(output_list,"Container is not running!")
-
-				loading(loader)
-				new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(option, lxc_name), null,
-				function(x, ec)
-				{
-					loading(loader, 0)
-					if (!x || ec)
-						return info_message(output_list,"Action failed!")
-
-					set_status(img, "purple")
-				})
-
-			break
-
-			case "unfreeze":
-				var tr = self.parentNode.parentNode
-				var img = tr.querySelector('img')
-
-				if(img.getAttribute('src') != window.img["purple"])
-					return info_message(output_list,"Container is not frozen!")
-
-				loading(loader)
-				new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(option, lxc_name), null,
-				function(x, ec)
-				{
-					loading(loader, 0)
-					if (!x || ec)
-						return info_message(output_list,"Action failed!")
-
-					set_status(img, "green")
-				})
-
-			break
-
-			case "reboot":
-				var tr = self.parentNode.parentNode
-				var img = tr.querySelector('img')
-				if(img.getAttribute('src') != window.img["green"])
-					return info_message(output_list,"Container is not running!")
-
-				if (!confirm("Are you sure?"))
-					return
-
-				loading(loader)
-				new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/' + '%h/%h'.format(option, lxc_name), null,
-				function(x, ec)
-				{
-					loading(loader, 0)
-					if (!x || ec)
-						return info_message(output_list,"Action failed!")
-
-					info_message(output_list,"LXC rebooted")
-				})
-			break
-		}
-
-	}
-
-	function set_empty(t_lxc_list)
-	{
-		if (document.getElementById('empty') !== null)
-			return
-
-		var row_count = t_lxc_list.rows.length;
-		while(--row_count) t_lxc_list.deleteRow(row_count);
-
-		var row = t_lxc_list.insertRow(-1);
-		row.id = 'empty'
-		var cell = row.insertCell(0);
-		cell.colSpan = 4;
-		cell.innerHTML = '<em><br />There are no containers available yet.</em>';
-	}
-
-	function lxc_list_update()
-	{
-		XHR.poll(4, '<%=luci.dispatcher.build_url("admin", "services")%>/lxc_action/list', null,
-		function(x, data)
-		{
-			if (!x) return;
-
-			var lxc_count = Object.keys(data).length
-			if (!data || !lxc_count)
-				return set_empty(t_lxc_list)
-
-			if (document.getElementById('empty') !== null)
-				t_lxc_list.deleteRow(1);
-
-			var lxcs = t_lxc_list.querySelectorAll('td[data-id]')
-			var lxc_name_table = {}
-			for (var i = 0, len = lxcs.length; i < len; i++)
-			{
-				var lxc_name = lxcs[i].getAttribute('data-id')
-				if (!(lxc_name in data))
-				{
-					var row = t_lxc_list.querySelector("[data-id='" + lxc_name + "']").parentNode
-					row.parentNode.removeChild(row)
-					continue
-				}
-
-				lxc_name_table[lxc_name] = lxcs[i].parentNode.querySelector('img')
-			}
-
-			for(var key in data)
-			{
-				var lxc_name = key
-				var state = window.states[data[key]]
-
-				if (!(lxc_name in lxc_name_table))
-					lxc_create_template(lxc_name, state)
-
-				else if (state != get_status(lxc_name_table[lxc_name]))
-					set_status(lxc_name_table[lxc_name], state)
-			}
-
-		})
-	}
-
-	function loading(elem, state)
-	{
-		state = (typeof state === 'undefined') ? 1 : state
-
-		if (state === 1)
-			elem.innerHTML = loader_html
-		else
-			setTimeout(function() { elem.innerHTML = ''}, 1000)
-	}
-
-	function set_status(elem, state)
-	{
-		state = (typeof state === 'undefined') ? 1 : state
-
-		setTimeout(function() { elem.setAttribute('src', window.img[state])}, 300)
-	}
-
-	function get_status(elem)
-	{
-		var src = elem.getAttribute('src')
-
-		for (var i in img)
-		{
-			if (img[i] == src)
-				return i
-		}
-	}
-
-	function info_message(output, msg, timeout)
-	{
-		timeout = timeout || 3000
-		output.innerHTML = msg
-		clearTimeout(timeout_msg)
-		timeout_msg = setTimeout(function(){ output.innerHTML=""}, timeout);
-	}
-
-	lxc_list_update()
-//]]></script>
diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/green.gif b/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/green.gif
deleted file mode 100644
index d09febf1273b9a20ed89f69b19c9837c325b6db2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=SHNk%w1VG;lm0K^{vZ~bkE`i3IOOtAj1%l^tt)@2&AVF&*PSoufY_~E|k
z)JgwHS>#<B{~2}AqJ8O#A^#yh|2{6|G?V|5N&7n`{~R&@B@+J+KH^8f`M^}}P&u`P
zg7SbT=_dgH0RR90A^8LW0018VEC2ui01^Na000HE;3tY1r*)miWn=p#W-uf~sU|KV
ztwisa62d648yJn5<A5W<eI9^-bV9941AxaTg8_KIU@#{0U@RhwbYz`AM-Yrh0a0l{
z?v2aEj&C3e0tg2l9tVblhlB?R0)c~skdcav1sWHUm>w4z1r7`qnUWO@4hjMkkD&(?
z0tz3V7O9d47M&sq1`M&7v<wDL9|{Hq6crbS7Znr*2Cgj$4#OG<2%H8Ez%B|78wLg&
Ir7j@=J5RTB3jhEB

diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/purple.gif b/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/purple.gif
deleted file mode 100644
index f0d68cc8b2c8e78ee3d8948f67fcb9e1c15f8e94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmV-D0mA-ANk%w1VG;lm0K^{v>e%u0>iE{m+T+XZwTj1<W~juJ*}aU?t%bbFn%-YE
zZOftF+Pvs;MS;$x;iHPH>Er9cj@j0><j|?%#h%s4tkt!ezkODUqkOU4!0GSd^^jtr
zu9LUFiPyb`*8l(iA^8LW0018VEC2ui01^Na000HL;3tY2vqaItXk+^YW(EWSkg0*I
z9g^nL0UzVQ5(NkhfKsDu0vLqcM=}{?2G}h2I+1(;NQs0&E@v2GD4;@_I2;rAVgYx<
zDHX)Rz)$c|eS8KB2n7xu9v&TwiHnGe4h0*BiItX>9S$296cLx79uX8676b;Mmj(nD
z0vijDs2vL%0v{X*39y$P2?!h_5Df&mpS%PO5F-K&7<&<m5rY^FwJi`27o-k*7#9!8
PE+PWh3JTuUBOw4gzwCq@

diff --git a/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/red.gif b/trunk/package/feeds/packages/luci-app-lxc/files/www/luci-static/resources/cbi/red.gif
deleted file mode 100644
index c1b39bbedb72c8265531985640df71d761c5f902..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmV-G0l)r7Nk%w1VG;lm0K@<Q{Ck!DyU6`GTK8da{VG-Z-s9RqVgD3G$~I5`)7$-p
znES}l{cnoYcZ&a2ckH~z|3z)%T4w)~sQ;a@|FFN?8$<p}aQ`4p!W=sMQ)%czWVIJJ
z-*}Gy7e@aOLjV8&A^8LV00000EC2ui01^Na000HO;3tX!09_XZ1Y`RZfTaXU5hxZ=
zxC;R+i-a%%1P~UZ0zpA(2A+W?MM2no01SzC!tH7$48SL#Q82=QG#blLXi5Wz#X+|~
zAoIFo0MHBwfC7Lhfq(=98WjT_9v%lB2a%5ljU59Oij0k$oRyab0~ej69v1@!91#Mf
zodOXY4+t5WtQ{E$4<D%lw4EKU93ll6s=bXDt{7Gy3&a@$7abkQ84(yrEd>n-5d+>4
S5eN;-E)Uxq8{)YwApkob^ml{+

diff --git a/trunk/package/feeds/packages/luci-app-sqm/Makefile b/trunk/package/feeds/packages/luci-app-sqm/Makefile
deleted file mode 100644
index f0bb2a0a..00000000
--- a/trunk/package/feeds/packages/luci-app-sqm/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-sqm
-PKG_VERSION:=3
-PKG_RELEASE:=1
-PKG_LICENSE:=GPLv2
-LUCI_DIR:=/usr/lib/lua/luci
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-sqm
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=SQM Scripts - LuCI interface
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  PKGARCH:=all
-  DEPENDS:= lua luci-base +sqm-scripts
-  SUBMENU:=3. Applications
-endef
-
-define Package/luci-app-sqm/description
-	Control the simple_qos SQM script
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/luci-app-sqm/install
-	$(INSTALL_DIR) $(1)$(LUCI_DIR)/controller $(1)$(LUCI_DIR)/model/cbi
-	$(INSTALL_DATA) ./files/sqm-controller.lua $(1)$(LUCI_DIR)/controller/sqm.lua
-	$(INSTALL_DATA) ./files/sqm-cbi.lua $(1)$(LUCI_DIR)/model/cbi/sqm.lua
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/uci-defaults-sqm $(1)/etc/uci-defaults/luci-sqm
-endef
-
-define Package/luci-app-sqm/postinst
-#!/bin/sh
-which uci > /dev/null || exit 0
-uci -q get ucitrack.@sqm[0] > /dev/null || {
-  uci add ucitrack sqm > /dev/null
-  uci set ucitrack.@sqm[0].init=sqm
-  uci add_list ucitrack.@firewall[0].affects=sqm
-  uci commit
-}
-endef
-
-define Package/luci-app-sqm/postrm
-#!/bin/sh
-which uci > /dev/null || exit 0
-uci -q get ucitrack.@sqm[0] > /dev/null && {
-  uci delete ucitrack.@sqm[0]
-  uci del_list ucitrack.@firewall[0].affects=sqm
-  uci commit
-}
-endef
-
-$(eval $(call BuildPackage,luci-app-sqm))
diff --git a/trunk/package/feeds/packages/luci-app-sqm/files/sqm-cbi.lua b/trunk/package/feeds/packages/luci-app-sqm/files/sqm-cbi.lua
deleted file mode 100644
index 83790259..00000000
--- a/trunk/package/feeds/packages/luci-app-sqm/files/sqm-cbi.lua
+++ /dev/null
@@ -1,217 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Steven Barth <steven@midlink.org>
-Copyright 2014 Dave Taht <dave.taht@bufferbloat.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local wa = require "luci.tools.webadmin"
-local fs = require "nixio.fs"
-local net = require "luci.model.network".init()
-local sys = require "luci.sys"
---local ifaces = net:get_interfaces()
-local ifaces = sys.net:devices()
-local path = "/usr/lib/sqm"
-
-m = Map("sqm", translate("Smart Queue Management"),
-	translate("With <abbr title=\"Smart Queue Management\">SQM</abbr> you " ..
-		"can enable traffic shaping, better mixing (Fair Queueing)," ..
-		" active queue length management (AQM) " ..
-		" and prioritisation on one " ..
-		"network interface."))
-
-s = m:section(TypedSection, "queue", translate("Queues"))
-s:tab("tab_basic", translate("Basic Settings"))
-s:tab("tab_qdisc", translate("Queue Discipline"))
-s:tab("tab_linklayer", translate("Link Layer Adaptation"))
-s.addremove = true -- set to true to allow adding SQM instances in the GUI
-s.anonymous = true
-
--- BASIC
-e = s:taboption("tab_basic", Flag, "enabled", translate("Enable"))
-e.rmempty = false
-
-n = s:taboption("tab_basic", ListValue, "interface", translate("Interface name"))
--- sm lifted from luci-app-wol, the original implementation failed to show pppoe-ge00 type interface names
-for _, iface in ipairs(ifaces) do
---     if iface:is_up() then
---	n:value(iface:name())
---     end
-	if iface ~= "lo" then 
-		n:value(iface) 
-	end
-end
-n.rmempty = false
-
-
-dl = s:taboption("tab_basic", Value, "download", translate("Download speed (kbit/s) (ingress):"))
-dl.datatype = "and(uinteger,min(0))"
-dl.rmempty = false
-
-ul = s:taboption("tab_basic", Value, "upload", translate("Upload speed (kbit/s) (egress):"))
-ul.datatype = "and(uinteger,min(0))"
-ul.rmempty = false
-
--- QDISC
-
-c = s:taboption("tab_qdisc", ListValue, "qdisc", translate("Queueing discipline"))
-c:value("fq_codel", "fq_codel ("..translate("default")..")")
-c:value("efq_codel")
-c:value("nfq_codel")
-c:value("sfq")
-c:value("codel")
-c:value("ns2_codel")
-c:value("pie")
-c:value("sfq")
-c.default = "fq_codel"
-c.rmempty = false
-
-local qos_desc = ""
-sc = s:taboption("tab_qdisc", ListValue, "script", translate("Queue setup script"))
-for file in fs.dir(path) do
-  if string.find(file, ".qos$") then
-    sc:value(file)
-  end
-  if string.find(file, ".qos.help$") then
-    fh = io.open(path .. "/" .. file, "r")
-    qos_desc = qos_desc .. "<p><b>" .. file:gsub(".help$", "") .. ":</b><br />" .. fh:read("*a") .. "</p>"
-  end
-end
-sc.default = "simple.qos"
-sc.rmempty = false
-sc.description = qos_desc
-
-ad = s:taboption("tab_qdisc", Flag, "qdisc_advanced", translate("Show and Use Advanced Configuration"))
-ad.default = false
-ad.rmempty = true
-
-squash_dscp  = s:taboption("tab_qdisc", ListValue, "squash_dscp", translate("Squash DSCP on inbound packets (ingress):"))
-squash_dscp:value("1", "SQUASH")
-squash_dscp:value("0", "DO NOT SQUASH")
-squash_dscp.default = "1"
-squash_dscp.rmempty = true
-squash_dscp:depends("qdisc_advanced", "1")
-
-squash_ingress = s:taboption("tab_qdisc", ListValue, "squash_ingress", translate("Ignore DSCP on ingress:"))
-squash_ingress:value("1", "Ignore")
-squash_ingress:value("0", "Allow")
-squash_ingress.default = "1"
-squash_ingress.rmempty = true
-squash_ingress:depends("qdisc_advanced", "1")
-
-iecn = s:taboption("tab_qdisc", ListValue, "ingress_ecn", translate("Explicit congestion notification (ECN) status on inbound packets (ingress):"))
-iecn:value("ECN", "ECN ("..translate("default")..")")
-iecn:value("NOECN")
-iecn.default = "ECN"
-iecn.rmempty = true
-iecn:depends("qdisc_advanced", "1")
-
-eecn = s:taboption("tab_qdisc", ListValue, "egress_ecn", translate("Explicit congestion notification (ECN) status on outbound packets (egress)."))
-eecn:value("NOECN", "NOECN ("..translate("default")..")")
-eecn:value("ECN")
-eecn.default = "NOECN"
-eecn.rmempty = true
-eecn:depends("qdisc_advanced", "1")
-
-ad2 = s:taboption("tab_qdisc", Flag, "qdisc_really_really_advanced", translate("Show and Use Dangerous Configuration"))
-ad2.default = false
-ad2.rmempty = true
-ad2:depends("qdisc_advanced", "1")
-
-ilim = s:taboption("tab_qdisc", Value, "ilimit", translate("Hard limit on ingress queues; leave empty for default."))
--- ilim.default = 1000
-ilim.isnumber = true
-ilim.datatype = "and(uinteger,min(0))"
-ilim.rmempty = true
-ilim:depends("qdisc_really_really_advanced", "1")
-
-elim = s:taboption("tab_qdisc", Value, "elimit", translate("Hard limit on egress queues; leave empty for default."))
--- elim.default = 1000
-elim.datatype = "and(uinteger,min(0))"
-elim.rmempty = true
-elim:depends("qdisc_really_really_advanced", "1")
-
-
-itarg = s:taboption("tab_qdisc", Value, "itarget", translate("Latency target for ingress, e.g 5ms [units: s, ms, or  us]; leave empty for automatic selection, put in the word default for the qdisc's default."))
-itarg.datatype = "string"
-itarg.rmempty = true
-itarg:depends("qdisc_really_really_advanced", "1")
-
-etarg = s:taboption("tab_qdisc", Value, "etarget", translate("Latency target for egress, e.g. 5ms [units: s, ms, or  us]; leave empty for automatic selection, put in the word default for the qdisc's default."))
-etarg.datatype = "string"
-etarg.rmempty = true
-etarg:depends("qdisc_really_really_advanced", "1")
-
-
-
-iqdisc_opts = s:taboption("tab_qdisc", Value, "iqdisc_opts", translate("Advanced option string to pass to the ingress queueing disciplines; no error checking, use very carefully."))
-iqdisc_opts.rmempty = true
-iqdisc_opts:depends("qdisc_really_really_advanced", "1")
-
-eqdisc_opts = s:taboption("tab_qdisc", Value, "eqdisc_opts", translate("Advanced option string to pass to the egress queueing disciplines; no error checking, use very carefully."))
-eqdisc_opts.rmempty = true
-eqdisc_opts:depends("qdisc_really_really_advanced", "1")
-
--- LINKLAYER
-ll = s:taboption("tab_linklayer", ListValue, "linklayer", translate("Which link layer to account for:"))
-ll:value("none", "none ("..translate("default")..")")
-ll:value("ethernet", "Ethernet with overhead: select for e.g. VDSL2.")
-ll:value("atm", "ATM: select for e.g. ADSL1, ADSL2, ADSL2+.")
--- ll:value("adsl")	-- reduce the options
-ll.default = "none"
-
-po = s:taboption("tab_linklayer", Value, "overhead", translate("Per Packet Overhead (byte):"))
-po.datatype = "and(integer,min(-1500))"
-po.default = 0
-po.isnumber = true
-po.rmempty = true
-po:depends("linklayer", "ethernet")
--- po:depends("linklayer", "adsl")
-po:depends("linklayer", "atm")
-
-
-adll = s:taboption("tab_linklayer", Flag, "linklayer_advanced", translate("Show Advanced Linklayer Options, (only needed if MTU > 1500)"))
-adll.rmempty = true
-adll:depends("linklayer", "ethernet")
--- adll:depends("linklayer", "adsl")
-adll:depends("linklayer", "atm")
-
-smtu = s:taboption("tab_linklayer", Value, "tcMTU", translate("Maximal Size for size and rate calculations, tcMTU (byte); needs to be >= interface MTU + overhead:"))
-smtu.datatype = "and(uinteger,min(0))"
-smtu.default = 2047
-smtu.isnumber = true
-smtu.rmempty = true
-smtu:depends("linklayer_advanced", "1")
-
-stsize = s:taboption("tab_linklayer", Value, "tcTSIZE", translate("Number of entries in size/rate tables, TSIZE; for ATM choose TSIZE = (tcMTU + 1) / 16:"))
-stsize.datatype = "and(uinteger,min(0))"
-stsize.default = 128
-stsize.isnumber = true
-stsize.rmempty = true
-stsize:depends("linklayer_advanced", "1")
-
-smpu = s:taboption("tab_linklayer", Value, "tcMPU", translate("Minimal packet size, MPU (byte); needs to be > 0 for ethernet size tables:"))
-smpu.datatype = "and(uinteger,min(0))"
-smpu.default = 0
-smpu.isnumber = true
-smpu.rmempty = true
-smpu:depends("linklayer_advanced", "1")
-
-lla = s:taboption("tab_linklayer", ListValue, "linklayer_adaptation_mechanism", translate("Which linklayer adaptation mechanism to use; for testing only"))
-lla:value("htb_private")
-lla:value("tc_stab", "tc_stab ("..translate("default")..")")
-lla.default = "tc_stab"
-lla.rmempty = true
-lla:depends("linklayer_advanced", "1")
-
--- PRORITIES?
-
-return m
diff --git a/trunk/package/feeds/packages/luci-app-sqm/files/sqm-controller.lua b/trunk/package/feeds/packages/luci-app-sqm/files/sqm-controller.lua
deleted file mode 100644
index d36f5fd6..00000000
--- a/trunk/package/feeds/packages/luci-app-sqm/files/sqm-controller.lua
+++ /dev/null
@@ -1,26 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-module("luci.controller.sqm", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/sqm") then
-		return
-	end
-	
-	local page
-
-	page = entry({"admin", "network", "sqm"}, cbi("sqm"), _("SQM QoS"))
-	page.dependent = true
-end
diff --git a/trunk/package/feeds/packages/luci-app-sqm/files/uci-defaults-sqm b/trunk/package/feeds/packages/luci-app-sqm/files/uci-defaults-sqm
deleted file mode 100644
index cd9e7b2b..00000000
--- a/trunk/package/feeds/packages/luci-app-sqm/files/uci-defaults-sqm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@sqm[-1]
-	add ucitrack sqm
-	set ucitrack.@sqm[-1].init=sqm
-        add_list ucitrack.@firewall[0].affects=sqm
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/trunk/package/feeds/packages/lvm2/Makefile b/trunk/package/feeds/packages/lvm2/Makefile
deleted file mode 100644
index 3e4361b5..00000000
--- a/trunk/package/feeds/packages/lvm2/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2009-2010 Stefan Monnier
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v3+.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=LVM2
-PKG_VERSION:=2.02.118
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0 LGPL-2.1
-
-PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
-PKG_MD5SUM:=27f028974e8f067a9791d685b4e0fa90
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdevmapper
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=The Linux Kernel Device Mapper userspace library
-  URL:=http://sourceware.org/dm/
-  DEPENDS:=+kmod-dm +libpthread
-endef
-
-define Package/libdevmapper/description
- The device-mapper is a component of the 2.6 linux kernel that supports logical
- volume management. It is required by LVM2 and EVMS.
-endef
-
-define Package/lvm2
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=disc
-  TITLE:=The Linux Logical Volume Manager
-  URL:=http://sourceware.org/lvm2/
-  DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses
-endef
-
-define Package/lvm2/description
- LVM2 refers to a new userspace toolset that provide logical volume management
- facilities on linux. It is reasonably backwards-compatible with the original
- LVM toolset.
-endef
-
-CONFIGURE_ARGS += --disable-o_direct
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libdevmapper.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libdevmapper/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so.* $(1)/usr/lib
-endef
-
-define Package/lvm2/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin
-	$(INSTALL_DIR) $(1)/etc/lvm
-	$(SED) '/^[[:space:]]*\(#\|$$$$\)/d; /cache_dir/s@.*@    cache_dir = "/tmp/lvm/cache"@' $(PKG_BUILD_DIR)/conf/example.conf
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/example.conf $(1)/etc/lvm/lvm.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2
-	$(FIND) $(PKG_INSTALL_DIR)/usr/sbin/ -type l -exec $(CP) -a {} $(1)/sbin/ \;
-endef
-
-define Package/lvm2/conffiles
-/etc/lvm/lvm.conf
-endef
-
-$(eval $(call BuildPackage,libdevmapper))
-$(eval $(call BuildPackage,lvm2))
diff --git a/trunk/package/feeds/packages/lvm2/files/lvm2.init b/trunk/package/feeds/packages/lvm2/files/lvm2.init
deleted file mode 100644
index 4faf5d5d..00000000
--- a/trunk/package/feeds/packages/lvm2/files/lvm2.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 Stefan Monnier
-START=15
-
-start () {
-	mkdir -p /tmp/lvm/cache
-	/sbin/lvm vgscan --ignorelockingfailure --mknodes || :
-	/sbin/lvm vgchange -aly --ignorelockingfailure || return 2
-}
-
-stop () {
-	mkdir -p /tmp/lvm/cache
-	/sbin/lvm vgchange -aln --ignorelockingfailure || return 2
-}
diff --git a/trunk/package/feeds/packages/lvm2/patches/000-compile.patch b/trunk/package/feeds/packages/lvm2/patches/000-compile.patch
deleted file mode 100644
index 9fa1c1d5..00000000
--- a/trunk/package/feeds/packages/lvm2/patches/000-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -19,7 +19,7 @@ SHELL = /bin/sh
- 
- # Allow environment to override any built-in default value for CC.
- # If there is a built-in default, CC is NOT set to @CC@ here.
--CC ?= @CC@
-+CC = @CC@
- 
- # If $(CC) holds the usual built-in default value of 'cc' then replace it with
- # the configured value.
diff --git a/trunk/package/feeds/packages/lvm2/patches/001-include_fix.patch b/trunk/package/feeds/packages/lvm2/patches/001-include_fix.patch
deleted file mode 100644
index 09d2db96..00000000
--- a/trunk/package/feeds/packages/lvm2/patches/001-include_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/device/dev-type.c
-+++ b/lib/device/dev-type.c
-@@ -22,7 +22,7 @@
- #include <ctype.h>
- 
- #ifdef BLKID_WIPING_SUPPORT
--#include <blkid.h>
-+#include <blkid/blkid.h>
- #endif
- 
- #ifdef UDEV_SYNC_SUPPORT
diff --git a/trunk/package/feeds/packages/lxc/Config.in b/trunk/package/feeds/packages/lxc/Config.in
deleted file mode 100644
index 37286bfa..00000000
--- a/trunk/package/feeds/packages/lxc/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-menu "Configuration"
-        depends on PACKAGE_lxc
-
-config LXC_KERNEL_OPTIONS
-	bool "Enable kernel support for LXC"
-	default n
-	select KERNEL_CGROUPS
-	select KERNEL_NAMESPACES
-	select KERNEL_LXC_MISC
-	help
-	  Select needed kernel options for LXC related utilities. Options
-	  include cgroups, namespaces and other miscellaneous options. These
-	  options unfortunately can not be installed as a module.
-
-config LXC_BUSYBOX_OPTIONS
-	bool "Enable busybox support for lxc-create tool"
-	default n
-	select BUSYBOX_CUSTOM
-	select BUSYBOX_CONFIG_HAVE_DOT_CONFIG
-	select BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ
-	select BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
-	select BUSYBOX_CONFIG_UNXZ
-	select BUSYBOX_CONFIG_XZ
-	select BUSYBOX_CONFIG_GETOPT
-	select BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
-	help
-	  Select needed busybox options for lxc-create utility. This include XZ tar
-	  compression, long option support for tar and built-in getopt support.
-
-endmenu
diff --git a/trunk/package/feeds/packages/lxc/Makefile b/trunk/package/feeds/packages/lxc/Makefile
deleted file mode 100644
index 3b2d1e43..00000000
--- a/trunk/package/feeds/packages/lxc/Makefile
+++ /dev/null
@@ -1,249 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lxc
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
-
-PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/lxc/
-PKG_MD5SUM:=d80cb08f0edf36f0887e32c96aec8c13
-
-PKG_BUILD_DEPENDS:=lua
-PKG_BUILD_PARALLEL:=1
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-LXC_APPLETS_BIN += \
-	attach autostart cgroup clone config console create destroy execute \
-	freeze info monitor snapshot start stop unfreeze unshare usernsexec wait
-
-LXC_APPLETS_LIB += \
-	monitord user-nic
-
-LXC_SCRIPTS += \
-	checkconfig ls top
-
-DEPENDS_APPLETS = +libpthread +libcap +liblxc
-
-DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates
-DEPENDS_ls = +lxc-config
-DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
-
-
-define Package/lxc/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=LXC userspace tools
-  URL:=http://lxc.sourceforge.net/
-endef
-
-define Package/lxc
-  $(call Package/lxc/Default)
-  MENU:=1
-endef
-
-define Package/lxc/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/lxc/description
- LXC is the userspace control package for Linux Containers, a lightweight
- virtual system mechanism sometimes described as "chroot on steroids".
-endef
-
-define Package/lxc-common
-  $(call Package/lxc/Default)
-  TITLE:=LXC common files
-  DEPENDS:= lxc
-endef
-
-define Package/lxc-hooks
-  $(call Package/lxc/Default)
-  TITLE:=LXC virtual machine hooks
-  DEPENDS:= lxc
-endef
-
-define Package/lxc-templates
-  $(call Package/lxc/Default)
-  TITLE:=LXC virtual machine templates
-  DEPENDS:= lxc
-endef
-
-define Package/lxc-configs
-  $(call Package/lxc/Default)
-  TITLE:=LXC virtual machine common config files
-  DEPENDS:= lxc
-endef
-
-define Package/liblxc
-  $(call Package/lxc/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=LXC userspace library
-  DEPENDS:= lxc +libcap +libpthread
-endef
-
-define Package/lxc-lua
-  $(call Package/lxc/Default)
-  TITLE:=LXC Lua bindings
-  DEPENDS:= lxc +liblua +liblxc +luafilesystem
-endef
-
-define Package/lxc-init
-  $(call Package/lxc/Default)
-  TITLE:=LXC Lua bindings
-  DEPENDS:= lxc +liblxc
-endef
-
-CONFIGURE_ARGS += \
-	--disable-apparmor \
-	--disable-doc \
-	--disable-examples \
-	--disable-seccomp
-	--enable-lua=yes \
-	--with-lua-pc="$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc" \
-
-MAKE_FLAGS += \
-	LUA_INSTALL_CMOD="/usr/lib/lua" \
-	LUA_INSTALL_LMOD="/usr/lib/lua"
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/lxc/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/lxc/* \
-		$(1)/usr/include/lxc/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblxc.so* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lxc.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-
-define Package/lxc/install
-	true
-endef
-
-define Package/lxc-common/conffiles
-/etc/lxc/default.conf
-/etc/lxc/lxc.conf
-endef
-
-define Package/lxc-common/install
-	$(INSTALL_DIR) $(1)/usr/lib/lxc/rootfs
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/lxc/rootfs/README \
-		$(1)/usr/lib/lxc/rootfs/
-
-	$(INSTALL_DIR) $(1)/usr/share/lxc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/lxc.functions \
-		$(1)/usr/share/lxc/
-
-	$(INSTALL_DIR) $(1)/etc/lxc/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/etc/lxc/default.conf \
-		$(1)/etc/lxc/default.conf
-
-	$(INSTALL_DIR) $(1)/etc/lxc/
-	$(CP) \
-		./files/lxc.conf \
-		$(1)/etc/lxc/lxc.conf
-
-	$(INSTALL_DIR) $(1)/lxc/
-endef
-
-define Package/lxc-hooks/install
-	$(INSTALL_DIR) $(1)/usr/share/lxc/hooks
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/hooks/* \
-		$(1)/usr/share/lxc/hooks/
-endef
-
-define Package/lxc-templates/install
-	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/templates/lxc-* \
-		$(1)/usr/share/lxc/templates/
-endef
-
-define Package/lxc-configs/install
-	$(INSTALL_DIR) $(1)/usr/share/lxc/config/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lxc/config/* \
-		$(1)/usr/share/lxc/config/
-endef
-
-define Package/liblxc/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblxc.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/lxc-lua/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/share/lua/5.1/lxc.lua \
-		$(1)/usr/lib/lua/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/lxc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/lua/5.1/lxc/core.so \
-		$(1)/usr/lib/lua/lxc/
-endef
-
-define Package/lxc-init/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/init.lxc \
-		$(1)/sbin/
-endef
-
-define GenPlugin
-  define Package/lxc-$(1)
-    $(call Package/lxc/Default)
-    TITLE:=Utility lxc-$(1) from the LXC userspace tools
-    DEPENDS:= lxc +lxc-common $(2) $(DEPENDS_$(1))
-  endef
-
-  define Package/lxc-$(1)/install
-	$(INSTALL_DIR) $$(1)$(3)
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)$(3)/lxc-$(1) \
-		$$(1)$(3)/
-  endef
-
-  $$(eval $$(call BuildPackage,lxc-$(1)))
-endef
-
-
-$(eval $(call BuildPackage,lxc))
-$(eval $(call BuildPackage,lxc-common))
-$(eval $(call BuildPackage,lxc-hooks))
-$(eval $(call BuildPackage,lxc-configs))
-$(eval $(call BuildPackage,lxc-templates))
-$(eval $(call BuildPackage,liblxc))
-$(eval $(call BuildPackage,lxc-lua))
-$(eval $(call BuildPackage,lxc-init))
-$(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin")))
-$(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc")))
-$(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin")))
diff --git a/trunk/package/feeds/packages/lxc/files/lxc.conf b/trunk/package/feeds/packages/lxc/files/lxc.conf
deleted file mode 100644
index 3b77baa9..00000000
--- a/trunk/package/feeds/packages/lxc/files/lxc.conf
+++ /dev/null
@@ -1 +0,0 @@
-lxc.lxcpath = /lxc
diff --git a/trunk/package/feeds/packages/lxc/patches/010-compile.patch b/trunk/package/feeds/packages/lxc/patches/010-compile.patch
deleted file mode 100644
index 6f12c382..00000000
--- a/trunk/package/feeds/packages/lxc/patches/010-compile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,30 +31,6 @@ AC_CANONICAL_HOST
- AM_PROG_CC_C_O
- AC_GNU_SOURCE
- 
--# Detect the distribution. This is used for the default configuration and
--# for some distro-specific build options.
--AC_MSG_CHECKING([host distribution])
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.]))
--if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
--	with_distro=`lsb_release -is`
--fi
--if test "z$with_distro" = "z"; then
--	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
--	AC_CHECK_FILE(/etc/oracle-release,with_distro="oracle")
--	AC_CHECK_FILE(/etc/centos-release,with_distro="centos")
--	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
--	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
--	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
--	AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
--	AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
--	AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
--	AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
--	AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
--	AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
--	AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
--fi
--with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
--
- if test "z$with_distro" = "z"; then
- 	with_distro="unknown"
- fi
diff --git a/trunk/package/feeds/packages/lxc/patches/015-getline.patch b/trunk/package/feeds/packages/lxc/patches/015-getline.patch
deleted file mode 100644
index e2f002af..00000000
--- a/trunk/package/feeds/packages/lxc/patches/015-getline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/lxc/utils.h
-+++ b/src/lxc/utils.h
-@@ -44,11 +44,7 @@ extern char *get_rundir(void);
- extern const char *lxc_global_config_value(const char *option_name);
- 
- /* Define getline() if missing from the C library */
--#ifndef HAVE_GETLINE
--#ifdef HAVE_FGETLN
--#include <../include/getline.h>
--#endif
--#endif
-+#include "../include/getline.h"
- 
- /* Define setns() if missing from the C library */
- #ifndef HAVE_SETNS
diff --git a/trunk/package/feeds/packages/lxc/patches/020-lxc-checkconfig.patch b/trunk/package/feeds/packages/lxc/patches/020-lxc-checkconfig.patch
deleted file mode 100644
index 272f76b0..00000000
--- a/trunk/package/feeds/packages/lxc/patches/020-lxc-checkconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/lxc/lxc-checkconfig.in
-+++ b/src/lxc/lxc-checkconfig.in
-@@ -4,6 +4,17 @@
- : ${CONFIG:=/proc/config.gz}
- : ${GREP:=zgrep}
- : ${MODNAME:=configs}
-+: ${ZGREP:=zgrep}
-+: ${GUNZIP:=gunzip}
-+
-+if [ -z $(which $ZGREP) ] && ! [ -z $(which $GUNZIP) ] && [ -x $(which $GUNZIP) ] &&  [ -f $CONFIG ] && [ "$CONFIG" == "/proc/config.gz" ] ; then
-+
-+	CONFIG_NEW="/tmp/config-$(uname -r)"
-+	$GUNZIP -c $CONFIG > $CONFIG_NEW
-+	CONFIG=$CONFIG_NEW
-+
-+	GREP=grep
-+fi
- 
- SETCOLOR_SUCCESS="printf \\033[1;32m"
- SETCOLOR_FAILURE="printf \\033[1;31m"
diff --git a/trunk/package/feeds/packages/lxc/patches/025-remove-unsupported-option.patch b/trunk/package/feeds/packages/lxc/patches/025-remove-unsupported-option.patch
deleted file mode 100644
index cb0a9f0d..00000000
--- a/trunk/package/feeds/packages/lxc/patches/025-remove-unsupported-option.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/templates/lxc-download.in
-+++ b/templates/lxc-download.in
-@@ -494,15 +494,7 @@ fi
- # Unpack the rootfs
- echo "Unpacking the rootfs"
- 
--EXCLUDES=""
--excludelist=$(relevant_file excludes)
--if [ -f "${excludelist}" ]; then
--    while read line; do
--        EXCLUDES="$EXCLUDES --exclude=$line"
--    done < $excludelist
--fi
--
--tar  --anchored ${EXCLUDES} --numeric-owner -xpJf \
-+tar --numeric-owner -xpJf \
-     ${LXC_CACHE_PATH}/rootfs.tar.xz -C ${LXC_ROOTFS}
- 
- mkdir -p ${LXC_ROOTFS}/dev/pts/
diff --git a/trunk/package/feeds/packages/lxc/patches/030-lxc-download.patch b/trunk/package/feeds/packages/lxc/patches/030-lxc-download.patch
deleted file mode 100644
index 295bae0a..00000000
--- a/trunk/package/feeds/packages/lxc/patches/030-lxc-download.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/templates/lxc-download.in
-+++ b/templates/lxc-download.in
-@@ -39,7 +39,7 @@ DOWNLOAD_LIST_IMAGES="false"
- DOWNLOAD_MODE="system"
- DOWNLOAD_READY_GPG="false"
- DOWNLOAD_RELEASE=
--DOWNLOAD_SERVER="images.linuxcontainers.org"
-+DOWNLOAD_SERVER="virtualwrt.org/containers/"
- DOWNLOAD_SHOW_GPG_WARNING="true"
- DOWNLOAD_SHOW_HTTP_WARNING="true"
- DOWNLOAD_TARGET="system"
-@@ -257,14 +257,6 @@ for bin in tar xz wget; do
-     fi
- done
- 
--# Check for GPG
--if [ "$DOWNLOAD_VALIDATE" = "true" ]; then
--    if ! type gpg >/dev/null 2>&1; then
--        echo "ERROR: Missing recommended tool: gpg" 1>&2
--        echo "You can workaround this by using --no-validate." 1>&2
--        exit 1
--    fi
--fi
- 
- # Check that we have all variables we need
- if [ -z "$LXC_NAME" ] || [ -z "$LXC_PATH" ] || [ -z "$LXC_ROOTFS" ]; then
-@@ -456,16 +448,9 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ];
-         echo "Downloading the rootfs"
-         download_file $DOWNLOAD_URL/rootfs.tar.xz \
-             ${DOWNLOAD_TEMP}/rootfs.tar.xz normal
--        download_sig  $DOWNLOAD_URL/rootfs.tar.xz.asc \
--             ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal
--        gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc
--
-         echo "Downloading the metadata"
-         download_file $DOWNLOAD_URL/meta.tar.xz \
-             ${DOWNLOAD_TEMP}/meta.tar.xz normal
--        download_sig  $DOWNLOAD_URL/meta.tar.xz.asc \
--            ${DOWNLOAD_TEMP}/meta.tar.xz.asc normal
--        gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc
- 
-         if [ -d $LXC_CACHE_PATH ]; then
-             rm -Rf $LXC_CACHE_PATH
diff --git a/trunk/package/feeds/packages/lxc/patches/300-lxc-destroy.patch b/trunk/package/feeds/packages/lxc/patches/300-lxc-destroy.patch
deleted file mode 100644
index a76e27a6..00000000
--- a/trunk/package/feeds/packages/lxc/patches/300-lxc-destroy.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-One of the 'features' of overlayfs is that depending on whether a file
-is on the upper or lower dir you get back a different device from stat.
-That breaks our lxc_rmdir_onedev.
-
-So at lxc_rmdir_ondev check the device of the directory being deleted.
-If it is overlayfs, then skip the device check.
-
-Note this is unrelated to overlayfs snapshots - in those cases when you
-delete a container, /var/lib/lxc/$container/ does not actually have an
-overlayfs under it.  Rather, to reproduce this you would
-
-sudo mkdir /opt/{lower,upper,workdir}
-sudo mount -t overlayfs -o lower=/opt/lower,upper=/opt/upper,workdir=/opt/workdir \
-	lxc /var/lib/lxc
-sudo lxc-create -t download -n c1 -- -d ubuntu -r trusty -a amd64
-sudo lxc-destroy -n c1
-
-Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
----
- src/lxc/utils.c | 39 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 32 insertions(+), 7 deletions(-)
-
---- a/src/lxc/utils.c
-+++ b/src/lxc/utils.c
-@@ -29,6 +29,7 @@
- #include <stddef.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/vfs.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/param.h>
-@@ -68,8 +69,8 @@
- 
- lxc_log_define(lxc_utils, lxc);
- 
--static int _recursive_rmdir_onedev(char *dirname, dev_t pdev,
--				   const char *exclude, int level)
-+static int _recursive_rmdir(char *dirname, dev_t pdev,
-+			    const char *exclude, int level, bool onedev)
- {
- 	struct dirent dirent, *direntp;
- 	DIR *dir;
-@@ -106,7 +107,7 @@ static int _recursive_rmdir_onedev(char
- 			if (ret < 0) {
- 				switch(errno) {
- 				case ENOTEMPTY:
--					INFO("Not deleting snapshots");
-+					INFO("Not deleting snapshot %s", pathname);
- 					hadexclude = true;
- 					break;
- 				case ENOTDIR:
-@@ -129,14 +130,14 @@ static int _recursive_rmdir_onedev(char
- 			failed=1;
- 			continue;
- 		}
--		if (mystat.st_dev != pdev)
-+		if (onedev && mystat.st_dev != pdev)
- 			continue;
- 		if (S_ISDIR(mystat.st_mode)) {
--			if (_recursive_rmdir_onedev(pathname, pdev, exclude, level+1) < 0)
-+			if (_recursive_rmdir(pathname, pdev, exclude, level+1, onedev) < 0)
- 				failed=1;
- 		} else {
- 			if (unlink(pathname) < 0) {
--				ERROR("%s: failed to delete %s", __func__, pathname);
-+				SYSERROR("%s: failed to delete %s", __func__, pathname);
- 				failed=1;
- 			}
- 		}
-@@ -158,17 +159,41 @@ static int _recursive_rmdir_onedev(char
- 	return failed ? -1 : 0;
- }
- 
-+/* we have two different magic values for overlayfs, yay */
-+#define OVERLAYFS_SUPER_MAGIC 0x794c764f
-+#define OVERLAY_SUPER_MAGIC 0x794c7630
-+/*
-+ * In overlayfs, st_dev is unreliable.  so on overlayfs we don't do
-+ * the lxc_rmdir_onedev()
-+ */
-+static bool is_native_overlayfs(const char *path)
-+{
-+	struct statfs sb;
-+
-+	if (statfs(path, &sb) < 0)
-+		return false;
-+	if (sb.f_type == OVERLAYFS_SUPER_MAGIC ||
-+			sb.f_type == OVERLAY_SUPER_MAGIC)
-+		return true;
-+	return false;
-+}
-+
- /* returns 0 on success, -1 if there were any failures */
- extern int lxc_rmdir_onedev(char *path, const char *exclude)
- {
- 	struct stat mystat;
-+	bool onedev = true;
-+
-+	if (is_native_overlayfs(path)) {
-+		onedev = false;
-+	}
- 
- 	if (lstat(path, &mystat) < 0) {
- 		ERROR("%s: failed to stat %s", __func__, path);
- 		return -1;
- 	}
- 
--	return _recursive_rmdir_onedev(path, mystat.st_dev, exclude, 0);
-+	return _recursive_rmdir(path, mystat.st_dev, exclude, 0, onedev);
- }
- 
- static int mount_fs(const char *source, const char *target, const char *type)
diff --git a/trunk/package/feeds/packages/mac-telnet/Makefile b/trunk/package/feeds/packages/mac-telnet/Makefile
deleted file mode 100644
index 7c67ed09..00000000
--- a/trunk/package/feeds/packages/mac-telnet/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mac-telnet
-PKG_VERSION:=2014-09-23
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/jow-/MAC-Telnet.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=269a5d7d53b59a2e4657ad3689e46ac057c22e28
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += -ffunction-sections -fdata-sections $(if $(CONFIG_MACTELNET_PLAIN_SUPPORT),-DTELNET_SUPPORT)
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-# 1: name
-# 2: executable
-define BuildPlugin
-  define Package/mac-telnet-$(1)
-    SECTION:=net
-    CATEGORY:=Network
-    DEPENDS:=+libubox
-    TITLE:=MAC-Telnet / MAC-SSH $(1)
-    URL:=https://github.com/jow-/MAC-Telnet
-  endef
-
-  define Package/mac-telnet-$(1)/description
-    Open source MAC Telnet client and server utilities for connecting to
-    Mikrotik RouterOS routers and Linux machines via MAC address.
-  endef
-
-  define Package/mac-telnet-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/
-	$(call Package/mac-telnet-$(1)/install-extra)
-  endef
-
-  $$(eval $$(call BuildPackage,mac-telnet-$(1)))
-endef
-
-define Package/mac-telnet-server/config
-  config MACTELNET_PLAIN_SUPPORT
-	bool "Include support for plain telnet connections"
-	depends on PACKAGE_mac-telnet-server
-        default y
-	help
-	  Disable this option to only support SSH logins to the
-	  MAC-Telnet server.
-endef
-
-define Package/mac-telnet-server/install-extra
-	$(INSTALL_DIR) $$(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mactelnet.init $$(1)/etc/init.d/mactelnet
-	$(INSTALL_DIR) $$(1)/etc/config
-	$(INSTALL_DATA) ./files/mactelnet.config $$(1)/etc/config/mactelnet
-endef
-
-
-$(eval $(call BuildPlugin,server,mactelnetd))
-$(eval $(call BuildPlugin,client,mactelnet))
-$(eval $(call BuildPlugin,ping,macping))
-$(eval $(call BuildPlugin,discover,mndp))
diff --git a/trunk/package/feeds/packages/mac-telnet/files/mactelnet.config b/trunk/package/feeds/packages/mac-telnet/files/mactelnet.config
deleted file mode 100644
index ddf71578..00000000
--- a/trunk/package/feeds/packages/mac-telnet/files/mactelnet.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Global settings for MAC-Telnet daemon
-config mactelnetd
-	option sshmode '0'
-	list interface 'lan'
-
-# Define a MAC-Telnet login, multiple login sections allowed
-config login
-	option username 'root'
-	option password ''
diff --git a/trunk/package/feeds/packages/mac-telnet/files/mactelnet.init b/trunk/package/feeds/packages/mac-telnet/files/mactelnet.init
deleted file mode 100755
index 701ce98e..00000000
--- a/trunk/package/feeds/packages/mac-telnet/files/mactelnet.init
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=60
-
-USE_PROCD=1
-
-PROG=/usr/sbin/mactelnetd
-USERS=/var/etc/mactelnetd.users
-SSHMODE=0
-
-add_account() {
-	local cfg="$1"
-	local user pass
-
-	[ $SSHMODE -eq 0 ] || {
-		[ -n "$already_warned" ] || {
-			echo "mactelnet.$cfg: login sections ignored in SSH mode" >&1
-			already_warned=1
-		}
-		return
-	}
-
-	config_get username "$cfg" username
-	config_get password "$cfg" password
-
-	[ -n "$username" ] || {
-		echo "mactelnet.$cfg: username missing" >&2
-		return
-	}
-
-	[ -n "$password" ] || {
-		echo "mactelnet.$cfg: password missing" >&2
-		return
-	}
-
-	echo "$username:$password" >> $USERS
-}
-
-add_interface() {
-	local iface="$1"
-	local device
-
-	[ -n "$iface" ] || return
-
-	if network_get_physdev device "$iface"; then
-		procd_append_param command -i "$device"
-	fi
-
-	procd_add_reload_interface_trigger "$iface"
-}
-
-add_globals() {
-	local cfg="$1"
-
-	config_get_bool SSHMODE "$cfg" sshmode 0
-	[ $SSHMODE -eq 0 ] || procd_append_param command -S
-
-	config_list_foreach "$cfg" interface add_interface
-}
-
-start_service() {
-	. /lib/functions/network.sh
-
-	procd_open_instance
-
-	procd_add_reload_trigger mactelnet
-	procd_set_param command "$PROG" -f
-
-	config_load mactelnet
-	config_foreach add_globals mactelnetd
-
-	[ $SSHMODE -eq 1 ] || {
-		rm -f $USERS
-		config_foreach add_account login
-	}
-
-	procd_close_instance
-}
-
diff --git a/trunk/package/feeds/packages/macchanger/Makefile b/trunk/package/feeds/packages/macchanger/Makefile
deleted file mode 100644
index 667f1d1c..00000000
--- a/trunk/package/feeds/packages/macchanger/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=macchanger
-PKG_VERSION:=1.7.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/alobbs/macchanger/releases/download/$(PKG_VERSION)/
-PKG_MD5SUM:=ca56f16142914337391dac91603eb332
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/macchanger
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=utility for viewing/manipulating the MAC address
-  URL:=https://github.com/alobbs/macchanger/
-endef
-
-define Package/macchanger/description
-	This is a GNU/Linux utility for viewing/manipulating the MAC address
-	of network interfaces.
-endef
-
-define Package/macchanger/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/macchanger $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,macchanger))
diff --git a/trunk/package/feeds/packages/madplay/Makefile b/trunk/package/feeds/packages/madplay/Makefile
deleted file mode 100644
index f23e93db..00000000
--- a/trunk/package/feeds/packages/madplay/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=madplay
-PKG_VERSION:=0.15.2b
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mad \
-	ftp://ftp.mars.org/pub/mpeg/
-PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/madplay
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libid3tag +libmad
-  TITLE:=MPEG audio player in fixed point
-  URL:=http://sourceforge.net/projects/mad
-endef
-
-define Package/madplay/description
-	MAD is an MPEG audio decoder. It currently only supports the MPEG 1
-	standard, but fully implements all three audio layers (Layer I, Layer II,
-	and Layer III, the latter often colloquially known as MP3.). There is also
-	full support for ID3 tags.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--disable-static \
-		--disable-debugging \
-		--disable-profiling \
-		--disable-experimental \
-		--without-libiconv-prefix \
-		--without-libintl-prefix \
-		--without-alsa \
-		--without-esd \
-		, \
-		LIBS="-lz" \
-	)
-endef
-
-define Package/madplay/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,madplay))
diff --git a/trunk/package/feeds/packages/mailman/Makefile b/trunk/package/feeds/packages/mailman/Makefile
deleted file mode 100644
index eee50f85..00000000
--- a/trunk/package/feeds/packages/mailman/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mailman
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/mailman/ http://ftp.gnu.org/gnu/mailman/
-PKG_VERSION:=2.1.20
-PKG_MD5SUM:=96819640406f90a12bc28edd3dc09d4a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=gnu-COPYING-GPL
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mailman
-  SECTION:=mail
-  CATEGORY:=Mail
-  TITLE:=The GNU Mailing List Manager
-  URL:=http://www.gnu.org/software/mailman/
-  DEPENDS:=+postfix +python +uhttpd +python-dns
-endef
-
-define Package/mailman/description
- Mailman is free software for managing electronic mail discussion and e-newsletter lists.
-endef
-
-prefix=/usr/local/mailman
-
-define Package/mailman/conffiles
-$(prefix)/Mailman/mm_cfg.py
-endef
-
-CONFIGURE_ARGS += \
-	--prefix="$(prefix)" \
-	--exec-prefix="$(prefix)" \
-	--with-username="root" \
-	--with-groupname="root" \
-	--with-mail-gid="nogroup" \
-	--with-cgi-gid="root" \
-	--without-permcheck \
-
-define Build/Compile
-endef
-
-define Package/mailman/install
-	$(INSTALL_DIR) $(1)$(prefix)
-	cd $(PKG_BUILD_DIR); $(MAKE) DESTDIR=$(1) install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mailman.init $(1)/etc/init.d/mailman
-	$(INSTALL_DIR) $(1)/usr/www
-	ln -s $(prefix)/cgi-bin/ $(1)/usr/www/mailman
-	ln -s $(prefix)/archives/public/ $(1)/usr/www/pipermail
-	ln -s $(prefix)/icons $(1)/usr/www/icons
-endef
-
-define Package/mailman/postinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-
- if [ `postconf alias_maps | grep -ci mailman` -eq 0 ]
- then
-  postconf -e "`postconf alias_maps`, cdb:$(prefix)/data/aliases"
- fi
- cd $(prefix)
- hostname=`cat /proc/sys/kernel/hostname`
- if [ ! -f data/aliases ]
- then
-  ./bin/genaliases
- fi
- newaliases
- if [ `grep -c DEFAULT_URL_HOST Mailman/mm_cfg.py` -eq 0 ]
- then
-  echo "DEFAULT_EMAIL_HOST = '$$hostname'" >> Mailman/mm_cfg.py
-  echo "DEFAULT_URL_HOST = '$$hostname'" >> Mailman/mm_cfg.py
-  echo "add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)" >> Mailman/mm_cfg.py
-  echo "QRUNNERS.remove(('NewsRunner',1))" >> Mailman/mm_cfg.py
- fi
- if [ `./bin/list_lists | grep -ci mailman` -eq 0 ]
- then
-  ./bin/newlist --urlhost=$$hostname --emailhost=$$hostname --quiet mailman root@$$hostname mailman
-  ./bin/config_list -i data/sitelist.cfg mailman
-  echo "NOTE: A default site-wide mailing list Mailman with password 'mailman' has been created. Please review it and change the password."
-  ./bin/mmsitepass mailman
-  echo "NOTE: The default site password 'mailman' has been created."
- fi
- # /etc/init.d/mailman enable
- if [ `ps | grep "mailman/bin/qrunner" | grep -cv grep` -gt 0 ]
- then
-  $(prefix)/bin/mailmanctl -q restart
- fi
- if [ `grep -c mailman /etc/config/uhttpd` -eq 0 ]
- then #we assume that the server is not configured yet, thus print out some help for the first time:
-  echo "NOTE: Please set the site password using $(prefix)/bin/mmsitepass <your-site-password>"
-  echo "Please add uhttpd config section to your /etc/config/uhttpd like this:"
-  echo "config uhttpd mailman"
-  echo "	list listen_http	0.0.0.0:80"
-  echo "	option home		/usr/www"
-  echo "	option cgi_prefix	/mailman"
-  echo "	no_symlinks		0"
-  echo "Don't forget to setup firewall for accessing this website!"
-  echo "To add a mailing list go to http://$$hostname/mailman/create."
- fi
-fi
-endef
-
-define Package/mailman/prerm
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-
- if [ `ps | grep "mailman/bin/qrunner" | grep -cv grep` -gt 0 ]
- then
-  $(prefix)/bin/mailmanctl stop
- fi
-fi
-endef
-
-$(eval $(call BuildPackage,mailman))
diff --git a/trunk/package/feeds/packages/mailman/files/mailman.init b/trunk/package/feeds/packages/mailman/files/mailman.init
deleted file mode 100644
index f68a4567..00000000
--- a/trunk/package/feeds/packages/mailman/files/mailman.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=50
-STOP=50
-
-PYTHON=/usr/bin/python
-MAILMANHOME=/usr/local/mailman
-MAILMANCTL=$MAILMANHOME/bin/mailmanctl
-
-start() {
-	#rm -f $MAILMANHOME/locks/*
-	$PYTHON $MAILMANCTL -s -q start
-}
-
-stop() {
-	$PYTHON $MAILMANCTL -q stop
-}
-
-restart() {
-	$PYTHON $MAILMANCTL -q restart
-}
diff --git a/trunk/package/feeds/packages/mailman/patches/100-postfix.patch b/trunk/package/feeds/packages/mailman/patches/100-postfix.patch
deleted file mode 100644
index 22fec1ea..00000000
--- a/trunk/package/feeds/packages/mailman/patches/100-postfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN mailman-2.1.14-1/Mailman/Defaults.py.in mailman-2.1.14-1_patched/Mailman/Defaults.py.in
---- mailman-2.1.14-1/Mailman/Defaults.py.in	2011-03-01 23:35:57.000000000 +0300
-+++ mailman-2.1.14-1_patched/Mailman/Defaults.py.in	2011-03-09 12:26:10.000000000 +0300
-@@ -461,7 +461,7 @@ DELIVERY_MODULE = 'SMTPDirect'
- # standard out (or send an email to the site list owner) for manual twiddling
- # of an /etc/aliases style file.  Use 'Postfix' if you are using the Postfix
- # MTA -- but then also see POSTFIX_STYLE_VIRTUAL_DOMAINS.
--MTA = 'Manual'
-+MTA = 'Postfix'
- 
- # If you set MTA='Postfix', then you also want to set the following variable,
- # depending on whether you're using virtual domains in Postfix, and which
diff --git a/trunk/package/feeds/packages/mailman/patches/200-nohostdnspython.patch b/trunk/package/feeds/packages/mailman/patches/200-nohostdnspython.patch
deleted file mode 100644
index e3211066..00000000
--- a/trunk/package/feeds/packages/mailman/patches/200-nohostdnspython.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur mailman-2.1.18-1/configure mailman-2.1.18-1_patched/configure
---- mailman-2.1.18-1/configure	2014-10-26 12:00:38.090360119 +0300
-+++ mailman-2.1.18-1_patched/configure	2014-10-26 12:00:21.323016430 +0300
-@@ -2236,35 +2236,35 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
- $as_echo "$version" >&6; }
- 
--# See if dnspython is installed.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dnspython" >&5
--$as_echo_n "checking dnspython... " >&6; }
--
--cat > conftest.py <<EOF
--try:
--    import dns.resolver
--    res = 'ok'
--except ImportError:
--    res = 'no'
--fp = open("conftest.out", "w")
--fp.write("%s\n" % res)
--fp.close()
--EOF
--
--$PYTHON conftest.py
--havednspython=`cat conftest.out`
--rm -f conftest.out conftest.py
--if test "$havednspython" = "no"
--then
--    as_fn_error $? "
--
--***** dnspython not found. It is required for the new
--***** dmarc_moderation_action featurer. Get it from
--***** <http://www.dnspython.org/> or
--***** <https://pypi.python.org/pypi/dnspython/>" "$LINENO" 5
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $havednspython" >&5
--$as_echo "$havednspython" >&6; }
-+## See if dnspython is installed.
-+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dnspython" >&5
-+#$as_echo_n "checking dnspython... " >&6; }
-+#
-+#cat > conftest.py <<EOF
-+#try:
-+#    import dns.resolver
-+#    res = 'ok'
-+#except ImportError:
-+#    res = 'no'
-+#fp = open("conftest.out", "w")
-+#fp.write("%s\n" % res)
-+#fp.close()
-+#EOF
-+#
-+#$PYTHON conftest.py
-+#havednspython=`cat conftest.out`
-+#rm -f conftest.out conftest.py
-+#if test "$havednspython" = "no"
-+#then
-+#    as_fn_error $? "
-+#
-+#***** dnspython not found. It is required for the new
-+#***** dmarc_moderation_action featurer. Get it from
-+#***** <http://www.dnspython.org/> or
-+#***** <https://pypi.python.org/pypi/dnspython/>" "$LINENO" 5
-+#fi
-+#{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $havednspython" >&5
-+#$as_echo "$havednspython" >&6; }
- 
- # Check the email package version.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's email package" >&5
diff --git a/trunk/package/feeds/packages/mailman/patches/300-targetpython.patch b/trunk/package/feeds/packages/mailman/patches/300-targetpython.patch
deleted file mode 100644
index 1dd2859f..00000000
--- a/trunk/package/feeds/packages/mailman/patches/300-targetpython.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mailman-2.1.18-1/configure mailman-2.1.18-1_patched/configure
---- mailman-2.1.18-1/configure	2014-05-06 20:43:56.000000000 +0400
-+++ mailman-2.1.18-1_patched/configure	2014-11-04 15:02:32.892666331 +0300
-@@ -3927,6 +3927,8 @@
- $as_echo "$URLHOST" >&6; }
- rm -f conftest.out conftest.py
- 
-+PYTHON=/usr/bin/python
-+
- # Checks for libraries.
- 
- for ac_func in strerror setregid syslog
diff --git a/trunk/package/feeds/packages/mailman/patches/400-modules.patch b/trunk/package/feeds/packages/mailman/patches/400-modules.patch
deleted file mode 100644
index 9fa72a26..00000000
--- a/trunk/package/feeds/packages/mailman/patches/400-modules.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur mailman-2.1.18-1/Mailman/MailList.py mailman-2.1.18-1_patched/Mailman/MailList.py
---- mailman-2.1.18-1/Mailman/MailList.py	2014-05-06 20:43:56.000000000 +0400
-+++ mailman-2.1.18-1_patched/Mailman/MailList.py	2014-11-04 15:57:06.832636147 +0300
-@@ -30,7 +30,7 @@
- import shutil
- import socket
- import urllib
--import cPickle
-+import pickle as cPickle
- 
- from cStringIO import StringIO
- from UserDict import UserDict
-diff -Naur mailman-2.1.18-1/misc/paths.py.in mailman-2.1.18-1_patched/misc/paths.py.in
---- mailman-2.1.18-1/misc/paths.py.in	2014-05-06 20:43:56.000000000 +0400
-+++ mailman-2.1.18-1_patched/misc/paths.py.in	2014-11-04 15:55:49.594941540 +0300
-@@ -66,14 +66,14 @@
- # In a normal interactive Python environment, the japanese.pth and korean.pth
- # files would be imported automatically.  But because we inhibit the importing
- # of the site module, we need to be explicit about importing these codecs.
--if not jaok:
--    import japanese
-+#if not jaok:
-+#    import japanese
- # As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean
- # codecs installed, however leave the first import in there in case an upgrade
- # changes this.
--if not kook:
--    import korean
--    import korean.aliases
-+#if not kook:
-+#    import korean
-+#    import korean.aliases
- # Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)
- import encodings.aliases
- encodings.aliases.aliases.update({
diff --git a/trunk/package/feeds/packages/mailsend/Makefile b/trunk/package/feeds/packages/mailsend/Makefile
deleted file mode 100644
index f9480f15..00000000
--- a/trunk/package/feeds/packages/mailsend/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2014-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mailsend
-PKG_VERSION:=1.17b15
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/muquit/mailsend/archive/$(PKG_VERSION)
-PKG_MD5SUM:=60103c411a8627e893d35e7836f904e8
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYRIGHT
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mailsend/default
-	SECTION:=mail
-	CATEGORY:=Mail
-	TITLE:=A command-line mail sender
-	URL:=https://github.com/muquit/mailsend
-endef
-
-define Package/mailsend-nossl
-	$(call Package/mailsend/default)
-	TITLE+= (without SSL)
-	VARIANT:=nossl
-endef
-
-define Package/mailsend
-	$(call Package/mailsend/default)
-	TITLE+= (with SSL)
-	DEPENDS:=+libopenssl
-	VARIANT:=ssl
-endef
-
-ifeq ($(BUILD_VARIANT),ssl)
-  CONFIGURE_ARGS+= --with-openssl=$(STAGING_DIR)/usr
-endif
-
-define Package/mailsend/description
-  $(call Package/mailsend-nossl/description)
-  .
-  SSL supported is provided by OpenSSL.
-endef
-
-define Package/mailsend-nossl/description
-  Mailsend is a simple command line program to send mail via SMTP protocol.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Package/mailsend/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mailsend $(1)/usr/bin/
-endef
-
-Package/mailsend-nossl/install=$(Package/mailsend/install)
-
-$(eval $(call BuildPackage,mailsend))
-$(eval $(call BuildPackage,mailsend-nossl))
diff --git a/trunk/package/feeds/packages/mc/Config.in b/trunk/package/feeds/packages/mc/Config.in
deleted file mode 100644
index 1445aa1a..00000000
--- a/trunk/package/feeds/packages/mc/Config.in
+++ /dev/null
@@ -1,60 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_mc
-
-config MC_DIFFVIEWER
-	bool "Enable internal diff viewer"
-	default n
-	help
-           This option enables the built-in diff viewer.
-           Disabled by default.
-
-config MC_EDITOR
-	bool "Enable internal editor"
-	default n
-	help
-           This option enables the built-in file editor.
-           Disabled by default.
-
-config MC_SUBSHELL
-	bool "Enable concurrent subshell"
-	default n
-	help
-           This option enables concurrent subshell support.
-           Disabled by default.
-
-config MC_LARGEFILE
-	bool "Enable largefile support"
-	default n
-	help
-           This option enables support for large files (> 2 GB).
-           Disabled by default.
-
-config MC_BACKGROUND
-	bool "Enable background operations"
-	default n
-	help
-           This option enables support for background operations which
-           allow to perform some tasks such as copying files in a
-           separate background process. Background code is known
-           to be less stable than the rest of the code.
-           Disabled by default.
-
-config MC_CHARSET
-	bool "Enable charset support"
-	default n
-	help
-           This option adds support for selecting character set of the text in
-           the internal viewer and editor and converting it on the fly.
-           The implementation is currently incomplete.
-           Disabled by default.
-
-config MC_VFS
-	bool "Enable virtual filesystem support"
-	default n
-	help
-           This option enables the Virtual File System switch code to get
-           transparent access to the following file systems:
-           cpio, tar, fish, sfs, ftp, sftp, extfs, smb.
-           Disabled by default.
-
-endmenu
diff --git a/trunk/package/feeds/packages/mc/Makefile b/trunk/package/feeds/packages/mc/Makefile
deleted file mode 100644
index ab8cd1b0..00000000
--- a/trunk/package/feeds/packages/mc/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mc
-PKG_VERSION:=4.8.14
-PKG_RELEASE:=1.3
-PKG_MAINTAINER:=Dirk Brenken <dibdot@gmail.com>
-PKG_LICENSE:=GPL-3.0+
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
-PKG_MD5SUM:=fbdaddb9edcf8925dcf3231331a8720b
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-PKG_CONFIG_DEPENDS := \
-	CONFIG_PACKAGE_MC \
-	CONFIG_MC_DIFFVIEWER \
-	CONFIG_MC_EDITOR \
-	CONFIG_MC_SUBSHELL \
-	CONFIG_MC_LARGEFILE \
-	CONFIG_MC_BACKGROUND \
-	CONFIG_MC_CHARSET \
-	CONFIG_MC_VFS
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/mc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+glib2 +libncurses +libmount +MC_VFS:libssh2 $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
-  TITLE:=Midnight Commander - a powerful visual file manager
-  URL:=http://www.midnight-commander.org/
-  MENU:=1
-endef
-
-define Package/mc/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/mc/description
- GNU Midnight Commander is a visual file manager,
- licensed under GNU General Public License and therefore qualifies as Free Software.
- It's a feature rich full-screen text mode application that allows you to copy,
- move and delete files and whole directory trees, search for files
- and run commands in the subshell. Internal viewer and editor are included.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-doxygen-doc \
-	--with-screen=ncurses \
-	--without-gpm-mouse \
-	--without-x \
-
-CONFIGURE_VARS += \
-	ac_cv_search_addwstr=no \
-
-ifeq ($(CONFIG_MC_DIFFVIEWER),)
-CONFIGURE_ARGS += \
-	--without-diff-viewer
-endif
-
-ifeq ($(CONFIG_MC_EDITOR),)
-CONFIGURE_ARGS += \
-	--without-internal-edit
-endif
-
-ifeq ($(CONFIG_MC_SUBSHELL),)
-CONFIGURE_ARGS += \
-	--without-subshell
-endif
-
-ifeq ($(CONFIG_MC_LARGEFILE),)
-CONFIGURE_ARGS += \
-	--disable-largefile
-endif
-
-ifeq ($(CONFIG_MC_BACKGROUND),)
-CONFIGURE_ARGS += \
-	--disable-background
-endif
-
-ifeq ($(CONFIG_MC_CHARSET),)
-CONFIGURE_ARGS += \
-	--disable-charset
-endif
-
-ifeq ($(CONFIG_MC_VFS),)
-CONFIGURE_ARGS += \
-	--disable-vfs
-endif
-
-define Package/mc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/mc
-ifeq ($(CONFIG_MC_DIFFVIEWER),y)
-	ln -sf mc $(1)/usr/bin/mcdiff
-endif
-ifeq ($(CONFIG_MC_EDITOR),y)
-	ln -sf mc $(1)/usr/bin/mcedit
-endif
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.menu $(1)/etc/mc
-	$(INSTALL_DIR) $(1)/etc/mc/skins
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/skins/default.ini $(1)/etc/mc/skins
-	$(INSTALL_DIR) $(1)/root/.mc/cedit/Syntax
-endef
-
-define Package/mc/conffiles
-/etc/mc/mc.menu
-/etc/mc/skins/default.ini
-endef
-
-$(eval $(call BuildPackage,mc))
diff --git a/trunk/package/feeds/packages/mdnsresponder/Makefile b/trunk/package/feeds/packages/mdnsresponder/Makefile
deleted file mode 100644
index 5eaedd2e..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mDNSResponder
-PKG_VERSION:=567
-PKG_RELEASE:=1
-
-PKG_SOURCE:=mDNSResponder-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://opensource.apple.com/tarballs/mDNSResponder/
-PKG_MD5SUM:=6eff6d243a12a3d4b6fca03c05a9893b
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=Apache-2.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/mDNSResponder-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=0
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-# sys/capability.h is not part of *libc*
-PKG_BUILD_DEPENDS:=libcap
-
-define Package/mDNSResponder/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE:=mDNS
-  URL:=http://developer.apple.com/networking/bonjour/
-endef
-
-define Package/mDNSResponder/Default/description
-  Bonjour, also known as zero-configuration networking, enables
-  automatic discovery of computers, devices, and services on
-  IP networks.
-endef
-
-define Package/mdns-utils
-$(call Package/mDNSResponder/Default)
-  TITLE+= client utilities
-  DEPENDS+= +mdnsd
-endef
-
-define Package/mdns-utils/description
-$(call Package/mDNSResponder/Default/description)
- .
- This package contains mDNS client utilities:
- - dns-sd
- - mDNSClient
- - mDNSIdentify
- - mDNSNetMonitor
- - mDNSProxyResponder
- - mDNSResponder
-endef
-
-define Package/mdnsd
-$(call Package/mDNSResponder/Default)
-  TITLE+= server daemon
-endef
-
-define Package/mdnsd/description
-$(call Package/mDNSResponder/Default/description)
- .
- This package contains the mDNS server daemon.
-endef
-
-define Package/mdnsresponder
-$(call Package/mDNSResponder/Default)
-  TITLE+= suite (meta)
-  DEPENDS+= +mdns-utils +mdnsd
-endef
-
-define Package/mdnsresponder/description
-$(call Package/mDNSResponder/Default/description)
- .
- This meta package contains only dependencies on other packages.
-endef
-
-# I have no idea why -lc is required, but without it, C library symbols are
-# not found:
-MAKE_FLAGS += \
-	CFLAGS_DEBUG="$(TARGET_CFLAGS)" \
-	LINKOPTS=-lc \
-	LDCONFIG= \
-	ETCBASE="$(PKG_INSTALL_DIR)/etc" \
-	INSTBASE="$(PKG_INSTALL_DIR)/usr" \
-	NSSINSTPATH="$(PKG_INSTALL_DIR)/lib" \
-	MANPATH="$(PKG_INSTALL_DIR)/usr/man" \
-	STARTUPSCRIPTDIR="$(PKG_INSTALL_DIR)/etc/init.d" \
-	RUNLEVELSCRIPTSDIR="$(PKG_INSTALL_DIR)/etc/rc.d" \
-	os=linux-uclibc
-MAKE_PATH = mDNSPosix
-
-define Build/Compile
-	$(call Build/Compile/Default)
-	# XXX: mDNSResponder's "make install" does not seem to create:
-	mkdir -p $(PKG_INSTALL_DIR)/lib/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/bin/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/sbin/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/lib/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/man/man5/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/man/man8/
-	mkdir -p $(PKG_INSTALL_DIR)/usr/include/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/init.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc2.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc3.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc4.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc5.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc0.d/
-	mkdir -p $(PKG_INSTALL_DIR)/etc/rc.d/rc6.d/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/mDNSShared/dns_sd.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/*.so* $(1)/usr/lib/
-endef
-
-define Package/mdns-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/dns-sd $(1)/usr/bin/
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/mDNSClientPosix $(1)/usr/bin/mDNSClient
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/mDNSIdentify $(1)/usr/bin/mDNSIdentify
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/mDNSNetMonitor $(1)/usr/bin/mDNSNetMonitor
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/mDNSProxyResponderPosix $(1)/usr/bin/mDNSProxyResponder
-	$(CP) $(PKG_BUILD_DIR)/mDNSPosix/build/prod/mDNSResponderPosix $(1)/usr/bin/mDNSResponder
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/mDNSResponder.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mDNSResponder.init $(1)/etc/init.d/mDNSResponder
-endef
-
-define Package/mdns-utils/conffiles
-/etc/mDNSResponder.conf
-endef
-
-define Package/mdnsd/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mdnsd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mdnsd.init $(1)/etc/init.d/mdnsd
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.1 $(1)/usr/lib/
-	$(LN) -s libdns_sd.so.1 $(1)/usr/lib/libdns_sd.so
-endef
-
-define Package/mdnsresponder/install
-	:
-endef
-
-$(eval $(call BuildPackage,mdns-utils))
-$(eval $(call BuildPackage,mdnsd))
-$(eval $(call BuildPackage,mdnsresponder))
diff --git a/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.conf b/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.conf
deleted file mode 100644
index 23aab169..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-"OpenWrt SSH"
-_ssh._tcp. local
-22
-OpenWrt SSH server
diff --git a/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.init b/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.init
deleted file mode 100644
index 87f9e900..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/files/mDNSResponder.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-
-START=61
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/bin/mDNSResponder -b -f /etc/mDNSResponder.conf
-}
-
-stop() {
-	service_stop /usr/bin/mDNSResponder
-}
diff --git a/trunk/package/feeds/packages/mdnsresponder/files/mdnsd.init b/trunk/package/feeds/packages/mdnsresponder/files/mdnsd.init
deleted file mode 100755
index 817604ba..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/files/mdnsd.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2014 OpenWrt.org
-
-START=60
-STOP=10
-USE_PROCD=1
-
-start_service() {
-    procd_open_instance
-    procd_set_param command /usr/sbin/mdnsd -debug
-    procd_set_param respawn
-    procd_close_instance
-}
-
diff --git a/trunk/package/feeds/packages/mdnsresponder/patches/001-cross_compile.patch b/trunk/package/feeds/packages/mdnsresponder/patches/001-cross_compile.patch
deleted file mode 100644
index b1685fc4..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/Clients/Makefile
-+++ b/Clients/Makefile
-@@ -27,6 +27,8 @@
- 
- #############################################################################
- 
-+CC = @cc
-+
- # On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable
- # If /usr/lib/libSystem.dylib exists, then we're on OS X, so we don't need also to link the "dns_sd" shared library
- ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
-@@ -46,10 +48,10 @@ build:
- 	mkdir build
- 
- build/dns-sd: build dns-sd.c ClientCommon.c
--	$(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
-+	$(CC) $(CFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
- 
- build/dns-sd64: build dns-sd.c ClientCommon.c
--	$(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
-+	$(CC) $(CFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
- 
- # Note, we can make a 'fat' version of dns-sd using 'lipo', as shown below, but we
- # don't, because we don't want or need a 'fat' version of dns-sd, because it will
---- a/mDNSPosix/Makefile
-+++ b/mDNSPosix/Makefile
-@@ -54,11 +54,12 @@ COREDIR = ../mDNSCore
- SHAREDDIR ?= ../mDNSShared
- JDK = /usr/jdk
- 
--CC = @cc
-+CC = @gcc
- BISON = @bison
- FLEX = @flex
- ST = @strip
--LD = ld -shared
-+LD = @ld
-+SOOPTS = -shared
- CP = cp
- RM = rm
- LN = ln -s -f
-@@ -92,7 +93,7 @@ CFLAGS_DEBUG = -O0 -DMDNS_DEBUGMSGS=0
- CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -DNOT_HAVE_SOCKLEN_T -DNOT_HAVE_IF_NAMETOINDEX \
- 	 -DLOG_PERROR=0 -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -DTARGET_OS_SOLARIS
- CC = gcc
--LD = gcc -shared
-+LD = gcc
- LINKOPTS = -lsocket -lnsl -lresolv
- JAVACFLAGS_OS += -I$(JDK)/include/solaris
- ifneq ($(DEBUG),1)
-@@ -148,7 +149,8 @@ CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp
- 	-D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 \
- 	-D__APPLE_USE_RFC_2292 #-Wunreachable-code
- CC = gcc
--LD = $(CC) -dynamiclib
-+LD = $(CC)
-+SOOPTS= -dynamiclib
- LINKOPTS = -lSystem
- LDSUFFIX = dylib
- JDK = /System/Library/Frameworks/JavaVM.framework/Home
-@@ -170,8 +172,9 @@ NSSLIBFILE  := $(NSSLIBNAME)-$(NSSVERSIO
- NSSLINKNAME := $(NSSLIBNAME).so.2
- NSSINSTPATH := /lib
- 
--# If not otherwise defined, we install into /usr/lib and /usr/include
-+# If not otherwise defined, we install into /usr/lib, /usr/include and /etc
- # and our startup script is called mdns (e.g. /etc/init.d/mdns)
-+ETCBASE?=/etc
- INSTBASE?=/usr
- STARTUPSCRIPTNAME?=mdns
- 
-@@ -257,7 +260,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$
- CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
- 
- $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
--	@$(LD) $(LINKOPTS) -o $@ $+
-+	@$(LD) $(SOOPTS) $(LINKOPTS) -o $@ $+
- 	@$(STRIP) $@
- 
- Clients: setup libdns_sd ../Clients/build/dns-sd
-@@ -292,7 +295,7 @@ InstalledManPages: $(MANPATH)/man8/mdnsd
- InstalledClients: $(INSTBASE)/bin/dns-sd
- 	@echo $+ " installed"
- 
--InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
-+InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) $(ETCBASE)/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
- 	@echo $+ " installed"
- 
- # Note: If daemon already installed, we make sure it's stopped before overwriting it
-@@ -347,19 +350,21 @@ $(INSTBASE)/bin/dns-sd: ../Clients/build
- 
- $(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
- 	$(LN) $< $@
--	ldconfig
-+ifdef LDCONFIG
-+	$(LDCONFIG)
-+endif
- 
- $(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
- 	$(CP) $< $@
- 	chmod 444 $@
- 
--/etc/nss_mdns.conf: nss_mdns.conf
-+$(ETCBASE)/nss_mdns.conf: nss_mdns.conf
- 	$(CP) $< $@
- 	chmod 444 $@
- 	# Check the nsswitch.conf file.
- 	# If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
--	cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
--	sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
-+	-[ -f $(ETCBASE)/nsswitch.conf ] && cp -f $(ETCBASE)/nsswitch.conf $(ETCBASE)/nsswitch.conf.pre-mdns
-+	-[ -f $(ETCBASE)/nsswitch.conf ] && sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' $(ETCBASE)/nsswitch.conf.pre-mdns > $(ETCBASE)/nsswitch.conf
- 
- #############################################################################
- 
diff --git a/trunk/package/feeds/packages/mdnsresponder/patches/100-linux_fixes.patch b/trunk/package/feeds/packages/mdnsresponder/patches/100-linux_fixes.patch
deleted file mode 100644
index 51b94848..00000000
--- a/trunk/package/feeds/packages/mdnsresponder/patches/100-linux_fixes.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..920cdfc
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,4 @@
-+Clients/build
-+mDNSPosix/build
-+mDNSPosix/objects
-+
-diff --git a/Clients/Makefile b/Clients/Makefile
-index 383af31..925c20e 100755
---- a/Clients/Makefile
-+++ b/Clients/Makefile
-@@ -34,7 +34,7 @@ TARGETS = build/dns-sd build/dns-sd64
- LIBS =
- else
- TARGETS = build/dns-sd
--LIBS = -L../mDNSPosix/build/prod/ -ldns_sd
-+LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd
- endif
- 
- all: $(TARGETS)
-diff --git a/mDNSPosix/PosixDaemon.c b/mDNSPosix/PosixDaemon.c
-index 88b3292..e86a6c7 100644
---- a/mDNSPosix/PosixDaemon.c
-+++ b/mDNSPosix/PosixDaemon.c
-@@ -37,6 +37,11 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <sys/types.h>
-+#ifdef __linux__
-+#include <sys/capability.h> /* !!! We require libcap-dev for this. Oh well. */
-+/* prctl is required to enable inheriting of capabilities across setuid */
-+#include <sys/prctl.h>
-+#endif /* __linux__ */
- 
- #if __APPLE__
- #undef daemon
-@@ -184,16 +189,50 @@ int main(int argc, char **argv)
- 
-     Reconfigure(&mDNSStorage);
- 
-+#ifdef __linux__
-+    /*
-+     * SO_BINDTODEVICE is privileged operation; however, we can get
-+     * around it using capabilities instead of remaining root.
-+     */
-+    if (mStatus_NoError == err)
-+      {
-+        if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0)
-+          perror("prctl PR_SET_KEEPCAPS");
-+      }
-+#endif /* __linux__ */
-+
-     // Now that we're finished with anything privileged, switch over to running as "nobody"
-     if (mStatus_NoError == err)
-     {
-         const struct passwd *pw = getpwnam("nobody");
-         if (pw != NULL)
-+          {
-             setuid(pw->pw_uid);
-+#ifdef __linux__
-+            struct __user_cap_header_struct ch;
-+            struct __user_cap_data_struct cd[_LINUX_CAPABILITY_U32S_3];
-+
-+            memset(&ch, 0, sizeof(ch));
-+            ch.version = _LINUX_CAPABILITY_VERSION_3;
-+            ch.pid = getpid();
-+            memset(&cd[0], 0, sizeof(cd));
-+            /* CAP_NET_RAW is required to use SO_BINDTODEVICE */
-+            int caps = CAP_TO_MASK(CAP_NET_RAW);
-+            cd[0].permitted = caps;
-+            cd[0].effective = caps;
-+            if (capset(&ch, &cd[0]) < 0)
-+              perror("capset");
-+#endif /* __linux__ */
-+          }
-         else
-             LogMsg("WARNING: mdnsd continuing as root because user \"nobody\" does not exist");
-     }
- 
-+#ifdef __linux__
-+    if (mStatus_NoError == err)
-+      err = mDNSPlatformPosixRefreshInterfaceList(&mDNSStorage);
-+#endif /* __linux__ */
-+
-     if (mStatus_NoError == err)
-         err = MainLoop(&mDNSStorage);
- 
-diff --git a/mDNSPosix/Responder.c b/mDNSPosix/Responder.c
-index 3996b7b..e58d8eb 100755
---- a/mDNSPosix/Responder.c
-+++ b/mDNSPosix/Responder.c
-@@ -603,7 +603,8 @@ static mStatus RegisterServicesInFile(const char *filePath)
-         status = mStatus_UnknownErr;
-     }
- 
--    assert(0 == fclose(fp));
-+    int rv = fclose(fp);
-+    assert(0 == rv);
- 
-     return status;
- }
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 6effa12..d3acf99 100755
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -138,7 +138,7 @@ mDNSlocal void SockAddrTomDNSAddr(const struct sockaddr *const sa, mDNSAddr *ipA
- 
- // mDNS core calls this routine when it needs to send a packet.
- mDNSexport mStatus mDNSPlatformSendUDP(const mDNS *const m, const void *const msg, const mDNSu8 *const end,
--                                       mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
-+                                       mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst,
-                                        mDNSIPPort dstPort, mDNSBool useBackgroundTrafficClass)
- {
-     int err = 0;
-@@ -583,9 +583,17 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf)
- {
-     assert(intf != NULL);
-     if (intf->intfName != NULL) free((void *)intf->intfName);
--    if (intf->multicastSocket4 != -1) assert(close(intf->multicastSocket4) == 0);
-+    if (intf->multicastSocket4 != -1)
-+      {
-+        int rv = close(intf->multicastSocket4);
-+        assert(rv == 0);
-+      }
- #if HAVE_IPV6
--    if (intf->multicastSocket6 != -1) assert(close(intf->multicastSocket6) == 0);
-+    if (intf->multicastSocket6 != -1)
-+      {
-+        int rv = close(intf->multicastSocket6);
-+        assert(rv == 0);
-+      }
- #endif
- 
-     // Move interface to the RecentInterfaces list for a minute
-@@ -724,6 +732,29 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf
-             if (err < 0) { err = errno; perror("setsockopt - IP_MULTICAST_TTL"); }
-         }
- 
-+#ifdef __linux__
-+#ifdef SO_BINDTODEVICE
-+        if (err == 0 && interfaceIndex)
-+        {
-+            char ifname[IFNAMSIZ];
-+            if (if_indextoname(interfaceIndex, ifname))
-+              {
-+                err = setsockopt(*sktPtr, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname));
-+                if (err < 0)
-+                  {
-+                    err = errno;
-+                    perror("setsockopt - SO_BINDTODEVICE");
-+                  }
-+              }
-+            else
-+              {
-+                err = errno;
-+                perror("if_indextoname");
-+              }
-+        }
-+#endif /* SO_BINDTODEVICE */
-+#endif /* __linux__ */
-+
-         // And start listening for packets
-         if (err == 0)
-         {
-@@ -805,6 +836,29 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf
-             if (err < 0) { err = errno; perror("setsockopt - IPV6_MULTICAST_HOPS"); }
-         }
- 
-+#ifdef __linux__
-+#ifdef SO_BINDTODEVICE
-+        if (err == 0 && interfaceIndex)
-+        {
-+            char ifname[IFNAMSIZ];
-+            if (if_indextoname(interfaceIndex, ifname))
-+              {
-+                err = setsockopt(*sktPtr, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname));
-+                if (err < 0)
-+                  {
-+                    err = errno;
-+                    perror("setsockopt - SO_BINDTODEVICE");
-+                  }
-+              }
-+            else
-+              {
-+                err = errno;
-+                perror("if_indextoname");
-+              }
-+        }
-+#endif /* SO_BINDTODEVICE */
-+#endif /* __linux__ */
-+
-         // And start listening for packets
-         if (err == 0)
-         {
-@@ -836,7 +890,12 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf
-     }
- 
-     // Clean up
--    if (err != 0 && *sktPtr != -1) { assert(close(*sktPtr) == 0); *sktPtr = -1; }
-+    if (err != 0 && *sktPtr != -1)
-+      {
-+        int rv = close(*sktPtr);
-+        assert(rv == 0);
-+        *sktPtr = -1;
-+      }
-     assert((err == 0) == (*sktPtr != -1));
-     return err;
- }
-@@ -1026,7 +1085,7 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD)
-     /* Subscribe the socket to Link & IP addr notifications. */
-     mDNSPlatformMemZero(&snl, sizeof snl);
-     snl.nl_family = AF_NETLINK;
--    snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
-+    snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR;
-     ret = bind(sock, (struct sockaddr *) &snl, sizeof snl);
-     if (0 == ret)
-         *pFD = sock;
-@@ -1104,11 +1163,18 @@ mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
-         PrintNetLinkMsg(pNLMsg);
- #endif
- 
-+        // this result isn't used anywhere as a number, just as
-+        // non-zero - however, I have seen devices with more than 32
-+        // interfaces at some point..
-+        // (on Linux, every tunnel increases index for example)
-+
-         // Process the NetLink message
-         if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK)
--            result |= 1 << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index;
-+          result |= 1;
-+        // << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index;
-         else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR)
--            result |= 1 << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index;
-+          result |= 1;
-+        // << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index;
- 
-         // Advance pNLMsg to the next message in the buffer
-         if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE)
-@@ -1279,8 +1345,12 @@ mDNSexport mStatus mDNSPlatformInit(mDNS *const m)
-     if (err == mStatus_NoError) err = SetupSocket(&sa, zeroIPPort, 0, &m->p->unicastSocket6);
- #endif
- 
-+    // In Linux case, we can't set up sockets with different owner -
-+    // it blows up SO_REUSEPORT. So we do this step bit later.
-+#ifndef __linux__
-     // Tell mDNS core about the network interfaces on this machine.
-     if (err == mStatus_NoError) err = SetupInterfaceList(m);
-+#endif /* !__linux__ */
- 
-     // Tell mDNS core about DNS Servers
-     mDNS_Lock(m);
-@@ -1313,9 +1383,17 @@ mDNSexport void mDNSPlatformClose(mDNS *const m)
- {
-     assert(m != NULL);
-     ClearInterfaceList(m);
--    if (m->p->unicastSocket4 != -1) assert(close(m->p->unicastSocket4) == 0);
-+    if (m->p->unicastSocket4 != -1)
-+      {
-+        int rv = close(m->p->unicastSocket4);
-+        assert(rv == 0);
-+      }
- #if HAVE_IPV6
--    if (m->p->unicastSocket6 != -1) assert(close(m->p->unicastSocket6) == 0);
-+    if (m->p->unicastSocket6 != -1)
-+      {
-+        int rv = close(m->p->unicastSocket6);
-+        assert(rv == 0);
-+      }
- #endif
- }
- 
-@@ -1571,14 +1649,14 @@ mDNSexport mStatus    mDNSPlatformClearSPSMACAddr(void)
- mDNSexport mDNSu16 mDNSPlatformGetUDPPort(UDPSocket *sock)
- {
-     (void) sock; // unused
-- 
-+
-     return (mDNSu16)-1;
- }
- 
- mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID)
- {
-     (void) InterfaceID; // unused
--    
-+
-     return mDNSfalse;
- }
- 
-diff --git a/mDNSPosix/mDNSUNP.c b/mDNSPosix/mDNSUNP.c
-index b392fc7..fe800af 100755
---- a/mDNSPosix/mDNSUNP.c
-+++ b/mDNSPosix/mDNSUNP.c
-@@ -63,6 +63,7 @@
- #if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <linux/if_addr.h>
- 
- /* Converts a prefix length to IPv6 network mask */
- void plen_to_mask(int plen, char *addr) {
-@@ -86,7 +87,7 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases)
-     FILE *fp;
-     char addr[8][5];
-     int flags, myflags, index, plen, scope;
--    char ifname[9], lastname[IFNAMSIZ];
-+    char ifname[IFNAMSIZ], lastname[IFNAMSIZ];
-     char addr6[32+7+1]; /* don't forget the seven ':' */
-     struct addrinfo hints, *res0;
-     struct sockaddr_in6 *sin6;
-@@ -94,7 +95,8 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases)
-     int err;
-     int sockfd = -1;
-     struct ifreq ifr;
--
-+    char mask[64] = "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %";
-+    sprintf(mask+strlen(mask), "%ds\n", IFNAMSIZ);
-     res0=NULL;
-     ifihead = NULL;
-     ifipnext = &ifihead;
-@@ -106,11 +108,12 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases)
-             goto gotError;
-         }
-         while (fscanf(fp,
--                      "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %8s\n",
-+                      mask,
-                       addr[0],addr[1],addr[2],addr[3],
-                       addr[4],addr[5],addr[6],addr[7],
-                       &index, &plen, &scope, &flags, ifname) != EOF) {
- 
-+            if (flags & IFA_F_DEPRECATED) continue;
-             myflags = 0;
-             if (strncmp(lastname, ifname, IFNAMSIZ) == 0) {
-                 if (doaliases == 0)
-@@ -205,7 +208,8 @@ gotError:
-     }
- done:
-     if (sockfd != -1) {
--        assert(close(sockfd) == 0);
-+      int rv = close(sockfd);
-+      assert(rv == 0);
-     }
-     return(ifihead);    /* pointer to first structure in linked list */
- }
-diff --git a/mDNSShared/dnsextd_parser.y b/mDNSShared/dnsextd_parser.y
-index 18c5990..d4b63ce 100644
---- a/mDNSShared/dnsextd_parser.y
-+++ b/mDNSShared/dnsextd_parser.y
-@@ -15,6 +15,8 @@
-  * limitations under the License.
-  */
- 
-+%parse-param { void *context }
-+
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -23,7 +25,7 @@
- #include "DebugServices.h"
- #include "dnsextd.h"
- 
--void yyerror( const char* error );
-+void yyerror( void *context, const char* error );
- int  yylex(void);
- 
- 
-@@ -378,7 +380,7 @@ int yywrap(void);
- 
- extern int yylineno;
- 
--void yyerror( const char *str )
-+void yyerror( void *context, const char *str )
- {
-         fprintf( stderr,"%s:%d: error: %s\n", g_filename, yylineno, str );
- }
diff --git a/trunk/package/feeds/packages/memcached/Makefile b/trunk/package/feeds/packages/memcached/Makefile
deleted file mode 100644
index 91ae4da6..00000000
--- a/trunk/package/feeds/packages/memcached/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-# Copyright (C) 2009-2014 Thomas Heil <heil@terminal-consulting.de>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=memcached
-PKG_VERSION:=1.4.22
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://memcached.org/files
-PKG_MD5SUM:=2b7eefa17c811998f4cd55bfabc12b8e
-PKG_INSTALL:=1
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=permissive free software license
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/memcached
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libevent +libpthread
-  TITLE:=The high-performance, distributed memory object caching system
-  URL:=http://memcached.org/
-endef
-
-define Package/memcached/description
-  Free and open source, high-performance, distributed memory object caching system
-endef
-
-define Package/memcached/conffiles
-/etc/config/memcached
-endef
-
-ifeq ($(CONFIG_BIG_ENDIAN),y)
-CONFIGURE_VARS += ac_cv_c_endian=big
-else
-CONFIGURE_VARS += ac_cv_c_endian=little
-endif
-
-CONFIGURE_ARGS += \
-	--with-libevent=$(STAGING_DIR)/usr/include/libevent \
-	--disable-docs \
-	--disable-dtrace \
-	--disable-coverage \
-	--disable-sasl
-
-TARGET_CFLAGS += \
-	-std=gnu99
-
-TARGET_LDFLAGS = \
-	-L$(STAGING_DIR)/usr/lib/libevent -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-
-define Package/memcached/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/memcached.init $(1)/etc/init.d/memcached
-endef
-
-$(eval $(call BuildPackage,memcached))
diff --git a/trunk/package/feeds/packages/memcached/files/memcached.config b/trunk/package/feeds/packages/memcached/files/memcached.config
deleted file mode 100644
index 4071116b..00000000
--- a/trunk/package/feeds/packages/memcached/files/memcached.config
+++ /dev/null
@@ -1,6 +0,0 @@
-config memcached
-	option user 'nobody'
-	option maxconn '1024'
-	option listen '0.0.0.0'
-	option port '11211'
-	option memory '64'
diff --git a/trunk/package/feeds/packages/memcached/files/memcached.init b/trunk/package/feeds/packages/memcached/files/memcached.init
deleted file mode 100644
index 063bf647..00000000
--- a/trunk/package/feeds/packages/memcached/files/memcached.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
-
-START=80
-
-start_instance () {
-	local section="$1"
-
-	config_get user "$section" user
-	config_get maxconn "$section" maxconn
-	config_get listen "$section" listen
-	config_get port "$section" port
-	config_get memory "$section" memory
-
-	service_start /usr/bin/memcached -d -u ${user:-nobody} \
-		-c ${maxconn:-1024} -l ${listen:-0.0.0.0} \
-		-p ${port:-11211} -U ${port:-11211} -m ${memory:-64}
-}
-
-start() {
-	config_load 'memcached'
-	config_foreach start_instance 'memcached'
-}
-
-stop() {
-	service_stop /usr/bin/memcached
-}
diff --git a/trunk/package/feeds/packages/memcached/patches/100-fix_iov_max.patch b/trunk/package/feeds/packages/memcached/patches/100-fix_iov_max.patch
deleted file mode 100644
index 1a5da94b..00000000
--- a/trunk/package/feeds/packages/memcached/patches/100-fix_iov_max.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/memcached.c
-+++ b/memcached.c
-@@ -13,6 +13,10 @@
-  *      Anatoly Vorobey <mellon@pobox.com>
-  *      Brad Fitzpatrick <brad@danga.com>
-  */
-+#ifndef __need_IOV_MAX
-+#define __need_IOV_MAX
-+#endif
-+
- #include "memcached.h"
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -29,9 +33,6 @@
- #define _P1003_1B_VISIBLE
- #endif
- /* need this to get IOV_MAX on some platforms. */
--#ifndef __need_IOV_MAX
--#define __need_IOV_MAX
--#endif
- #include <pwd.h>
- #include <sys/mman.h>
- #include <fcntl.h>
diff --git a/trunk/package/feeds/packages/micropython-lib/Makefile b/trunk/package/feeds/packages/micropython-lib/Makefile
deleted file mode 100644
index 025ae171..00000000
--- a/trunk/package/feeds/packages/micropython-lib/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=micropython-lib
-PKG_VERSION=0.1-20150302-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-PKG_LICENSE:=MIT, PSFL
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/micropython/micropython-lib.git
-PKG_SOURCE_VERSION:=654c7d288603f7dae09eb09b57fb67b38c7ac6c3
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/micropython-lib
-    SUBMENU:=Python
-    SECTION:=lang
-    CATEGORY:=Languages
-    TITLE:=micropython-lib
-    URL:=https://github.com/micropython/micropython-lib
-    DEPENDS:=+micropython
-endef
-
-define Package/micropython-lib/description
-    This package contains micropython-lib, a project to develop a non-monolothic
-    standard library for Micro Python. Note that this is a work in progress and
-    several libraries may be missing, incomplete or buggy.
-endef
-
-MAKE_FLAGS:=\
-	-C $(PKG_BUILD_DIR) \
-	PREFIX=$(PKG_BUILD_DIR)/_install_tmp \
-	install
-
-define Package/micropython-lib/install
-	$(INSTALL_DIR) $(1)/usr/lib/micropython
-	$(CP) $(PKG_BUILD_DIR)/_install_tmp/* $(1)/usr/lib/micropython
-endef
-
-$(eval $(call BuildPackage,micropython-lib))
-
diff --git a/trunk/package/feeds/packages/micropython/Makefile b/trunk/package/feeds/packages/micropython/Makefile
deleted file mode 100644
index 1bcc1234..00000000
--- a/trunk/package/feeds/packages/micropython/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=micropython
-PKG_VERSION=1.3.10-20150302-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/micropython/micropython.git
-PKG_SOURCE_VERSION:=f2a889564b3a215902622b040a1247af38cb8203
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/micropython
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Micro Python
-  URL:=http://micropython.org
-  DEPENDS:=+libffi
-endef
-
-define Package/micropython/description
- This package contains Micro Python, a lean and fast implementation of the Python 3.4 programming language
- that is optimised to run on a microcontroller (and low power computers).
-endef
-
-MAKE_FLAGS += \
-       -C $(PKG_BUILD_DIR)/unix \
-       MICROPY_USE_READLINE=0
-
-define Package/micropython/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix/micropython $(1)/usr/bin/micropython
-endef
-
-$(eval $(call BuildPackage,micropython))
diff --git a/trunk/package/feeds/packages/minicom/Makefile b/trunk/package/feeds/packages/minicom/Makefile
deleted file mode 100644
index cf60e53e..00000000
--- a/trunk/package/feeds/packages/minicom/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=minicom
-PKG_VERSION:=2.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/3977/
-PKG_MD5SUM:=7044ca3e291268c33294f171d426dc2d
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/minicom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=Terminal emulation program
-  URL:=http://alioth.debian.org/projects/minicom/
-  SUBMENU:=Terminal
-endef
-
-define Package/minicom/conffiles
-/etc/minirc.dfl
-endef
-
-define Package/minicom/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ascii-xfr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,minicom))
diff --git a/trunk/package/feeds/packages/minicom/patches/100-fix_iconv_include.patch b/trunk/package/feeds/packages/minicom/patches/100-fix_iconv_include.patch
deleted file mode 100644
index 88190faa..00000000
--- a/trunk/package/feeds/packages/minicom/patches/100-fix_iconv_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/minicom.c
-+++ b/src/minicom.c
-@@ -31,7 +31,9 @@
- #include <getopt.h>
- #include <wchar.h>
- #include <wctype.h>
-+#ifdef HAVE_ICONV
- #include <iconv.h>
-+#endif
- #include <limits.h>
- 
- #define EXTERN
diff --git a/trunk/package/feeds/packages/miniupnpc/Makefile b/trunk/package/feeds/packages/miniupnpc/Makefile
deleted file mode 100644
index fbf62221..00000000
--- a/trunk/package/feeds/packages/miniupnpc/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=miniupnpc
-PKG_VERSION:=1.9
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://miniupnp.free.fr/files
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=5ef3ba321e6df72d6519b728b292073e
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/miniupnpc/Default
-  TITLE:=Lightweight UPnP
-  URL:=http://miniupnp.tuxfamily.org/
-endef
-
-define Package/miniupnpc
-  $(call Package/miniupnpc/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= client
-  DEPENDS:=+libminiupnpc
-endef
-
-define Package/libminiupnpc
-  $(call Package/miniupnpc/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-MAKE_FLAGS += \
-	OS="Linux" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/miniupnpc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/miniupnpc/*.h \
-		$(1)/usr/include/miniupnpc/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
-		$(1)/usr/lib/
-endef
-
-define Package/miniupnpc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upnpc $(1)/usr/bin/
-endef
-
-define Package/libminiupnpc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/lib/libminiupnpc.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,miniupnpc))
-$(eval $(call BuildPackage,libminiupnpc))
diff --git a/trunk/package/feeds/packages/miniupnpc/patches/100-no_minixml_test.patch b/trunk/package/feeds/packages/miniupnpc/patches/100-no_minixml_test.patch
deleted file mode 100644
index 93f6772c..00000000
--- a/trunk/package/feeds/packages/miniupnpc/patches/100-no_minixml_test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -151,8 +151,8 @@ installpythonmodule3:	pythonmodule3
- 	python3 setup.py install
- 
- validateminixml:	minixmlvalid
--	@echo "minixml validation test"
--	./minixmlvalid
-+	@echo "(skipping) minixml validation test"
-+#	./minixmlvalid
- 	touch $@
- 
- validateminiwget:	testminiwget minihttptestserver testminiwget.sh
diff --git a/trunk/package/feeds/packages/miniupnpc/patches/200-miniupnpc_desc.patch b/trunk/package/feeds/packages/miniupnpc/patches/200-miniupnpc_desc.patch
deleted file mode 100644
index 320707ef..00000000
--- a/trunk/package/feeds/packages/miniupnpc/patches/200-miniupnpc_desc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/upnpcommands.c
-+++ b/upnpcommands.c
-@@ -367,7 +367,7 @@ UPNP_AddPortMapping(const char * control
- 	AddPortMappingArgs[5].elt = "NewEnabled";
- 	AddPortMappingArgs[5].val = "1";
- 	AddPortMappingArgs[6].elt = "NewPortMappingDescription";
--	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
-+	AddPortMappingArgs[6].val = desc?desc:"miniupnpc";
- 	AddPortMappingArgs[7].elt = "NewLeaseDuration";
- 	AddPortMappingArgs[7].val = leaseDuration?leaseDuration:"0";
- 	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
diff --git a/trunk/package/feeds/packages/mjpg-streamer/Config.in b/trunk/package/feeds/packages/mjpg-streamer/Config.in
deleted file mode 100644
index 4a29ba9f..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-
-if PACKAGE_mjpg-streamer
-
-config MJPG_STREAMER_V4L2
-	bool "Compile input_uvc with libv4l2 (camera controls)"
-	default n
-	select PACKAGE_libv4l
-
-config MJPG_STREAMER_INPUT_FILE
-	bool "Install input file plugin"
-	default n
-
-config MJPG_STREAMER_INPUT_UVC
-	bool "Install input uvc plugin"
-	default y
-
-config MJPG_STREAMER_INPUT_TESTPICTURE
-	bool "Install input testpicture plugin"
-	default n
-
-config MJPG_STREAMER_OUTPUT_FILE
-	bool "Install output file plugin"
-	default n
-
-config MJPG_STREAMER_OUTPUT_HTTP
-	bool "Install output http plugin"
-	default y
-
-config MJPG_STREAMER_WWW
-	bool "Install complete Web UI files (includes cambozola)"
-	default n
-
-endif
diff --git a/trunk/package/feeds/packages/mjpg-streamer/Makefile b/trunk/package/feeds/packages/mjpg-streamer/Makefile
deleted file mode 100644
index 0a297d4e..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mjpg-streamer
-PKG_REV:=182
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=6
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
-PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer-experimental
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l
-
-define Package/mjpg-streamer
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=MJPG-streamer
-  DEPENDS:=+libpthread +libjpeg +MJPG_STREAMER_V4L2:libv4l
-  URL:=http://mjpg-streamer.wiki.sourceforge.net/
-  MENU:=1
-endef
-
-define Package/mjpg-streamer/description
- Streaming application for Linux-UVC compatible webcams
-endef
-
-define Package/mjpg-streamer/config
-  source "$(SOURCE)/Config.in"
-endef
-
-EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)
-
-define Package/mjpg-streamer/conffiles
-/etc/config/mjpg-streamer
-endef
-
-CAMBOZOLA:=cambozola-latest.tar.gz
-
-define Download/cambozola
-  URL:=http://www.andywilcock.com/code/cambozola
-  FILE:=$(CAMBOZOLA)
-  MD5SUM:=c9b0da91f8e6e72efccd307e04e2b75b
-endef
-
-# Fetch latest cambozola that works with latest Java(s)
-# Yes, I know this is ugly
-define Build/Prepare
-    $(call Build/Prepare/Default)
-    ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
-	$(eval $(call Download,cambozola))
-	$(TAR) -xvf $(DL_DIR)/$(CAMBOZOLA) --strip=2 --wildcards \
-		-C $(PKG_BUILD_DIR)/www */dist/cambozola.jar
-    endif
-endef
-
-ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
-    TARGET_CFLAGS+= -DUSE_LIBV4L2
-    TARGET_LDFLAGS+= -lv4l2
-endif
-
-define Package/mjpg-streamer/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(CP) ./files/mjpg-streamer.config $(1)/etc/config/mjpg-streamer
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
-	$(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer
-	$(INSTALL_DIR) $(1)/usr/lib
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_FILE),y)
-	$(CP) $(PKG_BUILD_DIR)/input_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_UVC),y)
-	$(CP) $(PKG_BUILD_DIR)/input_uvc.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_TESTPICTURE),y)
-	$(CP) $(PKG_BUILD_DIR)/input_testpicture.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_FILE),y)
-	$(CP) $(PKG_BUILD_DIR)/output_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_HTTP),y)
-	$(CP) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/www/webcam
-    ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam
-    else
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream_simple.html $(1)/www/webcam/index.html
-    endif
-endif
-endef
-
-$(eval $(call BuildPackage,mjpg-streamer))
diff --git a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.config b/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.config
deleted file mode 100644
index 7d6bfa45..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-config mjpg-streamer 'core'
-	option enabled '0'
-	option input 'uvc'
-	option output 'http'
-	option device '/dev/video0'
-	option resolution '640x480'
-	option fps '5'
-	option led 'auto'
-	option www '/www/webcam'
-	option port '8080'
-	option username 'openwrt'
-	option password 'openwrt'
diff --git a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.hotplug b/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.hotplug
deleted file mode 100644
index 1443b173..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.hotplug
+++ /dev/null
@@ -1,10 +0,0 @@
-case "$ACTION" in
-	add)
-		# start process
-		/etc/init.d/mjpg-streamer start
-		;;
-	remove)
-		# stop process
-		/etc/init.d/mjpg-streamer stop
-		;;
-esac
diff --git a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.init b/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.init
deleted file mode 100644
index 1ce5ce1d..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/files/mjpg-streamer.init
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2014 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/bin/mjpg_streamer
-
-error() {
-	echo "${initscript}:" "$@" 1>&2
-}
-
-start_instance() {
-	local s="$1"
-
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -eq 0 ] && return
-
-	config_get input "$s" 'input'
-	if [ -z "$input" ]; then
-		error "in section '$s' option input is missing"
-		return 1
-	fi
-
-	config_get output "$s" 'output'
-	if [ -z "$output" ]; then
-		error "in section '$s' option output is missing"
-		return 1
-	fi
-
-	local input_arg
-	if [ "x$input" = 'xuvc' ]; then
-		input_arg="input_uvc.so"
-
-		config_get device "$s" 'device'
-		if [ ! -c "$device" ]; then
-			error "device '$device' does not exist"
-			return 1
-		fi
-		input_arg="${input_arg} --device $device"
-
-		config_get fps "$s" 'fps'
-		[ -n "$fps" ] && input_arg="${input_arg} --fps $fps"
-
-		config_get resolution "$s" 'resolution'
-		[ -n "$resolution" ] && input_arg="${input_arg} --resolution $resolution"
-
-		config_get led "$s" 'led'
-		[ -n "$led" ] && input_arg="${input_arg} --led $led"
-	fi
-
-	if [ -z "$input_arg" ]; then
-		error "unsuported input option '$input' in section '$s'"
-		return 1
-	fi
-
-	local output_arg
-	if [ "x$output" = 'xhttp' ]; then
-		output_arg="output_http.so"
-
-		config_get port "$s" 'port'
-		[ -n "$port" ] && output_arg="${output_arg} --port $port"
-
-		config_get www "$s" 'www'
-		[ -n "$www" ] && output_arg="${output_arg} --www $www"
-
-		config_get username "$s" 'username'
-		config_get password "$s" 'password'
-		[ -n "$username" ] && [ -n "$password" ] && output_arg="${output_arg} --credentials $username:$password"
-	fi
-
-	if [ -z "$output_arg" ]; then
-		error "unsuported output option '$output' in section '$s'"
-		return 1
-	fi
-
-	procd_open_instance
-	procd_set_param command "$PROG" --input "$input_arg" --output "$output_arg"
-	procd_close_instance
-}
-
-start_service() {
-	config_load 'mjpg-streamer'
-	config_foreach start_instance 'mjpg-streamer'
-}
-
-service_triggers() {
-	procd_add_reload_trigger 'mjpg-streamer'
-}
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/010-enable_additional_plugins.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/010-enable_additional_plugins.patch
deleted file mode 100644
index 4713a08d..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/010-enable_additional_plugins.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -33,12 +33,12 @@ APP_BINARY = mjpg_streamer
- 
- # define the names and targets of the plugins
- PLUGINS = input_uvc.so
--#PLUGINS += output_file.so
-+PLUGINS += output_file.so
- #PLUGINS += output_udp.so
- PLUGINS += output_http.so
- PLUGINS += input_testpicture.so
- #PLUGINS += output_autofocus.so
--#PLUGINS += input_file.so
-+PLUGINS += input_file.so
- # PLUGINS += input_pylon.so
- # PLUGINS += input_megatec.so
- # PLUGINS += output_mars2020.so
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/020-remove_gcc_debug_options.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/020-remove_gcc_debug_options.patch
deleted file mode 100644
index 00d831e0..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/020-remove_gcc_debug_options.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/plugins/input_uvc/Makefile
-+++ b/plugins/input_uvc/Makefile
-@@ -13,7 +13,7 @@ OTHER_HEADERS = ../../mjpg_streamer.h ..
- 
- CFLAGS += -O1  -DLINUX -D_GNU_SOURCE -Wall -shared -fPIC
- 
--CFLAGS += -g -DDEBUG
-+#CFLAGS += -g -DDEBUG
- 
- ifeq ($(USE_LIBV4L2),true)
- LFLAGS += -lv4l2
---- a/plugins/output_file/Makefile
-+++ b/plugins/output_file/Makefile
-@@ -12,7 +12,7 @@ CC = gcc
- OTHER_HEADERS = ../../mjpg_streamer.h ../../utils.h ../output.h ../input.h
- 
- CFLAGS += -O2 -DLINUX -D_GNU_SOURCE -Wall -shared -fPIC
--CFLAGS += -DDEBUG -g
-+#CFLAGS += -DDEBUG -g
- LFLAGS += -lpthread -ldl
- 
- all: output_file.so
---- a/plugins/output_udp/Makefile
-+++ b/plugins/output_udp/Makefile
-@@ -14,7 +14,7 @@ CC = gcc
- OTHER_HEADERS = ../../mjpg_streamer.h ../../utils.h ../output.h ../input.h
- 
- CFLAGS += -O2 -DLINUX -D_GNU_SOURCE -Wall -shared -fPIC
--CFLAGS += -DDEBUG
-+#CFLAGS += -DDEBUG
- LFLAGS += -lpthread -ldl
- 
- all: output_udp.so
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/030-allow_16_char_device_names.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/030-allow_16_char_device_names.patch
deleted file mode 100644
index 0f8660ad..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/030-allow_16_char_device_names.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/input_uvc/v4l2uvc.c
-+++ b/plugins/input_uvc/v4l2uvc.c
-@@ -69,7 +69,7 @@ int init_videoIn(struct vdIn *vd, char *
-     vd->videodevice = (char *) calloc(1, 16 * sizeof(char));
-     vd->status = (char *) calloc(1, 100 * sizeof(char));
-     vd->pictName = (char *) calloc(1, 80 * sizeof(char));
--    snprintf(vd->videodevice, 12, "%s", device);
-+    snprintf(vd->videodevice, 16, "%s", device);
-     vd->toggleAvi = 0;
-     vd->getPict = 0;
-     vd->signalquit = 1;
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/040-Buffer-the-bytesused-variable-from-struct-v4l2_buffe.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/040-Buffer-the-bytesused-variable-from-struct-v4l2_buffe.patch
deleted file mode 100644
index a228f420..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/040-Buffer-the-bytesused-variable-from-struct-v4l2_buffe.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 19202b54698b343a0207d7e213448e32b8e58fc3 Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl <o.schinagl@ultimaker.com>
-Date: Wed, 29 Oct 2014 09:34:41 +0100
-Subject: [PATCH 1/7] Buffer the bytesused variable from struct v4l2_buffer
-
-Starting with kernel versions 3.16, (DE)Queing of buffers has been fixed
-after it was leaking data for ages. in the struct v4l2_buffer is the
-bytesused element which indicates the size of the buffer. This however
-gets cleared whenever the buffer gets requeued and is thus no longer
-valid.
-
-This patch copies the bytesused variable so it is available until the
-next frame captured again.
-
-Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
----
- plugins/input_uvc/input_uvc.c | 6 +++---
- plugins/input_uvc/v4l2uvc.c   | 2 ++
- plugins/input_uvc/v4l2uvc.h   | 1 +
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/input_uvc/input_uvc.c b/plugins/input_uvc/input_uvc.c
-index e6c74fd..64f66cb 100644
---- a/plugins/input_uvc/input_uvc.c
-+++ b/plugins/input_uvc/input_uvc.c
-@@ -482,7 +482,7 @@ void *cam_thread(void *arg)
-             exit(EXIT_FAILURE);
-         }
- 
--        //DBG("received frame of size: %d from plugin: %d\n", pcontext->videoIn->buf.bytesused, pcontext->id);
-+        //DBG("received frame of size: %d from plugin: %d\n", pcontext->videoIn->tmpbytesused, pcontext->id);
- 
-         /*
-          * Workaround for broken, corrupted frames:
-@@ -491,7 +491,7 @@ void *cam_thread(void *arg)
-          * For example a VGA (640x480) webcam picture is normally >= 8kByte large,
-          * corrupted frames are smaller.
-          */
--        if(pcontext->videoIn->buf.bytesused < minimum_size) {
-+        if(pcontext->videoIn->tmpbytesused < minimum_size) {
-             DBG("dropping too small frame, assuming it as broken\n");
-             continue;
-         }
-@@ -529,7 +529,7 @@ void *cam_thread(void *arg)
-         } else {
-         #endif
-             //DBG("copying frame from input: %d\n", (int)pcontext->id);
--            pglobal->in[pcontext->id].size = memcpy_picture(pglobal->in[pcontext->id].buf, pcontext->videoIn->tmpbuffer, pcontext->videoIn->buf.bytesused);
-+            pglobal->in[pcontext->id].size = memcpy_picture(pglobal->in[pcontext->id].buf, pcontext->videoIn->tmpbuffer, pcontext->videoIn->tmpbytesused);
-         #ifndef NO_LIBJPEG
-         }
-         #endif
-diff --git a/plugins/input_uvc/v4l2uvc.c b/plugins/input_uvc/v4l2uvc.c
-index c5a5aa4..d11510c 100644
---- a/plugins/input_uvc/v4l2uvc.c
-+++ b/plugins/input_uvc/v4l2uvc.c
-@@ -532,6 +532,7 @@ int uvcGrab(struct vdIn *vd)
-         */
- 
-         memcpy(vd->tmpbuffer, vd->mem[vd->buf.index], vd->buf.bytesused);
-+	vd->tmpbytesused = vd->buf.bytesused;
- 
-         if(debug)
-             fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused);
-@@ -570,6 +571,7 @@ int close_v4l2(struct vdIn *vd)
-     if(vd->tmpbuffer)
-         free(vd->tmpbuffer);
-     vd->tmpbuffer = NULL;
-+    vd->tmpbytesused = 0;
-     free(vd->framebuffer);
-     vd->framebuffer = NULL;
-     free(vd->videodevice);
-diff --git a/plugins/input_uvc/v4l2uvc.h b/plugins/input_uvc/v4l2uvc.h
-index 022c57e..2c7c8ba 100644
---- a/plugins/input_uvc/v4l2uvc.h
-+++ b/plugins/input_uvc/v4l2uvc.h
-@@ -83,6 +83,7 @@ struct vdIn {
-     struct v4l2_requestbuffers rb;
-     void *mem[NB_BUFFER];
-     unsigned char *tmpbuffer;
-+    int tmpbytesused;
-     unsigned char *framebuffer;
-     streaming_state streamingState;
-     int grabmethod;
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/041-Stop-leaking-data-via-struct-v4l2_buffer.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/041-Stop-leaking-data-via-struct-v4l2_buffer.patch
deleted file mode 100644
index 4f45da5d..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/041-Stop-leaking-data-via-struct-v4l2_buffer.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From 11b28b36a8711b53658e8bbc50435595522f91ba Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl <o.schinagl@ultimaker.com>
-Date: Wed, 29 Oct 2014 11:21:16 +0100
-Subject: [PATCH 2/7] Stop leaking data via struct v4l2_buffer
-
-Before the 3.16 kernel, the v4l2_buffer was leaking data and violating
-its own spec. Since 3.16 this has been corrected and after calling the
-QBUF ioctl, the struct gets cleaned up.
-
-Right now, input_uvc assumes the buffer is valid at all times. This no
-longer being true, this patch removes the v4l2_buffer from the vdIn
-struct. Certain values are still needed outside of this buffer however,
-the length buffer in the buffer array 'mem' and the timestamp. These are
-now stored in the vdIn struct.
-
-All of this is still somewhat hackish, as a) the processing of the image
-should really be done inside the uvcGrab function between the queuing
-and dequeing of the buffers (or separate that into 3 functions, deq, q
-and process and call them from input_uvc). b) we are still copying the
-image using memcpy, which is something we don't really want and defeats
-the purpose of using a mmap in the first place. Changing this however
-requires some heavier re-architecting and in the end, may still not be avoided.
-
-More information about this bug and change can be found on the
-linux-media mailing list[0] with the title uvcvideo fails on 3.16 and
-3.17 kernels.
-
-[0] http://www.spinics.net/lists/linux-media/msg81515.html
-
-Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
----
- plugins/input_uvc/input_uvc.c |  6 ++--
- plugins/input_uvc/v4l2uvc.c   | 64 +++++++++++++++++++++++--------------------
- plugins/input_uvc/v4l2uvc.h   |  4 ++-
- 3 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/plugins/input_uvc/input_uvc.c b/plugins/input_uvc/input_uvc.c
-index 64f66cb..64ef56c 100644
---- a/plugins/input_uvc/input_uvc.c
-+++ b/plugins/input_uvc/input_uvc.c
-@@ -500,8 +500,8 @@ void *cam_thread(void *arg)
-         if (pcontext->videoIn->soft_framedrop == 1) {
-             unsigned long last = pglobal->in[pcontext->id].timestamp.tv_sec * 1000 +
-                                 (pglobal->in[pcontext->id].timestamp.tv_usec/1000); // convert to ms
--            unsigned long current = pcontext->videoIn->buf.timestamp.tv_sec * 1000 +
--                                    pcontext->videoIn->buf.timestamp.tv_usec/1000; // convert to ms
-+            unsigned long current = pcontext->videoIn->tmptimestamp.tv_sec * 1000 +
-+                                    pcontext->videoIn->tmptimestamp.tv_usec/1000; // convert to ms
- 
-             // if the requested time did not esplashed skip the frame
-             if ((current - last) < pcontext->videoIn->frame_period_time) {
-@@ -543,7 +543,7 @@ void *cam_thread(void *arg)
- #endif
- 
-         /* copy this frame's timestamp to user space */
--        pglobal->in[pcontext->id].timestamp = pcontext->videoIn->buf.timestamp;
-+        pglobal->in[pcontext->id].timestamp = pcontext->videoIn->tmptimestamp;
- 
-         /* signal fresh_frame */
-         pthread_cond_broadcast(&pglobal->in[pcontext->id].db_update);
-diff --git a/plugins/input_uvc/v4l2uvc.c b/plugins/input_uvc/v4l2uvc.c
-index d11510c..7ec5eec 100644
---- a/plugins/input_uvc/v4l2uvc.c
-+++ b/plugins/input_uvc/v4l2uvc.c
-@@ -217,6 +217,9 @@ static int init_v4l2(struct vdIn *vd)
- {
-     int i;
-     int ret = 0;
-+    struct v4l2_buffer buf;
-+
-+
-     if((vd->fd = OPEN_VIDEO(vd->videodevice, O_RDWR)) == -1) {
-         perror("ERROR opening V4L interface");
-         DBG("errno: %d", errno);
-@@ -375,26 +378,27 @@ static int init_v4l2(struct vdIn *vd)
-      * map the buffers
-      */
-     for(i = 0; i < NB_BUFFER; i++) {
--        memset(&vd->buf, 0, sizeof(struct v4l2_buffer));
--        vd->buf.index = i;
--        vd->buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        vd->buf.memory = V4L2_MEMORY_MMAP;
--        ret = xioctl(vd->fd, VIDIOC_QUERYBUF, &vd->buf);
-+        memset(&buf, 0, sizeof(struct v4l2_buffer));
-+        buf.index = i;
-+        buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+        buf.memory = V4L2_MEMORY_MMAP;
-+        ret = xioctl(vd->fd, VIDIOC_QUERYBUF, &buf);
-         if(ret < 0) {
-             perror("Unable to query buffer");
-             goto fatal;
-         }
- 
-         if(debug)
--            fprintf(stderr, "length: %u offset: %u\n", vd->buf.length, vd->buf.m.offset);
-+            fprintf(stderr, "length: %u offset: %u\n", buf.length, buf.m.offset);
- 
-         vd->mem[i] = mmap(0 /* start anywhere */ ,
--                          vd->buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, vd->fd,
--                          vd->buf.m.offset);
-+                          buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, vd->fd,
-+                          buf.m.offset);
-         if(vd->mem[i] == MAP_FAILED) {
-             perror("Unable to map buffer");
-             goto fatal;
-         }
-+	vd->memlength[i] = buf.length;
-         if(debug)
-             fprintf(stderr, "Buffer mapped at address %p.\n", vd->mem[i]);
-     }
-@@ -403,11 +407,11 @@ static int init_v4l2(struct vdIn *vd)
-      * Queue the buffers.
-      */
-     for(i = 0; i < NB_BUFFER; ++i) {
--        memset(&vd->buf, 0, sizeof(struct v4l2_buffer));
--        vd->buf.index = i;
--        vd->buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        vd->buf.memory = V4L2_MEMORY_MMAP;
--        ret = xioctl(vd->fd, VIDIOC_QBUF, &vd->buf);
-+        memset(&buf, 0, sizeof(struct v4l2_buffer));
-+        buf.index = i;
-+        buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+        buf.memory = V4L2_MEMORY_MMAP;
-+        ret = xioctl(vd->fd, VIDIOC_QBUF, &buf);
-         if(ret < 0) {
-             perror("Unable to queue buffer");
-             goto fatal;;
-@@ -499,17 +503,18 @@ int memcpy_picture(unsigned char *out, unsigned char *buf, int size)
- int uvcGrab(struct vdIn *vd)
- {
- #define HEADERFRAME1 0xaf
-+    struct v4l2_buffer buf;
-     int ret;
- 
-     if(vd->streamingState == STREAMING_OFF) {
-         if(video_enable(vd))
-             goto err;
-     }
--    memset(&vd->buf, 0, sizeof(struct v4l2_buffer));
--    vd->buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    vd->buf.memory = V4L2_MEMORY_MMAP;
-+    memset(&buf, 0, sizeof(struct v4l2_buffer));
-+    buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+    buf.memory = V4L2_MEMORY_MMAP;
- 
--    ret = xioctl(vd->fd, VIDIOC_DQBUF, &vd->buf);
-+    ret = xioctl(vd->fd, VIDIOC_DQBUF, &buf);
-     if(ret < 0) {
-         perror("Unable to dequeue buffer");
-         goto err;
-@@ -517,33 +522,34 @@ int uvcGrab(struct vdIn *vd)
- 
-     switch(vd->formatIn) {
-     case V4L2_PIX_FMT_MJPEG:
--        if(vd->buf.bytesused <= HEADERFRAME1) {
-+        if(buf.bytesused <= HEADERFRAME1) {
-             /* Prevent crash
-                                                         * on empty image */
-             fprintf(stderr, "Ignoring empty buffer ...\n");
-             return 0;
-         }
- 
--        /* memcpy(vd->tmpbuffer, vd->mem[vd->buf.index], vd->buf.bytesused);
-+        /* memcpy(vd->tmpbuffer, vd->mem[buf.index], buf.bytesused);
- 
--        memcpy (vd->tmpbuffer, vd->mem[vd->buf.index], HEADERFRAME1);
-+        memcpy (vd->tmpbuffer, vd->mem[buf.index], HEADERFRAME1);
-         memcpy (vd->tmpbuffer + HEADERFRAME1, dht_data, sizeof(dht_data));
--        memcpy (vd->tmpbuffer + HEADERFRAME1 + sizeof(dht_data), vd->mem[vd->buf.index] + HEADERFRAME1, (vd->buf.bytesused - HEADERFRAME1));
-+        memcpy (vd->tmpbuffer + HEADERFRAME1 + sizeof(dht_data), vd->mem[buf.index] + HEADERFRAME1, (buf.bytesused - HEADERFRAME1));
-         */
- 
--        memcpy(vd->tmpbuffer, vd->mem[vd->buf.index], vd->buf.bytesused);
--	vd->tmpbytesused = vd->buf.bytesused;
-+        memcpy(vd->tmpbuffer, vd->mem[buf.index], buf.bytesused);
-+	vd->tmpbytesused = buf.bytesused;
-+	vd->tmptimestamp = buf.timestamp;
- 
-         if(debug)
--            fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused);
-+            fprintf(stderr, "bytes in used %d \n", buf.bytesused);
-         break;
-     case V4L2_PIX_FMT_RGB565:
-     case V4L2_PIX_FMT_YUYV:
-     case V4L2_PIX_FMT_RGB24:
--        if(vd->buf.bytesused > vd->framesizeIn)
--            memcpy(vd->framebuffer, vd->mem[vd->buf.index], (size_t) vd->framesizeIn);
-+        if(buf.bytesused > vd->framesizeIn)
-+            memcpy(vd->framebuffer, vd->mem[buf.index], (size_t) vd->framesizeIn);
-         else
--            memcpy(vd->framebuffer, vd->mem[vd->buf.index], (size_t) vd->buf.bytesused);
-+            memcpy(vd->framebuffer, vd->mem[buf.index], (size_t) buf.bytesused);
-         break;
- 
-     default:
-@@ -551,7 +557,7 @@ int uvcGrab(struct vdIn *vd)
-         break;
-     }
- 
--    ret = xioctl(vd->fd, VIDIOC_QBUF, &vd->buf);
-+    ret = xioctl(vd->fd, VIDIOC_QBUF, &buf);
-     if(ret < 0) {
-         perror("Unable to requeue buffer");
-         goto err;
-@@ -947,7 +953,7 @@ int setResolution(struct vdIn *vd, int width, int height)
-         DBG("Unmap buffers\n");
-         int i;
-         for(i = 0; i < NB_BUFFER; i++)
--            munmap(vd->mem[i], vd->buf.length);
-+            munmap(vd->mem[i], vd->memlength[i]);
- 
-         if(CLOSE_VIDEO(vd->fd) == 0) {
-             DBG("Device closed successfully\n");
-diff --git a/plugins/input_uvc/v4l2uvc.h b/plugins/input_uvc/v4l2uvc.h
-index 2c7c8ba..e625957 100644
---- a/plugins/input_uvc/v4l2uvc.h
-+++ b/plugins/input_uvc/v4l2uvc.h
-@@ -35,6 +35,7 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/select.h>
-+#include <sys/time.h>
- 
- #include <linux/types.h>          /* for videodev2.h */
- #include <linux/videodev2.h>
-@@ -79,11 +80,12 @@ struct vdIn {
-     char *pictName;
-     struct v4l2_capability cap;
-     struct v4l2_format fmt;
--    struct v4l2_buffer buf;
-     struct v4l2_requestbuffers rb;
-     void *mem[NB_BUFFER];
-+    int memlength[NB_BUFFER];
-     unsigned char *tmpbuffer;
-     int tmpbytesused;
-+    struct timeval tmptimestamp;
-     unsigned char *framebuffer;
-     streaming_state streamingState;
-     int grabmethod;
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/mjpg-streamer/patches/050-fix-yuv-capture.patch b/trunk/package/feeds/packages/mjpg-streamer/patches/050-fix-yuv-capture.patch
deleted file mode 100644
index 0c4d27a6..00000000
--- a/trunk/package/feeds/packages/mjpg-streamer/patches/050-fix-yuv-capture.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Binary files a/ipkg-ar71xx/mjpg-streamer/usr/lib/input_uvc.so and b/ipkg-ar71xx/mjpg-streamer/usr/lib/input_uvc.so differ
-diff -ur a/plugins/input_uvc/input_uvc.c b/plugins/input_uvc/input_uvc.c
---- a/plugins/input_uvc/input_uvc.c     2015-03-02 09:14:05.000000000 +0200
-+++ b/plugins/input_uvc/input_uvc.c     2015-03-02 09:18:22.000000000 +0200
-@@ -311,6 +311,10 @@
-     }
-     memset(cams[id].videoIn, 0, sizeof(struct vdIn));
- 
-+    /* Non-MJPEG formats seem to fail with unlimited FPS */
-+    if (format != V4L2_PIX_FMT_MJPEG && fps == -1)
-+        fps = 15;
-+
-     /* display the parsed values */
-     IPRINT("Using V4L2 device.: %s\n", dev);
-     IPRINT("Desired Resolution: %i x %i\n", width, height);
-diff -ur a/plugins/input_uvc/jpeg_utils.c b/plugins/input_uvc/jpeg_utils.c
---- a/plugins/input_uvc/jpeg_utils.c    2015-03-02 09:17:02.000000000 +0300
-+++ b/plugins/input_uvc/jpeg_utils.c    2015-03-02 09:25:18.000000000 +0200
-@@ -198,7 +198,7 @@
-             }
- 
-             row_pointer = (JSAMPROW*)line_buffer;
--            jpeg_write_scanlines(&cinfo, row_pointer, 1);
-+            jpeg_write_scanlines(&cinfo, &row_pointer, 1);
-         }
-     } else if (vd->formatIn == V4L2_PIX_FMT_RGB565) {
-         while(cinfo.next_scanline < vd->height) {
-@@ -220,7 +220,7 @@
-             }
- 
-             row_pointer = (JSAMPROW*)line_buffer;
--            jpeg_write_scanlines(&cinfo, row_pointer, 1);
-+            jpeg_write_scanlines(&cinfo, &row_pointer, 1);
-         }
-     } else if (vd->formatIn == V4L2_PIX_FMT_RGB24) {
-         jpeg_write_scanlines(&cinfo, (JSAMPROW*)vd->framebuffer, vd->height);
-diff -ur a/plugins/input_uvc/v4l2uvc.c b/plugins/input_uvc/v4l2uvc.c
---- a/plugins/input_uvc/v4l2uvc.c       2015-03-02 09:14:05.000000000 +0200
-+++ b/plugins/input_uvc/v4l2uvc.c       2015-03-02 09:22:09.000000000 +0200
-@@ -338,11 +338,15 @@
-                         vd->frame_period_time = 1000/vd->fps; // calcualate frame period time in ms
-                         IPRINT("Frame period time ......: %ld ms\n", vd->frame_period_time);
- 
--                        // set FPS to maximum in order to minimize the lagging
-                         memset(setfps, 0, sizeof(struct v4l2_streamparm));
-                         setfps->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                         setfps->parm.capture.timeperframe.numerator = 1;
--                        setfps->parm.capture.timeperframe.denominator = 255;
-+                       if (vd->formatIn == V4L2_PIX_FMT_MJPEG)
-+                           // set FPS to maximum in order to minimize the lagging
-+                           setfps->parm.capture.timeperframe.denominator = 255;
-+                       else
-+                           setfps->parm.capture.timeperframe.denominator = vd->fps;
-+
-                         ret = xioctl(vd->fd, VIDIOC_S_PARM, setfps);
-                         if (ret) {
-                             perror("Unable to set the FPS\n");
-
diff --git a/trunk/package/feeds/packages/mksh/Makefile b/trunk/package/feeds/packages/mksh/Makefile
deleted file mode 100644
index 89380a92..00000000
--- a/trunk/package/feeds/packages/mksh/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-# Copyright (c) 2009-2014 Thorsten Glaser <tg@mirbsd.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mksh
-PKG_VERSION:=50d
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Thorsten Glaser <tg@mirbsd.org>
-PKG_LICENSE:=MirOS
-
-PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
-PKG_MD5SUM:=1c3882c07a760b23df1ad94ad0b4ed2e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mksh
-  SECTION:=shells
-  CATEGORY:=Base system
-  TITLE:=MirBSD Korn Shell
-  DEPENDS:=$(DEP)
-  URL:=http://mirbsd.de/mksh
-endef
-
-define Package/mksh/description
-mksh is the MirBSD enhanced version of the Public Domain Korn
-shell (pdksh), a Bourne-compatible shell which is largely si-
-milar to the original AT&T Korn shell; mksh is the only pdksh
-derivate currently being actively developed.  It includes bug
-fixes and feature improvements, in order to produce a modern,
-robust shell good for interactive and especially script use.
-mksh has UTF-8 support (in substring operations and the Emacs
-editing mode) and - while R50 corresponds to OpenBSD 5.5-cur-
-rent ksh (without GNU bash-like PS1 and fancy character clas-
-ses) - adheres to SUSv4 and is much more robust. The code has
-been cleaned up and simplified, bugs fixed, standards compli-
-ance added, and several enhancements (for extended compatibi-
-lity to other modern shells - as well as a couple of its own)
-are available. It has sensible defaults as usual with BSD.
-endef
-
-define Build/Compile
-	# -DMKSH_SMALL=1 ⇒ reduce functionality quite a lot
-	# -DMKSH_ASSUME_UTF8=0 ⇒ never automatically enable
-	#	UTF-8 mode, neither use setlocale/nl_langinfo
-	#	nor look at $LC_* and $LANG (not recommended)
-	# -DMKSH_BINSHPOSIX ⇒ enable POSIX mode if called as sh
-	#XXX maybe change to -DMKSH_ASSUME_UTF8=1 now (which
-	#XXX is always assume UTF-8 mode)
-	# HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency
-	# HAVE_CAN_FSTACKPROTECTORSTRONG=0 ⇒ same, for gcc 4.9+
-	cd $(PKG_BUILD_DIR); \
-		CC="$(TARGET_CC)" \
-		TARGET_OS="$(shell uname -s)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_BINSHPOSIX" \
-		HAVE_CAN_FSTACKPROTECTORALL=0 \
-		HAVE_CAN_FSTACKPROTECTORSTRONG=0 \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-			$(BASH) Build.sh -Q -r -c lto
-endef
-
-define Package/mksh/postinst
-#!/bin/sh
-grep mksh $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/mksh" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/mksh/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dot.mkshrc $(1)/etc/mkshrc
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mksh $(1)/bin/
-endef
-
-define Package/mksh/conffiles
-/etc/mkshrc
-endef
-
-$(eval $(call BuildPackage,mksh))
diff --git a/trunk/package/feeds/packages/mksh/patches/100-dot_mkshrc b/trunk/package/feeds/packages/mksh/patches/100-dot_mkshrc
deleted file mode 100644
index a7bf840b..00000000
--- a/trunk/package/feeds/packages/mksh/patches/100-dot_mkshrc
+++ /dev/null
@@ -1,50 +0,0 @@
-From 23712cea8e2a623fd952eb781df0011c501703d0 Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@mirbsd.org>
-Date: Thu, 25 Jul 2013 22:07:33 +0200
-Subject: [PATCH] Make default mkshrc file suitable for OpenWrt environment:
-
-* Part of the FreeWRT patches:
-  - no hostname(1)
-  - ls(1) has no -o option
-* OpenWrt and FreeWRT-1.0 fix:
-  - since this is not ~/.mkshrc make sure subshells find it
----
- dot.mkshrc | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dot.mkshrc b/dot.mkshrc
-index 233a10c..caf482c 100644
---- a/dot.mkshrc
-+++ b/dot.mkshrc
-@@ -28,8 +28,8 @@ case $KSH_VERSION in
- *) return 0 ;;
- esac
- 
--PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(ulimit -c 0; hostname -s \
--    2>/dev/null)} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
-+PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(</proc/sys/kernel/hostname
-+    )} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
-     2>/dev/null); : ${EDITOR:=/bin/ed} ${HOSTNAME:=nil} ${TERM:=vt100}
- : ${MKSH:=$(whence -p mksh)}; PS4='[$EPOCHREALTIME] '; PS1=$'\001\r''${|
- 	local e=$?
-@@ -50,7 +50,7 @@ unalias ls
- alias l='ls -F'
- alias la='l -a'
- alias ll='l -l'
--alias lo='l -alo'
-+alias lo='l -al'
- alias doch='sudo mksh -c "$(fc -ln -1)"'
- whence -p rot13 >/dev/null || alias rot13='tr \
-     abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
-@@ -402,4 +402,8 @@ alias cls='print -n \\033c'
- 
- unset p
- 
-+# we need this in OpenWrt for subshells that are not login shells
-+: ${ENV=/etc/mkshrc}
-+[[ -z $ENV ]] || export ENV
-+
- : place customisations above this line
--- 
-2.1.1
-
diff --git a/trunk/package/feeds/packages/mktorrent/Makefile b/trunk/package/feeds/packages/mktorrent/Makefile
deleted file mode 100644
index 2e23e23b..00000000
--- a/trunk/package/feeds/packages/mktorrent/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mktorrent
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/$(PKG_NAME)/
-PKG_MD5SUM:=0da00209da96a0dc39efbb6eb5b4d8ff
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mktorrent
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mktorrent
-  URL:=http://mktorrent.sourceforge.net/
-endef
-
-define Package/mktorrent/Description
- mktorrent is a simple command line utility to create BitTorrent metainfo files.
-endef
-
-
-define Package/mktorrent/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mktorrent $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,mktorrent))
diff --git a/trunk/package/feeds/packages/mmc-utils/Makefile b/trunk/package/feeds/packages/mmc-utils/Makefile
deleted file mode 100644
index ca854936..00000000
--- a/trunk/package/feeds/packages/mmc-utils/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mmc-utils
-PKG_VERSION=2015-03-25-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
-PKG_SOURCE_VERSION:=50b68547ad895803128519af71c31b9f14bfc791
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mmc-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Userspace tools for MMC/SD devices
-  URL:=http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
-endef
-
-define Package/mmc-utils/description
-  This package contains the userspace mmc utils, the userspace
-  counterpart to the Linux MMC/SD subsystem.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	        $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" \
-	        mmc
-endef
-
-define Package/mmc-utils/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mmc $(1)/sbin
-endef
-
-$(eval $(call BuildPackage,mmc-utils))
diff --git a/trunk/package/feeds/packages/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch b/trunk/package/feeds/packages/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch
deleted file mode 100644
index 4a35b959..00000000
--- a/trunk/package/feeds/packages/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189/Makefile
-===================================================================
---- mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189.orig/Makefile
-+++ mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189/Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
--AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2
-+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- CFLAGS ?= -g -O2
- objects = \
- 	mmc.o \
diff --git a/trunk/package/feeds/packages/mocp/Makefile b/trunk/package/feeds/packages/mocp/Makefile
deleted file mode 100644
index 5552ec96..00000000
--- a/trunk/package/feeds/packages/mocp/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2011-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=moc
-PKG_VERSION:=2.5.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.daper.net/pub/soft/moc/stable/
-PKG_MD5SUM:=18e3a979b67091bfee4b62217908c473
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/moc
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-lib +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg +libltdl +libmagic +faad2 +libdb47
-  TITLE:=Music On Console
-  URL:=http://moc.daper.net/
-endef
-
-define Package/moc/description
-	MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(if $(CONFIG_BUILD_PATENTED),,--without-mp3) \
-		--enable-shared \
-		--disable-static \
-		--disable-debug \
-		--without-speex \
-		--without-samplerate \
-		--without-curl \
-		--without-flac \
-		--without-musepack \
-		--without-rcc \
-		$(if $(CONFIG_PACKAGE_libncursesw),--with-ncursesw --without-ncurses,--with-ncurses --without-ncursesw) \
-	)
-endef
-
-define Package/moc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mocp $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/moc/decoder_plugins
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/moc/decoder_plugins/*.so $(1)/usr/lib/moc/decoder_plugins
-endef
-
-$(eval $(call BuildPackage,moc))
diff --git a/trunk/package/feeds/packages/monit/Makefile b/trunk/package/feeds/packages/monit/Makefile
deleted file mode 100644
index b14b2225..00000000
--- a/trunk/package/feeds/packages/monit/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=monit
-PKG_VERSION:=5.12.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mmonit.com/monit/dist
-PKG_MD5SUM:=5f5cf4c18b42e8091b49b4e07cf972ce
-
-PKG_LICENSE:=AGPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/monit/Default
-  SECTION:=admin
-  CATEGORY:=Administration
-  DEPENDS:= +libpthread
-  TITLE:=System services monitoring utility
-  URL:=http://mmonit.com/monit/
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-endef
-
-define Package/monit/Default/description
-	An utility for monitoring services on a Unix system
-endef
-
-define Package/monit
-$(call Package/monit/Default)
-  DEPENDS+= +libopenssl
-  TITLE+= (with SSL support)
-  VARIANT:=ssl
-endef
-
-define Package/monit/description
-$(call Package/monit/Default/description)
-	This package is built with SSL support.
-endef
-
-define Package/monit-nossl
-$(call Package/monit/Default)
-  TITLE+= (without SSL support)
-  VARIANT:=nossl
-endef
-
-define Package/monit-nossl/description
-$(call Package/monit/Default/description)
-	This package is built without SSL support.
-endef
-
-CONFIGURE_ARGS += \
-	--without-pam \
-	libmonit_cv_setjmp_available=yes \
-	libmonit_cv_vsnprintf_c99_conformant=yes
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl \
-		--with-ssl-dir="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--without-ssl
-endif
-
-define Package/monit/conffiles
-/etc/monitrc
-endef
-
-define Package/monit/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/monit $(1)/usr/bin/
-endef
-
-Package/monit-nossl/conffiles = $(Package/monit/conffiles)
-Package/monit-nossl/install = $(Package/monit/install)
-
-$(eval $(call BuildPackage,monit))
-$(eval $(call BuildPackage,monit-nossl))
diff --git a/trunk/package/feeds/packages/monit/files/monit.init b/trunk/package/feeds/packages/monit/files/monit.init
deleted file mode 100644
index 2bb36092..00000000
--- a/trunk/package/feeds/packages/monit/files/monit.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=60
-USE_PROCD=1
-PROG=/usr/bin/monit
-
-start_service() {
-	[ -f /etc/monitrc ] || { echo "monit: /etc/monitrc is missing"; return 1; }
-	chmod 0600 /etc/monitrc
-	procd_open_instance
-	# -I runs in foreground, as procd requires
-	procd_set_param command "$PROG" -I
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/monit/patches/001-fix-default-piddir.patch b/trunk/package/feeds/packages/monit/patches/001-fix-default-piddir.patch
deleted file mode 100644
index 13d6029c..00000000
--- a/trunk/package/feeds/packages/monit/patches/001-fix-default-piddir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -13821,14 +13821,7 @@ fi
- # Find the right directory to put the root-mode PID file in
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pid file location" >&5
- $as_echo_n "checking pid file location... " >&6; }
--if test -d "/run"
--then
--	piddir="/run"
--elif test -d "/var/run"; then
--        piddir="/var/run"
--elif test -d "/etc"; then
--        piddir="/etc"
--fi
-+piddir="/var/run"
- 
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/trunk/package/feeds/packages/mosquitto/Config.in b/trunk/package/feeds/packages/mosquitto/Config.in
deleted file mode 100644
index 9fe48ce3..00000000
--- a/trunk/package/feeds/packages/mosquitto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config MOSQUITTO_LWS
-    bool "libwebsockets support"
-    depends on PACKAGE_mosquitto
-    default y
-    help
-        Includes websockets support in the broker, via libwebsockets
diff --git a/trunk/package/feeds/packages/mosquitto/Makefile b/trunk/package/feeds/packages/mosquitto/Makefile
deleted file mode 100644
index 5b015795..00000000
--- a/trunk/package/feeds/packages/mosquitto/Makefile
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-# Copyright (C) 2011-2013 OpenWrt.org
-# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mosquitto
-PKG_VERSION:=1.4.1
-PKG_RELEASE:=2
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE.txt
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mosquitto.org/files/source/
-PKG_MD5SUM:=46008028563eb750c6aa93281ab2e181
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)/default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mosquitto - an MQTT message broker
-  URL:=http://www.mosquitto.org/
-  MAINTAINER:=Karl Palsson <karlp@remake.is>
-  DEPENDS:= +librt +libuuid
-  USERID:=mosquitto=200:mosquitto=200
-endef
-
-define Package/$(PKG_NAME)
-    $(call Package/mosquitto/default)
-    TITLE+= (with SSL support)
-    DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
-    VARIANT:=ssl
-endef
-
-define Package/$(PKG_NAME)-nossl
-    $(call Package/$(PKG_NAME)/default)
-    TITLE+= (without SSL support)
-    VARIANT:=nossl
-endef
-
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/$(PKG_NAME)/default/description
-Mosquitto is an open source (BSD licensed) message broker that implements
-the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight
-method of carrying out messaging using a publish/subscribe model.
-
-This package also includes some basic support for configuring via UCI
-endef
-
-define Package/$(PKG_NAME)/description
-	$(call Package/$(PKG_NAME)/default/description)
-	This package is built with SSL support
-endef
-
-define Package/$(PKG_NAME)-nossl/description
-        $(call Package/$(PKG_NAME)/default/description)
-        This package is built WITHOUT SSL support.
-endef
-
-
-define Package/mosquitto-client/default
-    $(Package/mosquitto/default)
-    TITLE:= mosquitto - client tools
-    DEPENDS+=+libcares
-endef
-define Package/mosquitto-client
-    $(call Package/mosquitto-client/default)
-    TITLE+= (With SSL support)
-    DEPENDS+=+libmosquitto
-    VARIANT:=ssl
-endef
-define Package/mosquitto-client-nossl
-    $(call Package/mosquitto-client/default)
-    TITLE+= (Without SSL support)
-    DEPENDS+=+libmosquitto-nossl
-    VARIANT:=nossl
-endef
-
-define Package/mosquitto-client/default/description
- Command line client tools for publishing messages to MQTT servers
-and subscribing to topics.
-endef
-
-define Package/mosquitto-client/description
-$(call Package/mosquitto-client/default/description)
-        This package is built with SSL support
-endef
-define Package/mosquitto-client-nossl/description
-$(call Package/mosquitto-client/default/description)
-        This package is built without SSL support
-endef
-
-define Package/libmosquitto/default
-    $(Package/mosquitto/default)
-    SECTION:=libs
-    CATEGORY:=Libraries
-    DEPENDS:=+libpthread +librt +libcares
-    TITLE:= mosquitto - client library
-endef
-
-define Package/libmosquitto
-    $(call Package/libmosquitto/default)
-    TITLE+= (With SSL Support)
-    DEPENDS+= +libopenssl
-    VARIANT=ssl
-endef
-define Package/libmosquitto-nossl
-    $(call Package/libmosquitto/default)
-    TITLE+= (Without SSL Support)
-    VARIANT=nossl
-endef
-
-define Package/libmosquitto/default/description
- Library required for mosquitto's command line client tools, also for
-use by any third party software that wants to communicate with a
-mosquitto server.
-
-Should be useable for communicating with any MQTT v3.1/3.1.1 compatible
-server, such as IBM's RSMB, in addition to Mosquitto
-endef
-
-define Package/libmosquitto/description
-    $(call Package/libmosquitto/default/description)
-    This package is built with SSL support
-endef
-define Package/libmosquitto-nossl/description
-    $(call Package/libmosquitto/default/description)
-    This package is built without SSL support
-endef
-
-
-define Package/$(PKG_NAME)/conffiles
-/etc/mosquitto/mosquitto.conf
-/etc/config/mosquitto
-endef
-
-Package/$(PKG_NAME)-nossl/conffiles = $(Package/$(PKG_NAME)/conffiles)
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
-	$(INSTALL_DIR) $(1)/etc/mosquitto
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/mosquitto.init $(1)/etc/init.d/mosquitto
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/mosquitto.uci.convert $(1)/usr/bin
-endef
-Package/$(PKG_NAME)-nossl/install = $(Package/$(PKG_NAME)/install)
-
-
-define Package/mosquitto-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_pub $(1)/usr/bin/mosquitto_pub
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_sub $(1)/usr/bin/mosquitto_sub
-endef
-Package/mosquitto-client-nossl/install = $(Package/mosquitto-client/install)
-
-# This installs files into ./staging_dir/. so that you can cross compile from the host
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/mosquitto.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-endef
-
-# This installs files on the target.  Compare with Build/InstallDev
-define Package/libmosquitto/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-endef
-Package/libmosquitto-nossl/install = $(Package/libmosquitto/install)
-
-# Applies to all...
-MAKE_FLAGS += WITH_DOCS=no
-ifeq ($(BUILD_VARIANT),nossl)
-        MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
-else
-	MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
-endif
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)-nossl))
-$(eval $(call BuildPackage,libmosquitto))
-$(eval $(call BuildPackage,libmosquitto-nossl))
-$(eval $(call BuildPackage,mosquitto-client))
-$(eval $(call BuildPackage,mosquitto-client-nossl))
diff --git a/trunk/package/feeds/packages/mosquitto/files/mosquitto.init b/trunk/package/feeds/packages/mosquitto/files/mosquitto.init
deleted file mode 100755
index 2b3a93a7..00000000
--- a/trunk/package/feeds/packages/mosquitto/files/mosquitto.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Basic init script for mosquitto
-# April 2012, OpenWrt.org
-# Provides support for the luci-app-mosquitto package, if installed
-
-START=80
-APP=`which mosquitto`
-USE_UCI_CONFIG=$(uci -q get mosquitto.owrt.use_uci)
-if [ $? -eq 1 ]; then
-    USE_UCI_CONFIG=0
-fi
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-start() {
-        if [ "$USE_UCI_CONFIG" -eq 1 ]; then
-            CONF=/tmp/mosquitto.converted.$$.conf
-            mosquitto.uci.convert -f $CONF
-        else
-            CONF=/etc/mosquitto/mosquitto.conf
-        fi
-        service_start $APP -c $CONF
-}
-
-stop() {
-        service_stop $APP
-}
diff --git a/trunk/package/feeds/packages/mosquitto/files/mosquitto.uci.convert b/trunk/package/feeds/packages/mosquitto/files/mosquitto.uci.convert
deleted file mode 100644
index 1a03d979..00000000
--- a/trunk/package/feeds/packages/mosquitto/files/mosquitto.uci.convert
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-# Converts a uci config file into an appropriate mosquitto.conf snippet
-# expected to be used in an init file to generate a config file to run from
-# Karl Palsson <karlp@remake.is> 2012.
-# Considered to be released into the public domain
-
-[ -f $IPKG_INSTROOT/lib/functions.sh ] && . $IPKG_INSTROOT/lib/functions.sh
-
-TCONF=/tmp/mosquitto.generated.$$.conf
-while getopts "f:" o; do
-    case $o in
-    f)
-        TCONF=$OPTARG
-        ;;
-    esac
-done
-
-if [ -e $TCONF ]; then
-    echo "Odd, same temporary generated config file already existed: $TCONF"
-    exit 1
-fi
-
-echo "Generating mosquitto config file in $TCONF"
-NOW=$(date)
-echo "# mosquitto.conf file generated from UCI config." >>$TCONF
-echo "# Config snippet generated by $0 on $NOW" >>$TCONF
-echo "#" >> $TCONF
-
-# Usage: append_if cfg uci_name output_name
-# add a config line of the form "output_name <value>"
-# if the "uci_name" was found.
-# output_name defaults to uci_name if not specified.
-append_if() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    if [ -z "$out_name" ]; then
-        out_name=$uci_name
-    fi
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        echo "$out_name $val" >> $TCONF
-    fi
-}
-
-# mosquitto uses true/false, uci uses 1/0
-# note that this is not shell truthy, but equality with 1!
-append_bool() {
-    if [ $2 -eq 1 ]; then
-        echo "$1 true" >> $TCONF
-    else
-        echo "$1 false" >> $TCONF
-    fi
-}
-
-# as per append_if, but gets the value as a uci bool, not raw
-append_optional_bool() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        config_get_bool real $cfg $uci_name
-        append_bool $out_name $real
-    fi
-}
-
-mosq_general() {
-    config_get destinations "$1" log_dest
-    for dest in $destinations; do
-        echo "log_dest $dest" >> $TCONF
-    done
-
-    config_get_bool no_remote "$1" no_remote_access 0
-    if [ "$no_remote" -eq 1 ]; then
-        echo "bind_address 127.0.0.1" >> $TCONF
-    fi
-
-    config_get port "$1" port 1883
-    echo "port $port" >> $TCONF
-    append_if "$1" protocol
-    append_if "$1" max_inflight_messages
-    append_if "$1" max_queued_messages
-
-}
-
-add_listener() {
-    echo "" >> $TCONF
-    config_get port "$1" port
-    if [ -z "$port" ]; then
-        echo "Ignoring listener section without port"
-        return
-    fi
-    config_get_bool no_remote "$1" no_remote_access 0
-    if [ "$no_remote" -eq 1 ]; then
-        echo "listener $port 127.0.0.1" >> $TCONF
-    else
-        echo "listener $port" >> $TCONF
-    fi
-
-    append_if "$1" protocol
-}
-
-add_topic() {
-    echo "topic $1" >> $TCONF
-}
-
-add_bridge() {
-    config_get conn "$1" connection
-    config_get addr "$1" address
-    if [ -z "$conn" -o -z "$addr" ]; then
-        echo "Ignoring bridge section, misisng connection/address"
-        return
-    fi
-    echo "" >> $TCONF
-    echo "# Bridge connection from UCI section" >> $TCONF
-    append_if "$1" connection
-    append_if "$1" address
-
-    config_list_foreach "$1" topic add_topic
-    append_optional_bool "$1" cleansession cleansession
-    append_optional_bool "$1" try_private try_private
-
-    append_if "$1" clientid
-    append_if "$1" identity bridge_identity
-    append_if "$1" psk bridge_psk
-    append_if "$1" tls_version bridge_tls_version
-}
-
-
-config_load "mosquitto"
-config_foreach mosq_general "mosquitto"
-config_foreach add_listener "listener"
-config_foreach add_bridge "bridge"
diff --git a/trunk/package/feeds/packages/mosquitto/patches/101-qos2-inflight.patch b/trunk/package/feeds/packages/mosquitto/patches/101-qos2-inflight.patch
deleted file mode 100644
index 61706d39..00000000
--- a/trunk/package/feeds/packages/mosquitto/patches/101-qos2-inflight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/mosquitto.c b/lib/mosquitto.c
-index bd9dbd3..7314248 100644
---- a/lib/mosquitto.c
-+++ b/lib/mosquitto.c
-@@ -594,7 +594,6 @@ int mosquitto_publish(struct mosquitto *mosq, int *mid, const char *topic, int p
- 		pthread_mutex_lock(&mosq->out_message_mutex);
- 		_mosquitto_message_queue(mosq, message, mosq_md_out);
- 		if(mosq->max_inflight_messages == 0 || mosq->inflight_messages < mosq->max_inflight_messages){
--			mosq->inflight_messages++;
- 			if(qos == 1){
- 				message->state = mosq_ms_wait_for_puback;
- 			}else if(qos == 2){
diff --git a/trunk/package/feeds/packages/motion/Makefile b/trunk/package/feeds/packages/motion/Makefile
deleted file mode 100644
index 412b5f90..00000000
--- a/trunk/package/feeds/packages/motion/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2008-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=motion
-PKG_VERSION=3.4.0-20141018-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/Mr-Dave/motion.git
-PKG_SOURCE_VERSION:=9479d910f2149b5558788bb86f97f26522794212
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/motion
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libjpeg +libpthread
-  TITLE:=webcam motion sensing and logging
-  URL:=http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
-endef
-
-define Package/motion/conffiles
-  /etc/motion.conf
-endef
-
-CONFIGURE_ARGS+= \
-	--without-optimizecpu \
-	--without-ffmpeg \
-	--without-jpeg-mmx \
-	--without-sdl \
-	--without-mysql \
-	--without-pgsql \
-	--without-sqlite3 \
-
-define Package/motion/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_BUILD_DIR)/motion-dist.conf $(1)/etc/motion.conf
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/motion $(1)/usr/bin/
-
-endef
-
-$(eval $(call BuildPackage,motion))
diff --git a/trunk/package/feeds/packages/mpack/Makefile b/trunk/package/feeds/packages/mpack/Makefile
deleted file mode 100644
index c2b77eb1..00000000
--- a/trunk/package/feeds/packages/mpack/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mpack
-PKG_VERSION:=1.6
-PKG_RELEASE:=1
-PKG_LICENSE:=NLPL
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/mpack/
-PKG_MD5SUM:=a70fa5afa76539a9afb70b9d81568fe8
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mpack
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=mpack/munpack MIME format mail messages
-  URL:=http://ftp.andrew.cmu.edu/pub/mpack/
-  MAINTAINER:=Dmitry V. Zimin <pfzim@mail.ru>
-endef
-
-define Package/mpack/description
-  Mpack and munpack are utilities for encoding and decoding
-  (respectively) binary files in MIME (Multipurpose Internet Mail
-  Extensions) format mail messages.  For compatibility with older forms
-  of transferring binary files, the munpack program can also decode
-  messages in split-uuencoded format.
-endef
-
-define Package/mpack/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,mpack))
-
diff --git a/trunk/package/feeds/packages/mpc/Makefile b/trunk/package/feeds/packages/mpc/Makefile
deleted file mode 100644
index e6b62633..00000000
--- a/trunk/package/feeds/packages/mpc/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mpc
-PKG_VERSION:=0.26
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.musicpd.org/download/mpc/0
-PKG_MD5SUM:=d4f37e7e6b32c804a870192d1eb86199
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mpc
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libmpdclient
-  TITLE:=Music Player Daemon Console Client
-  URL:=http://www.musicpd.org/
-endef
-
-define Package/mpc/description
-	MPD is a music player supporting flac, mp3 and ogg files.
-	It is typically controlled over a network using one of it's many
-	clients including mpc(console), gmpc(gnome), phpmp(php) etc.
-	this is MPC
-endef
-
-define Build/Configure
-$(call Build/Configure/Default, \
-	--disable-iconv \
-)
-endef
-
-define Build/Compile
-$(call Build/Compile/Default,\
-		CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
-		prefix="/usr" \
-		all \
-)
-endef
-
-define Package/mpc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mpc $(1)/usr/bin/
-	$(INSTALL_BIN) ./files/pls-handler.sh $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,mpc))
diff --git a/trunk/package/feeds/packages/mpc/files/pls-handler.sh b/trunk/package/feeds/packages/mpc/files/pls-handler.sh
deleted file mode 100644
index 93944178..00000000
--- a/trunk/package/feeds/packages/mpc/files/pls-handler.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-echo parameter: file.pls
-mpc clear
-grep '^File[0-9]*' $1 | sed -e 's/^File[0-9]*=//' | mpc add
-mpc play
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/msmtp/Makefile b/trunk/package/feeds/packages/msmtp/Makefile
deleted file mode 100644
index 8c91a95b..00000000
--- a/trunk/package/feeds/packages/msmtp/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Copyright (C) 2009 David Cooper <dave@kupesoft.com>
-# Copyright (C) 2009-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=msmtp
-PKG_VERSION:=1.6.1
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@SF/msmtp
-PKG_MD5SUM:=6ebba4809bbc665b8a665a018d1a5ee1
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/msmtp/Default
-  SECTION:=mail
-  CATEGORY:=Mail
-  TITLE:=Simple sendmail SMTP forwarding
-  URL:=http://msmtp.sourceforge.net/
-endef
-
-define Package/msmtp/Default/description
- msmtp is an SMTP client. In the default mode, it transmits a mail to
- an SMTP server (for example at a free mail provider) which does the
- delivery. To use this program with your mail user agent (MUA), create
- a configuration file with your mail account(s) and tell your MUA to
- call msmtp instead of /usr/sbin/sendmail.
-endef
-
-define Package/msmtp
-$(call Package/msmtp/Default)
-  DEPENDS+= +libopenssl
-  TITLE+= (with SSL support)
-  VARIANT:=ssl
-endef
-
-define Package/msmtp/conffiles
-/etc/msmtprc
-endef
-
-define Package/msmtp/description
-$(call Package/msmtp/Default/description)
- This package is built with SSL support.
-endef
-
-define Package/msmtp-nossl
-$(call Package/msmtp/Default)
-  TITLE+= (without SSL support)
-  VARIANT:=nossl
-endef
-
-define Package/msmtp-nossl/description
-$(call Package/msmtp/Default/description)
- This package is built without SSL support.
-endef
-
-define Package/msmtp-queue
-$(call Package/msmtp/Default)
-  DEPENDS+= +bash
-  TITLE+= (queue scripts)
-endef
-
-define Package/msmtp-queue/description
-$(call Package/msmtp/Default/description)
- This package contains the msmtp queue scripts.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-rpath \
-	--without-libintl-prefix \
-	--without-libgsasl \
-	--without-libidn \
-	--without-libsecret \
-	--without-macosx-keyring \
-
-ifneq ($(CONFIG_USE_UCLIBC),)
-  CONFIGURE_ARGS += --disable-gai-idn
-endif
-
-MAKE_FLAGS :=
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-tls=openssl
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--with-tls=no
-endif
-
-define Package/msmtp/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \
-		$(1)/etc/msmtprc
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/
-endef
-
-define Package/msmtp/postinst
-	[ -e $${IPKG_INSTROOT}/usr/sbin/sendmail ] || {
-		mkdir -p $${IPKG_INSTROOT}/usr/sbin
-		ln -sf ../bin/msmtp $${IPKG_INSTROOT}/usr/sbin/sendmail
-	}
-endef
-
-define Package/msmtp/prerm
-	[ "../bin/msmtp" = "$(readlink -qs $${IPKG_INSTROOT}/usr/sbin/sendmail)" ] && {
-		rm -f $${IPKG_INSTROOT}/usr/sbin/sendmail
-	}
-endef
-
-Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles)
-Package/msmtp-nossl/install = $(Package/msmtp/install)
-Package/msmtp-nossl/postinst = $(Package/msmtp/postinst)
-Package/msmtp-nossl/prerm = $(Package/msmtp/prerm)
-
-define Package/msmtp-queue/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpq/msmtp{q,-queue} $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpqueue/msmtp-{en,list,run}queue.sh $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,msmtp))
-$(eval $(call BuildPackage,msmtp-nossl))
-$(eval $(call BuildPackage,msmtp-queue))
diff --git a/trunk/package/feeds/packages/mtr/Makefile b/trunk/package/feeds/packages/mtr/Makefile
deleted file mode 100644
index 7214991b..00000000
--- a/trunk/package/feeds/packages/mtr/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mtr
-PKG_VERSION:=0.86
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr
-PKG_MD5SUM:=8d63592c9d4579ef20cf491b41843eb2
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mtr
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libncurses
-  TITLE:=Full screen ncurses traceroute tool
-  URL:=http://www.bitwizard.nl/mtr/
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-endef
-
-define Package/mtr/description
-	mtr combines the functionality of the 'traceroute' and 'ping' programs
-	in a single network diagnostic tool.
-	As mtr starts, it investigates the network connection between the host
-	mtr runs on and a user-specified destination host. After it
-	determines the address of each network hop between the machines,
-	it sends a sequence ICMP ECHO requests to each one to determine the
-	quality of the link to each machine. As it does this, it prints
-	running statistics about each machine.
-endef
-
-CONFIGURE_ARGS += \
-	--without-gtk \
-	--without-glib \
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.in \
-		aclocal.m4 \
-		Makefile.in \
-		img/Makefile.in \
-		stamp-h.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default)
-endef
-
-define Package/mtr/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,mtr))
diff --git a/trunk/package/feeds/packages/mtr/patches/501-dns.patch b/trunk/package/feeds/packages/mtr/patches/501-dns.patch
deleted file mode 100644
index e50b7fbf..00000000
--- a/trunk/package/feeds/packages/mtr/patches/501-dns.patch
+++ /dev/null
@@ -1,510 +0,0 @@
---- a/dns.c
-+++ b/dns.c
-@@ -921,6 +921,507 @@ void restell(char *s)
-   fputs("\r",stderr);
- }
- 
-+#ifdef __UCLIBC__
-+
-+static const char       digits[] = "0123456789";
-+#define __set_errno(e) (errno = (e))
-+
-+#define NS_PUT16(s, cp) do { \
-+        register u_int16_t t_s = (u_int16_t)(s); \
-+        register u_char *t_cp = (u_char *)(cp); \
-+        *t_cp++ = t_s >> 8; \
-+        *t_cp   = t_s; \
-+        (cp) += NS_INT16SZ; \
-+} while (0)
-+
-+
-+
-+#define NS_PUT32(l, cp) do { \
-+        register u_int32_t t_l = (u_int32_t)(l); \
-+        register u_char *t_cp = (u_char *)(cp); \
-+        *t_cp++ = t_l >> 24; \
-+        *t_cp++ = t_l >> 16; \
-+        *t_cp++ = t_l >> 8; \
-+        *t_cp   = t_l; \
-+        (cp) += NS_INT32SZ; \
-+} while (0)
-+
-+
-+void
-+ns_put16(u_int src, u_char *dst) {
-+        NS_PUT16(src, dst);
-+}
-+
-+void
-+ns_put32(u_long src, u_char *dst) {
-+        NS_PUT32(src, dst);
-+}
-+
-+void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-+void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-+
-+int
-+mklower(int ch) {
-+        if (ch >= 0x41 && ch <= 0x5A)
-+                return (ch + 0x20);
-+        return (ch);
-+}
-+
-+
-+static int
-+dn_find(const u_char *domain, const u_char *msg,
-+        const u_char * const *dnptrs,
-+        const u_char * const *lastdnptr)
-+{
-+        const u_char *dn, *cp, *sp;
-+        const u_char * const *cpp;
-+        u_int n;
-+
-+        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-+                sp = *cpp;
-+                /*
-+                 * terminate search on:
-+                 * root label
-+                 * compression pointer
-+                 * unusable offset
-+                 */
-+                while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
-+                       (sp - msg) < 0x4000) {
-+                        dn = domain;
-+                        cp = sp;
-+                        while ((n = *cp++) != 0) {
-+                                /*
-+                                 * check for indirection
-+                                 */
-+                                switch (n & NS_CMPRSFLGS) {
-+                                case 0:         /* normal case, n == len */
-+                                        if (n != *dn++)
-+                                                goto next;
-+                                        for ((void)NULL; n > 0; n--)
-+                                                if (mklower(*dn++) !=
-+                                                    mklower(*cp++))
-+                                                        goto next;
-+                                        /* Is next root for both ? */
-+                                        if (*dn == '\0' && *cp == '\0')
-+                                                return (sp - msg);
-+                                        if (*dn)
-+                                                continue;
-+                                        goto next;
-+
-+                                case NS_CMPRSFLGS:      /* indirection */
-+                                        cp = msg + (((n & 0x3f) << 8) | *cp);
-+                                        break;
-+
-+                                default:        /* illegal type */
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                        }
-+ next:
-+                        sp += *sp + 1;
-+                }
-+        }
-+        __set_errno (ENOENT);
-+        return (-1);
-+}
-+
-+
-+int
-+ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-+             const u_char **dnptrs, const u_char **lastdnptr)
-+{
-+        u_char *dstp;
-+        const u_char **cpp, **lpp, *eob, *msg;
-+        const u_char *srcp;
-+        int n, l, first = 1;
-+
-+        srcp = src;
-+        dstp = dst;
-+        eob = dstp + dstsiz;
-+        lpp = cpp = NULL;
-+        if (dnptrs != NULL) {
-+                if ((msg = *dnptrs++) != NULL) {
-+                        for (cpp = dnptrs; *cpp != NULL; cpp++)
-+                                (void)NULL;
-+                        lpp = cpp;      /* end of list to search */
-+                }
-+        } else
-+                msg = NULL;
-+
-+        /* make sure the domain we are about to add is legal */
-+        l = 0;
-+        do {
-+                n = *srcp;
-+                if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                if (n == 0x41)
-+                        n = *++srcp / 8;
-+                l += n + 1;
-+                if (l > MAXCDNAME) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                srcp += n + 1;
-+        } while (n != 0);
-+
-+        /* from here on we need to reset compression pointer array on error */
-+        srcp = src;
-+        do {
-+                /* Look to see if we can use pointers. */
-+                n = *srcp;
-+                if (n != 0 && n != 0x41 && msg != NULL) {
-+                        l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-+                                    (const u_char * const *)lpp);
-+                        if (l >= 0) {
-+                                if (dstp + 1 >= eob) {
-+                                        goto cleanup;
-+                                }
-+                                *dstp++ = (l >> 8) | NS_CMPRSFLGS;
-+                                *dstp++ = l % 256;
-+                                return (dstp - dst);
-+                        }
-+                        /* Not found, save it. */
-+                        if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-+                            (dstp - msg) < 0x4000 && first) {
-+                                *cpp++ = dstp;
-+                                *cpp = NULL;
-+                                first = 0;
-+                        }
-+                }
-+                /* copy label to buffer */
-+                if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {             /* Should not happen. */
-+                        goto cleanup;
-+                }
-+                if (n == 0x41) {
-+                        n = *++srcp / 8;
-+                        if (dstp + 1 >= eob)
-+                                goto cleanup;
-+                        *dstp++ = 0x41;
-+                }
-+                if (dstp + 1 + n >= eob) {
-+                        goto cleanup;
-+                }
-+                memcpy(dstp, srcp, n + 1);
-+                srcp += n + 1;
-+                dstp += n + 1;
-+        } while (n != 0);
-+
-+        if (dstp > eob) {
-+cleanup:
-+                if (msg != NULL)
-+                        *lpp = NULL;
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        return (dstp - dst);
-+}
-+
-+
-+int
-+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-+        u_char *label, *bp, *eom;
-+        int c, n, escaped;
-+        char *cp;
-+
-+        escaped = 0;
-+        bp = dst;
-+        eom = dst + dstsiz;
-+        label = bp++;
-+
-+        while ((c = *src++) != 0) {
-+                if (escaped) {
-+                        if ((cp = strchr(digits, c)) != NULL) {
-+                                n = (cp - digits) * 100;
-+                                if ((c = *src++) == 0 ||
-+                                    (cp = strchr(digits, c)) == NULL) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                n += (cp - digits) * 10;
-+                                if ((c = *src++) == 0 ||
-+                                    (cp = strchr(digits, c)) == NULL) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                n += (cp - digits);
-+                                if (n > 255) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                c = n;
-+                        } else if (c == '[' && label == bp - 1 && *src == 'x') {
-+                                /* Theoretically we would have to handle \[o
-+                                   as well but we do not since we do not need
-+                                   it internally.  */
-+                                *label = 0x41;
-+                                label = bp++;
-+                                ++src;
-+                                while (isxdigit (*src)) {
-+                                        n = *src > '9' ? *src - 'a' + 10 : *src - '0';
-+                                        ++src;
-+                                        if (! isxdigit(*src)) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        n <<= 4;
-+                                        n += *src > '9' ? *src - 'a' + 10 : *src - '0';
-+                                        if (bp + 1 >= eom) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        *bp++ = n;
-+                                        ++src;
-+                                }
-+                                *label = (bp - label - 1) * 8;
-+                                if (*src++ != ']' || *src++ != '.') {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                escaped = 0;
-+                                label = bp++;
-+                                if (bp >= eom) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                continue;
-+                        }
-+                        escaped = 0;
-+                } else if (c == '\\') {
-+                        escaped = 1;
-+                        continue;
-+                } else if (c == '.') {
-+                        c = (bp - label - 1);
-+                        if ((c & NS_CMPRSFLGS) != 0) {  /* Label too big. */
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        if (label >= eom) {
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        *label = c;
-+                        /* Fully qualified ? */
-+                        if (*src == '\0') {
-+                                if (c != 0) {
-+                                        if (bp >= eom) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        *bp++ = '\0';
-+                                }
-+                                if ((bp - dst) > MAXCDNAME) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                return (1);
-+                        }
-+                        if (c == 0 || *src == '.') {
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        label = bp++;
-+                        continue;
-+                }
-+                if (bp >= eom) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                *bp++ = (u_char)c;
-+        }
-+        c = (bp - label - 1);
-+        if ((c & NS_CMPRSFLGS) != 0) {          /* Label too big. */
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        if (label >= eom) {
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        *label = c;
-+        if (c != 0) {
-+                if (bp >= eom) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                *bp++ = 0;
-+        }
-+        if ((bp - dst) > MAXCDNAME) {   /* src too big */
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        return (0);
-+}
-+
-+
-+
-+int
-+ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-+                 const u_char **dnptrs, const u_char **lastdnptr)
-+{
-+        u_char tmp[NS_MAXCDNAME];
-+
-+        if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-+                return (-1);
-+        return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-+}
-+
-+
-+int
-+dn_comp(const char *src, u_char *dst, int dstsiz,
-+        u_char **dnptrs, u_char **lastdnptr)
-+{
-+        return (ns_name_compress(src, dst, (size_t)dstsiz,
-+                                 (const u_char **)dnptrs,
-+                                 (const u_char **)lastdnptr));
-+}
-+
-+
-+
-+
-+int
-+res_nmkquery(res_state statp,
-+             int op,                    /* opcode of query */
-+             const char *dname,         /* domain name */
-+             int class, int type,       /* class and type of query */
-+             const u_char *data,        /* resource record data */
-+             int datalen,               /* length of data */
-+             const u_char *newrr_in,    /* new rr for modify or append */
-+             u_char *buf,               /* buffer to put query */
-+             int buflen)                /* size of buffer */
-+{
-+        register HEADER *hp;
-+        register u_char *cp;
-+        register int n;
-+        u_char *dnptrs[20], **dpp, **lastdnptr;
-+
-+#ifdef DEBUG
-+        if (statp->options & RES_DEBUG)
-+                printf(";; res_nmkquery(%s, %s, %s, %s)\n",
-+                       _res_opcodes[op], dname, p_class(class), p_type(type));
-+#endif
-+        /*
-+         * Initialize header fields.
-+         */
-+        if ((buf == NULL) || (buflen < HFIXEDSZ))
-+                return (-1);
-+        memset(buf, 0, HFIXEDSZ);
-+        hp = (HEADER *) buf;
-+        /* We randomize the IDs every time.  The old code just
-+           incremented by one after the initial randomization which
-+           still predictable if the application does multiple
-+           requests.  */
-+#if 0
-+        hp->id = htons(++statp->id);
-+#else
-+        hp->id = htons(statp->id);
-+        int randombits;
-+        do
-+          {
-+#ifdef RANDOM_BITS
-+            RANDOM_BITS (randombits);
-+#else
-+            struct timeval tv;
-+            gettimeofday (&tv, NULL);
-+            randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
-+#endif
-+          }
-+        while ((randombits & 0xffff) == 0);
-+        statp->id = (statp->id + randombits) & 0xffff;
-+#endif
-+        hp->opcode = op;
-+        hp->rd = (statp->options & RES_RECURSE) != 0;
-+        hp->rcode = NOERROR;
-+        cp = buf + HFIXEDSZ;
-+        buflen -= HFIXEDSZ;
-+        dpp = dnptrs;
-+        *dpp++ = buf;
-+        *dpp++ = NULL;
-+        lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-+        /*
-+         * perform opcode specific processing
-+         */
-+        switch (op) {
-+        case QUERY:     /*FALLTHROUGH*/
-+        case NS_NOTIFY_OP:
-+                if ((buflen -= QFIXEDSZ) < 0)
-+                        return (-1);
-+                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-+                        return (-1);
-+                cp += n;
-+                buflen -= n;
-+                __putshort(type, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                hp->qdcount = htons(1);
-+                if (op == QUERY || data == NULL)
-+                        break;
-+                /*
-+                 * Make an additional record for completion domain.
-+                 */
-+                buflen -= RRFIXEDSZ;
-+                n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-+                if (n < 0)
-+                        return (-1);
-+                cp += n;
-+                buflen -= n;
-+                __putshort(T_NULL, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                __putlong(0, cp);
-+                cp += INT32SZ;
-+                __putshort(0, cp);
-+                cp += INT16SZ;
-+                hp->arcount = htons(1);
-+                break;
-+
-+        case IQUERY:
-+                /*
-+                 * Initialize answer section
-+                 */
-+                if (buflen < 1 + RRFIXEDSZ + datalen)
-+                        return (-1);
-+                *cp++ = '\0';   /* no domain name */
-+                __putshort(type, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                __putlong(0, cp);
-+                cp += INT32SZ;
-+                __putshort(datalen, cp);
-+                cp += INT16SZ;
-+                if (datalen) {
-+                        memcpy(cp, data, datalen);
-+                        cp += datalen;
-+                }
-+                hp->ancount = htons(1);
-+                break;
-+
-+        default:
-+                return (-1);
-+        }
-+        return (cp - buf);
-+}
-+
-+int
-+res_mkquery(int op,                     /* opcode of query */
-+            const char *dname,          /* domain name */
-+            int class, int type,        /* class and type of query */
-+            const u_char *data,         /* resource record data */
-+            int datalen,                /* length of data */
-+            const u_char *newrr_in,     /* new rr for modify or append */
-+            u_char *buf,                /* buffer to put query */
-+            int buflen)                 /* size of buffer */
-+{
-+        return (res_nmkquery(&_res, op, dname, class, type,
-+                             data, datalen,
-+                             newrr_in, buf, buflen));
-+}
-+
-+#endif
- 
- void dorequest(char *s,int type,word id)
- {
diff --git a/trunk/package/feeds/packages/mtr/patches/502-fix-res_ninit.patch b/trunk/package/feeds/packages/mtr/patches/502-fix-res_ninit.patch
deleted file mode 100644
index 2d9883b4..00000000
--- a/trunk/package/feeds/packages/mtr/patches/502-fix-res_ninit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/dns.c
-+++ b/dns.c
-@@ -1308,28 +1308,6 @@ res_nmkquery(res_state statp,
-                 return (-1);
-         memset(buf, 0, HFIXEDSZ);
-         hp = (HEADER *) buf;
--        /* We randomize the IDs every time.  The old code just
--           incremented by one after the initial randomization which
--           still predictable if the application does multiple
--           requests.  */
--#if 0
--        hp->id = htons(++statp->id);
--#else
--        hp->id = htons(statp->id);
--        int randombits;
--        do
--          {
--#ifdef RANDOM_BITS
--            RANDOM_BITS (randombits);
--#else
--            struct timeval tv;
--            gettimeofday (&tv, NULL);
--            randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
--#endif
--          }
--        while ((randombits & 0xffff) == 0);
--        statp->id = (statp->id + randombits) & 0xffff;
--#endif
-         hp->opcode = op;
-         hp->rd = (statp->options & RES_RECURSE) != 0;
-         hp->rcode = NOERROR;
diff --git a/trunk/package/feeds/packages/muninlite/Makefile b/trunk/package/feeds/packages/muninlite/Makefile
deleted file mode 100644
index 1c1793ed..00000000
--- a/trunk/package/feeds/packages/muninlite/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=muninlite
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/muninlite
-  SECTION:=admin
-  CATEGORY:=Administration
-  DEPENDS:=+xinetd
-  TITLE:=Munin node implemented in shell
-  URL:=http://sourceforge.net/projects/muninlite/
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-endef
-
-define Package/muninlite/Default/description
-	Munin node implemented in shell.
-	Munin is a monitoring system for Unix networks.
-endef
-
-define Package/muninlite/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/munin-node $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/xinetd.d
-	$(INSTALL_DATA) ./files/etc/xinetd.d/munin $(1)/etc/xinetd.d/
-endef
-
-define Package/muninlite/conffiles
-/etc/xinetd.d/munin
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-$(eval $(call BuildPackage,muninlite))
diff --git a/trunk/package/feeds/packages/muninlite/files/etc/xinetd.d/munin b/trunk/package/feeds/packages/muninlite/files/etc/xinetd.d/munin
deleted file mode 100644
index 012d71b9..00000000
--- a/trunk/package/feeds/packages/muninlite/files/etc/xinetd.d/munin
+++ /dev/null
@@ -1,10 +0,0 @@
-service munin
-{
-	socket_type	= stream
-	protocol	= tcp
-	wait		= no
-	user		= root
-	group		= root
-	server		= /usr/sbin/munin-node
-	disable		= no
-}
diff --git a/trunk/package/feeds/packages/muninlite/patches/001-no_disks.patch b/trunk/package/feeds/packages/muninlite/patches/001-no_disks.patch
deleted file mode 100644
index bf9b2b1c..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/001-no_disks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- 
- 
--PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_
--#PLUGINS=cpu if_ if_err_ load memory processes netstat uptime interrupts irqstats
-+#PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_
-+PLUGINS=cpu if_ if_err_ load memory processes netstat uptime interrupts irqstats
- 
- munin-node: plugins/* munin-node.conf
- 	@VERSION=$$(cat VERSION); \
diff --git a/trunk/package/feeds/packages/muninlite/patches/002-hostname.patch b/trunk/package/feeds/packages/muninlite/patches/002-hostname.patch
deleted file mode 100644
index 5d871683..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/002-hostname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/munin-node.in
-+++ b/munin-node.in
-@@ -113,7 +113,7 @@ PLUGINS=$RES
- 
- # ===== MAIN LOOP =====
- FUNCTIONS="list nodes config fetch version quit"
--HOSTNAME=$(hostname -f 2>/dev/null || hostname)
-+HOSTNAME=$(/sbin/uci get "system.@system[0].hostname" 2>/dev/null || cat /proc/sys/kernel/hostname)
- echo "# munin node at $HOSTNAME"
- while read arg0 arg1 
- do 
diff --git a/trunk/package/feeds/packages/muninlite/patches/100-fix-no-ethtool.patch b/trunk/package/feeds/packages/muninlite/patches/100-fix-no-ethtool.patch
deleted file mode 100644
index 88f7e305..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/100-fix-no-ethtool.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/plugins/if_
-+++ b/plugins/if_
-@@ -15,10 +15,14 @@ config_if() {
-   echo "up.min 0"
-   echo "up.negative down"
-   echo "up.cdef up,8,*"
--  if ethtool $1 | grep -q Speed; then
--    MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\  -f2) * 1000000))
--    echo "up.max $MAX"
--    echo "down.max $MAX"
-+  if [ -n "$(which ethtool)" ]; then
-+	if [ -x "$(which ethtool)" ]; then
-+  		if ethtool $1 | grep -q Speed; then
-+    			MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\  -f2) * 1000000))
-+    			echo "up.max $MAX"
-+    			echo "down.max $MAX"
-+		fi
-+	fi
-   fi
- }
- fetch_if() {
diff --git a/trunk/package/feeds/packages/muninlite/patches/110-fix-uptime-days.patch b/trunk/package/feeds/packages/muninlite/patches/110-fix-uptime-days.patch
deleted file mode 100644
index d9aa43f4..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/110-fix-uptime-days.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/plugins/uptime
-+++ b/plugins/uptime
-@@ -4,8 +4,7 @@ config_uptime() {
-   echo "graph_vlabel uptime in days"
-   echo "uptime.label uptime"
-   echo "uptime.draw AREA"
--  echo "uptime.cdef uptime,86400,/"
- }
- fetch_uptime() {
--  echo "uptime.value" $(cut -d\  -f1 /proc/uptime)
-+  awk '{printf "uptime.value %.2f",$1/86400; print ""}' /proc/uptime
- }
diff --git a/trunk/package/feeds/packages/muninlite/patches/200-add-tap-dev.patch b/trunk/package/feeds/packages/muninlite/patches/200-add-tap-dev.patch
deleted file mode 100644
index fa46ce6b..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/200-add-tap-dev.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/munin-node.in
-+++ b/munin-node.in
-@@ -72,7 +72,7 @@ RES=""
- for PLUG in $PLUGINS
- do 
-   if [ "$PLUG" = "if_" ]; then  
--    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-+    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-     do
-       INTERRES=$(echo $INTER | sed 's/\./VLAN/')
-       RES="$RES if_$INTERRES"
-@@ -80,7 +80,7 @@ do
-       eval "config_if_${INTERRES}() { config_if $INTER $@; };"
-     done
-   elif [ "$PLUG" = "if_err_" ]; then
--    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-+    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-     do
-       INTERRES=$(echo $INTER | sed 's/\./VLAN/')
-       RES="$RES if_err_$INTERRES"
diff --git a/trunk/package/feeds/packages/muninlite/patches/210-add-bridge-devs.patch b/trunk/package/feeds/packages/muninlite/patches/210-add-bridge-devs.patch
deleted file mode 100644
index 1a76e971..00000000
--- a/trunk/package/feeds/packages/muninlite/patches/210-add-bridge-devs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/munin-node.in
-+++ b/munin-node.in
-@@ -72,17 +72,17 @@ RES=""
- for PLUG in $PLUGINS
- do 
-   if [ "$PLUG" = "if_" ]; then  
--    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-+    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-     do
--      INTERRES=$(echo $INTER | sed 's/\./VLAN/')
-+      INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/')
-       RES="$RES if_$INTERRES"
-       eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };"
-       eval "config_if_${INTERRES}() { config_if $INTER $@; };"
-     done
-   elif [ "$PLUG" = "if_err_" ]; then
--    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-+    for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g');
-     do
--      INTERRES=$(echo $INTER | sed 's/\./VLAN/')
-+      INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/')
-       RES="$RES if_err_$INTERRES"
-       eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };"
-       eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };"
diff --git a/trunk/package/feeds/packages/mwan3-luci/Makefile b/trunk/package/feeds/packages/mwan3-luci/Makefile
deleted file mode 100644
index 6656806b..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-mwan3
-PKG_VERSION:=1.4
-PKG_RELEASE:=2
-PKG_MAINTAINER:=Aedan Renner <chipdankly@gmail.com>
-PKG_LICENSE:=GPLv2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-mwan3
-  SECTION:=LuCI
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=LuCI support for the MWAN3 multiwan hotplug script
-  DEPENDS:=+mwan3 +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio
-  PKGARCH:=all
-  MAINTAINER:=Aedan Renner <chipdankly@gmail.com>
-endef
-
-define Package/luci-app-mwan3/description
-Hotplug script which makes configuration of multiple WAN interfaces simple and
-manageable with loadbalancing/failover support for up to 250 physical or logical
-WAN interfaces, connection tracking and an easy to manage traffic ruleset
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-mwan3/install
-	$(CP) ./files/* $(1)
-endef
-
-$(eval $(call BuildPackage,luci-app-mwan3))
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/etc/hotplug.d/iface/16-mwancustombak b/trunk/package/feeds/packages/mwan3-luci/files/etc/hotplug.d/iface/16-mwancustombak
deleted file mode 100755
index b8f66058..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/etc/hotplug.d/iface/16-mwancustombak
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# to enable this script uncomment the case loop at the bottom
-# to report mwan status on interface hotplug ifup/ifdown events modify the lines in the send_alert function
-
-send_alert()
-{
-	# variable "$1" stores the MWAN status information
-	# insert your code here to send the contents of "$1"
-	echo "$1"
-}
-
-gather_event_info()
-{
-	# create event information message
-	local EVENT_INFO="Interface [ "$INTERFACE" ($DEVICE) ] on router [ "$(uci get -p /var/state system.@system[0].hostname)" ] has triggered a hotplug [ "$ACTION" ] event on "$(date +"%a %b %d %Y %T %Z")""
-
-	# get current interface, policy and rule status
-	local CURRENT_STATUS="$(/usr/sbin/mwan3 status)"
-
-	# get last 50 MWAN systemlog messages
-	local MWAN_LOG="$(echo -e "Last 50 MWAN systemlog entries. Newest entries sorted at the top:\n$(logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x')")"
-
-	# pass event info to send_alert function
-	send_alert "$(echo -e "$EVENT_INFO\n\n$CURRENT_STATUS\n\n$MWAN_LOG")"
-}
-
-#case "$ACTION" in
-#	ifup)
-#		gather_event_info
-#	;;
-#
-#	ifdown)
-#		gather_event_info
-#	;;
-#esac
-
-exit 0
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/etc/uci-defaults/mwan-luci b/trunk/package/feeds/packages/mwan3-luci/files/etc/uci-defaults/mwan-luci
deleted file mode 100755
index ff9a229e..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/etc/uci-defaults/mwan-luci
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# replace existing mwan ucitrack entry
-uci -q batch <<-EOF >/dev/null
-	del ucitrack.@mwan3[-1]
-	add ucitrack mwan3
-	set ucitrack.@mwan3[-1].exec="/usr/sbin/mwan3 restart"
-	commit ucitrack
-EOF
-
-# remove LuCI cache
-rm -rf /tmp/luci-indexcache /tmp/luci-modulecache
-
-exit 0
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
deleted file mode 100644
index d40ad011..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/controller/mwan3.lua
+++ /dev/null
@@ -1,318 +0,0 @@
-module("luci.controller.mwan3", package.seeall)
-
-sys = require "luci.sys"
-ut = require "luci.util"
-
-function index()
-	if not nixio.fs.access("/etc/config/mwan3") then
-		return
-	end
-
-	entry({"admin", "network", "mwan"},
-		alias("admin", "network", "mwan", "overview"),
-		_("Load Balancing"), 600)
-
-	entry({"admin", "network", "mwan", "overview"},
-		alias("admin", "network", "mwan", "overview", "overview_interface"),
-		_("Overview"), 10)
-	entry({"admin", "network", "mwan", "overview", "overview_interface"},
-		template("mwan/overview_interface"))
-	entry({"admin", "network", "mwan", "overview", "interface_status"},
-		call("interfaceStatus"))
-	entry({"admin", "network", "mwan", "overview", "overview_detailed"},
-		template("mwan/overview_detailed"))
-	entry({"admin", "network", "mwan", "overview", "detailed_status"},
-		call("detailedStatus"))
-
-	entry({"admin", "network", "mwan", "configuration"},
-		alias("admin", "network", "mwan", "configuration", "interface"),
-		_("Configuration"), 20)
-	entry({"admin", "network", "mwan", "configuration", "interface"},
-		arcombine(cbi("mwan/interface"), cbi("mwan/interfaceconfig")),
-		_("Interfaces"), 10).leaf = true
-	entry({"admin", "network", "mwan", "configuration", "member"},
-		arcombine(cbi("mwan/member"), cbi("mwan/memberconfig")),
-		_("Members"), 20).leaf = true
-	entry({"admin", "network", "mwan", "configuration", "policy"},
-		arcombine(cbi("mwan/policy"), cbi("mwan/policyconfig")),
-		_("Policies"), 30).leaf = true
-	entry({"admin", "network", "mwan", "configuration", "rule"},
-		arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")),
-		_("Rules"), 40).leaf = true
-
-	entry({"admin", "network", "mwan", "advanced"},
-		alias("admin", "network", "mwan", "advanced", "hotplugscript"),
-		_("Advanced"), 100)
-	entry({"admin", "network", "mwan", "advanced", "hotplugscript"},
-		form("mwan/advanced_hotplugscript"))
-	entry({"admin", "network", "mwan", "advanced", "mwanconfig"},
-		form("mwan/advanced_mwanconfig"))
-	entry({"admin", "network", "mwan", "advanced", "networkconfig"},
-		form("mwan/advanced_networkconfig"))
-	entry({"admin", "network", "mwan", "advanced", "diagnostics"},
-		template("mwan/advanced_diagnostics"))
-	entry({"admin", "network", "mwan", "advanced", "diagnostics_display"},
-		call("diagnosticsData"), nil).leaf = true
-	entry({"admin", "network", "mwan", "advanced", "troubleshooting"},
-		template("mwan/advanced_troubleshooting"))
-	entry({"admin", "network", "mwan", "advanced", "troubleshooting_display"},
-		call("troubleshootingData"))
-end
-
-function getInterfaceStatus(ruleNumber, interfaceName)
-	if ut.trim(sys.exec("uci get -p /var/state mwan3." .. interfaceName .. ".enabled")) == "1" then
-		if ut.trim(sys.exec("ip route list table " .. ruleNumber)) ~= "" then
-			if ut.trim(sys.exec("uci get -p /var/state mwan3." .. interfaceName .. ".track_ip")) ~= "" then
-				return "online"
-			else
-				return "notMonitored"
-			end
-		else
-			return "offline"
-		end
-	else
-		return "notEnabled"
-	end
-end
-
-function getInterfaceName()
-	local ruleNumber, status = 0, ""
-	uci.cursor():foreach("mwan3", "interface",
-		function (section)
-			ruleNumber = ruleNumber+1
-			status = status .. section[".name"] .. "[" .. getInterfaceStatus(ruleNumber, section[".name"]) .. "]"
-		end
-	)
-	return status
-end
-
-function interfaceStatus()
-	local ntm = require "luci.model.network".init()
-
-	local mArray = {}
-
-	-- overview status
-	local statusString = getInterfaceName()
-	if statusString ~= "" then
-		mArray.wans = {}
-		wansid = {}
-
-		for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do
-			local wanInterfaceName = ut.trim(sys.exec("uci get -p /var/state network." .. wanName .. ".ifname"))
-				if wanInterfaceName == "" then
-					wanInterfaceName = "X"
-				end
-			local wanDeviceLink = ntm:get_interface(wanInterfaceName)
-				wanDeviceLink = wanDeviceLink and wanDeviceLink:get_network()
-				wanDeviceLink = wanDeviceLink and wanDeviceLink:adminlink() or "#"
-			wansid[wanName] = #mArray.wans + 1
-			mArray.wans[wansid[wanName]] = { name = wanName, link = wanDeviceLink, ifname = wanInterfaceName, status = interfaceState }
-		end
-	end
-
-	-- overview status log
-	local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x'"))
-	if mwanLog ~= "" then
-		mArray.mwanlog = { mwanLog }
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(mArray)
-end
-
-function detailedStatus()
-	local mArray = {}
-
-	-- detailed mwan status
-	local detailStatusInfo = ut.trim(sys.exec("/usr/sbin/mwan3 status"))
-	if detailStatusInfo ~= "" then
-		mArray.mwandetail = { detailStatusInfo }
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(mArray)
-end
-
-function diagnosticsData(interface, tool, task)
-	function getInterfaceNumber()
-		local number = 0
-		uci.cursor():foreach("mwan3", "interface",
-			function (section)
-				number = number+1
-				if section[".name"] == interface then
-					interfaceNumber = number
-				end
-			end
-		)
-	end
-
-	local mArray = {}
-
-	local results = ""
-	if tool == "service" then
-		os.execute("/usr/sbin/mwan3 " .. task)
-		if task == "restart" then
-			results = "MWAN3 restarted"
-		elseif task == "stop" then
-			results = "MWAN3 stopped"
-		else
-			results = "MWAN3 started"
-		end
-	else
-		local interfaceDevice = ut.trim(sys.exec("uci get -p /var/state network." .. interface .. ".ifname"))
-		if interfaceDevice ~= "" then
-			if tool == "ping" then
-				local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'"))
-				if gateway ~= "" then
-					if task == "gateway" then
-						local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway
-						results = pingCommand .. "\n\n" .. sys.exec(pingCommand)
-					else
-						local tracked = ut.trim(sys.exec("uci get -p /var/state mwan3." .. interface .. ".track_ip"))
-						if tracked ~= "" then
-							for z in tracked:gmatch("[^ ]+") do
-								local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z
-								results = results .. pingCommand .. "\n\n" .. sys.exec(pingCommand) .. "\n\n"
-							end
-						else
-							results = "No tracking IP addresses configured on " .. interface
-						end
-					end
-				else
-					results = "No default gateway for " .. interface .. " found. Default route does not exist or is configured incorrectly"
-				end
-			elseif tool == "rulechk" then
-				getInterfaceNumber()
-				local rule1 = sys.exec("ip rule | grep $(echo $((" .. interfaceNumber .. " + 1000)))")
-				local rule2 = sys.exec("ip rule | grep $(echo $((" .. interfaceNumber .. " + 2000)))")
-				if rule1 ~= "" and rule2 ~= "" then
-					results = "All required interface IP rules found:\n\n" .. rule1 .. rule2
-				elseif rule1 ~= "" or rule2 ~= "" then
-					results = "Missing 1 of the 2 required interface IP rules\n\n\nRules found:\n\n" .. rule1 .. rule2
-				else
-					results = "Missing both of the required interface IP rules"
-				end
-			elseif tool == "routechk" then
-				getInterfaceNumber()
-				local routeTable = sys.exec("ip route list table " .. interfaceNumber)
-				if routeTable ~= "" then
-					results = "Interface routing table " .. interfaceNumber .. " was found:\n\n" .. routeTable
-				else
-					results = "Missing required interface routing table " .. interfaceNumber
-				end
-			elseif tool == "hotplug" then
-				if task == "ifup" then
-					os.execute("/usr/sbin/mwan3 ifup " .. interface)
-					results = "Hotplug ifup sent to interface " .. interface .. "..."
-				else
-					os.execute("/usr/sbin/mwan3 ifdown " .. interface)
-					results = "Hotplug ifdown sent to interface " .. interface .. "..."
-				end
-			end
-		else
-			results = "Unable to perform diagnostic tests on " .. interface .. ". There is no physical or virtual device associated with this interface"
-		end
-	end
-	if results ~= "" then
-		results = ut.trim(results)
-		mArray.diagnostics = { results }
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(mArray)
-end
-
-function troubleshootingData()
-	local mArray = {}
-
-	-- software versions
-	local wrtRelease = ut.trim(luci.version.distversion)
-		if wrtRelease ~= "" then
-			wrtRelease = "OpenWrt - " .. wrtRelease
-		else
-			wrtRelease = "OpenWrt - unknown"
-		end
-	local luciRelease = ut.trim(luci.version.luciversion)
-		if luciRelease ~= "" then
-			luciRelease = "\nLuCI - " .. luciRelease
-		else
-			luciRelease = "\nLuCI - unknown"
-		end
-	local mwanVersion = ut.trim(sys.exec("opkg info mwan3 | grep Version | awk '{print $2}'"))
-		if mwanVersion ~= "" then
-			mwanVersion = "\n\nmwan3 - " .. mwanVersion
-		else
-			mwanVersion = "\n\nmwan3 - unknown"
-		end
-	local mwanLuciVersion = ut.trim(sys.exec("opkg info luci-app-mwan3 | grep Version | awk '{print $2}'"))
-		if mwanLuciVersion ~= "" then
-			mwanLuciVersion = "\nmwan3-luci - " .. mwanLuciVersion
-		else
-			mwanLuciVersion = "\nmwan3-luci - unknown"
-		end
-	mArray.versions = { wrtRelease .. luciRelease .. mwanVersion .. mwanLuciVersion }
-
-	-- mwan config
-	local mwanConfig = ut.trim(sys.exec("cat /etc/config/mwan3"))
-		if mwanConfig == "" then
-			mwanConfig = "No data found"
-		end
-	mArray.mwanconfig = { mwanConfig }
-
-	-- network config
-	local networkConfig = ut.trim(sys.exec("cat /etc/config/network | sed -e 's/.*username.*/	USERNAME HIDDEN/' -e 's/.*password.*/	PASSWORD HIDDEN/'"))
-		if networkConfig == "" then
-			networkConfig = "No data found"
-		end
-	mArray.netconfig = { networkConfig }
-
-	-- ifconfig
-	local ifconfig = ut.trim(sys.exec("ifconfig"))
-		if ifconfig == "" then
-			ifconfig = "No data found"
-		end
-	mArray.ifconfig = { ifconfig }
-
-	-- route -n
-	local routeShow = ut.trim(sys.exec("route -n"))
-		if routeShow == "" then
-			routeShow = "No data found"
-		end
-	mArray.routeshow = { routeShow }
-
-	-- ip rule show
-	local ipRuleShow = ut.trim(sys.exec("ip rule show"))
-		if ipRuleShow == "" then
-			ipRuleShow = "No data found"
-		end
-	mArray.iprule = { ipRuleShow }
-
-	-- ip route list table 1-250
-	local routeList, routeString = ut.trim(sys.exec("ip rule | sed 's/://g' | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), ""
-		if routeList ~= "" then
-			for line in routeList:gmatch("[^\r\n]+") do
-				routeString = routeString .. line .. "\n" .. sys.exec("ip route list table " .. line)
-			end
-			routeString = ut.trim(routeString)
-		else
-			routeString = "No data found"
-		end
-	mArray.routelist = { routeString }
-
-	-- default firewall output policy
-	local firewallOut = ut.trim(sys.exec("uci get -p /var/state firewall.@defaults[0].output"))
-		if firewallOut == "" then
-			firewallOut = "No data found"
-		end
-	mArray.firewallout = { firewallOut }
-
-	-- iptables
-	local iptables = ut.trim(sys.exec("iptables -L -t mangle -v -n"))
-		if iptables == "" then
-			iptables = "No data found"
-		end
-	mArray.iptables = { iptables }
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(mArray)
-end
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_hotplugscript.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_hotplugscript.lua
deleted file mode 100644
index 0e7b8b11..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_hotplugscript.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- ------ hotplug script configuration ------ --
-
-fs = require "nixio.fs"
-sys = require "luci.sys"
-ut = require "luci.util"
-
-script = "/etc/hotplug.d/iface/16-mwancustom"
-scriptBackup = "/etc/hotplug.d/iface/16-mwancustombak"
-
-if luci.http.formvalue("cbid.luci.1._restorebak") then -- restore button has been clicked
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript") .. "?restore=yes")
-elseif luci.http.formvalue("restore") == "yes" then -- restore script from backup
-	os.execute("cp -f " .. scriptBackup .. " " .. script)
-end
-
-
-m5 = SimpleForm("luci", nil)
-	m5:append(Template("mwan/advanced_hotplugscript")) -- highlight current tab
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/hotplug.d/iface/16-mwancustom<br />" ..
-	"This is useful for running system commands and/or scripts based on interface ifup or ifdown hotplug events<br /><br />" ..
-	"Notes:<br />" ..
-	"The first line of the script must be &#34;#!/bin/sh&#34; without quotes<br />" ..
-	"Lines beginning with # are comments and are not executed<br /><br />" ..
-	"Available variables:<br />" ..
-	"$ACTION is the hotplug event (ifup, ifdown)<br />" ..
-	"$INTERFACE is the interface name (wan1, wan2, etc.)<br />" ..
-	"$DEVICE is the device name attached to the interface (eth0.1, eth1, etc.)"))
-
-
-restore = f:option(Button, "_restorebak", translate("Restore default hotplug script"))
-	restore.inputtitle = translate("Restore...")
-	restore.inputstyle = "apply"
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		local hps = fs.readfile(script)
-		if not hps or hps == "" then -- if script does not exist or is blank restore from backup
-			sys.call("cp -f " .. scriptBackup .. " " .. script)
-			return fs.readfile(script)
-		else
-			return hps
-		end
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return fs.writefile(script, ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_mwanconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_mwanconfig.lua
deleted file mode 100644
index e0a99e83..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_mwanconfig.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- ------ mwan configuration ------ --
-
-ut = require "luci.util"
-
-mwanConfig = "/etc/config/mwan3"
-
-
-m5 = SimpleForm("luci", nil)
-	m5:append(Template("mwan/advanced_mwanconfig")) -- highlight current tab
-
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/config/mwan3"))
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		return nixio.fs.readfile(mwanConfig) or ""
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return nixio.fs.writefile(mwanConfig, "\n" .. ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-	function f.handle(self, state, data)
-		return true
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_networkconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_networkconfig.lua
deleted file mode 100644
index b93d8975..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/advanced_networkconfig.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- ------ network configuration ------ --
-
-ut = require "luci.util"
-
-networkConfig = "/etc/config/network"
-
-
-m5 = SimpleForm("networkconf", nil)
-	m5:append(Template("mwan/advanced_networkconfig")) -- highlight current tab
-
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/config/network"))
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		return nixio.fs.readfile(networkConfig) or ""
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return nixio.fs.writefile(networkConfig, "\n" .. ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-	function f.handle(self, state, data)
-		return true
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interface.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interface.lua
deleted file mode 100644
index 5b31390b..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interface.lua
+++ /dev/null
@@ -1,266 +0,0 @@
--- ------ extra functions ------ --
-
-function interfaceCheck() -- find issues with too many interfaces, reliability and metric
-	uci.cursor():foreach("mwan3", "interface",
-		function (section)
-			local interfaceName = section[".name"]
-			interfaceNumber = interfaceNumber+1 -- count number of mwan interfaces configured
-			-- create list of metrics for none and duplicate checking
-			local metricValue = ut.trim(sys.exec("uci get -p /var/state network." .. interfaceName .. ".metric"))
-			if metricValue == "" then
-				errorFound = 1
-				errorNoMetricList = errorNoMetricList .. interfaceName .. " "
-			else
-				metricList = metricList .. interfaceName .. " " .. metricValue .. "\n"
-			end
-			-- check if any interfaces have a higher reliability requirement than tracking IPs configured
-			local trackingNumber = tonumber(ut.trim(sys.exec("echo $(uci get -p /var/state mwan3." .. interfaceName .. ".track_ip) | wc -w")))
-			if trackingNumber > 0 then
-				local reliabilityNumber = tonumber(ut.trim(sys.exec("uci get -p /var/state mwan3." .. interfaceName .. ".reliability")))
-				if reliabilityNumber and reliabilityNumber > trackingNumber then
-					errorFound = 1
-					errorReliabilityList = errorReliabilityList .. interfaceName .. " "
-				end
-			end
-			-- check if any interfaces are not properly configured in /etc/config/network or have no default route in main routing table
-			if ut.trim(sys.exec("uci get -p /var/state network." .. interfaceName)) == "interface" then
-				local interfaceDevice = ut.trim(sys.exec("uci get -p /var/state network." .. interfaceName .. ".ifname"))
-				if interfaceDevice == "uci: Entry not found" or interfaceDevice == "" then
-					errorFound = 1
-					errorNetConfigList = errorNetConfigList .. interfaceName .. " "
-					errorRouteList = errorRouteList .. interfaceName .. " "
-				else
-					local routeCheck = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $1}'"))
-					if routeCheck == "" then
-						errorFound = 1
-						errorRouteList = errorRouteList .. interfaceName .. " "
-					end
-				end
-			else
-				errorFound = 1
-				errorNetConfigList = errorNetConfigList .. interfaceName .. " "
-				errorRouteList = errorRouteList .. interfaceName .. " "
-			end
-		end
-	)
-	-- check if any interfaces have duplicate metrics
-	local metricDuplicateNumbers = sys.exec("echo '" .. metricList .. "' | awk '{print $2}' | uniq -d")
-	if metricDuplicateNumbers ~= "" then
-		errorFound = 1
-		local metricDuplicates = ""
-		for line in metricDuplicateNumbers:gmatch("[^\r\n]+") do
-			metricDuplicates = sys.exec("echo '" .. metricList .. "' | grep '" .. line .. "' | awk '{print $1}'")
-			errorDuplicateMetricList = errorDuplicateMetricList .. metricDuplicates
-		end
-		errorDuplicateMetricList = sys.exec("echo '" .. errorDuplicateMetricList .. "' | tr '\n' ' '")
-	end
-end
-
-function interfaceWarnings() -- display status and warning messages at the top of the page
-	local warnings = ""
-	if interfaceNumber <= 250 then
-		warnings = "<strong>There are currently " .. interfaceNumber .. " of 250 supported interfaces configured</strong>"
-	else
-		warnings = "<font color=\"ff0000\"><strong>WARNING: " .. interfaceNumber .. " interfaces are configured exceeding the maximum of 250!</strong></font>"
-	end
-	if errorReliabilityList ~= " " then
-		warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>WARNING: some interfaces have a higher reliability requirement than there are tracking IP addresses!</strong></font>"
-	end
-	if errorRouteList ~= " " then
-		warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>WARNING: some interfaces have no default route in the main routing table!</strong></font>"
-	end
-	if errorNetConfigList ~= " " then
-		warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>WARNING: some interfaces are configured incorrectly or not at all in /etc/config/network!</strong></font>"
-	end
-	if errorNoMetricList ~= " " then
-		warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>WARNING: some interfaces have no metric configured in /etc/config/network!</strong></font>"
-	end
-	if errorDuplicateMetricList ~= " " then
-		warnings = warnings .. "<br /><br /><font color=\"ff0000\"><strong>WARNING: some interfaces have duplicate metrics configured in /etc/config/network!</strong></font>"
-	end
-	return warnings
-end
-
--- ------ interface configuration ------ --
-
-dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
-
-interfaceNumber = 0
-metricList = ""
-errorFound = 0
-errorDuplicateMetricList = " "
-errorNetConfigList = " "
-errorNoMetricList = " "
-errorReliabilityList = " "
-errorRouteList = " "
-interfaceCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Interface Configuration"),
-	translate(interfaceWarnings()))
-	m5:append(Template("mwan/config_css"))
-
-
-mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"),
-	translate("MWAN supports up to 250 physical and/or logical interfaces<br />" ..
-	"MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" ..
-	"Names must match the interface name found in /etc/config/network (see advanced tab)<br />" ..
-	"Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
-	"Interfaces may not share the same name as configured members, policies or rules"))
-	mwan_interface.addremove = true
-	mwan_interface.dynamic = false
-	mwan_interface.sectionhead = "Interface"
-	mwan_interface.sortable = true
-	mwan_interface.template = "cbi/tblsection"
-	mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s")
-	function mwan_interface.create(self, section)
-		TypedSection.create(self, section)
-		m5.uci:save("mwan3")
-		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "interface", section))
-	end
-
-
-enabled = mwan_interface:option(DummyValue, "enabled", translate("Enabled"))
-	enabled.rawhtml = true
-	function enabled.cfgvalue(self, s)
-		if self.map:get(s, "enabled") == "1" then
-			return "Yes"
-		else
-			return "No"
-		end
-	end
-
-track_ip = mwan_interface:option(DummyValue, "track_ip", translate("Tracking IP"))
-	track_ip.rawhtml = true
-	function track_ip.cfgvalue(self, s)
-		tracked = self.map:get(s, "track_ip")
-		if tracked then
-			local ipList = ""
-			for k,v in pairs(tracked) do
-				ipList = ipList .. v .. "<br />"
-			end
-			return ipList
-		else
-			return "&#8212;"
-		end
-	end
-
-reliability = mwan_interface:option(DummyValue, "reliability", translate("Tracking reliability"))
-	reliability.rawhtml = true
-	function reliability.cfgvalue(self, s)
-		if tracked then
-			return self.map:get(s, "reliability") or "&#8212;"
-		else
-			return "&#8212;"
-		end
-	end
-
-count = mwan_interface:option(DummyValue, "count", translate("Ping count"))
-	count.rawhtml = true
-	function count.cfgvalue(self, s)
-		if tracked then
-			return self.map:get(s, "count") or "&#8212;"
-		else
-			return "&#8212;"
-		end
-	end
-
-timeout = mwan_interface:option(DummyValue, "timeout", translate("Ping timeout"))
-	timeout.rawhtml = true
-	function timeout.cfgvalue(self, s)
-		if tracked then
-			local timeoutValue = self.map:get(s, "timeout")
-			if timeoutValue then
-				return timeoutValue .. "s"
-			else
-				return "&#8212;"
-			end
-		else
-			return "&#8212;"
-		end
-	end
-
-interval = mwan_interface:option(DummyValue, "interval", translate("Ping interval"))
-	interval.rawhtml = true
-	function interval.cfgvalue(self, s)
-		if tracked then
-			local intervalValue = self.map:get(s, "interval")
-			if intervalValue then
-				return intervalValue .. "s"
-			else
-				return "&#8212;"
-			end
-		else
-			return "&#8212;"
-		end
-	end
-
-down = mwan_interface:option(DummyValue, "down", translate("Interface down"))
-	down.rawhtml = true
-	function down.cfgvalue(self, s)
-		if tracked then
-			return self.map:get(s, "down") or "&#8212;"
-		else
-			return "&#8212;"
-		end
-	end
-
-up = mwan_interface:option(DummyValue, "up", translate("Interface up"))
-	up.rawhtml = true
-	function up.cfgvalue(self, s)
-		if tracked then
-			return self.map:get(s, "up") or "&#8212;"
-		else
-			return "&#8212;"
-		end
-	end
-
-metric = mwan_interface:option(DummyValue, "metric", translate("Metric"))
-	metric.rawhtml = true
-	function metric.cfgvalue(self, s)
-		local metricValue = sys.exec("uci get -p /var/state network." .. s .. ".metric")
-		if metricValue ~= "" then
-			return metricValue
-		else
-			return "&#8212;"
-		end
-	end
-
-errors = mwan_interface:option(DummyValue, "errors", translate("Errors"))
-	errors.rawhtml = true
-	function errors.cfgvalue(self, s)
-		if errorFound == 1 then
-			local mouseOver, lineBreak = "", ""
-			if string.find(errorReliabilityList, " " .. s .. " ") then
-				mouseOver = "Higher reliability requirement than there are tracking IP addresses"
-				lineBreak = "&#10;&#10;"
-			end
-			if string.find(errorRouteList, " " .. s .. " ") then
-				mouseOver = mouseOver .. lineBreak .. "No default route in the main routing table"
-				lineBreak = "&#10;&#10;"
-			end
-			if string.find(errorNetConfigList, " " .. s .. " ") then
-				mouseOver = mouseOver .. lineBreak .. "Configured incorrectly or not at all in /etc/config/network"
-				lineBreak = "&#10;&#10;"
-			end
-			if string.find(errorNoMetricList, " " .. s .. " ") then
-				mouseOver = mouseOver .. lineBreak .. "No metric configured in /etc/config/network"
-				lineBreak = "&#10;&#10;"
-			end
-			if string.find(errorDuplicateMetricList, " " .. s .. " ") then
-				mouseOver = mouseOver .. lineBreak .. "Duplicate metric configured in /etc/config/network"
-			end
-			if mouseOver == "" then
-				return ""
-			else
-				return "<span title=\"" .. mouseOver .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
-			end
-		else
-			return ""
-		end
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interfaceconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interfaceconfig.lua
deleted file mode 100644
index 16a7ec39..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/interfaceconfig.lua
+++ /dev/null
@@ -1,190 +0,0 @@
--- ------ extra functions ------ --
-
-function interfaceCheck()
-	metricValue = ut.trim(sys.exec("uci get -p /var/state network." .. arg[1] .. ".metric"))
-	if metricValue == "" then -- no metric
-		errorNoMetric = 1
-	else -- if metric exists create list of interface metrics to compare against for duplicates
-		uci.cursor():foreach("mwan3", "interface",
-			function (section)
-				local metricValue = ut.trim(sys.exec("uci get -p /var/state network." .. section[".name"] .. ".metric"))
-				metricList = metricList .. section[".name"] .. " " .. metricValue .. "\n"
-			end
-		)
-		-- compare metric against list
-		local metricDuplicateNumbers, metricDuplicates = sys.exec("echo '" .. metricList .. "' | awk '{print $2}' | uniq -d"), ""
-		for line in metricDuplicateNumbers:gmatch("[^\r\n]+") do
-			metricDuplicates = sys.exec("echo '" .. metricList .. "' | grep '" .. line .. "' | awk '{print $1}'")
-			errorDuplicateMetricList = errorDuplicateMetricList .. metricDuplicates
-		end
-		if sys.exec("echo '" .. errorDuplicateMetricList .. "' | grep -w " .. arg[1]) ~= "" then
-			errorDuplicateMetric = 1
-		end
-	end
-	-- check if this interface has a higher reliability requirement than track IPs configured
-	local trackingNumber = tonumber(ut.trim(sys.exec("echo $(uci get -p /var/state mwan3." .. arg[1] .. ".track_ip) | wc -w")))
-	if trackingNumber > 0 then
-		local reliabilityNumber = tonumber(ut.trim(sys.exec("uci get -p /var/state mwan3." .. arg[1] .. ".reliability")))
-		if reliabilityNumber and reliabilityNumber > trackingNumber then
-			errorReliability = 1
-		end
-	end
-	-- check if any interfaces are not properly configured in /etc/config/network or have no default route in main routing table
-	if ut.trim(sys.exec("uci get -p /var/state network." .. arg[1])) == "interface" then
-		local interfaceDevice = ut.trim(sys.exec("uci get -p /var/state network." .. arg[1] .. ".ifname"))
-		if interfaceDevice == "uci: Entry not found" or interfaceDevice == "" then
-			errorNetConfig = 1
-			errorRoute = 1
-		else
-			local routeCheck = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $1}'"))
-			if routeCheck == "" then
-				errorRoute = 1
-			end
-		end
-	else
-		errorNetConfig = 1
-		errorRoute = 1
-	end
-end
-
-function interfaceWarnings() -- display warning messages at the top of the page
-	local warns, lineBreak = "", ""
-	if errorReliability == 1 then
-		warns = "<font color=\"ff0000\"><strong>WARNING: this interface has a higher reliability requirement than there are tracking IP addresses!</strong></font>"
-		lineBreak = "<br /><br />"
-	end
-	if errorRoute == 1 then
-		warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>WARNING: this interface has no default route in the main routing table!</strong></font>"
-		lineBreak = "<br /><br />"
-	end
-	if errorNetConfig == 1 then
-		warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>WARNING: this interface is configured incorrectly or not at all in /etc/config/network!</strong></font>"
-		lineBreak = "<br /><br />"
-	end
-	if errorNoMetric == 1 then
-		warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>WARNING: this interface has no metric configured in /etc/config/network!</strong></font>"
-	elseif errorDuplicateMetric == 1 then
-		warns = warns .. lineBreak .. "<font color=\"ff0000\"><strong>WARNING: this and other interfaces have duplicate metrics configured in /etc/config/network!</strong></font>"
-	end
-	return warns
-end
-
--- ------ interface configuration ------ --
-
-dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
-arg[1] = arg[1] or ""
-
-metricValue = ""
-metricList = ""
-errorDuplicateMetricList = ""
-errorNoMetric = 0
-errorDuplicateMetric = 0
-errorRoute = 0
-errorNetConfig = 0
-errorReliability = 0
-interfaceCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Interface Configuration - " .. arg[1]),
-	translate(interfaceWarnings()))
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "interface")
-
-
-mwan_interface = m5:section(NamedSection, arg[1], "interface", "")
-	mwan_interface.addremove = false
-	mwan_interface.dynamic = false
-
-
-enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled"))
-	enabled.default = "1"
-	enabled:value("1", translate("Yes"))
-	enabled:value("0", translate("No"))
-
-track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking IP"),
-	translate("This IP address will be pinged to dermine if the link is up or down. Leave blank to assume interface is always online"))
-	track_ip.datatype = "ipaddr"
-
-reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"),
-	translate("Acceptable values: 1-100. This many Tracking IP addresses must respond for the link to be deemed up"))
-	reliability.datatype = "range(1, 100)"
-	reliability.default = "1"
-
-count = mwan_interface:option(ListValue, "count", translate("Ping count"))
-	count.default = "1"
-	count:value("1")
-	count:value("2")
-	count:value("3")
-	count:value("4")
-	count:value("5")
-
-timeout = mwan_interface:option(ListValue, "timeout", translate("Ping timeout"))
-	timeout.default = "2"
-	timeout:value("1", translate("1 second"))
-	timeout:value("2", translate("2 seconds"))
-	timeout:value("3", translate("3 seconds"))
-	timeout:value("4", translate("4 seconds"))
-	timeout:value("5", translate("5 seconds"))
-	timeout:value("6", translate("6 seconds"))
-	timeout:value("7", translate("7 seconds"))
-	timeout:value("8", translate("8 seconds"))
-	timeout:value("9", translate("9 seconds"))
-	timeout:value("10", translate("10 seconds"))
-
-interval = mwan_interface:option(ListValue, "interval", translate("Ping interval"))
-	interval.default = "5"
-	interval:value("1", translate("1 second"))
-	interval:value("3", translate("3 seconds"))
-	interval:value("5", translate("5 seconds"))
-	interval:value("10", translate("10 seconds"))
-	interval:value("20", translate("20 seconds"))
-	interval:value("30", translate("30 seconds"))
-	interval:value("60", translate("1 minute"))
-	interval:value("300", translate("5 minutes"))
-	interval:value("600", translate("10 minutes"))
-	interval:value("900", translate("15 minutes"))
-	interval:value("1800", translate("30 minutes"))
-	interval:value("3600", translate("1 hour"))
-
-down = mwan_interface:option(ListValue, "down", translate("Interface down"),
-	translate("Interface will be deemed down after this many failed ping tests"))
-	down.default = "3"
-	down:value("1")
-	down:value("2")
-	down:value("3")
-	down:value("4")
-	down:value("5")
-	down:value("6")
-	down:value("7")
-	down:value("8")
-	down:value("9")
-	down:value("10")
-
-up = mwan_interface:option(ListValue, "up", translate("Interface up"),
-	translate("Downed interface will be deemed up after this many successful ping tests"))
-	up.default = "3"
-	up:value("1")
-	up:value("2")
-	up:value("3")
-	up:value("4")
-	up:value("5")
-	up:value("6")
-	up:value("7")
-	up:value("8")
-	up:value("9")
-	up:value("10")
-
-metric = mwan_interface:option(DummyValue, "metric", translate("Metric"),
-	translate("This displays the metric assigned to this interface in /etc/config/network"))
-	metric.rawhtml = true
-	function metric.cfgvalue(self, s)
-		if errorNoMetric == 0 then
-			return metricValue
-		else
-			return "&#8212;"
-		end
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/member.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/member.lua
deleted file mode 100644
index 3bccbd94..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/member.lua
+++ /dev/null
@@ -1,46 +0,0 @@
--- ------ member configuration ------ --
-
-ds = require "luci.dispatcher"
-
-
-m5 = Map("mwan3", translate("MWAN Member Configuration"))
-	m5:append(Template("mwan/config_css"))
-
-
-mwan_member = m5:section(TypedSection, "member", translate("Members"),
-	translate("Members are profiles attaching a metric and weight to an MWAN interface<br />" ..
-	"Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
-	"Members may not share the same name as configured interfaces, policies or rules"))
-	mwan_member.addremove = true
-	mwan_member.dynamic = false
-	mwan_member.sectionhead = "Member"
-	mwan_member.sortable = true
-	mwan_member.template = "cbi/tblsection"
-	mwan_member.extedit = ds.build_url("admin", "network", "mwan", "configuration", "member", "%s")
-	function mwan_member.create(self, section)
-		TypedSection.create(self, section)
-		m5.uci:save("mwan3")
-		luci.http.redirect(ds.build_url("admin", "network", "mwan", "configuration", "member", section))
-	end
-
-
-interface = mwan_member:option(DummyValue, "interface", translate("Interface"))
-	interface.rawhtml = true
-	function interface.cfgvalue(self, s)
-		return self.map:get(s, "interface") or "&#8212;"
-	end
-
-metric = mwan_member:option(DummyValue, "metric", translate("Metric"))
-	metric.rawhtml = true
-	function metric.cfgvalue(self, s)
-		return self.map:get(s, "metric") or "1"
-	end
-
-weight = mwan_member:option(DummyValue, "weight", translate("Weight"))
-	weight.rawhtml = true
-	function weight.cfgvalue(self, s)
-		return self.map:get(s, "weight") or "1"
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/memberconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/memberconfig.lua
deleted file mode 100644
index 181d22e0..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/memberconfig.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- ------ extra functions ------ --
-
-function cbi_add_interface(field)
-	uci.cursor():foreach("mwan3", "interface",
-		function (section)
-			field:value(section[".name"])
-		end
-	)
-end
-
--- ------ member configuration ------ --
-
-dsp = require "luci.dispatcher"
-arg[1] = arg[1] or ""
-
-
-m5 = Map("mwan3", translate("MWAN Member Configuration - ") .. arg[1])
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "member")
-
-
-mwan_member = m5:section(NamedSection, arg[1], "member", "")
-	mwan_member.addremove = false
-	mwan_member.dynamic = false
-
-
-interface = mwan_member:option(Value, "interface", translate("Interface"))
-	cbi_add_interface(interface)
-
-metric = mwan_member:option(Value, "metric", translate("Metric"),
-	translate("Acceptable values: 1-1000. Defaults to 1 if not set"))
-	metric.datatype = "range(1, 1000)"
-
-weight = mwan_member:option(Value, "weight", translate("Weight"),
-	translate("Acceptable values: 1-1000. Defaults to 1 if not set"))
-	weight.datatype = "range(1, 1000)"
-
-
--- ------ currently configured interfaces ------ --
-
-mwan_interface = m5:section(TypedSection, "interface", translate("Currently Configured Interfaces"))
-	mwan_interface.addremove = false
-	mwan_interface.dynamic = false
-	mwan_interface.sortable = false
-	mwan_interface.template = "cbi/tblsection"
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policy.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policy.lua
deleted file mode 100644
index e141d696..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policy.lua
+++ /dev/null
@@ -1,95 +0,0 @@
--- ------ extra functions ------ --
-
-function policyCheck() -- check to see if any policy names exceed the maximum of 15 characters
-	uci.cursor():foreach("mwan3", "policy",
-		function (section)
-			if string.len(section[".name"]) > 15 then
-				nameTooLong = 1
-				err_name_list = err_name_list .. section[".name"] .. " "
-			end
-		end
-	)
-end
-
-function policyWarn() -- display status and warning messages at the top of the page
-	if nameTooLong == 1 then
-		return "<font color=\"ff0000\"><strong>WARNING: Some policies have names exceeding the maximum of 15 characters!</strong></font>"
-	else
-		return ""
-	end
-end
-
--- ------ policy configuration ------ --
-
-ds = require "luci.dispatcher"
-sys = require "luci.sys"
-
-nameTooLong = 0
-err_name_list = " "
-policyCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Policy Configuration"),
-	translate(policyWarn()))
-	m5:append(Template("mwan/config_css"))
-
-
-mwan_policy = m5:section(TypedSection, "policy", translate("Policies"),
-	translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" ..
-	"Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" ..
-	"Load-balanced member interfaces distribute more traffic out those with higher weights<br />" ..
-	"Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be 15 characters or less<br />" ..
-	"Policies may not share the same name as configured interfaces, members or rules"))
-	mwan_policy.addremove = true
-	mwan_policy.dynamic = false
-	mwan_policy.sectionhead = "Policy"
-	mwan_policy.sortable = true
-	mwan_policy.template = "cbi/tblsection"
-	mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "configuration", "policy", "%s")
-	function mwan_policy.create(self, section)
-		TypedSection.create(self, section)
-		m5.uci:save("mwan3")
-		luci.http.redirect(ds.build_url("admin", "network", "mwan", "configuration", "policy", section))
-	end
-
-
-use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned"))
-	use_member.rawhtml = true
-	function use_member.cfgvalue(self, s)
-		local memberConfig, memberList = self.map:get(s, "use_member"), ""
-		if memberConfig then
-			for k,v in pairs(memberConfig) do
-				memberList = memberList .. v .. "<br />"
-			end
-			return memberList
-		else
-			return "&#8212;"
-		end
-		
-	end
-
-last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort"))
-	last_resort.rawhtml = true
-	function last_resort.cfgvalue(self, s)
-		local action = self.map:get(s, "last_resort")
-		if action == "blackhole" then
-			return "blackhole (drop)"
-		elseif action == "default" then
-			return "default (use main routing table)"
-		else
-			return "unreachable (reject)"
-		end
-	end
-
-errors = mwan_policy:option(DummyValue, "errors", translate("Errors"))
-	errors.rawhtml = true
-	function errors.cfgvalue(self, s)
-		if not string.find(err_name_list, " " .. s .. " ") then
-			return ""
-		else
-			return "<span title=\"Name exceeds 15 characters\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
-		end
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policyconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policyconfig.lua
deleted file mode 100644
index f48a104c..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/policyconfig.lua
+++ /dev/null
@@ -1,65 +0,0 @@
--- ------ extra functions ------ --
-
-function policyCheck() -- check to see if this policy's name exceed the maximum of 15 characters
-	policyNameLength = string.len(arg[1])
-	if policyNameLength > 15 then
-		nameTooLong = 1
-	end
-end
-
-function policyWarn() -- display status and warning messages at the top of the page
-	if nameTooLong == 1 then
-		return "<font color=\"ff0000\"><strong>WARNING: this policy's name is " .. policyNameLength .. " characters exceeding the maximum of 15!</strong></font>"
-	else
-		return ""
-	end
-end
-
-function cbiAddMember(field)
-	uci.cursor():foreach("mwan3", "member",
-		function (section)
-			field:value(section[".name"])
-		end
-	)
-end
-
--- ------ policy configuration ------ --
-
-dsp = require "luci.dispatcher"
-arg[1] = arg[1] or ""
-
-nameTooLong = 0
-policyCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Policy Configuration - " .. arg[1]),
-	translate(policyWarn()))
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "policy")
-
-
-mwan_policy = m5:section(NamedSection, arg[1], "policy", "")
-	mwan_policy.addremove = false
-	mwan_policy.dynamic = false
-
-
-use_member = mwan_policy:option(DynamicList, "use_member", translate("Member used"))
-	cbiAddMember(use_member)
-
-last_resort = mwan_policy:option(ListValue, "last_resort", translate("Last resort"),
-	translate("When all policy members are offline use this behavior for matched traffic"))
-	last_resort.default = "unreachable"
-	last_resort:value("unreachable", translate("unreachable (reject)"))
-	last_resort:value("blackhole", translate("blackhole (drop)"))
-	last_resort:value("default", translate("default (use main routing table)"))
-
-
--- ------ currently configured members ------ --
-
-mwan_member = m5:section(TypedSection, "member", translate("Currently Configured Members"))
-	mwan_member.addremove = false
-	mwan_member.dynamic = false
-	mwan_member.sortable = false
-	mwan_member.template = "cbi/tblsection"
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/rule.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/rule.lua
deleted file mode 100644
index cbd8bdd0..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/rule.lua
+++ /dev/null
@@ -1,141 +0,0 @@
--- ------ extra functions ------ --
-
-function ruleCheck() -- determine if rules needs a proper protocol configured
-	uci.cursor():foreach("mwan3", "rule",
-		function (section)
-			local sourcePort = ut.trim(sys.exec("uci get -p /var/state mwan3." .. section[".name"] .. ".src_port"))
-			local destPort = ut.trim(sys.exec("uci get -p /var/state mwan3." .. section[".name"] .. ".dest_port"))
-			if sourcePort ~= "" or destPort ~= "" then -- ports configured
-				local protocol = ut.trim(sys.exec("uci get -p /var/state mwan3." .. section[".name"] .. ".proto"))
-				if protocol == "" or protocol == "all" then -- no or improper protocol
-					error_protocol_list = error_protocol_list .. section[".name"] .. " "
-				end
-			end
-		end
-	)
-end
-
-function ruleWarn() -- display warning messages at the top of the page
-	if error_protocol_list ~= " " then
-		return "<font color=\"ff0000\"><strong>WARNING: some rules have a port configured with no or improper protocol specified! Please configure a specific protocol!</strong></font>"
-	else
-		return ""
-	end
-end
-
--- ------ rule configuration ------ --
-
-dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
-
-error_protocol_list = " "
-ruleCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Rule Configuration"),
-	translate(ruleWarn()))
-	m5:append(Template("mwan/config_css"))
-
-
-mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"),
-	translate("Rules specify which traffic will use a particular MWAN policy based on IP address, port or protocol<br />" ..
-	"Rules are matched from top to bottom. Rules below a matching rule are ignored. Traffic not matching any rule is routed using the main routing table<br />" ..
-	"Traffic destined for known (other than default) networks is handled by the main routing table. Traffic matching a rule, but all WAN interfaces for that policy are down will be blackholed<br />" ..
-	"Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
-	"Rules may not share the same name as configured interfaces, members or policies"))
-	mwan_rule.addremove = true
-	mwan_rule.anonymous = false
-	mwan_rule.dynamic = false
-	mwan_rule.sectionhead = "Rule"
-	mwan_rule.sortable = true
-	mwan_rule.template = "cbi/tblsection"
-	mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "rule", "%s")
-	function mwan_rule.create(self, section)
-		TypedSection.create(self, section)
-		m5.uci:save("mwan3")
-		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "rule", section))
-	end
-
-
-src_ip = mwan_rule:option(DummyValue, "src_ip", translate("Source address"))
-	src_ip.rawhtml = true
-	function src_ip.cfgvalue(self, s)
-		return self.map:get(s, "src_ip") or "&#8212;"
-	end
-
-src_port = mwan_rule:option(DummyValue, "src_port", translate("Source port"))
-	src_port.rawhtml = true
-	function src_port.cfgvalue(self, s)
-		return self.map:get(s, "src_port") or "&#8212;"
-	end
-
-dest_ip = mwan_rule:option(DummyValue, "dest_ip", translate("Destination address"))
-	dest_ip.rawhtml = true
-	function dest_ip.cfgvalue(self, s)
-		return self.map:get(s, "dest_ip") or "&#8212;"
-	end
-
-dest_port = mwan_rule:option(DummyValue, "dest_port", translate("Destination port"))
-	dest_port.rawhtml = true
-	function dest_port.cfgvalue(self, s)
-		return self.map:get(s, "dest_port") or "&#8212;"
-	end
-
-proto = mwan_rule:option(DummyValue, "proto", translate("Protocol"))
-	proto.rawhtml = true
-	function proto.cfgvalue(self, s)
-		return self.map:get(s, "proto") or "all"
-	end
-
-sticky = mwan_rule:option(DummyValue, "sticky", translate("Sticky"))
-	sticky.rawhtml = true
-	function sticky.cfgvalue(self, s)
-		if self.map:get(s, "sticky") == "1" then
-			stickied = 1
-			return "Yes"
-		else
-			stickied = nil
-			return "No"
-		end
-	end
-
-timeout = mwan_rule:option(DummyValue, "timeout", translate("Sticky timeout"))
-	timeout.rawhtml = true
-	function timeout.cfgvalue(self, s)
-		if stickied then
-			local timeoutValue = self.map:get(s, "timeout")
-			if timeoutValue then
-				return timeoutValue .. "s"
-			else
-				return "600s"
-			end
-		else
-			return "&#8212;"
-		end
-	end
-
-ipset = mwan_rule:option(DummyValue, "ipset", translate("IPset"))
-	ipset.rawhtml = true
-	function ipset.cfgvalue(self, s)
-		return self.map:get(s, "ipset") or "&#8212;"
-	end
-
-use_policy = mwan_rule:option(DummyValue, "use_policy", translate("Policy assigned"))
-	use_policy.rawhtml = true
-	function use_policy.cfgvalue(self, s)
-		return self.map:get(s, "use_policy") or "&#8212;"
-	end
-
-errors = mwan_rule:option(DummyValue, "errors", translate("Errors"))
-	errors.rawhtml = true
-	function errors.cfgvalue(self, s)
-		if not string.find(error_protocol_list, " " .. s .. " ") then
-			return ""
-		else
-			return "<span title=\"No protocol specified\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
-		end
-	end
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/ruleconfig.lua b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/ruleconfig.lua
deleted file mode 100644
index d880a72e..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/model/cbi/mwan/ruleconfig.lua
+++ /dev/null
@@ -1,113 +0,0 @@
--- ------ extra functions ------ --
-
-function ruleCheck() -- determine if rule needs a protocol specified
-	local sourcePort = ut.trim(sys.exec("uci get -p /var/state mwan3." .. arg[1] .. ".src_port"))
-	local destPort = ut.trim(sys.exec("uci get -p /var/state mwan3." .. arg[1] .. ".dest_port"))
-	if sourcePort ~= "" or destPort ~= "" then -- ports configured
-		local protocol = ut.trim(sys.exec("uci get -p /var/state mwan3." .. arg[1] .. ".proto"))
-		if protocol == "" or protocol == "all" then -- no or improper protocol
-			error_protocol = 1
-		end
-	end
-end
-
-function ruleWarn() -- display warning message at the top of the page
-	if error_protocol == 1 then
-		return "<font color=\"ff0000\"><strong>WARNING: this rule is incorrectly configured with no or improper protocol specified! Please configure a specific protocol!</strong></font>"
-	else
-		return ""
-	end
-end
-
-function cbiAddPolicy(field)
-	uci.cursor():foreach("mwan3", "policy",
-		function (section)
-			field:value(section[".name"])
-		end
-	)
-end
-
-function cbiAddProtocol(field)
-	local protocols = ut.trim(sys.exec("cat /etc/protocols | grep '	# ' | awk '{print $1}' | grep -vw -e 'ip' -e 'tcp' -e 'udp' -e 'icmp' -e 'esp' | grep -v 'ipv6' | sort | tr '\n' ' '"))
-	for p in string.gmatch(protocols, "%S+") do
-		field:value(p)
-	end
-end
-
--- ------ rule configuration ------ --
-
-dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
-arg[1] = arg[1] or ""
-
-error_protocol = 0
-ruleCheck()
-
-
-m5 = Map("mwan3", translate("MWAN Rule Configuration - ") .. arg[1],
-	translate(ruleWarn()))
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "rule")
-
-
-mwan_rule = m5:section(NamedSection, arg[1], "rule", "")
-	mwan_rule.addremove = false
-	mwan_rule.dynamic = false
-
-
-src_ip = mwan_rule:option(Value, "src_ip", translate("Source address"),
-	translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"))
-	src_ip.datatype = ipaddr
-
-src_port = mwan_rule:option(Value, "src_port", translate("Source port"),
-	translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes"))
-
-dest_ip = mwan_rule:option(Value, "dest_ip", translate("Destination address"),
-	translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"))
-	dest_ip.datatype = ipaddr
-
-dest_port = mwan_rule:option(Value, "dest_port", translate("Destination port"),
-	translate("May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or as a portrange (eg \"1024:2048\") without quotes"))
-
-proto = mwan_rule:option(Value, "proto", translate("Protocol"),
-	translate("View the contents of /etc/protocols for protocol descriptions"))
-	proto.default = "all"
-	proto.rmempty = false
-	proto:value("all")
-	proto:value("ip")
-	proto:value("tcp")
-	proto:value("udp")
-	proto:value("icmp")
-	proto:value("esp")
-	cbiAddProtocol(proto)
-
-sticky = mwan_rule:option(ListValue, "sticky", translate("Sticky"),
-	translate("Traffic from the same source IP address that previously matched this rule within the sticky timeout period will use the same WAN interface"))
-	sticky.default = "0"
-	sticky:value("1", translate("Yes"))
-	sticky:value("0", translate("No"))
-
-timeout = mwan_rule:option(Value, "timeout", translate("Sticky timeout"),
-	translate("Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"))
-	timeout.datatype = "range(1, 1000000)"
-
-ipset = mwan_rule:option(Value, "ipset", translate("IPset"),
-	translate("Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/youtube.com/youtube\")"))
-
-use_policy = mwan_rule:option(Value, "use_policy", translate("Policy assigned"))
-	cbiAddPolicy(use_policy)
-	use_policy:value("unreachable", translate("unreachable (reject)"))
-	use_policy:value("blackhole", translate("blackhole (drop)"))
-	use_policy:value("default", translate("default (use main routing table)"))
-
-
--- ------ currently configured policies ------ --
-
-mwan_policy = m5:section(TypedSection, "policy", translate("Currently Configured Policies"))
-	mwan_policy.addremove = false
-	mwan_policy.dynamic = false
-	mwan_policy.sortable = false
-	mwan_policy.template = "cbi/tblsection"
-
-
-return m5
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan.htm
deleted file mode 100644
index 53b997af..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/admin_status/index/mwan.htm
+++ /dev/null
@@ -1 +0,0 @@
-<%+mwan/openwrt_overview_status%>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_diagnostics.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_diagnostics.htm
deleted file mode 100644
index 19615695..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_diagnostics.htm
+++ /dev/null
@@ -1,128 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<%
-	local uci = require "luci.model.uci"
-
-	interfaceNames = ""
-	uci.cursor():foreach("mwan3", "interface",
-		function (section)
-			interfaceNames = interfaceNames .. section[".name"] .. " "
-		end
-	)
-%>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	var stxhr = new XHR();
-
-	function update_status(tool, task)
-	{
-		var iface = document.getElementById('mwaniface').value;
-		var output = document.getElementById('diag_output');
-
-		if (tool == "service")
-			{
-				output.innerHTML =
-					'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
-					"Waiting for MWAN to " + task + "..."
-				;
-			}
-			else
-			{
-				output.innerHTML =
-					'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
-					"Waiting for diagnostic results..."
-				;
-			}
-
-		output.parentNode.style.display = 'block';
-		output.style.display = 'inline';
-
-		stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "mwan", "advanced")%>/diagnostics_display' + '/' + iface + '/' + tool + '/' + task, null,
-			function(x, mArray)
-			{
-				if (mArray.diagnostics)
-				{
-					output.innerHTML = String.format('<pre id="diag_output_css">%h</pre>', mArray.diagnostics[0]);
-				}
-				else
-				{
-					output.innerHTML = '<pre id="diag_output_css"><strong>No diagnostic results returned</strong></pre>';
-				}
-			}
-		);
-	}
-//]]></script>
-
-<div id="mwan_diagnostics" class="cbi-map">
-	<fieldset id="diag_select" class="cbi-section">
-		<legend><%:MWAN Interface Diagnostics%></legend>
-		<select id="mwaniface">
-			<% for z in interfaceNames:gmatch("[^ ]+") do -%><option value="<%=z%>"><%=z%></option><%- end %>
-		</select>
-		<div id="buttoncss">
-			<input type="button" value="<%:Ping default gateway%>" class="cbi-button cbi-button-apply" onclick="update_status('ping', 'gateway')" />
-			<input type="button" value="<%:Ping tracking IP%>" class="cbi-button cbi-button-apply" onclick="update_status('ping', 'track_ip')" />
-			<input type="button" value="<%:Check IP rules%>" class="cbi-button cbi-button-apply" onclick="update_status('rulechk', null)" />
-			<input type="button" value="<%:Check routing table%>" class="cbi-button cbi-button-apply" onclick="update_status('routechk', null)" />
-			<input type="button" value="<%:Hotplug ifup%>" class="cbi-button cbi-button-apply" onclick="update_status('hotplug', 'ifup')" />
-			<input type="button" value="<%:Hotplug ifdown%>" class="cbi-button cbi-button-apply" onclick="update_status('hotplug', 'ifdown')" />
-		</div>
-	</fieldset>
-	<fieldset id="diag_select" class="cbi-section">
-		<legend><%:MWAN Service Control%></legend>
-		<div id="buttoncss">
-			<input type="button" value="<%:Restart MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'restart')" />
-			<input type="button" value="<%:Stop MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'stop')" />
-			<input type="button" value="<%:Start MWAN%>" class="cbi-button cbi-button-apply" onclick="update_status('service', 'start')" />
-		</div>
-	</fieldset>
-	<fieldset class="cbi-section" style="display:none">
-		<legend><%:Diagnostic Results%></legend>
-		<div id="diag_output"></div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {  /* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #mwan_diagnostics {
-	background-color: #FFFFFF;
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-  #diag_select {
-	padding: 12px 20px 20px 20px;
-  }
-  #mwaniface {
-	float: left;
-	margin: 8px 20px 0px 0px;
-  }
-  #buttoncss {
-	display: table;
-	float: left;
-	text-align: left;
-  }
-  .cbi-button {
-	margin: 8px 20px 0px 0px;
-	min-width: 153px;
-  }
-  #diag_output_css {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
-<%+footer%>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_hotplugscript.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_hotplugscript.htm
deleted file mode 100644
index cbef94b0..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_hotplugscript.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin: 0px 0px 0px 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  .cbi-section-node {
-	margin-top: 20px;
-  }
-  .cbi-section {
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-</style>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_mwanconfig.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_mwanconfig.htm
deleted file mode 100644
index 5d83bdda..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_mwanconfig.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin: 0px 0px 0px 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  .cbi-section-node {
-	margin-top: 20px;
-  }
-  .cbi-section {
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-</style>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_networkconfig.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_networkconfig.htm
deleted file mode 100644
index 5c06d362..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_networkconfig.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin: 0px 0px 0px 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  .cbi-section-node {
-	margin-top: 20px;
-  }
-  .cbi-section {
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-</style>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_troubleshooting.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_troubleshooting.htm
deleted file mode 100644
index 514d91f9..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/advanced_troubleshooting.htm
+++ /dev/null
@@ -1,71 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/hotplugscript")%>"><%:Hotplug Script%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/mwanconfig")%>"><%:MWAN Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/networkconfig")%>"><%:Network Config%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/diagnostics")%>"><%:Diagnostics%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/advanced/troubleshooting")%>"><%:Troubleshooting%></a></li>
-</ul>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "advanced", "troubleshooting_display")%>', null,
-		function(x, mArray)
-		{
-			var tshoot = document.getElementById('troubleshoot_text');
-			if (mArray.versions)
-			{
-				var versions = '<span class="description">Software versions : </span><br /><br />';
-				var mwanConfig = '<br /><br /><span class="description">Output of &#34;cat /etc/config/mwan3&#34; : </span><br /><br />';
-				var netConfig = '<br /><br /><span class="description">Output of &#34;cat /etc/config/network&#34; : </span><br /><br />';
-				var ifconfig = '<br /><br /><span class="description">Output of &#34;ifconfig&#34; : </span><br /><br />';
-				var ipRoute = '<br /><br /><span class="description">Output of &#34;route -n&#34; : </span><br /><br />';
-				var ipRuleShow = '<br /><br /><span class="description">Output of &#34;ip rule show&#34; : </span><br /><br />';
-				var routeListTable = '<br /><br /><span class="description">Output of &#34;ip route list table 1-250&#34; : </span><br /><br />';
-				var firewallOut = '<br /><br /><span class="description">Firewall default output policy (must be ACCEPT) : </span><br /><br />';
-				var iptables = '<br /><br /><span class="description">Output of &#34;iptables -L -t mangle -v -n&#34; : </span><br /><br />';
-				tshoot.innerHTML = String.format(
-					'<pre>%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s</pre>',
-					versions, mArray.versions[0], mwanConfig, mArray.mwanconfig[0], netConfig, mArray.netconfig[0],
-					ifconfig, mArray.ifconfig[0], ipRoute, mArray.routeshow[0], ipRuleShow, mArray.iprule[0],
-					routeListTable, mArray.routelist[0], firewallOut, mArray.firewallout[0], iptables, mArray.iptables[0]
-				);
-			}
-			else
-			{
-				tshoot.innerHTML = '<strong>Error collecting troubleshooting information</strong>';
-			}
-		}
-	);
-//]]></script>
-
-<div id="troubleshoot">
-	<fieldset class="cbi-section">
-		<legend><%:Troubleshooting Data%></legend>
-		<div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #troubleshoot {
-	background-color: #FFFFFF;
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-  #troubleshoot_text {
-	padding: 20px;
-	text-align: left;
-  }
-  .description {
-	background-color: rgb(78, 186, 241);
-  }
-</style>
-
-<%+footer%>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/config_css.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/config_css.htm
deleted file mode 100644
index 99da4875..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/config_css.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  table td {	/* cells showing the configuration values */
-	padding: 0px;
-	text-align: center;
-	vertical-align: middle;
-  }
-  table th {	/* column for configuration section name */
-	padding: 0px;
-	text-align: center;
-	vertical-align: middle;
-  }
-  table tbody th {	/* column for configuration section name */
-	padding: 0px;
-	vertical-align: middle;
-  }
-  .cbi-section-node table div {	/* rows */
-	padding-top: 5px;
-  }
-  table.cbi-section-table td.cbi-section-table-cell {	/* sort buttons column */
-	text-align: center;
-  }
-  .cbi-section h3 {
-	color: rgb(85, 85, 85);
-	font-family: Trebuchet MS,Verdana,sans-serif;
-	font-style: italic;
-	font-weight: normal;
-  }
-</style>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
deleted file mode 100644
index 6dec9c8e..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/openwrt_overview_status.htm
+++ /dev/null
@@ -1,83 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "interface_status")%>', null,
-		function(x, mArray)
-		{
-			var status = document.getElementById('mwan_status_text');
-			if (mArray.wans)
-			{
-				var temp = '';
-				for( var i = 0; i < mArray.wans.length; i++ )
-				{
-					var stat = '';
-					var cssc = '';
-					switch (mArray.wans[i].status)
-					{
-						case 'online':
-							stat = 'Online (tracking active)';
-							cssc = 'wanon';
-							break;
-						case 'notMonitored':
-							stat = 'Online (tracking off)';
-							cssc = 'wanon';
-							break;
-						case 'offline':
-							stat = 'Offline';
-							cssc = 'wanoff';
-							break;
-						case 'notEnabled':
-							stat = 'Disabled';
-							cssc = 'wanoff';
-							break;
-					}
-					temp += String.format(
-						'<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>',
-						cssc, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, stat
-					);
-				}
-				status.innerHTML = temp;
-			}
-			else
-			{
-				status.innerHTML = '<strong>No MWAN interfaces found</strong>';
-			}
-		}
-	);
-//]]></script>
-
-<fieldset id="interface_field" class="cbi-section">
-	<legend><%:MWAN Interface Live Status%></legend>
-	<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-</fieldset>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: 1044px;
-  }
-  #interface_field {
-	padding: 12px 20px 20px 20px;
-  }
-  #mwan_status_text {
-	display: table;
-	font-size: 14px;
-	margin: auto;
-	max-width: 1044px;
-	min-width: 246px;
-	width: 100%;
-  }
-  .wanon {
-	background-color: rgb(144, 240, 144);
-  }
-  .wanoff {
-	background-color: rgb(240, 144, 144);
-  }
-  .wanon, .wanoff {
-	border-radius: 60px;
-	box-shadow: 0px 2px 5px -3px;
-	float: left;
-	margin: 8px 3px 0px 3px;
-	min-height: 30px;
-	min-width: 235px;
-	padding: 5px 10px 8px 10px;
-	text-align: center;
-  }
-</style>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_detailed.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_detailed.htm
deleted file mode 100644
index b80b9f3a..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_detailed.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview/overview_detailed")%>"><%:Detailed Status%></a></li>
-</ul>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "detailed_status")%>', null,
-		function(x, mArray)
-		{
-			var status = document.getElementById('mwan_detail_text');
-			if (mArray.mwandetail)
-			{
-				status.innerHTML = String.format('<pre>%s</pre>', mArray.mwandetail[0]);
-			}
-			else
-			{
-				status.innerHTML = '<strong>No detailed status information available</strong>';
-			}
-		}
-	);
-//]]></script>
-
-<div id="mwan_detail_status">
-	<fieldset class="cbi-section">
-		<legend><%:MWAN Detailed Status%></legend>
-		<div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #mwan_detail_status {
-	border: 1px dotted #555555;
-	background-color: #FFFFFF;
-	padding: 20px;
-  }
-  #mwan_detail_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
-<%+footer%>
diff --git a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm b/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
deleted file mode 100644
index 776fd4ce..00000000
--- a/trunk/package/feeds/packages/mwan3-luci/files/usr/lib/lua/luci/view/mwan/overview_interface.htm
+++ /dev/null
@@ -1,122 +0,0 @@
-<%+header%>
-
-<ul class="cbi-tabmenu">
-	<li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview")%>"><%:Interface Status%></a></li>
-	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/network/mwan/overview/overview_detailed")%>"><%:Detailed Status%></a></li>
-</ul>
-
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "mwan", "overview", "interface_status")%>', null,
-		function(x, mArray)
-		{
-			var statusDiv = document.getElementById('mwan_status_text');
-			if (mArray.wans)
-			{
-				var interfaceStatus = '';
-				for( var i = 0; i < mArray.wans.length; i++ )
-				{
-					var status = '';
-					var css = '';
-					switch (mArray.wans[i].status)
-					{
-						case 'online':
-							status = 'Online (tracking active)';
-							css = 'wanon';
-							break;
-						case 'notMonitored':
-							status = 'Online (tracking off)';
-							css = 'wanon';
-							break;
-						case 'offline':
-							status = 'Offline';
-							css = 'wanoff';
-							break;
-						case 'notEnabled':
-							status = 'Disabled';
-							css = 'wanoff';
-							break;
-					}
-					interfaceStatus += String.format(
-						'<span class="%s"><strong>%s (<a href="%q">%s</a>)</strong><br />%s</span>',
-						css, mArray.wans[i].name, mArray.wans[i].link, mArray.wans[i].ifname, status
-					);
-				}
-				statusDiv.innerHTML = interfaceStatus;
-			}
-			else
-			{
-				statusDiv.innerHTML = '<strong>No MWAN interfaces found</strong>';
-			}
-
-			var logs = document.getElementById('mwan_statuslog_text');
-			if (mArray.mwanlog)
-			{
-				var mwanLog = 'Last 50 MWAN systemlog entries. Newest entries sorted at the top :';
-				logs.innerHTML = String.format('<pre>%s<br /><br />%s</pre>', mwanLog, mArray.mwanlog[0]);
-			}
-			else
-			{
-				logs.innerHTML = '<strong>No MWAN systemlog history found</strong>';
-			}
-		}
-	);
-//]]></script>
-
-<div id="mwan_interface_status">
-	<fieldset id="interface_field" class="cbi-section">
-		<legend><%:MWAN Interface Live Status%></legend>
-		<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-	<fieldset class="cbi-section">
-		<legend><%:MWAN Interface Systemlog%></legend>
-		<div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
-	</fieldset>
-</div>
-
-<style type="text/css">
-  .container {	/* container for entire page. fixes bootstrap theme's ridiculously small page width */
-	max-width: none;
-	margin-left: 30px;
-	padding-right: 30px;
-	width: auto;
-  }
-  #mwan_interface_status {
-	background-color: #FFFFFF;
-	border: 1px dotted #555555;
-	padding: 20px;
-  }
-  #interface_field {
-	padding: 12px 20px 20px 20px;
-  }
-  #mwan_status_text {
-	display: table;
-	font-size: 14px;
-	margin: auto;
-	max-width: 1044px;
-	min-width: 246px;
-	width: 100%;
-  }
-  .wanon {
-	background-color: rgb(144, 240, 144);
-  }
-  .wanoff {
-	background-color: rgb(240, 144, 144);
-  }
-  .wanon, .wanoff {
-	border-radius: 60px;
-	box-shadow: 0px 2px 5px -3px;
-	float: left;
-	margin: 8px 3px 0px 3px;
-	min-height: 30px;
-	min-width: 235px;
-	padding: 5px 10px 8px 10px;
-	text-align: center;
-  }
-  #mwan_statuslog_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
-<%+footer%>
diff --git a/trunk/package/feeds/packages/mwan3/Makefile b/trunk/package/feeds/packages/mwan3/Makefile
deleted file mode 100644
index d714d4fe..00000000
--- a/trunk/package/feeds/packages/mwan3/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mwan3
-PKG_VERSION:=1.6
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
-PKG_LICENSE:=GPLv2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mwan3
-   SECTION:=net
-   CATEGORY:=Network
-   SUBMENU:=Routing and Redirection
-   DEPENDS:=+ip +ipset +iptables +iptables-mod-conntrack-extra +iptables-mod-ipopt
-   TITLE:=Multiwan hotplug script with connection tracking support
-   MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
-   PKGARCH:=all
-endef
-
-define Package/mwan3/description
-Hotplug script which makes configuration of multiple WAN interfaces simple
-and manageable. With loadbalancing/failover support for up to 250 wan
-interfaces, connection tracking and an easy to manage traffic ruleset.
-endef
-
-define Package/mwan3/conffiles
-/etc/config/mwan3
-endef
-
-define Build/Compile
-endef
-
-define Package/mwan3/install
-$(CP) ./files/* $(1)
-endef
-
-$(eval $(call BuildPackage,mwan3))
diff --git a/trunk/package/feeds/packages/mwan3/files/etc/config/mwan3 b/trunk/package/feeds/packages/mwan3/files/etc/config/mwan3
deleted file mode 100644
index f66c024c..00000000
--- a/trunk/package/feeds/packages/mwan3/files/etc/config/mwan3
+++ /dev/null
@@ -1,80 +0,0 @@
-
-config interface 'wan'
-	option enabled '1'
-	list track_ip '8.8.4.4'
-	list track_ip '8.8.8.8'
-	list track_ip '208.67.222.222'
-	list track_ip '208.67.220.220'
-	option reliability '2'
-	option count '1'
-	option timeout '2'
-	option interval '5'
-	option down '3'
-	option up '8'
-
-config interface 'wan2'
-	option enabled '0'
-	list track_ip '8.8.8.8'
-	list track_ip '208.67.220.220'
-	option reliability '1'
-	option count '1'
-	option timeout '2'
-	option interval '5'
-	option down '3'
-	option up '8'
-
-config member 'wan_m1_w3'
-	option interface 'wan'
-	option metric '1'
-	option weight '3'
-
-config member 'wan_m2_w3'
-	option interface 'wan'
-	option metric '2'
-	option weight '3'
-
-config member 'wan2_m1_w2'
-	option interface 'wan2'
-	option metric '1'
-	option weight '2'
-
-config member 'wan2_m2_w2'
-	option interface 'wan2'
-	option metric '2'
-	option weight '2'
-
-config policy 'wan_only'
-	list use_member 'wan_m1_w3'
-
-config policy 'wan2_only'
-	list use_member 'wan2_m1_w2'
-
-config policy 'balanced'
-	list use_member 'wan_m1_w3'
-	list use_member 'wan2_m1_w2'
-
-config policy 'wan_wan2'
-	list use_member 'wan_m1_w3'
-	list use_member 'wan2_m2_w2'
-
-config policy 'wan2_wan'
-	list use_member 'wan_m2_w3'
-	list use_member 'wan2_m1_w2'
-
-config rule 'youtube'
-	option sticky '1'
-	option ipset 'youtube'
-	option dest_port '80,443'
-	option proto 'tcp'
-	option use_policy 'balanced'
-
-config rule 'https'
-	option sticky '1'
-	option dest_port '443'
-	option proto 'tcp'
-	option use_policy 'balanced'
-
-config rule 'default_rule'
-	option dest_ip '0.0.0.0/0'
-	option use_policy 'balanced'
-
diff --git a/trunk/package/feeds/packages/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/trunk/package/feeds/packages/mwan3/files/etc/hotplug.d/iface/15-mwan3
deleted file mode 100644
index f117e49e..00000000
--- a/trunk/package/feeds/packages/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ /dev/null
@@ -1,427 +0,0 @@
-#!/bin/sh
-
-mwan3_get_iface_id()
-{
-	let iface_count++
-	[ "$1" == "$INTERFACE" ] && iface_id=$iface_count
-}
-
-mwan3_set_general_iptables()
-{
-	if ! $IPT -S mwan3_ifaces &> /dev/null; then
-		$IPT -N mwan3_ifaces
-	fi
-
-	if ! $IPT -S mwan3_connected &> /dev/null; then
-		$IPT -N mwan3_connected
-		$IPS create mwan3_connected hash:net
-		$IPT -A mwan3_connected -m set --match-set mwan3_connected dst -j MARK --set-xmark 0xff00/0xff00
-	fi
-
-	if ! $IPT -S mwan3_track &> /dev/null; then
-		$IPT -N mwan3_track
-	fi
-
-	if ! $IPT -S mwan3_rules &> /dev/null; then
-		$IPT -N mwan3_rules
-	fi
-
-	if ! $IPT -S mwan3_hook &> /dev/null; then
-		$IPT -N mwan3_hook
-		$IPT -A mwan3_hook -j CONNMARK --restore-mark --nfmask 0xff00 --ctmask 0xff00
-		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_ifaces
-		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_connected
-		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_track
-		$IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_rules
-		$IPT -A mwan3_hook -j CONNMARK --save-mark --nfmask 0xff00 --ctmask 0xff00
-		$IPT -A mwan3_hook -m mark ! --mark 0xff00/0xff00 -j mwan3_connected
-	fi
-
-	if ! $IPT -S PREROUTING | grep mwan3_hook &> /dev/null; then
-		$IPT -A PREROUTING -j mwan3_hook
-	fi
-
-	if ! $IPT -S OUTPUT | grep mwan3_hook &> /dev/null; then
-		$IPT -A OUTPUT -j mwan3_hook
-	fi
-
-	$IPT -F mwan3_rules
-}
-
-mwan3_set_general_rules()
-{
-	if [ -z "$($IP rule list | awk '$1 == "2253:"')" ]; then
-		$IP rule add pref 2253 fwmark 0xfd00/0xff00 blackhole
-	fi
-
-	if [ -z "$($IP rule list | awk '$1 == "2254:"')" ]; then
-		$IP rule add pref 2254 fwmark 0xfe00/0xff00 unreachable
-	fi
-}
-
-mwan3_set_connected_iptables()
-{
-	local connected_network
-
-	if $IPT -S mwan3_connected &> /dev/null; then
-
-		$IPS create mwan3_connected_temp hash:net
-
-		for connected_network in $($IP route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
-			$IPS -! add mwan3_connected_temp $connected_network
-		done
-
-		for connected_network in $($IP route list table 0 | awk '{print $2}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
-			$IPS -! add mwan3_connected_temp $connected_network
-		done
-
-		$IPS add mwan3_connected_temp 224.0.0.0/3
-		$IPS swap mwan3_connected_temp mwan3_connected
-		$IPS destroy mwan3_connected_temp
-
-	fi
-}
-
-mwan3_set_iface_iptables()
-{
-	if ! $IPT -S mwan3_iface_$INTERFACE &> /dev/null; then
-		$IPT -N mwan3_iface_$INTERFACE
-	fi
-
-	$IPT -F mwan3_iface_$INTERFACE
-	$IPT -D mwan3_ifaces -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE &> /dev/null
-
-	if [ $ACTION == "ifup" ]; then
-		$IPT -I mwan3_iface_$INTERFACE -i $DEVICE -m set --match-set mwan3_connected src -m mark --mark 0x0/0xff00 -m comment --comment "default" -j MARK --set-xmark 0xff00/0xff00
-		$IPT -A mwan3_iface_$INTERFACE -i $DEVICE -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE" -j MARK --set-xmark $(($iface_id*256))/0xff00
-		$IPT -A mwan3_ifaces -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE
-	fi
-
-	if [ $ACTION == "ifdown" ]; then
-		$IPT -X mwan3_iface_$INTERFACE
-	fi
-}
-
-mwan3_set_iface_route()
-{
-	$IP route flush table $iface_id
-	[ $ACTION == "ifup" ] && $IP route add table $iface_id default $route_args
-}
-
-mwan3_set_iface_rules()
-{
-	while [ -n "$($IP rule list | awk '$1 == "'$(($iface_id+1000)):'"')" ]; do
-		$IP rule del pref $(($iface_id+1000))
-	done
-
-	while [ -n "$($IP rule list | awk '$1 == "'$(($iface_id+2000)):'"')" ]; do
-		$IP rule del pref $(($iface_id+2000))
-	done
-
-	[ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+1000)) iif $DEVICE lookup main
-	[ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+2000)) fwmark $(($iface_id*256))/0xff00 lookup $iface_id
-}
-
-mwan3_set_iface_ipset()
-{
-	local setname entry
-
-	for setname in $(ipset -n list | grep ^mwan3_sticky_); do
-		for entry in $(ipset list $setname | grep "$(echo $(($iface_id*256)) | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do
-			$IPS del $setname $entry
-		done
-	done
-}
-
-mwan3_track()
-{
-	local track_ip track_ips reliability count timeout interval down up
-
-	mwan3_list_track_ips()
-	{
-		track_ips="$1 $track_ips"
-	}
-	config_list_foreach $INTERFACE track_ip mwan3_list_track_ips
-
-	if [ -e /var/run/mwan3track-$INTERFACE.pid ] ; then
-		kill $(cat /var/run/mwan3track-$INTERFACE.pid) &> /dev/null
-		rm /var/run/mwan3track-$INTERFACE.pid &> /dev/null
-	fi
-
-	if [ -n "$track_ips" ]; then
-		config_get reliability $INTERFACE reliability 1
-		config_get count $INTERFACE count 1
-		config_get timeout $INTERFACE timeout 4
-		config_get interval $INTERFACE interval 10
-		config_get down $INTERFACE down 5
-		config_get up $INTERFACE up 5
-
-		$IPS -! create mwan3_track_$INTERFACE hash:ip
-		$IPS create mwan3_track_temp_$INTERFACE hash:ip
-
-		for track_ip in $track_ips; do
-			$IPS -! add mwan3_track_temp_$INTERFACE $track_ip
-		done
-
-		$IPS swap mwan3_track_temp_$INTERFACE mwan3_track_$INTERFACE
-		$IPS destroy mwan3_track_temp_$INTERFACE
-
-		$IPT -D mwan3_track -p icmp -m set --match-set mwan3_track_$INTERFACE dst -m icmp --icmp-type 8 -m length --length 32 -j MARK --set-xmark 0xff00/0xff00 &> /dev/null
-		$IPT -A mwan3_track -p icmp -m set --match-set mwan3_track_$INTERFACE dst -m icmp --icmp-type 8 -m length --length 32 -j MARK --set-xmark 0xff00/0xff00
-
-		[ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track $INTERFACE $DEVICE $reliability $count $timeout $interval $down $up $track_ips &
-	else
-		$IPT -D mwan3_track -p icmp -m set --match-set mwan3_track_$INTERFACE dst -m icmp --icmp-type 8 -m length --length 32 -j MARK --set-xmark 0xff00/0xff00 &> /dev/null
-		$IPS destroy mwan3_track_$INTERFACE
-	fi
-}
-
-mwan3_set_policy()
-{
-	local iface_count iface_id INTERFACE metric probability weight
-
-	config_get INTERFACE $1 interface
-	config_get metric $1 metric 1
-	config_get weight $1 weight 1
-
-	[ -n "$INTERFACE" ] || return 0
-
-	config_foreach mwan3_get_iface_id interface
-
-	[ -n "$iface_id" ] || return 0
-
-	if $IPT -S mwan3_iface_$INTERFACE &> /dev/null; then
-		if [ "$metric" -lt "$lowest_metric" ]; then
-
-			total_weight=$weight
-			$IPT -F mwan3_policy_$policy
-			$IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE $weight $weight" -j MARK --set-xmark $(($iface_id*256))/0xff00
-
-			lowest_metric=$metric
-
-		elif [ "$metric" -eq "$lowest_metric" ]; then
-
-			total_weight=$(($total_weight+$weight))
-			probability=$(($weight*1000/$total_weight))
-
-			if [ "$probability" -lt 10 ]; then
-				probability="0.00$probability"
-			elif [ $probability -lt 100 ]; then
-				probability="0.0$probability"
-			elif [ $probability -lt 1000 ]; then
-				probability="0.$probability"
-			else
-				probability="1"
-			fi
-
-			probability="-m statistic --mode random --probability $probability"
-
-			$IPT -I mwan3_policy_$policy -m mark --mark 0x0/0xff00 $probability -m comment --comment "$INTERFACE $weight $total_weight" -j MARK --set-xmark $(($iface_id*256))/0xff00
-		fi
-	fi
-}
-
-mwan3_set_policies_iptables()
-{
-	local last_resort lowest_metric policy total_weight
-
-	policy=$1
-
-	config_get last_resort $1 last_resort unreachable
-
-	if [ "$policy" != $(echo "$policy" | cut -c1-15) ]; then
-		$LOG warn "Policy $policy exceeds max of 15 chars. Not setting policy" && return 0
-	fi
-
-	if ! $IPT -S mwan3_policy_$policy &> /dev/null; then
-		$IPT -N mwan3_policy_$policy
-	fi
-
-	$IPT -F mwan3_policy_$policy
-
-	case "$last_resort" in
-		blackhole)
-			$IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "blackhole" -j MARK --set-xmark 0xfd00/0xff00
-		;;
-		default)
-			$IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "default" -j MARK --set-xmark 0xff00/0xff00
-		;;
-		*)
-			$IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "unreachable" -j MARK --set-xmark 0xfe00/0xff00
-		;;
-	esac
-
-	lowest_metric=256
-	total_weight=0
-
-	config_list_foreach $policy use_member mwan3_set_policy
-}
-
-mwan3_set_sticky_iptables()
-{
-	local INTERFACE iface_count iface_id
-
-	INTERFACE="$1"
-
-	config_foreach mwan3_get_iface_id interface
-	unset iface_count
-
-	$IPS -! create mwan3_sticky_$rule hash:ip,mark markmask 0xff00 timeout $timeout
-
-	if [ -n "$iface_id" ]; then
-		if [ -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" ]; then
-			$IPT -I mwan3_rule_$rule -m set ! --match-set mwan3_sticky_$rule src,src -j MARK --set-xmark 0x0/0xff00
-			$IPT -I mwan3_rule_$rule -m mark --mark 0/0xff00 -j MARK --set-xmark $(($iface_id*256))/0xff00
-		fi
-	fi
-
-	unset iface_id
-}
-
-mwan3_set_user_rules_iptables()
-{
-	local ipset proto src_ip src_port sticky dest_ip dest_port use_policy rule timeout
-
-	config_get sticky $1 sticky 0
-	config_get timeout $1 timeout 600
-	config_get ipset $1 ipset
-	config_get proto $1 proto all
-	config_get src_ip $1 src_ip 0.0.0.0/0
-	config_get src_port $1 src_port 0:65535
-	config_get dest_ip $1 dest_ip 0.0.0.0/0
-	config_get dest_port $1 dest_port 0:65535
-	config_get use_policy $1 use_policy
-
-	rule="$1"
-
-	if [ "$rule" != $(echo "$rule" | cut -c1-15) ]; then
-		$LOG warn "Rule $rule exceeds max of 15 chars. Not setting rule" && return 0
-	fi
-
-	if [ -n "$ipset" ]; then
-		if [ -z "$($IPS -n list $ipset)" ]; then
-			$IPS create $ipset hash:ip timeout 3600
-		fi
-
-		ipset="-m set --match-set $ipset dst"
-	fi
-
-	if [ -n "$use_policy" ]; then
-		if [ "$use_policy" == "default" ]; then
-			use_policy="MARK --set-xmark 0xff00/0xff00"
-		elif [ "$use_policy" == "unreachable" ]; then
-			use_policy="MARK --set-xmark 0xfe00/0xff00"
-		elif [ "$use_policy" == "blackhole" ]; then
-			use_policy="MARK --set-xmark 0xfd00/0xff00"
-		else
-			if [ "$sticky" -eq 1 ]; then
-
-				if ! $IPT -S mwan3_rule_$rule &> /dev/null; then
-					$IPT -N mwan3_rule_$rule
-				fi
-
-				$IPT -F mwan3_rule_$rule
-
-				config_foreach mwan3_set_sticky_iptables interface
-
-				$IPT -A mwan3_rule_$rule -m mark --mark 0/0xff00 -j mwan3_policy_$use_policy
-				$IPT -A mwan3_rule_$rule -m mark ! --mark 0xfc00/0xfc00 -j SET --del-set mwan3_sticky_$rule src,src
-				$IPT -A mwan3_rule_$rule -m mark ! --mark 0xfc00/0xfc00 -j SET --add-set mwan3_sticky_$rule src,src
-
-				use_policy="mwan3_rule_$rule"
-			else
-				use_policy="mwan3_policy_$use_policy"
-			fi
-		fi
-
-		case $proto in
-			tcp|udp)
-			$IPT -A mwan3_rules -p $proto -s $src_ip -d $dest_ip $ipset -m multiport --sports $src_port -m multiport --dports $dest_port -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null
-			;;
-			*)
-			$IPT -A mwan3_rules -p $proto -s $src_ip -d $dest_ip $ipset -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null
-			;;
-		esac
-	fi
-}
-
-mwan3_ifupdown()
-{
-	local counter enabled iface_count iface_id route_args wan_metric
-
-	config_load mwan3
-	config_foreach mwan3_get_iface_id interface
-
-	[ -n "$iface_id" ] || return 0
-	[ "$iface_count" -le 250 ] || return 0
-	unset iface_count
-
-	config_get enabled $INTERFACE enabled 0
-
-	counter=0
-
-	if [ $ACTION == "ifup" ]; then
-		[ "$enabled" -eq 1 ] || return 0
-
-		while [ -z "$($IP route list dev $DEVICE default | head -1)" -a "$counter" -lt 10 ]; do
-			sleep 1
-			let counter++
-			if [ "$counter" -ge 10 ]; then
-				$LOG warn "Could not find gateway for interface $INTERFACE ($DEVICE)" && return 0
-			fi
-		done
-
-		route_args=$($IP route list dev $DEVICE default | head -1 | sed '/.*via \([^ ]*\) .*$/!d;s//via \1/;q' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}')
-		route_args="$route_args dev $DEVICE"
-	fi
-
-	while [ "$(pgrep -f -o hotplug-call)" -ne $$ -a "$counter" -lt 60 ]; do
-		sleep 1
-		let counter++
-		if [ "$counter" -ge 60 ]; then
-			$LOG warn "Timeout waiting for older hotplug processes to finish. $ACTION interface $INTERFACE (${DEVICE:-unknown}) aborted" && return 0
-		fi
-	done
-
-	$LOG notice "$ACTION interface $INTERFACE (${DEVICE:-unknown})"
-
-	mwan3_set_general_iptables
-	mwan3_set_general_rules
-	mwan3_set_iface_iptables
-	mwan3_set_iface_route
-	mwan3_set_iface_rules
-
-	[ $ACTION == "ifdown" ] && mwan3_set_iface_ipset
-	[ $ACTION == "ifup" ] && mwan3_track
-
-	config_foreach mwan3_set_policies_iptables policy
-	config_foreach mwan3_set_user_rules_iptables rule
-}
-
-[ -n "$ACTION" ] || exit 0
-[ -n "$INTERFACE" ] || exit 0
-
-if [ $ACTION == "ifup" ]; then
-	[ -n "$DEVICE" ] || exit 0
-fi
-
-[ -x /usr/sbin/ip ] || exit 1
-[ -x /usr/sbin/ipset ] || exit 1
-[ -x /usr/sbin/iptables ] || exit 1
-[ -x /usr/bin/logger ] || exit 1
-
-local IP IPS IPT LOG
-
-IP="/usr/sbin/ip -4"
-IPS="/usr/sbin/ipset"
-IPT="/usr/sbin/iptables -t mangle -w"
-LOG="/usr/bin/logger -t mwan3 -p"
-
-case "$ACTION" in
-	ifup|ifdown)
-		mwan3_ifupdown
-		mwan3_set_connected_iptables
-	;;
-esac
-
-exit 0
diff --git a/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3 b/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3
deleted file mode 100755
index c69d94ee..00000000
--- a/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-IP="/usr/sbin/ip -4"
-IPS="/usr/sbin/ipset"
-IPT="/usr/sbin/iptables -t mangle -w"
-
-help()
-{
-	cat <<EOF
-Syntax: mwan3 [command]
-
-Available commands:
-	start           Load iptables rules, ip rules and ip routes
-	stop            Unload iptables rules, ip rules and ip routes
-	restart         Reload iptables rules, ip rules and ip routes
-        ifup <iface>    Load rules and routes for specific interface
-        ifdown <iface>  Unload rules and routes for specific interface
-        interfaces      Show interfaces status
-        policies        Show policies status
-        rules           Show rules status
-        status          Show all status
-
-EOF
-}
-
-ifdown()
-{
-	if [ -z "$1" ]; then
-		echo "Error: Expecting interface. Usage: mwan3 ifdown <interface>" && exit 0
-	fi
-
-	if [ -n "$2" ]; then
-		echo "Error: Too many arguments. Usage: mwan3 ifdown <interface>" && exit 0
-	fi
-
-	if [ -e /var/run/mwan3track-$1.pid ] ; then
-		kill $(cat /var/run/mwan3track-$1.pid)
-		rm /var/run/mwan3track-$1.pid
-	fi
-
-	ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
-}
-
-ifup()
-{
-	local device enabled
-
-	config_load mwan3
-
-	if [ -z "$1" ]; then
-		echo "Expecting interface. Usage: mwan3 ifup <interface>" && exit 0
-	fi
-
-	if [ -n "$2" ]; then
-		echo "Too many arguments. Usage: mwan3 ifup <interface>" && exit 0
-	fi
-
-	config_get enabled "$1" enabled 0
-
-	device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
-
-	if [ -n "$device" ] ; then
-		[ "$enabled" -eq 1 ] && ACTION=ifup INTERFACE=$1 DEVICE=$device /sbin/hotplug-call iface
-	fi
-}
-
-interfaces()
-{
-	local device enabled iface_id tracking
-
-	config_load mwan3
-
-	echo "Interface status:"
-
-	check_iface_status()
-	{
-		let iface_id++
-		device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
-
-		if [ -z "$device" ]; then
-			echo " interface $1 is unknown"
-			return 0
-		fi
-
-		config_get enabled "$1" enabled 0
-
-		if [ -n "$(ps -w | grep mwan3track | grep -v grep | sed '/.*\/usr\/sbin\/mwan3track \([^ ]*\) .*$/!d;s//\1/' | awk '$1 == "'$1'"')" ]; then
-			tracking="active"
-		else
-			tracking="down"
-		fi
-
-		if [ -n "$($IP rule | awk '$5 == "'$device'"')" -a -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" -a -n "$($IP route list table $iface_id default dev $device 2> /dev/null)" ]; then
-			if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then
-				echo " interface $1 is online (tracking $tracking)"
-			else
-				echo " interface $1 is online"
-			fi
-		elif [ -n "$($IP rule | awk '$5 == "'$device'"')" -o -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" -o -n "$($IP route list table $iface_id default dev $device 2> /dev/null)" ]; then
-			echo " interface $1 error"
-		else
-			if [ "$enabled" -eq 1 ]; then
-				if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then
-					echo " interface $1 is offline (tracking $tracking)"
-				else
-					echo " interface $1 is offline"
-				fi
-			else
-				echo " interface $1 is disabled"
-			fi
-		fi
-	}
-	config_foreach check_iface_status interface
-	echo -e
-}
-
-policies()
-{
-	local percent policy share total_weight weight iface
-
-	for policy in $($IPT -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do
-		echo "Policy $policy:" | sed 's/mwan3_policy_//'
-
-		[ -n "$total_weight" ] || total_weight=$($IPT -S $policy | cut -s -d'"' -f2 | head -1 | awk '{print $3}')
-
-		if [ ! -z "${total_weight##*[!0-9]*}" ]; then
-			for iface in $($IPT -S $policy | cut -s -d'"' -f2 | awk '{print $1}'); do
-				weight=$($IPT -S $policy | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}')
-				percent=$(($weight*100/$total_weight))
-				echo " $iface ($percent%)"
-			done
-		else
-			echo " $($IPT -S $policy | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')"
-		fi
-
-		echo -e
-
-		unset iface
-		unset total_weight
-	done
-}
-rules()
-{
-	local address
-
-	if [ -n "$($IPT -S mwan3_connected 2> /dev/null)" ]; then
-		echo "Known networks:"
-		for address in $($IPS list mwan3_connected | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
-			echo " $address"
-		done
-		echo -e
-	fi
-
-	if [ -n "$($IPT -S mwan3_rules 2> /dev/null)" ]; then
-		echo "Active rules:"
-		$IPT -L mwan3_rules -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_/- /' | sed 's/mwan3_rule_/S /'
-		echo -e
-	fi
-}
-
-status()
-{
-	interfaces
-	policies
-	rules
-}
-
-start()
-{
-	config_load mwan3
-	config_foreach ifup interface
-}
-
-stop()
-{
-	local ipset route rule table
-
-	killall mwan3track &> /dev/null
-	rm /var/run/mwan3track-* &> /dev/null
-
-	for route in $($IP route list table all | sed 's/.*table \([^ ]*\) .*/\1/' |  awk '{print $1}' | awk '{for(i=1;i<=NF;i++) if($i+0>0) if($i+0<255) {print;break}}'); do
-		$IP route flush table $route &> /dev/null
-	done
-
-	for rule in $($IP rule list | egrep '^[1-2][0-9]{3}\:' | cut -d ':' -f 1); do
-		$IP rule del pref $rule &> /dev/null
-	done
-
-	$IPT -D PREROUTING -j mwan3_hook &> /dev/null
-	$IPT -D OUTPUT -j mwan3_hook &> /dev/null
-
-	for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
-		$IPT -F $table &> /dev/null
-	done
-
-	for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
-		$IPT -X $table &> /dev/null
-	done
-
-	for ipset in $(ipset -n list | grep mwan3); do
-		$IPS destroy $ipset
-	done
-}
-
-restart() {
-	stop
-	start
-}
-
-case "$1" in
-	ifup|ifdown|interfaces|policies|rules|status|start|stop|restart)
-		$*
-	;;
-	*)
-		help
-	;;
-esac
-
-exit 0
diff --git a/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3track b/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3track
deleted file mode 100755
index c4d25e99..00000000
--- a/trunk/package/feeds/packages/mwan3/files/usr/sbin/mwan3track
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-[ -z "$9" ] && echo "Error: should not be started manually" && exit 0
-
-if [ -e /var/run/mwan3track-$1.pid ] ; then
-	kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null
-	rm /var/run/mwan3track-$1.pid &> /dev/null
-fi
-
-echo "$$" > /var/run/mwan3track-$1.pid
-
-score=$(($7+$8))
-track_ips=$(echo $* | cut -d ' ' -f 9-99)
-host_up_count=0
-lost=0
-
-while true; do
-
-	for track_ip in $track_ips; do
-		ping -I $2 -c $4 -W $5 -s 4 -q $track_ip &> /dev/null
-		if [ $? -eq 0 ]; then
-			let host_up_count++
-		else
-			let lost++
-		fi
-	done
-		
-	if [ $host_up_count -lt $3 ]; then
-		let score--
-
-		if [ $score -lt $8 ]; then score=0 ; fi
-		if [ $score -eq $8 ]; then
-
-			logger -t mwan3track -p notice "Interface $1 ($2) is offline"
-			env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
-			score=0
-
-		fi
-
-	else
-
-		if [ $score -lt $(($7+$8)) ] && [ $lost -gt 0 ]; then
-
-			logger -t mwan3track -p info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)"
-
-		fi
-
-		let score++
-		lost=0
-
-		if [ $score -gt $8 ]; then score=$(($7+$8)); fi
-		if [ $score -eq $8 ]; then
-
-			logger -t mwan3track -p notice "Interface $1 ($2) is online"
-			env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
-			rm /var/run/mwan3track-$1.pid
-			exit 0
-		fi
-	fi
-
-	host_up_count=0
-	sleep $6
-done
-
-exit 1
diff --git a/trunk/package/feeds/packages/mxml/Makefile b/trunk/package/feeds/packages/mxml/Makefile
deleted file mode 100644
index 74cff413..00000000
--- a/trunk/package/feeds/packages/mxml/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mxml
-PKG_VERSION:=2.8
-PKG_RELEASE:=1
-PKG_MD5SUM:=d85ee6d30de053581242c4a86e79a5d2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.msweet.org/files/project3/
-PKG_FIXUP:=autoreconf
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mxml
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Mini-XML
-  URL:=http://www.minixml.org/
-endef
-
-define Package/mxml/description
-  A small xml library.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/mxml.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmxml.so* $(1)/usr/lib/
-	mkdir -p $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/mxml.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/mxml/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmxml.so.*  $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,mxml))
diff --git a/trunk/package/feeds/packages/mxml/patches/001-targets.patch b/trunk/package/feeds/packages/mxml/patches/001-targets.patch
deleted file mode 100644
index 86379f02..00000000
--- a/trunk/package/feeds/packages/mxml/patches/001-targets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -88,7 +88,7 @@ PUBLIBOBJS	=	mxml-attr.o mxml-entity.o m
- 			mxml-index.o mxml-node.o mxml-search.o mxml-set.o
- LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
- OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
--TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
-+TARGETS		=	$(LIBMXML)
- 
- 
- #
diff --git a/trunk/package/feeds/packages/mysql/Makefile b/trunk/package/feeds/packages/mysql/Makefile
deleted file mode 100644
index f0553a9d..00000000
--- a/trunk/package/feeds/packages/mysql/Makefile
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
-
-PKG_NAME:=mysql
-PKG_VERSION:=5.1.73
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=\
-	http://mysql.he.net/Downloads/MySQL-5.1/ \
-	http://www.linorg.usp.br/mysql/Downloads/MySQL-5.1/ \
-	http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQL-5.1/ \
-	http://mirror.switch.ch/ftp/mirror/mysql/Downloads/MySQL-5.1/
-
-PKG_MD5SUM:=887f869bcc757957067b9198f707f32f
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=GPL-2.0
-
-PKG_BUILD_DEPENDS:=libncurses libreadline
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmysqlclient/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(CXX_DEPENDS) +zlib
-  TITLE:=MySQL client library
-  URL:=http://dev.mysql.com/
-endef
-
-define Package/mysql-server
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libmysqlclient +libpthread +libncursesw +libreadline
-  TITLE:=MySQL Server
-  URL:=http://dev.mysql.com/
-  SUBMENU:=database
-endef
-
-define Package/libmysqlclient
-  $(call Package/libmysqlclient/Default)
-endef
-
-define Package/libmysqlclient-r
-  $(call Package/libmysqlclient/Default)
-  TITLE += threadsafe
-  DEPENDS+= +libpthread
-endef
-
-ifneq ($(CONFIG_USE_UCLIBCXX),)
-  TARGET_CXX=g++-uc
-endif
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--enable-thread-safe-client \
-	--disable-assembler \
-	--with-pthread \
-	--with-server \
-	--without-mysqlmanager \
-	--with-mysqld-user=root \
-	--with-unix-socket-path=/tmp \
-	--without-libwrap \
-	--with-low-memory \
-	--without-embedded-server \
-	--without-query-cache \
-	--without-ssl \
-	--without-docs \
-	--without-man \
-	--without-readline \
-	--without-debug \
-	--with-named-thread-libs=-lpthread
-
-CONFIGURE_VARS += \
-	mysql_cv_compress=yes \
-	mysql_cv_gethostname_style=glibc2 \
-	mysql_cv_gcc_atomic_builtins=yes \
-	mysql_cv_gcc_atomic_builtins_pthread_t=yes \
-	ac_cv_c_stack_direction=-1
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	g++ -I $(PKG_BUILD_DIR)/include \
-		-o $(PKG_BUILD_DIR)/sql/gen_lex_hash \
-		$(PKG_BUILD_DIR)/sql/gen_lex_hash.cc
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
-		CC="g++" \
-		CFLAGS="$(HOST_CFLAGS)" \
-		CPPFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		conf_to_src
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql_r" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="libmysql_r" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="scripts" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		bin_SCRIPTS="mysql_config" \
-		install
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/
-	ln -sf $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/
-	# NOTE: needed for MySQL-Python
-	$(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(1)/usr/include/mysql/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(1)/usr/lib/
-	rm -f $(1)/usr/lib/mysql/libmysqlclient.la
-endef
-
-define Package/libmysqlclient/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/
-endef
-define Package/libmysqlclient-r/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient_r.so.* $(1)/usr/lib/
-endef
-
-define Package/mysql-server/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mysqld $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/myisamchk $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqladmin $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqldump $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_install_db $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/my_print_defaults $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld
-	$(INSTALL_CONF) conf/my.cnf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/share/mysql
-	$(INSTALL_DIR) $(1)/usr/share/mysql/english
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/english/errmsg.sys $(1)/usr/share/mysql/english
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/fill_help_tables.sql $(1)/usr/share/mysql/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables.sql $(1)/usr/share/mysql/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables_data.sql $(1)/usr/share/mysql/
-endef
-
-define Package/mysql-server/conffiles
-/etc/my.cnf
-endef
-
-$(eval $(call BuildPackage,mysql-server))
-$(eval $(call BuildPackage,libmysqlclient))
-$(eval $(call BuildPackage,libmysqlclient-r))
diff --git a/trunk/package/feeds/packages/mysql/conf/my.cnf b/trunk/package/feeds/packages/mysql/conf/my.cnf
deleted file mode 100644
index ec2ade2c..00000000
--- a/trunk/package/feeds/packages/mysql/conf/my.cnf
+++ /dev/null
@@ -1,54 +0,0 @@
-[client]
-port		= 3306
-socket		= /var/run/mysqld.sock
-
-[mysqld]
-user		= root
-socket		= /var/run/mysqld.sock
-port		= 3306
-basedir		= /usr
-
-############ Don't put this on the NAND #############
-# Figure out where you are going to put the databases
-# And run mysql_install_db --force
-datadir		= /mnt/data/mysql/
-
-######### This should also not go on the NAND #######
-tmpdir		= /mnt/data/tmp/
-
-skip-external-locking
-
-bind-address		= 127.0.0.1
-
-# Fine Tuning
-key_buffer		= 16M
-max_allowed_packet	= 16M
-thread_stack		= 192K
-thread_cache_size       = 8
-
-# Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-
-# The following can be used as easy to replay backup logs or for replication.
-#server-id		= 1
-#log_bin			= /var/log/mysql/mysql-bin.log
-#expire_logs_days	= 10
-#max_binlog_size         = 100M
-#binlog_do_db		= include_database_name
-#binlog_ignore_db	= include_database_name
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer		= 16M
-
-
diff --git a/trunk/package/feeds/packages/mysql/files/mysqld.init b/trunk/package/feeds/packages/mysql/files/mysqld.init
deleted file mode 100644
index 48e61896..00000000
--- a/trunk/package/feeds/packages/mysql/files/mysqld.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
-
-START=95
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-SERVICE_STOP_TIME=9
-
-error() {
-	echo "${initscript}:" "$@" 1>&2
-}
-
-start() {
-	local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" /etc/my.cnf)
-	if [ ! -d "$datadir" ]; then
-		error "Error: datadir '$datadir' in /etc/my.cnf doesn't exist"
-		return 1
-	fi
-	if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then
-		error "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables"
-		return 1
-	fi
-	service_start /usr/bin/mysqld
-}
-
-stop() {
-	service_stop /usr/bin/mysqld
-}
diff --git a/trunk/package/feeds/packages/mysql/patches/100-fix_hostname.patch b/trunk/package/feeds/packages/mysql/patches/100-fix_hostname.patch
deleted file mode 100644
index faedc271..00000000
--- a/trunk/package/feeds/packages/mysql/patches/100-fix_hostname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/mysql_install_db.sh
-+++ b/scripts/mysql_install_db.sh
-@@ -322,7 +322,7 @@ then
- fi
- 
- # Try to determine the hostname
--hostname=`@HOSTNAME@`
-+hostname=`cat /proc/sys/kernel/hostname`
- 
- # Check if hostname is valid
- if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
diff --git a/trunk/package/feeds/packages/mysql/patches/110-cross_compile.patch b/trunk/package/feeds/packages/mysql/patches/110-cross_compile.patch
deleted file mode 100644
index 85d25913..00000000
--- a/trunk/package/feeds/packages/mysql/patches/110-cross_compile.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- a/storage/innodb_plugin/plug.in
-+++ b/storage/innodb_plugin/plug.in
-@@ -56,10 +56,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-   esac
-   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
- 
--  AC_MSG_CHECKING(whether GCC atomic builtins are available)
--  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
--  AC_TRY_RUN(
--    [
-+  AC_CACHE_CHECK([whether GCC atomic builtins are available],
-+		 [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
-       int main()
-       {
- 	long	x;
-@@ -96,21 +94,18 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
- 
- 	return(0);
-       }
--    ],
--    [
--      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
--                [GCC atomic builtins are available])
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--  )
-+    ], [mysql_cv_gcc_atomic_builtins=yes],
-+       [mysql_cv_gcc_atomic_builtins=no],
-+       [mysql_cv_gcc_atomic_builtins=no])])
-+
-+  if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
-+    AC_DEFINE(HAVE_IB_GCC_ATOMIC_BUILTINS, 1,
-+              [Define to 1 if compiler provides atomic builtins.])
-+  fi
- 
--  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
--  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
--  AC_TRY_RUN(
--    [
-+
-+  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
-+		 [mysql_cv_gcc_atomic_builtins_pthread_t], [AC_TRY_RUN([
-       #include <pthread.h>
-       #include <string.h>
- 
-@@ -127,16 +122,14 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
- 
-         return(0);
-       }
--    ],
--    [
--      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
--                [pthread_t can be used by GCC atomic builtins])
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--  )
-+    ], [mysql_cv_gcc_atomic_builtins_pthread_t=yes],
-+       [mysql_cv_gcc_atomic_builtins_pthread_t=no],
-+       [mysql_cv_gcc_atomic_builtins_pthread_t=no])])
-+
-+  if test "x$mysql_cv_gcc_atomic_builtins_pthread_t" = xyes; then
-+    AC_DEFINE(HAVE_IB_ATOMIC_PTHREAD_T_GCC, 1,
-+              [Define to 1 if pthread_t can be used by GCC atomic builtins])
-+  fi
- 
-   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-   # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
-@@ -156,7 +149,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-     AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-       [Define to 1 if Solaris libc atomic functions are available]
-     )
--  fi
- 
-   AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
-   # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
-@@ -230,6 +222,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
-       AC_MSG_RESULT(no)
-     ]
-   )
-+  fi
-+
-   ])
- 
- # vim: set ft=config:
---- a/sql/gen_lex_hash.cc
-+++ b/sql/gen_lex_hash.cc
-@@ -344,55 +344,6 @@ void print_find_structs()
- }
- 
- 
--static void usage(int version)
--{
--  printf("%s  Ver 3.6 Distrib %s, for %s (%s)\n",
--	 my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
--  if (version)
--    return;
--  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
--  puts("This program generates a perfect hashing function for the sql_lex.cc");
--  printf("Usage: %s [OPTIONS]\n\n", my_progname);
--  my_print_help(my_long_options);
--}
--
--
--extern "C" my_bool
--get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
--	       char *argument __attribute__((unused)))
--{
--  switch(optid) {
--  case 'V':
--    usage(1);
--    exit(0);
--  case 'I':
--  case '?':
--    usage(0);
--    exit(0);
--  case '#':
--    DBUG_PUSH(argument ? argument : default_dbug_option);
--    break;
--  }
--  return 0;
--}
--
--
--static int get_options(int argc, char **argv)
--{
--  int ho_error;
--
--  if ((ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
--    exit(ho_error);
--
--  if (argc >= 1)
--  {
--    usage(0);
--     exit(1);
--  }
--  return(0);
--}
--
--
- int check_dup_symbols(SYMBOL *s1, SYMBOL *s2)
- {
-   if (s1->length!=s2->length || strncmp(s1->name,s2->name,s1->length))
-@@ -443,12 +394,6 @@ int check_duplicates()
- 
- int main(int argc,char **argv)
- {
--  MY_INIT(argv[0]);
--  DBUG_PROCESS(argv[0]);
--
--  if (get_options(argc,(char **) argv))
--    exit(1);
--
-   /* Broken up to indicate that it's not advice to you, gentle reader. */
-   printf("/*\n\n  Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
- 
-@@ -549,7 +494,6 @@ static SYMBOL *get_hash_symbol(const cha
-   }\n\
- }\n"
- );
--  my_end(0);
-   exit(0);
- }
- 
---- a/sql/Makefile.am
-+++ b/sql/Makefile.am
-@@ -26,7 +26,6 @@ INCLUDES =		@ZLIB_INCLUDES@ \
- WRAPLIBS=		@WRAPLIBS@
- SUBDIRS =		share
- libexec_PROGRAMS =	mysqld
--EXTRA_PROGRAMS =	gen_lex_hash
- bin_PROGRAMS =		mysql_tzinfo_to_sql
- 
- noinst_LTLIBRARIES=	libndb.la \
diff --git a/trunk/package/feeds/packages/mysql/patches/120-bison-compat.patch b/trunk/package/feeds/packages/mysql/patches/120-bison-compat.patch
deleted file mode 100644
index 6c9ac944..00000000
--- a/trunk/package/feeds/packages/mysql/patches/120-bison-compat.patch
+++ /dev/null
@@ -1,3290 +0,0 @@
---- a/sql/sql_lex.cc
-+++ b/sql/sql_lex.cc
-@@ -775,14 +775,13 @@ bool consume_comment(Lex_input_stream *l
- 				(which can't be followed by a signed number)
- */
- 
--int MYSQLlex(void *arg, void *yythd)
-+int MYSQLlex(void *arg, THD *thd)
- {
-   reg1	uchar c= 0;
-   bool comment_closed;
-   int	tokval, result_state;
-   uint length;
-   enum my_lex_states state;
--  THD *thd= (THD *)yythd;
-   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
-   LEX *lex= thd->lex;
-   YYSTYPE *yylval=(YYSTYPE*) arg;
---- a/sql/sql_lex.h
-+++ b/sql/sql_lex.h
-@@ -2072,7 +2072,7 @@ extern void lex_init(void);
- extern void lex_free(void);
- extern void lex_start(THD *thd);
- extern void lex_end(LEX *lex);
--extern int MYSQLlex(void *arg, void *yythd);
-+extern int MYSQLlex(void *arg, THD *thd);
- 
- extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str);
- 
---- a/sql/sql_parse.cc
-+++ b/sql/sql_parse.cc
-@@ -8012,7 +8012,7 @@ bool check_host_name(LEX_STRING *str)
- }
- 
- 
--extern int MYSQLparse(void *thd); // from sql_yacc.cc
-+extern int MYSQLparse(THD *thd); // from sql_yacc.cc
- 
- 
- /**
---- a/sql/sql_yacc.yy
-+++ b/sql/sql_yacc.yy
-@@ -25,17 +25,15 @@
- %{
- /* thd is passed as an argument to yyparse(), and subsequently to yylex().
- ** The type will be void*, so it must be  cast to (THD*) when used.
--** Use the YYTHD macro for this.
-+** Use the thd macro for this.
- */
--#define YYPARSE_PARAM yythd
--#define YYLEX_PARAM yythd
--#define YYTHD ((THD *)yythd)
--#define YYLIP (& YYTHD->m_parser_state->m_lip)
-+#define YYLIP (& thd->m_parser_state->m_lip)
-+#define YYPS (& thd->m_parser_state->m_yacc)
- 
- #define MYSQL_YACC
- #define YYINITDEPTH 100
- #define YYMAXDEPTH 3200                        /* Because of 64K stack */
--#define Lex (YYTHD->lex)
-+#define Lex (thd->lex)
- #define Select Lex->current_select
- #include "mysql_priv.h"
- #include "slave.h"
-@@ -64,7 +62,7 @@ const LEX_STRING null_lex_str= {0,0};
-     ulong val= *(F);                          \
-     if (my_yyoverflow((B), (D), &val))        \
-     {                                         \
--      yyerror((char*) (A));                   \
-+      yyerror(current_thd, (char*) (A));      \
-       return 2;                               \
-     }                                         \
-     else                                      \
-@@ -76,7 +74,7 @@ const LEX_STRING null_lex_str= {0,0};
- #define MYSQL_YYABORT                         \
-   do                                          \
-   {                                           \
--    LEX::cleanup_lex_after_parse_error(YYTHD);\
-+    LEX::cleanup_lex_after_parse_error(thd);  \
-     YYABORT;                                  \
-   } while (0)
- 
-@@ -159,10 +157,8 @@ void my_parse_error(const char *s)
-   to abort from the parser.
- */
- 
--void MYSQLerror(const char *s)
-+void MYSQLerror(THD *thd, const char *s)
- {
--  THD *thd= current_thd;
--
-   /*
-     Restore the original LEX if it was replaced when parsing
-     a stored procedure. We must ensure that a parsing error
-@@ -675,7 +671,10 @@ static bool add_create_index (LEX *lex,
- bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
- %}
- 
--%pure_parser                                    /* We have threads */
-+/* We have threads */
-+%define api.pure
-+%parse-param { THD *thd }
-+%lex-param { THD *thd }
- /*
-   Currently there are 169 shift/reduce conflicts.
-   We should not introduce new conflicts any more.
-@@ -1516,7 +1515,6 @@ rule: <-- starts at col 1
- query:
-           END_OF_INPUT
-           {
--            THD *thd= YYTHD;
-             if (!thd->bootstrap &&
-               (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT)))
-             {
-@@ -1530,7 +1528,7 @@ query:
-           {
-             Lex_input_stream *lip = YYLIP;
- 
--            if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) &&
-+            if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) &&
-                 ! lip->stmt_prepare_mode &&
-                 ! lip->eof())
-             {
-@@ -1626,7 +1624,6 @@ statement:
- deallocate:
-           deallocate_or_drop PREPARE_SYM ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
-             lex->prepared_stmt_name= $3;
-@@ -1641,7 +1638,6 @@ deallocate_or_drop:
- prepare:
-           PREPARE_SYM ident FROM prepare_src
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->sql_command= SQLCOM_PREPARE;
-             lex->prepared_stmt_name= $2;
-@@ -1651,14 +1647,12 @@ prepare:
- prepare_src:
-           TEXT_STRING_sys
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->prepared_stmt_code= $1;
-             lex->prepared_stmt_code_is_varref= FALSE;
-           }
-         | '@' ident_or_text
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->prepared_stmt_code= $2;
-             lex->prepared_stmt_code_is_varref= TRUE;
-@@ -1668,7 +1662,6 @@ prepare_src:
- execute:
-           EXECUTE_SYM ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->sql_command= SQLCOM_EXECUTE;
-             lex->prepared_stmt_name= $2;
-@@ -1826,7 +1819,6 @@ master_file_def:
- create:
-           CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->sql_command= SQLCOM_CREATE_TABLE;
-             if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
-@@ -1844,13 +1836,13 @@ create:
-           }
-           create2
-           {
--            LEX *lex= YYTHD->lex;
-+            LEX *lex= thd->lex;
-             lex->current_select= &lex->select_lex; 
-             if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
-                 !lex->create_info.db_type)
-             {
--              lex->create_info.db_type= ha_default_handlerton(YYTHD);
--              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+              lex->create_info.db_type= ha_default_handlerton(thd);
-+              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                                   ER_WARN_USING_OTHER_HANDLER,
-                                   ER(ER_WARN_USING_OTHER_HANDLER),
-                                   ha_resolve_storage_engine_name(lex->create_info.db_type),
-@@ -1979,7 +1971,6 @@ server_option:
- event_tail:
-           remember_name EVENT_SYM opt_if_not_exists sp_name
-           {
--            THD *thd= YYTHD;
-             LEX *lex=Lex;
- 
-             lex->stmt_definition_begin= $1;
-@@ -2046,7 +2037,7 @@ opt_ev_status:
- ev_starts:
-           /* empty */
-           {
--            Item *item= new (YYTHD->mem_root) Item_func_now_local();
-+            Item *item= new (thd->mem_root) Item_func_now_local();
-             if (item == NULL)
-               MYSQL_YYABORT;
-             Lex->event_parse_data->item_starts= item;
-@@ -2096,7 +2087,6 @@ opt_ev_comment:
- 
- ev_sql_stmt:
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -2139,7 +2129,6 @@ ev_sql_stmt:
-           }
-           ev_sql_stmt_inner
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
- 
-             /* return back to the original memory root ASAP */
-@@ -2198,11 +2187,10 @@ sp_name:
-             $$= new sp_name($1, $3, true);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
--            $$->init_qname(YYTHD);
-+            $$->init_qname(thd);
-           }
-         | ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             LEX_STRING db;
-             if (check_routine_name(&$1))
-@@ -2272,7 +2260,7 @@ call:
-             lex->sql_command= SQLCOM_CALL;
-             lex->spname= $2;
-             lex->value_list.empty();
--            sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE);
-+            sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE);
-           }
-           opt_sp_cparam_list {}
-         ;
-@@ -2345,7 +2333,7 @@ sp_fdparam:
-                                                      (enum enum_field_types)$3,
-                                                      sp_param_in);
- 
--            if (lex->sphead->fill_field_definition(YYTHD, lex,
-+            if (lex->sphead->fill_field_definition(thd, lex,
-                                                    (enum enum_field_types) $3,
-                                                    &spvar->field_def))
-             {
-@@ -2382,7 +2370,7 @@ sp_pdparam:
-                                                      (enum enum_field_types)$4,
-                                                      (sp_param_mode_t)$1);
- 
--            if (lex->sphead->fill_field_definition(YYTHD, lex,
-+            if (lex->sphead->fill_field_definition(thd, lex,
-                                                    (enum enum_field_types) $4,
-                                                    &spvar->field_def))
-             {
-@@ -2445,13 +2433,12 @@ sp_decl:
-           {
-             LEX *lex= Lex;
- 
--            lex->sphead->reset_lex(YYTHD);
-+            lex->sphead->reset_lex(thd);
-             lex->spcont->declare_var_boundary($2);
-           }
-           type
-           sp_opt_default
-           {
--            THD *thd= YYTHD;
-             LEX *lex= Lex;
-             sp_pcontext *pctx= lex->spcont;
-             uint num_vars= pctx->context_var_count();
-@@ -2477,7 +2464,7 @@ sp_decl:
-               spvar->type= var_type;
-               spvar->dflt= dflt_value_item;
-             
--              if (lex->sphead->fill_field_definition(YYTHD, lex, var_type,
-+              if (lex->sphead->fill_field_definition(thd, lex, var_type,
-                                                      &spvar->field_def))
-               {
-                 MYSQL_YYABORT;
-@@ -2501,7 +2488,7 @@ sp_decl:
-             }
- 
-             pctx->declare_var_boundary(0);
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-             $$.vars= $2;
-             $$.conds= $$.hndlrs= $$.curs= 0;
-@@ -2516,7 +2503,7 @@ sp_decl:
- 	      my_error(ER_SP_DUP_COND, MYF(0), $2.str);
- 	      MYSQL_YYABORT;
- 	    }
--	    if(YYTHD->lex->spcont->push_cond(&$2, $5))
-+	    if(thd->lex->spcont->push_cond(&$2, $5))
-               MYSQL_YYABORT;
-             $$.vars= $$.hndlrs= $$.curs= 0;
-             $$.conds= 1;
-@@ -2602,7 +2589,7 @@ sp_decl:
- 
- sp_cursor_stmt:
-           {
--            Lex->sphead->reset_lex(YYTHD);
-+            Lex->sphead->reset_lex(thd);
-           }
-           select
-           {
-@@ -2618,7 +2605,7 @@ sp_cursor_stmt:
-             }
-             lex->sp_lex_in_use= TRUE;
-             $$= lex;
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -2662,7 +2649,7 @@ sp_hcond_element:
- sp_cond:
-           ulong_num
-           { /* mysql errno */
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::number;
-@@ -2675,7 +2662,7 @@ sp_cond:
-               my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str);
-               MYSQL_YYABORT;
-             }
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *) thd->alloc(sizeof(sp_cond_type_t));
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::state;
-@@ -2705,21 +2692,21 @@ sp_hcond:
-           }
-         | SQLWARNING_SYM /* SQLSTATEs 01??? */
-           {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *) thd->alloc(sizeof(sp_cond_type_t));
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::warning;
-           }
-         | not FOUND_SYM /* SQLSTATEs 02??? */
-           {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *) thd->alloc(sizeof(sp_cond_type_t));
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::notfound;
-           }
-         | SQLEXCEPTION_SYM /* All other SQLSTATEs */
-           {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *) thd->alloc(sizeof(sp_cond_type_t));
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::exception;
-@@ -2789,7 +2776,6 @@ sp_proc_stmt_if:
-         
- sp_proc_stmt_statement:
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -2798,7 +2784,6 @@ sp_proc_stmt_statement:
-           }
-           statement
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_head *sp= lex->sphead;
-@@ -2845,7 +2830,7 @@ sp_proc_stmt_statement:
- 
- sp_proc_stmt_return:
-           RETURN_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr
-           {
-             LEX *lex= Lex;
-@@ -2867,7 +2852,7 @@ sp_proc_stmt_return:
-                 MYSQL_YYABORT;
-               sp->m_flags|= sp_head::HAS_RETURN;
-             }
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -3094,7 +3079,7 @@ sp_fetch_list:
-         ;
- 
- sp_if:
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr THEN_SYM
-           {
-             LEX *lex= Lex;
-@@ -3108,7 +3093,7 @@ sp_if:
-                 sp->add_cont_backpatch(i) ||
-                 sp->add_instr(i))
-               MYSQL_YYABORT;
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-           sp_proc_stmts1
-@@ -3147,7 +3132,7 @@ simple_case_stmt:
-           {
-             LEX *lex= Lex;
-             case_stmt_action_case(lex);
--            lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            lex->sphead->reset_lex(thd); /* For expr $3 */
-           }
-           expr
-           {
-@@ -3156,7 +3141,7 @@ simple_case_stmt:
-               MYSQL_YYABORT;
- 
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-           simple_when_clause_list
-@@ -3198,7 +3183,7 @@ searched_when_clause_list:
- simple_when_clause:
-           WHEN_SYM
-           {
--            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            Lex->sphead->reset_lex(thd); /* For expr $3 */
-           }
-           expr
-           {
-@@ -3208,7 +3193,7 @@ simple_when_clause:
-             if (case_stmt_action_when(lex, $3, true))
-               MYSQL_YYABORT;
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-           THEN_SYM
-@@ -3223,7 +3208,7 @@ simple_when_clause:
- searched_when_clause:
-           WHEN_SYM
-           {
--            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            Lex->sphead->reset_lex(thd); /* For expr $3 */
-           }
-           expr
-           {
-@@ -3231,7 +3216,7 @@ searched_when_clause:
-             if (case_stmt_action_when(lex, $3, false))
-               MYSQL_YYABORT;
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-           THEN_SYM
-@@ -3395,7 +3380,7 @@ sp_unlabeled_control:
-               MYSQL_YYABORT;
- 	  }
-         | WHILE_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr DO_SYM
-           {
-             LEX *lex= Lex;
-@@ -3409,7 +3394,7 @@ sp_unlabeled_control:
-                 sp->new_cont_backpatch(i) ||
-                 sp->add_instr(i))
-               MYSQL_YYABORT;
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-           sp_proc_stmts1 END WHILE_SYM
-@@ -3424,7 +3409,7 @@ sp_unlabeled_control:
-             lex->sphead->do_cont_backpatch();
-           }
-         | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr END REPEAT_SYM
-           {
-             LEX *lex= Lex;
-@@ -3436,7 +3421,7 @@ sp_unlabeled_control:
-             if (i == NULL ||
-                 lex->sphead->add_instr(i))
-               MYSQL_YYABORT;
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-             /* We can shortcut the cont_backpatch here */
-             i->m_cont_dest= ip+1;
-@@ -3859,7 +3844,6 @@ create2:
-           create3 {}
-         | LIKE table_ident
-           {
--            THD *thd= YYTHD;
-             TABLE_LIST *src_table;
-             LEX *lex= thd->lex;
- 
-@@ -3873,7 +3857,6 @@ create2:
-           }
-         | '(' LIKE table_ident ')'
-           {
--            THD *thd= YYTHD;
-             TABLE_LIST *src_table;
-             LEX *lex= thd->lex;
- 
-@@ -4342,7 +4325,6 @@ part_bit_expr:
-           bit_expr
-           {
-             Item *part_expr= $1;
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Name_resolution_context *context= &lex->current_select->context;
-             TABLE_LIST *save_list= context->table_list;
-@@ -4364,7 +4346,7 @@ part_bit_expr:
-               my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
-               MYSQL_YYABORT;
-             }
--            if (part_expr->fix_fields(YYTHD, (Item**)0) ||
-+            if (part_expr->fix_fields(thd, (Item**)0) ||
-                 ((context->table_list= save_list), FALSE) ||
-                 (!part_expr->const_item()) ||
-                 (!lex->safe_to_cache_query))
-@@ -4629,7 +4611,7 @@ create_table_option:
-         | TYPE_SYM opt_equal storage_engines
-           {
-             Lex->create_info.db_type= $3;
--            WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine",
-+            WARN_DEPRECATED(thd, "6.0", "TYPE=storage_engine",
-                             "'ENGINE=storage_engine'");
-             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
-           }
-@@ -4791,19 +4773,19 @@ default_collation:
- storage_engines:
-           ident_or_text
-           {
--            plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1);
-+            plugin_ref plugin= ha_resolve_by_name(thd, &$1);
- 
-             if (plugin)
-               $$= plugin_data(plugin, handlerton*);
-             else
-             {
--              if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
-+              if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
-               {
-                 my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
-                 MYSQL_YYABORT;
-               }
-               $$= 0;
--              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                                   ER_UNKNOWN_STORAGE_ENGINE,
-                                   ER(ER_UNKNOWN_STORAGE_ENGINE),
-                                   $1.str);
-@@ -4815,7 +4797,7 @@ known_storage_engines:
-           ident_or_text
-           {
-             plugin_ref plugin;
--            if ((plugin= ha_resolve_by_name(YYTHD, &$1)))
-+            if ((plugin= ha_resolve_by_name(thd, &$1)))
-               $$= plugin_data(plugin, handlerton*);
-             else
-             {
-@@ -5043,7 +5025,7 @@ type:
-               {
-                 char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
-                 my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
--                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
-+                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                                     ER_WARN_DEPRECATED_SYNTAX,
-                                     ER(ER_WARN_DEPRECATED_SYNTAX),
-                                     buff, "YEAR(4)");
-@@ -5057,7 +5039,7 @@ type:
-           { $$=MYSQL_TYPE_TIME; }
-         | TIMESTAMP opt_field_length
-           {
--            if (YYTHD->variables.sql_mode & MODE_MAXDB)
-+            if (thd->variables.sql_mode & MODE_MAXDB)
-               $$=MYSQL_TYPE_DATETIME;
-             else
-             {
-@@ -5189,7 +5171,7 @@ int_type:
- real_type:
-           REAL
-           {
--            $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
-+            $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ?
-               MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
-           }
-         | DOUBLE_SYM
-@@ -5263,7 +5245,7 @@ attribute:
-         | DEFAULT now_or_signed_literal { Lex->default_value=$2; }
-         | ON UPDATE_SYM NOW_SYM optional_braces
-           {
--            Item *item= new (YYTHD->mem_root) Item_func_now_local();
-+            Item *item= new (thd->mem_root) Item_func_now_local();
-             if (item == NULL)
-               MYSQL_YYABORT;
-             Lex->on_update_value= item;
-@@ -5312,7 +5294,7 @@ attribute:
- now_or_signed_literal:
-           NOW_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_local();
-+            $$= new (thd->mem_root) Item_func_now_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -5673,7 +5655,6 @@ string_list:
- alter:
-           ALTER opt_ignore TABLE_SYM table_ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->name.str= 0;
-             lex->name.length= 0;
-@@ -5799,7 +5780,7 @@ alter:
-               Event_parse_data.
-             */
- 
--            if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD)))
-+            if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd)))
-               MYSQL_YYABORT;
-             Lex->event_parse_data->identifier= $4;
- 
-@@ -6192,7 +6173,6 @@ alter_list_item:
-           {
-             if (!$4)
-             {
--              THD *thd= YYTHD;
-               $4= thd->variables.collation_database;
-             }
-             $5= $5 ? $5 : $4;
-@@ -6556,7 +6536,7 @@ keycache_list:
- assign_to_keycache:
-           table_ident cache_keys_spec
-           {
--            if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, 
-+            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, 
-                                            Select->pop_index_hints()))
-               MYSQL_YYABORT;
-           }
-@@ -6585,7 +6565,7 @@ preload_list:
- preload_keys:
-           table_ident cache_keys_spec opt_ignore_leaves
-           {
--            if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ,
-+            if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ,
-                                            Select->pop_index_hints()))
-               MYSQL_YYABORT;
-           }
-@@ -6593,7 +6573,7 @@ preload_keys:
- 
- cache_keys_spec:
-           {
--            Lex->select_lex.alloc_index_hints(YYTHD);
-+            Lex->select_lex.alloc_index_hints(thd);
-             Select->set_index_hint_type(INDEX_HINT_USE, 
-                                         global_system_variables.old_mode ? 
-                                         INDEX_HINT_MASK_JOIN : 
-@@ -6813,7 +6793,6 @@ select_item_list:
-         | select_item
-         | '*'
-           {
--            THD *thd= YYTHD;
-             Item *item= new (thd->mem_root)
-                           Item_field(&thd->lex->current_select->context,
-                                      NULL, NULL, "*");
-@@ -6828,7 +6807,6 @@ select_item_list:
- select_item:
-           remember_name select_item2 remember_end select_alias
-           {
--            THD *thd= YYTHD;
-             DBUG_ASSERT($1 < $3);
- 
-             if (add_item_to_list(thd, $2))
-@@ -6929,7 +6907,7 @@ expr:
-             else
-             {
-               /* X OR Y */
--              $$ = new (YYTHD->mem_root) Item_cond_or($1, $3);
-+              $$ = new (thd->mem_root) Item_cond_or($1, $3);
-               if ($$ == NULL)
-                 MYSQL_YYABORT;
-             }
-@@ -6937,7 +6915,7 @@ expr:
-         | expr XOR expr %prec XOR
-           {
-             /* XOR is a proprietary extension */
--            $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3);
-+            $$ = new (thd->mem_root) Item_cond_xor($1, $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -6979,50 +6957,50 @@ expr:
-             else
-             {
-               /* X AND Y */
--              $$ = new (YYTHD->mem_root) Item_cond_and($1, $3);
-+              $$ = new (thd->mem_root) Item_cond_and($1, $3);
-               if ($$ == NULL)
-                 MYSQL_YYABORT;
-             }
-           }
-         | NOT_SYM expr %prec NOT_SYM
-           {
--            $$= negate_expression(YYTHD, $2);
-+            $$= negate_expression(thd, $2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS TRUE_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_istrue($1);
-+            $$= new (thd->mem_root) Item_func_istrue($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS not TRUE_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnottrue($1);
-+            $$= new (thd->mem_root) Item_func_isnottrue($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS FALSE_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isfalse($1);
-+            $$= new (thd->mem_root) Item_func_isfalse($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS not FALSE_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnotfalse($1);
-+            $$= new (thd->mem_root) Item_func_isnotfalse($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS UNKNOWN_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnull($1);
-+            $$= new (thd->mem_root) Item_func_isnull($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS not UNKNOWN_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
-+            $$= new (thd->mem_root) Item_func_isnotnull($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7032,19 +7010,19 @@ expr:
- bool_pri:
-           bool_pri IS NULL_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnull($1);
-+            $$= new (thd->mem_root) Item_func_isnull($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri IS not NULL_SYM %prec IS
-           {
--            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
-+            $$= new (thd->mem_root) Item_func_isnotnull($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_func_equal($1,$3);
-+            $$= new (thd->mem_root) Item_func_equal($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7066,13 +7044,12 @@ bool_pri:
- predicate:
-           bit_expr IN_SYM '(' subselect ')'
-           {
--            $$= new (YYTHD->mem_root) Item_in_subselect($1, $4);
-+            $$= new (thd->mem_root) Item_in_subselect($1, $4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr not IN_SYM '(' subselect ')'
-           {
--            THD *thd= YYTHD;
-             Item *item= new (thd->mem_root) Item_in_subselect($1, $5);
-             if (item == NULL)
-               MYSQL_YYABORT;
-@@ -7082,7 +7059,7 @@ predicate:
-           }
-         | bit_expr IN_SYM '(' expr ')'
-           {
--            $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4);
-+            $$= handle_sql2003_note184_exception(thd, $1, true, $4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7090,13 +7067,13 @@ predicate:
-           { 
-             $6->push_front($4);
-             $6->push_front($1);
--            $$= new (YYTHD->mem_root) Item_func_in(*$6);
-+            $$= new (thd->mem_root) Item_func_in(*$6);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr not IN_SYM '(' expr ')'
-           {
--            $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5);
-+            $$= handle_sql2003_note184_exception(thd, $1, false, $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7104,7 +7081,7 @@ predicate:
-           {
-             $7->push_front($5);
-             $7->push_front($1);
--            Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7);
-+            Item_func_in *item = new (thd->mem_root) Item_func_in(*$7);
-             if (item == NULL)
-               MYSQL_YYABORT;
-             item->negate();
-@@ -7112,14 +7089,14 @@ predicate:
-           }
-         | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
-           {
--            $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5);
-+            $$= new (thd->mem_root) Item_func_between($1,$3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate
-           {
-             Item_func_between *item;
--            item= new (YYTHD->mem_root) Item_func_between($1,$4,$6);
-+            item= new (thd->mem_root) Item_func_between($1,$4,$6);
-             if (item == NULL)
-               MYSQL_YYABORT;
-             item->negate();
-@@ -7127,42 +7104,42 @@ predicate:
-           }
-         | bit_expr SOUNDS_SYM LIKE bit_expr
-           {
--            Item *item1= new (YYTHD->mem_root) Item_func_soundex($1);
--            Item *item4= new (YYTHD->mem_root) Item_func_soundex($4);
-+            Item *item1= new (thd->mem_root) Item_func_soundex($1);
-+            Item *item4= new (thd->mem_root) Item_func_soundex($4);
-             if ((item1 == NULL) || (item4 == NULL))
-               MYSQL_YYABORT;
--            $$= new (YYTHD->mem_root) Item_func_eq(item1, item4);
-+            $$= new (thd->mem_root) Item_func_eq(item1, item4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr LIKE simple_expr opt_escape
-           {
--            $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
-+            $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr not LIKE simple_expr opt_escape
-           {
--            Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5,
-+            Item *item= new (thd->mem_root) Item_func_like($1,$4,$5,
-                                                              Lex->escape_used);
-             if (item == NULL)
-               MYSQL_YYABORT;
--            $$= new (YYTHD->mem_root) Item_func_not(item);
-+            $$= new (thd->mem_root) Item_func_not(item);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr REGEXP bit_expr
-           {
--            $$= new (YYTHD->mem_root) Item_func_regex($1,$3);
-+            $$= new (thd->mem_root) Item_func_regex($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr not REGEXP bit_expr
-           {
--            Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4);
-+            Item *item= new (thd->mem_root) Item_func_regex($1,$4);
-             if (item == NULL)
-               MYSQL_YYABORT;
--            $$= negate_expression(YYTHD, item);
-+            $$= negate_expression(thd, item);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7172,85 +7149,85 @@ predicate:
- bit_expr:
-           bit_expr '|' bit_expr %prec '|'
-           {
--            $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3);
-+            $$= new (thd->mem_root) Item_func_bit_or($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '&' bit_expr %prec '&'
-           {
--            $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3);
-+            $$= new (thd->mem_root) Item_func_bit_and($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT
-           {
--            $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3);
-+            $$= new (thd->mem_root) Item_func_shift_left($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT
-           {
--            $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3);
-+            $$= new (thd->mem_root) Item_func_shift_right($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '+' bit_expr %prec '+'
-           {
--            $$= new (YYTHD->mem_root) Item_func_plus($1,$3);
-+            $$= new (thd->mem_root) Item_func_plus($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '-' bit_expr %prec '-'
-           {
--            $$= new (YYTHD->mem_root) Item_func_minus($1,$3);
-+            $$= new (thd->mem_root) Item_func_minus($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '+' INTERVAL_SYM expr interval %prec '+'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0);
-+            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '-' INTERVAL_SYM expr interval %prec '-'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1);
-+            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '*' bit_expr %prec '*'
-           {
--            $$= new (YYTHD->mem_root) Item_func_mul($1,$3);
-+            $$= new (thd->mem_root) Item_func_mul($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '/' bit_expr %prec '/'
-           {
--            $$= new (YYTHD->mem_root) Item_func_div($1,$3);
-+            $$= new (thd->mem_root) Item_func_div($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '%' bit_expr %prec '%'
-           {
--            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
-+            $$= new (thd->mem_root) Item_func_mod($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr DIV_SYM bit_expr %prec DIV_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_func_int_div($1,$3);
-+            $$= new (thd->mem_root) Item_func_int_div($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr MOD_SYM bit_expr %prec MOD_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
-+            $$= new (thd->mem_root) Item_func_mod($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | bit_expr '^' bit_expr
-           {
--            $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3);
-+            $$= new (thd->mem_root) Item_func_bit_xor($1,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7299,7 +7276,6 @@ simple_expr:
-         | function_call_conflict
-         | simple_expr COLLATE_SYM ident_or_text %prec NEG
-           {
--            THD *thd= YYTHD;
-             Item *i1= new (thd->mem_root) Item_string($3.str,
-                                                       $3.length,
-                                                       thd->charset());
-@@ -7315,7 +7291,7 @@ simple_expr:
-         | sum_expr
-         | simple_expr OR_OR_SYM simple_expr
-           {
--            $$= new (YYTHD->mem_root) Item_func_concat($1, $3);
-+            $$= new (thd->mem_root) Item_func_concat($1, $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7325,25 +7301,25 @@ simple_expr:
-           }
-         | '-' simple_expr %prec NEG
-           {
--            $$= new (YYTHD->mem_root) Item_func_neg($2);
-+            $$= new (thd->mem_root) Item_func_neg($2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | '~' simple_expr %prec NEG
-           {
--            $$= new (YYTHD->mem_root) Item_func_bit_neg($2);
-+            $$= new (thd->mem_root) Item_func_bit_neg($2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | not2 simple_expr %prec NEG
-           {
--            $$= negate_expression(YYTHD, $2);
-+            $$= negate_expression(thd, $2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | '(' subselect ')'
-           { 
--            $$= new (YYTHD->mem_root) Item_singlerow_subselect($2);
-+            $$= new (thd->mem_root) Item_singlerow_subselect($2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7352,20 +7328,20 @@ simple_expr:
-         | '(' expr ',' expr_list ')'
-           {
-             $4->push_front($2);
--            $$= new (YYTHD->mem_root) Item_row(*$4);
-+            $$= new (thd->mem_root) Item_row(*$4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | ROW_SYM '(' expr ',' expr_list ')'
-           {
-             $5->push_front($3);
--            $$= new (YYTHD->mem_root) Item_row(*$5);
-+            $$= new (thd->mem_root) Item_row(*$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | EXISTS '(' subselect ')'
-           {
--            $$= new (YYTHD->mem_root) Item_exists_subselect($3);
-+            $$= new (thd->mem_root) Item_exists_subselect($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7374,7 +7350,7 @@ simple_expr:
-         | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
-           {
-             $2->push_front($5);
--            Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6);
-+            Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6);
-             if (i1 == NULL)
-               MYSQL_YYABORT;
-             Select->add_ftfunc_to_list(i1);
-@@ -7382,7 +7358,7 @@ simple_expr:
-           }
-         | BINARY simple_expr %prec NEG
-           {
--            $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL,
-+            $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL,
-                                  &my_charset_bin);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-@@ -7390,27 +7366,27 @@ simple_expr:
-         | CAST_SYM '(' expr AS cast_type ')'
-           {
-             LEX *lex= Lex;
--            $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec,
-+            $$= create_func_cast(thd, $3, $5, lex->length, lex->dec,
-                                  lex->charset);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CASE_SYM opt_expr when_list opt_else END
-           {
--            $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 );
-+            $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 );
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CONVERT_SYM '(' expr ',' cast_type ')'
-           {
--            $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec,
-+            $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec,
-                                  Lex->charset);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CONVERT_SYM '(' expr USING charset_name ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5);
-+            $$= new (thd->mem_root) Item_func_conv_charset($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7423,14 +7399,14 @@ simple_expr:
-               my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str);
-               MYSQL_YYABORT;
-             }
--            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(),
-+            $$= new (thd->mem_root) Item_default_value(Lex->current_context(),
-                                                          $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | VALUES '(' simple_ident_nospvar ')'
-           {
--            $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
-+            $$= new (thd->mem_root) Item_insert_value(Lex->current_context(),
-                                                         $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-@@ -7438,7 +7414,7 @@ simple_expr:
-         | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM
-           /* we cannot put interval before - */
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0);
-+            $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7453,19 +7429,19 @@ simple_expr:
- function_call_keyword:
-           CHAR_SYM '(' expr_list ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_char(*$3);
-+            $$= new (thd->mem_root) Item_func_char(*$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CHAR_SYM '(' expr_list USING charset_name ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_char(*$3, $5);
-+            $$= new (thd->mem_root) Item_func_char(*$3, $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CURRENT_USER optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
-+            $$= new (thd->mem_root) Item_func_current_user(Lex->current_context());
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->set_stmt_unsafe();
-@@ -7473,31 +7449,30 @@ function_call_keyword:
-           }
-         | DATE_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_typecast($3);
-+            $$= new (thd->mem_root) Item_date_typecast($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | DAY_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_dayofmonth($3);
-+            $$= new (thd->mem_root) Item_func_dayofmonth($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | HOUR_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_hour($3);
-+            $$= new (thd->mem_root) Item_func_hour($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | INSERT '(' expr ',' expr ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9);
-+            $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM
-           {
--            THD *thd= YYTHD;
-             List<Item> *list= new (thd->mem_root) List<Item>;
-             if (list == NULL)
-               MYSQL_YYABORT;
-@@ -7512,7 +7487,6 @@ function_call_keyword:
-           }
-         | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM
-           {
--            THD *thd= YYTHD;
-             $7->push_front($5);
-             $7->push_front($3);
-             Item_row *item= new (thd->mem_root) Item_row(*$7);
-@@ -7524,103 +7498,103 @@ function_call_keyword:
-           }
-         | LEFT '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_left($3,$5);
-+            $$= new (thd->mem_root) Item_func_left($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MINUTE_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_minute($3);
-+            $$= new (thd->mem_root) Item_func_minute($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MONTH_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_month($3);
-+            $$= new (thd->mem_root) Item_func_month($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | RIGHT '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_right($3,$5);
-+            $$= new (thd->mem_root) Item_func_right($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SECOND_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_second($3);
-+            $$= new (thd->mem_root) Item_func_second($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TIME_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_time_typecast($3);
-+            $$= new (thd->mem_root) Item_time_typecast($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TIMESTAMP '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_datetime_typecast($3);
-+            $$= new (thd->mem_root) Item_datetime_typecast($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TIMESTAMP '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0);
-+            $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_trim($3);
-+            $$= new (thd->mem_root) Item_func_trim($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' LEADING expr FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4);
-+            $$= new (thd->mem_root) Item_func_ltrim($6,$4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' TRAILING expr FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4);
-+            $$= new (thd->mem_root) Item_func_rtrim($6,$4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' BOTH expr FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_trim($6,$4);
-+            $$= new (thd->mem_root) Item_func_trim($6,$4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' LEADING FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_ltrim($5);
-+            $$= new (thd->mem_root) Item_func_ltrim($5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' TRAILING FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_rtrim($5);
-+            $$= new (thd->mem_root) Item_func_rtrim($5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' BOTH FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_trim($5);
-+            $$= new (thd->mem_root) Item_func_trim($5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRIM '(' expr FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_trim($5,$3);
-+            $$= new (thd->mem_root) Item_func_trim($5,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | USER '(' ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_user();
-+            $$= new (thd->mem_root) Item_func_user();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->set_stmt_unsafe();
-@@ -7628,7 +7602,7 @@ function_call_keyword:
-           }
-         | YEAR_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_year($3);
-+            $$= new (thd->mem_root) Item_func_year($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7649,34 +7623,34 @@ function_call_keyword:
- function_call_nonkeyword:
-           ADDDATE_SYM '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5,
-+            $$= new (thd->mem_root) Item_date_add_interval($3, $5,
-                                                              INTERVAL_DAY, 0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0);
-+            $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CURDATE optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_curdate_local();
-+            $$= new (thd->mem_root) Item_func_curdate_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | CURTIME optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_curtime_local();
-+            $$= new (thd->mem_root) Item_func_curtime_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | CURTIME '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_curtime_local($3);
-+            $$= new (thd->mem_root) Item_func_curtime_local($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-@@ -7684,83 +7658,83 @@ function_call_nonkeyword:
-         | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
-           %prec INTERVAL_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0);
-+            $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
-           %prec INTERVAL_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1);
-+            $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | EXTRACT_SYM '(' interval FROM expr ')'
-           {
--            $$=new (YYTHD->mem_root) Item_extract( $3, $5);
-+            $$=new (thd->mem_root) Item_extract( $3, $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | GET_FORMAT '(' date_time_type  ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_get_format($3, $5);
-+            $$= new (thd->mem_root) Item_func_get_format($3, $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | NOW_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_local();
-+            $$= new (thd->mem_root) Item_func_now_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | NOW_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_local($3);
-+            $$= new (thd->mem_root) Item_func_now_local($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | POSITION_SYM '(' bit_expr IN_SYM expr ')'
-           {
--            $$ = new (YYTHD->mem_root) Item_func_locate($5,$3);
-+            $$ = new (thd->mem_root) Item_func_locate($5,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBDATE_SYM '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5,
-+            $$= new (thd->mem_root) Item_date_add_interval($3, $5,
-                                                              INTERVAL_DAY, 1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1);
-+            $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBSTRING '(' expr ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7);
-+            $$= new (thd->mem_root) Item_func_substr($3,$5,$7);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBSTRING '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_substr($3,$5);
-+            $$= new (thd->mem_root) Item_func_substr($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBSTRING '(' expr FROM expr FOR_SYM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7);
-+            $$= new (thd->mem_root) Item_func_substr($3,$5,$7);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUBSTRING '(' expr FROM expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_substr($3,$5);
-+            $$= new (thd->mem_root) Item_func_substr($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7775,9 +7749,9 @@ function_call_nonkeyword:
-             */
-             Lex->set_stmt_unsafe();
-             if (global_system_variables.sysdate_is_now == 0)
--              $$= new (YYTHD->mem_root) Item_func_sysdate_local();
-+              $$= new (thd->mem_root) Item_func_sysdate_local();
-             else
--              $$= new (YYTHD->mem_root) Item_func_now_local();
-+              $$= new (thd->mem_root) Item_func_now_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-@@ -7785,42 +7759,42 @@ function_call_nonkeyword:
-         | SYSDATE '(' expr ')'
-           {
-             if (global_system_variables.sysdate_is_now == 0)
--              $$= new (YYTHD->mem_root) Item_func_sysdate_local($3);
-+              $$= new (thd->mem_root) Item_func_sysdate_local($3);
-             else
--              $$= new (YYTHD->mem_root) Item_func_now_local($3);
-+              $$= new (thd->mem_root) Item_func_now_local($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0);
-+            $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3);
-+            $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | UTC_DATE_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_curdate_utc();
-+            $$= new (thd->mem_root) Item_func_curdate_utc();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | UTC_TIME_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_curtime_utc();
-+            $$= new (thd->mem_root) Item_func_curtime_utc();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | UTC_TIMESTAMP_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_utc();
-+            $$= new (thd->mem_root) Item_func_now_utc();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-@@ -7835,62 +7809,61 @@ function_call_nonkeyword:
- function_call_conflict:
-           ASCII_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_ascii($3);
-+            $$= new (thd->mem_root) Item_func_ascii($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | CHARSET '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_charset($3);
-+            $$= new (thd->mem_root) Item_func_charset($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | COALESCE '(' expr_list ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_coalesce(* $3);
-+            $$= new (thd->mem_root) Item_func_coalesce(* $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | COLLATION_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_collation($3);
-+            $$= new (thd->mem_root) Item_func_collation($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | DATABASE '(' ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_database();
-+            $$= new (thd->mem_root) Item_func_database();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | IF '(' expr ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7);
-+            $$= new (thd->mem_root) Item_func_if($3,$5,$7);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MICROSECOND_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_microsecond($3);
-+            $$= new (thd->mem_root) Item_func_microsecond($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MOD_SYM '(' expr ',' expr ')'
-           {
--            $$ = new (YYTHD->mem_root) Item_func_mod($3, $5);
-+            $$ = new (thd->mem_root) Item_func_mod($3, $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | OLD_PASSWORD '(' expr ')'
-           {
--            $$=  new (YYTHD->mem_root) Item_func_old_password($3);
-+            $$=  new (thd->mem_root) Item_func_old_password($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | PASSWORD '(' expr ')'
-           {
--            THD *thd= YYTHD;
-             Item* i1;
-             if (thd->variables.old_passwords)
-               i1= new (thd->mem_root) Item_func_old_password($3);
-@@ -7902,31 +7875,30 @@ function_call_conflict:
-           }
-         | QUARTER_SYM '(' expr ')'
-           {
--            $$ = new (YYTHD->mem_root) Item_func_quarter($3);
-+            $$ = new (thd->mem_root) Item_func_quarter($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | REPEAT_SYM '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_repeat($3,$5);
-+            $$= new (thd->mem_root) Item_func_repeat($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | REPLACE '(' expr ',' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7);
-+            $$= new (thd->mem_root) Item_func_replace($3,$5,$7);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRUNCATE_SYM '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_round($3,$5,1);
-+            $$= new (thd->mem_root) Item_func_round($3,$5,1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | WEEK_SYM '(' expr ')'
-           {
--            THD *thd= YYTHD;
-             Item *i1= new (thd->mem_root) Item_int((char*) "0",
-                                            thd->variables.default_week_format,
-                                                    1);
-@@ -7938,7 +7910,7 @@ function_call_conflict:
-           }
-         | WEEK_SYM '(' expr ',' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_week($3,$5);
-+            $$= new (thd->mem_root) Item_func_week($3,$5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -7960,52 +7932,52 @@ function_call_conflict:
- geometry_function:
-           CONTAINS_SYM '(' expr ',' expr ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_rel($3, $5,
-                                                Item_func::SP_CONTAINS_FUNC));
-           }
-         | GEOMETRYCOLLECTION '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_geometrycollection,
-                            Geometry::wkb_point));
-           }
-         | LINESTRING '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_linestring,
-                            Geometry::wkb_point));
-           }
-         | MULTILINESTRING '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_multilinestring,
-                            Geometry::wkb_linestring));
-           }
-         | MULTIPOINT '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_multipoint,
-                            Geometry::wkb_point));
-           }
-         | MULTIPOLYGON '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_multipolygon,
-                            Geometry::wkb_polygon));
-           }
-         | POINT_SYM '(' expr ',' expr ')'
-           {
--            $$= GEOM_NEW(YYTHD, Item_func_point($3,$5));
-+            $$= GEOM_NEW(thd, Item_func_point($3,$5));
-           }
-         | POLYGON '(' expr_list ')'
-           {
--            $$= GEOM_NEW(YYTHD,
-+            $$= GEOM_NEW(thd,
-                          Item_func_spatial_collection(* $3,
-                            Geometry::wkb_polygon,
-                            Geometry::wkb_linestring));
-@@ -8043,7 +8015,6 @@ function_call_generic:
-           }
-           opt_udf_expr_list ')'
-           {
--            THD *thd= YYTHD;
-             Create_func *builder;
-             Item *item= NULL;
- 
-@@ -8097,7 +8068,6 @@ function_call_generic:
-           }
-         | ident '.' ident '(' opt_expr_list ')'
-           {
--            THD *thd= YYTHD;
-             Create_qfunc *builder;
-             Item *item= NULL;
- 
-@@ -8161,7 +8131,7 @@ opt_udf_expr_list:
- udf_expr_list:
-           udf_expr
-           {
--            $$= new (YYTHD->mem_root) List<Item>;
-+            $$= new (thd->mem_root) List<Item>;
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->push_back($1);
-@@ -8194,7 +8164,7 @@ udf_expr:
-                remember_name we may get quoted or escaped names.
-             */
-             else if ($2->type() != Item::FIELD_ITEM)
--              $2->set_name($1, (uint) ($3 - $1), YYTHD->charset());
-+              $2->set_name($1, (uint) ($3 - $1), thd->charset());
-             $$= $2;
-           }
-         ;
-@@ -8202,46 +8172,46 @@ udf_expr:
- sum_expr:
-           AVG_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_avg($3);
-+            $$= new (thd->mem_root) Item_sum_avg($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | AVG_SYM '(' DISTINCT in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_avg_distinct($4);
-+            $$= new (thd->mem_root) Item_sum_avg_distinct($4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | BIT_AND  '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_and($3);
-+            $$= new (thd->mem_root) Item_sum_and($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | BIT_OR  '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_or($3);
-+            $$= new (thd->mem_root) Item_sum_or($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | BIT_XOR  '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_xor($3);
-+            $$= new (thd->mem_root) Item_sum_xor($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | COUNT_SYM '(' opt_all '*' ')'
-           {
--            Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1);
-+            Item *item= new (thd->mem_root) Item_int((int32) 0L,1);
-             if (item == NULL)
-               MYSQL_YYABORT;
--            $$= new (YYTHD->mem_root) Item_sum_count(item);
-+            $$= new (thd->mem_root) Item_sum_count(item);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | COUNT_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_count($3);
-+            $$= new (thd->mem_root) Item_sum_count($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -8251,13 +8221,13 @@ sum_expr:
-           { Select->in_sum_expr--; }
-           ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_count_distinct(* $5);
-+            $$= new (thd->mem_root) Item_sum_count_distinct(* $5);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MIN_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_min($3);
-+            $$= new (thd->mem_root) Item_sum_min($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -8268,55 +8238,55 @@ sum_expr:
-         */
-         | MIN_SYM '(' DISTINCT in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_min($4);
-+            $$= new (thd->mem_root) Item_sum_min($4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MAX_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_max($3);
-+            $$= new (thd->mem_root) Item_sum_max($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | MAX_SYM '(' DISTINCT in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_max($4);
-+            $$= new (thd->mem_root) Item_sum_max($4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | STD_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_std($3, 0);
-+            $$= new (thd->mem_root) Item_sum_std($3, 0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | VARIANCE_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_variance($3, 0);
-+            $$= new (thd->mem_root) Item_sum_variance($3, 0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | STDDEV_SAMP_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_std($3, 1);
-+            $$= new (thd->mem_root) Item_sum_std($3, 1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | VAR_SAMP_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_variance($3, 1);
-+            $$= new (thd->mem_root) Item_sum_variance($3, 1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUM_SYM '(' in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_sum($3);
-+            $$= new (thd->mem_root) Item_sum_sum($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | SUM_SYM '(' DISTINCT in_sum_expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_sum_sum_distinct($4);
-+            $$= new (thd->mem_root) Item_sum_sum_distinct($4);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -8328,7 +8298,7 @@ sum_expr:
-           {
-             SELECT_LEX *sel= Select;
-             sel->in_sum_expr--;
--            $$= new (YYTHD->mem_root)
-+            $$= new (thd->mem_root)
-                   Item_func_group_concat(Lex->current_context(), $3, $5,
-                                          sel->gorder_list, $7);
-             if ($$ == NULL)
-@@ -8357,7 +8327,7 @@ variable_aux:
-           ident_or_text SET_VAR expr
-           {
-             Item_func_set_user_var *item;
--            $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3);
-+            $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             LEX *lex= Lex;
-@@ -8366,7 +8336,7 @@ variable_aux:
-           }
-         | ident_or_text
-           {
--            $$= new (YYTHD->mem_root) Item_func_get_user_var($1);
-+            $$= new (thd->mem_root) Item_func_get_user_var($1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             LEX *lex= Lex;
-@@ -8380,7 +8350,7 @@ variable_aux:
-               my_parse_error(ER(ER_SYNTAX_ERROR));
-               MYSQL_YYABORT;
-             }
--            if (!($$= get_system_var(YYTHD, $2, $3, $4)))
-+            if (!($$= get_system_var(thd, $2, $3, $4)))
-               MYSQL_YYABORT;
-             if (!((Item_func_get_system_var*) $$)->is_written_to_binlog())
-               Lex->set_stmt_unsafe();
-@@ -8395,7 +8365,7 @@ opt_distinct:
- opt_gconcat_separator:
-           /* empty */
-           {
--            $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
-+            $$= new (thd->mem_root) String(",", 1, &my_charset_latin1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -8422,9 +8392,9 @@ opt_gorder_clause:
- 
- gorder_list:
-           gorder_list ',' order_ident order_dir
--          { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
-+          { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
-         | order_ident order_dir
--          { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
-+          { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
-         ;
- 
- in_sum_expr:
-@@ -8477,7 +8447,7 @@ opt_expr_list:
- expr_list:
-           expr
-           {
--            $$= new (YYTHD->mem_root) List<Item>;
-+            $$= new (thd->mem_root) List<Item>;
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->push_back($1);
-@@ -8497,7 +8467,7 @@ ident_list_arg:
- ident_list:
-           simple_ident
-           {
--            $$= new (YYTHD->mem_root) List<Item>;
-+            $$= new (thd->mem_root) List<Item>;
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             $$->push_back($1);
-@@ -8595,7 +8565,7 @@ join_table:
-           {
-             MYSQL_YYABORT_UNLESS($1 && $3);
-             /* Change the current name resolution context to a local context. */
--            if (push_new_name_resolution_context(YYTHD, $1, $3))
-+            if (push_new_name_resolution_context(thd, $1, $3))
-               MYSQL_YYABORT;
-             Select->parsing_place= IN_ON;
-           }
-@@ -8610,7 +8580,7 @@ join_table:
-           {
-             MYSQL_YYABORT_UNLESS($1 && $3);
-             /* Change the current name resolution context to a local context. */
--            if (push_new_name_resolution_context(YYTHD, $1, $3))
-+            if (push_new_name_resolution_context(thd, $1, $3))
-               MYSQL_YYABORT;
-             Select->parsing_place= IN_ON;
-           }
-@@ -8640,7 +8610,7 @@ join_table:
-           {
-             MYSQL_YYABORT_UNLESS($1 && $5);
-             /* Change the current name resolution context to a local context. */
--            if (push_new_name_resolution_context(YYTHD, $1, $5))
-+            if (push_new_name_resolution_context(thd, $1, $5))
-               MYSQL_YYABORT;
-             Select->parsing_place= IN_ON;
-           }
-@@ -8676,7 +8646,7 @@ join_table:
-           {
-             MYSQL_YYABORT_UNLESS($1 && $5);
-             /* Change the current name resolution context to a local context. */
--            if (push_new_name_resolution_context(YYTHD, $1, $5))
-+            if (push_new_name_resolution_context(thd, $1, $5))
-               MYSQL_YYABORT;
-             Select->parsing_place= IN_ON;
-           }
-@@ -8724,7 +8694,7 @@ table_factor:
-           }
-           table_ident opt_table_alias opt_key_definition
-           {
--            if (!($$= Select->add_table_to_list(YYTHD, $2, $3,
-+            if (!($$= Select->add_table_to_list(thd, $2, $3,
-                                                 Select->get_table_join_options(),
-                                                 Lex->lock_option,
-                                                 Select->pop_index_hints())))
-@@ -8922,7 +8892,7 @@ index_hints_list:
- 
- opt_index_hints_list:
-           /* empty */
--        | { Select->alloc_index_hints(YYTHD); } index_hints_list
-+        | { Select->alloc_index_hints(thd); } index_hints_list
-         ;
- 
- opt_key_definition:
-@@ -8931,15 +8901,15 @@ opt_key_definition:
-         ;
- 
- opt_key_usage_list:
--          /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); }
-+          /* empty */ { Select->add_index_hint(thd, NULL, 0); }
-         | key_usage_list {}
-         ;
- 
- key_usage_element:
-           ident
--          { Select->add_index_hint(YYTHD, $1.str, $1.length); }
-+          { Select->add_index_hint(thd, $1.str, $1.length); }
-         | PRIMARY_SYM
--          { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); }
-+          { Select->add_index_hint(thd, (char *)"PRIMARY", 7); }
-         ;
- 
- key_usage_list:
-@@ -8952,7 +8922,7 @@ using_list:
-           {
-             if (!($$= new List<String>))
-               MYSQL_YYABORT;
--            String *s= new (YYTHD->mem_root) String((const char *) $1.str,
-+            String *s= new (thd->mem_root) String((const char *) $1.str,
-                                                     $1.length,
-                                                     system_charset_info);
-             if (s == NULL)
-@@ -8961,7 +8931,7 @@ using_list:
-           }
-         | using_list ',' ident
-           {
--            String *s= new (YYTHD->mem_root) String((const char *) $3.str,
-+            String *s= new (thd->mem_root) String((const char *) $3.str,
-                                                     $3.length,
-                                                     system_charset_info);
-             if (s == NULL)
-@@ -9002,7 +8972,7 @@ interval_time_stamp:
-                                     implementation without changing its
-                                     resolution.
-                                   */
--                                  WARN_DEPRECATED(yythd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND");
-+                                  WARN_DEPRECATED(thd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND");
-                                 }
- 	;
- 
-@@ -9086,7 +9056,6 @@ opt_escape:
-           }
-         | /* empty */
-           {
--            THD *thd= YYTHD;
-             Lex->escape_used= FALSE;
-             $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
-                  new (thd->mem_root) Item_string("", 0, &my_charset_latin1) :
-@@ -9107,9 +9076,9 @@ group_clause:
- 
- group_list:
-           group_list ',' order_ident order_dir
--          { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
-+          { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
-         | order_ident order_dir
--          { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
-+          { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
-         ;
- 
- olap_opt:
-@@ -9156,7 +9125,6 @@ alter_order_list:
- alter_order_item:
-           simple_ident_nospvar order_dir
-           {
--            THD *thd= YYTHD;
-             bool ascending= ($2 == 1) ? true : false;
-             if (add_order_to_list(thd, $1, ascending))
-               MYSQL_YYABORT;
-@@ -9209,9 +9177,9 @@ order_clause:
- 
- order_list:
-           order_list ',' order_ident order_dir
--          { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; }
-+          { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; }
-         | order_ident order_dir
--          { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; }
-+          { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; }
-         ;
- 
- order_dir:
-@@ -9271,19 +9239,19 @@ limit_option:
-         }
-         | ULONGLONG_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
-+            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | LONG_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
-+            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | NUM
-           {
--            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
-+            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -9365,7 +9333,7 @@ procedure_clause:
-             lex->proc_list.elements=0;
-             lex->proc_list.first=0;
-             lex->proc_list.next= &lex->proc_list.first;
--            Item_field *item= new (YYTHD->mem_root)
-+            Item_field *item= new (thd->mem_root)
-                                 Item_field(&lex->current_select->context,
-                                            NULL, NULL, $2.str);
-             if (item == NULL)
-@@ -9390,8 +9358,6 @@ procedure_list2:
- procedure_item:
-           remember_name expr remember_end
-           {
--            THD *thd= YYTHD;
--
-             if (add_proc_to_list(thd, $2))
-               MYSQL_YYABORT;
-             if (!$2->name)
-@@ -9560,7 +9526,6 @@ drop:
-           }
-         | DROP FUNCTION_SYM if_exists ident '.' ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             sp_name *spname;
-             if ($4.str && check_db_name(&$4))
-@@ -9583,7 +9548,6 @@ drop:
-           }
-         | DROP FUNCTION_SYM if_exists ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             LEX_STRING db= {0, 0};
-             sp_name *spname;
-@@ -9664,7 +9628,7 @@ table_list:
- table_name:
-           table_ident
-           {
--            if (!Select->add_table_to_list(YYTHD, $1, NULL, TL_OPTION_UPDATING))
-+            if (!Select->add_table_to_list(thd, $1, NULL, TL_OPTION_UPDATING))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -9677,7 +9641,7 @@ table_alias_ref_list:
- table_alias_ref:
-           table_ident_opt_wild
-           {
--            if (!Select->add_table_to_list(YYTHD, $1, NULL,
-+            if (!Select->add_table_to_list(thd, $1, NULL,
-                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-                                            Lex->lock_option ))
-               MYSQL_YYABORT;
-@@ -9868,7 +9832,7 @@ expr_or_default:
-           expr { $$= $1;}
-         | DEFAULT
-           {
--            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context());
-+            $$= new (thd->mem_root) Item_default_value(Lex->current_context());
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -9922,7 +9886,7 @@ update_list:
- update_elem:
-           simple_ident_nospvar equal expr_or_default
-           {
--            if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3))
-+            if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -9965,7 +9929,7 @@ delete:
- single_multi:
-           FROM table_ident
-           {
--            if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING,
-+            if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING,
-                                            Lex->lock_option))
-               MYSQL_YYABORT;
-           }
-@@ -9998,7 +9962,7 @@ table_wild_one:
-             Table_ident *ti= new Table_ident($1);
-             if (ti == NULL)
-               MYSQL_YYABORT;
--            if (!Select->add_table_to_list(YYTHD,
-+            if (!Select->add_table_to_list(thd,
-                                            ti,
-                                            $3,
-                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -10007,10 +9971,10 @@ table_wild_one:
-           }
-         | ident '.' ident opt_wild opt_table_alias
-           {
--            Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0);
-+            Table_ident *ti= new Table_ident(thd, $1, $3, 0);
-             if (ti == NULL)
-               MYSQL_YYABORT;
--            if (!Select->add_table_to_list(YYTHD,
-+            if (!Select->add_table_to_list(thd,
-                                            ti,
-                                            $5, 
-                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -10130,7 +10094,7 @@ show_param:
-            {
-              LEX *lex= Lex;
-              lex->sql_command= SQLCOM_SHOW_DATABASES;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA))
-+             if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA))
-                MYSQL_YYABORT;
-            }
-          | opt_full TABLES opt_db wild_and_where
-@@ -10138,7 +10102,7 @@ show_param:
-              LEX *lex= Lex;
-              lex->sql_command= SQLCOM_SHOW_TABLES;
-              lex->select_lex.db= $3;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES))
-+             if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES))
-                MYSQL_YYABORT;
-            }
-          | opt_full TRIGGERS_SYM opt_db wild_and_where
-@@ -10146,7 +10110,7 @@ show_param:
-              LEX *lex= Lex;
-              lex->sql_command= SQLCOM_SHOW_TRIGGERS;
-              lex->select_lex.db= $3;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS))
-+             if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS))
-                MYSQL_YYABORT;
-            }
-          | EVENTS_SYM opt_db wild_and_where
-@@ -10154,7 +10118,7 @@ show_param:
-              LEX *lex= Lex;
-              lex->sql_command= SQLCOM_SHOW_EVENTS;
-              lex->select_lex.db= $2;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS))
-+             if (prepare_schema_table(thd, lex, 0, SCH_EVENTS))
-                MYSQL_YYABORT;
-            }
-          | TABLE_SYM STATUS_SYM opt_db wild_and_where
-@@ -10162,7 +10126,7 @@ show_param:
-              LEX *lex= Lex;
-              lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
-              lex->select_lex.db= $3;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES))
-+             if (prepare_schema_table(thd, lex, 0, SCH_TABLES))
-                MYSQL_YYABORT;
-            }
-         | OPEN_SYM TABLES opt_db wild_and_where
-@@ -10170,22 +10134,22 @@ show_param:
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
-             lex->select_lex.db= $3;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES))
-+            if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES))
-               MYSQL_YYABORT;
-           }
-         | opt_full PLUGIN_SYM
-           {
-             LEX *lex= Lex;
--            WARN_DEPRECATED(yythd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'");
-+            WARN_DEPRECATED(thd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'");
-             lex->sql_command= SQLCOM_SHOW_PLUGINS;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
-+            if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS))
-               MYSQL_YYABORT;
-           }
-         | PLUGINS_SYM
-           {
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_PLUGINS;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
-+            if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS))
-               MYSQL_YYABORT;
-           }
-         | ENGINE_SYM known_storage_engines show_engine_param
-@@ -10198,7 +10162,7 @@ show_param:
-             lex->sql_command= SQLCOM_SHOW_FIELDS;
-             if ($5)
-               $4->change_db($5);
--            if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS))
-+            if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS))
-               MYSQL_YYABORT;
-           }
-         | NEW_SYM MASTER_SYM FOR_SYM SLAVE
-@@ -10233,7 +10197,7 @@ show_param:
-             lex->sql_command= SQLCOM_SHOW_KEYS;
-             if ($4)
-               $3->change_db($4);
--            if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS))
-+            if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS))
-               MYSQL_YYABORT;
-           }
-         | COLUMN_SYM TYPES_SYM
-@@ -10245,15 +10209,15 @@ show_param:
-           {
-             LEX *lex=Lex;
-             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
--            WARN_DEPRECATED(yythd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
-+            WARN_DEPRECATED(thd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
-+            if (prepare_schema_table(thd, lex, 0, SCH_ENGINES))
-               MYSQL_YYABORT;
-           }
-         | opt_storage ENGINES_SYM
-           {
-             LEX *lex=Lex;
-             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
-+            if (prepare_schema_table(thd, lex, 0, SCH_ENGINES))
-               MYSQL_YYABORT;
-           }
-         | AUTHORS_SYM
-@@ -10285,7 +10249,7 @@ show_param:
-           { 
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_PROFILE;
--            if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0)
-+            if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0)
-               YYABORT;
-           }
-         | opt_var_type STATUS_SYM wild_and_where
-@@ -10293,7 +10257,7 @@ show_param:
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_STATUS;
-             lex->option_type= $1;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS))
-+            if (prepare_schema_table(thd, lex, 0, SCH_STATUS))
-               MYSQL_YYABORT;
-           }
-         | INNOBASE_SYM STATUS_SYM
-@@ -10301,24 +10265,24 @@ show_param:
-             LEX *lex= Lex;
-             lex->sql_command = SQLCOM_SHOW_ENGINE_STATUS;
-             if (!(lex->create_info.db_type=
--                  ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB)))
-+                  ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB)))
-             {
-               my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
-               MYSQL_YYABORT;
-             }
--            WARN_DEPRECATED(yythd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
-+            WARN_DEPRECATED(thd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
-           }
-         | MUTEX_SYM STATUS_SYM
-           {
-             LEX *lex= Lex;
-             lex->sql_command = SQLCOM_SHOW_ENGINE_MUTEX;
-             if (!(lex->create_info.db_type=
--                  ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB)))
-+                  ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB)))
-             {
-               my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
-               MYSQL_YYABORT;
-             }
--            WARN_DEPRECATED(yythd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
-+            WARN_DEPRECATED(thd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
-           }
-         | opt_full PROCESSLIST_SYM
-           { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
-@@ -10327,21 +10291,21 @@ show_param:
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_VARIABLES;
-             lex->option_type= $1;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES))
-+            if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES))
-               MYSQL_YYABORT;
-           }
-         | charset wild_and_where
-           {
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_CHARSETS;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS))
-+            if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS))
-               MYSQL_YYABORT;
-           }
-         | COLLATION_SYM wild_and_where
-           {
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_COLLATIONS;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS))
-+            if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS))
-               MYSQL_YYABORT;
-           }
-         | GRANTS
-@@ -10371,7 +10335,7 @@ show_param:
-           {
-             LEX *lex= Lex;
-             lex->sql_command = SQLCOM_SHOW_CREATE;
--            if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0))
-+            if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0))
-               MYSQL_YYABORT;
-             lex->only_view= 0;
-             lex->create_info.storage_media= HA_SM_DEFAULT;
-@@ -10380,7 +10344,7 @@ show_param:
-           {
-             LEX *lex= Lex;
-             lex->sql_command = SQLCOM_SHOW_CREATE;
--            if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0))
-+            if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0))
-               MYSQL_YYABORT;
-             lex->only_view= 1;
-           }
-@@ -10416,14 +10380,14 @@ show_param:
-           {
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES))
-+            if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
-               MYSQL_YYABORT;
-           }
-         | FUNCTION_SYM STATUS_SYM wild_and_where
-           {
-             LEX *lex= Lex;
-             lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
--            if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES))
-+            if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
-               MYSQL_YYABORT;
-           }
-         | PROCEDURE CODE_SYM sp_name
-@@ -10501,7 +10465,7 @@ wild_and_where:
-           /* empty */
-         | LIKE TEXT_STRING_sys
-           {
--            Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length,
-+            Lex->wild= new (thd->mem_root) String($2.str, $2.length,
-                                                     system_charset_info);
-             if (Lex->wild == NULL)
-               MYSQL_YYABORT;
-@@ -10525,7 +10489,7 @@ describe:
-             lex->sql_command= SQLCOM_SHOW_FIELDS;
-             lex->select_lex.db= 0;
-             lex->verbose= 0;
--            if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS))
-+            if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS))
-               MYSQL_YYABORT;
-           }
-           opt_describe_column {}
-@@ -10554,7 +10518,7 @@ opt_describe_column:
-         | text_string { Lex->wild= $1; }
-         | ident
-           {
--            Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str,
-+            Lex->wild= new (thd->mem_root) String((const char*) $1.str,
-                                                     $1.length,
-                                                     system_charset_info);
-             if (Lex->wild == NULL)
-@@ -10697,7 +10661,6 @@ use:
- load:
-           LOAD DATA_SYM
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
- 
-             if (lex->sphead)
-@@ -10711,7 +10674,7 @@ load:
-         | LOAD TABLE_SYM table_ident FROM MASTER_SYM
-           {
-             LEX *lex=Lex;
--            WARN_DEPRECATED(yythd, "6.0", "LOAD TABLE FROM MASTER",
-+            WARN_DEPRECATED(thd, "6.0", "LOAD TABLE FROM MASTER",
-                             "MySQL Administrator (mysqldump, mysql)");
-             if (lex->sphead)
-             {
-@@ -10719,7 +10682,7 @@ load:
-               MYSQL_YYABORT;
-             }
-             lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;
--            if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING))
-+            if (!Select->add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -10739,7 +10702,7 @@ load_data:
-           opt_duplicate INTO TABLE_SYM table_ident
-           {
-             LEX *lex=Lex;
--            if (!Select->add_table_to_list(YYTHD, $9, NULL, TL_OPTION_UPDATING,
-+            if (!Select->add_table_to_list(thd, $9, NULL, TL_OPTION_UPDATING,
-                                            lex->lock_option))
-               MYSQL_YYABORT;
-             lex->field_list.empty();
-@@ -10754,7 +10717,7 @@ load_data:
-         | FROM MASTER_SYM
-           {
-             Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
--            WARN_DEPRECATED(yythd, "6.0", "LOAD DATA FROM MASTER",
-+            WARN_DEPRECATED(thd, "6.0", "LOAD DATA FROM MASTER",
-                             "mysqldump or future "
-                             "BACKUP/RESTORE DATABASE facility");
-           }
-@@ -10872,7 +10835,7 @@ field_or_var:
-           simple_ident_nospvar {$$= $1;}
-         | '@' ident_or_text
-           {
--            $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2);
-+            $$= new (thd->mem_root) Item_user_var_as_out_param($2);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -10889,7 +10852,6 @@ text_literal:
-           TEXT_STRING
-           {
-             LEX_STRING tmp;
--            THD *thd= YYTHD;
-             CHARSET_INFO *cs_con= thd->variables.collation_connection;
-             CHARSET_INFO *cs_cli= thd->variables.character_set_client;
-             uint repertoire= thd->lex->text_string_is_7bit &&
-@@ -10915,7 +10877,7 @@ text_literal:
-             uint repertoire= Lex->text_string_is_7bit ?
-                              MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
-             DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info));
--            $$= new (YYTHD->mem_root) Item_string($1.str, $1.length,
-+            $$= new (thd->mem_root) Item_string($1.str, $1.length,
-                                                   national_charset_info,
-                                                   DERIVATION_COERCIBLE,
-                                                   repertoire);
-@@ -10924,7 +10886,7 @@ text_literal:
-           }
-         | UNDERSCORE_CHARSET TEXT_STRING
-           {
--            Item_string *str= new (YYTHD->mem_root) Item_string($2.str,
-+            Item_string *str= new (thd->mem_root) Item_string($2.str,
-                                                                 $2.length, $1);
-             if (str == NULL)
-               MYSQL_YYABORT;
-@@ -10943,7 +10905,7 @@ text_literal:
-                  If the string has been pure ASCII so far,
-                  check the new part.
-               */
--              CHARSET_INFO *cs= YYTHD->variables.collation_connection;
-+              CHARSET_INFO *cs= thd->variables.collation_connection;
-               item->collation.repertoire|= my_string_repertoire(cs,
-                                                                 $2.str,
-                                                                 $2.length);
-@@ -10954,15 +10916,15 @@ text_literal:
- text_string:
-           TEXT_STRING_literal
-           {
--            $$= new (YYTHD->mem_root) String($1.str,
-+            $$= new (thd->mem_root) String($1.str,
-                                              $1.length,
--                                             YYTHD->variables.collation_connection);
-+                                             thd->variables.collation_connection);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | HEX_NUM
-           {
--            Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length);
-+            Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length);
-             if (tmp == NULL)
-               MYSQL_YYABORT;
-             /*
-@@ -10974,7 +10936,7 @@ text_string:
-           }
-         | BIN_NUM
-           {
--            Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length);
-+            Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length);
-             if (tmp == NULL)
-               MYSQL_YYABORT;
-             /*
-@@ -10989,7 +10951,6 @@ text_string:
- param_marker:
-           PARAM_MARKER
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             Item_param *item;
-@@ -11022,38 +10983,38 @@ literal:
-         | NUM_literal { $$ = $1; }
-         | NULL_SYM
-           {
--            $$ = new (YYTHD->mem_root) Item_null();
-+            $$ = new (thd->mem_root) Item_null();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT;
-           }
-         | FALSE_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1);
-+            $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | TRUE_SYM
-           {
--            $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1);
-+            $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | HEX_NUM
-           {
--            $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length);
-+            $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | BIN_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length);
-+            $$= new (thd->mem_root) Item_bin_string($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | UNDERSCORE_CHARSET HEX_NUM
-           {
--            Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length);
-+            Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length);
-             if (tmp == NULL)
-               MYSQL_YYABORT;
-             /*
-@@ -11064,7 +11025,7 @@ literal:
-             String *str= tmp->val_str((String*) 0);
- 
-             Item_string *item_str;
--            item_str= new (YYTHD->mem_root)
-+            item_str= new (thd->mem_root)
-                         Item_string(NULL, /* name will be set in select_item */
-                                     str ? str->ptr() : "",
-                                     str ? str->length() : 0,
-@@ -11082,7 +11043,7 @@ literal:
-           }
-         | UNDERSCORE_CHARSET BIN_NUM
-           {
--            Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length);
-+            Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length);
-             if (tmp == NULL)
-               MYSQL_YYABORT;
-             /*
-@@ -11093,7 +11054,7 @@ literal:
-             String *str= tmp->val_str((String*) 0);
- 
-             Item_string *item_str;
--            item_str= new (YYTHD->mem_root)
-+            item_str= new (thd->mem_root)
-                         Item_string(NULL, /* name will be set in select_item */
-                                     str ? str->ptr() : "",
-                                     str ? str->length() : 0,
-@@ -11117,7 +11078,7 @@ NUM_literal:
-           NUM
-           {
-             int error;
--            $$= new (YYTHD->mem_root)
-+            $$= new (thd->mem_root)
-                   Item_int($1.str,
-                            (longlong) my_strtoll10($1.str, NULL, &error),
-                            $1.length);
-@@ -11127,7 +11088,7 @@ NUM_literal:
-         | LONG_NUM
-           {
-             int error;
--            $$= new (YYTHD->mem_root)
-+            $$= new (thd->mem_root)
-                   Item_int($1.str,
-                            (longlong) my_strtoll10($1.str, NULL, &error),
-                            $1.length);
-@@ -11136,23 +11097,23 @@ NUM_literal:
-           }
-         | ULONGLONG_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length);
-+            $$= new (thd->mem_root) Item_uint($1.str, $1.length);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | DECIMAL_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length,
--                                                   YYTHD->charset());
--            if (($$ == NULL) || (YYTHD->is_error()))
-+            $$= new (thd->mem_root) Item_decimal($1.str, $1.length,
-+                                                   thd->charset());
-+            if (($$ == NULL) || (thd->is_error()))
-             {
-               MYSQL_YYABORT;
-             }
-           }
-         | FLOAT_NUM
-           {
--            $$= new (YYTHD->mem_root) Item_float($1.str, $1.length);
--            if (($$ == NULL) || (YYTHD->is_error()))
-+            $$= new (thd->mem_root) Item_float($1.str, $1.length);
-+            if (($$ == NULL) || (thd->is_error()))
-             {
-               MYSQL_YYABORT;
-             }
-@@ -11172,7 +11133,7 @@ table_wild:
-           ident '.' '*'
-           {
-             SELECT_LEX *sel= Select;
--            $$= new (YYTHD->mem_root) Item_field(Lex->current_context(),
-+            $$= new (thd->mem_root) Item_field(Lex->current_context(),
-                                                  NullS, $1.str, "*");
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-@@ -11180,7 +11141,6 @@ table_wild:
-           }
-         | ident '.' ident '.' '*'
-           {
--            THD *thd= YYTHD;
-             SELECT_LEX *sel= Select;
-             const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
-                                   NullS : $1.str;
-@@ -11200,7 +11160,6 @@ order_ident:
- simple_ident:
-           ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_variable_t *spv;
-@@ -11251,7 +11210,6 @@ simple_ident:
- simple_ident_nospvar:
-           ident
-           {
--            THD *thd= YYTHD;
-             SELECT_LEX *sel=Select;
-             if ((sel->parsing_place != IN_HAVING) ||
-                 (sel->get_in_sum_expr() > 0))
-@@ -11273,7 +11231,6 @@ simple_ident_nospvar:
- simple_ident_q:
-           ident '.' ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
- 
-             /*
-@@ -11352,7 +11309,6 @@ simple_ident_q:
-           }
-         | '.' ident '.' ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             SELECT_LEX *sel= lex->current_select;
-             if (sel->no_table_names_allowed)
-@@ -11377,7 +11333,6 @@ simple_ident_q:
-           }
-         | ident '.' ident '.' ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             SELECT_LEX *sel= lex->current_select;
-             const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ?
-@@ -11445,7 +11400,7 @@ table_ident:
-           }
-         | ident '.' ident
-           {
--            $$= new Table_ident(YYTHD, $1,$3,0);
-+            $$= new Table_ident(thd, $1,$3,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -11467,7 +11422,7 @@ table_ident_opt_wild:
-           }
-         | ident '.' ident opt_wild
-           {
--            $$= new Table_ident(YYTHD, $1,$3,0);
-+            $$= new Table_ident(thd, $1,$3,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -11477,7 +11432,7 @@ table_ident_nodb:
-           ident
-           {
-             LEX_STRING db={(char*) any_db,3};
--            $$= new Table_ident(YYTHD, db,$1,0);
-+            $$= new Table_ident(thd, db,$1,0);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -11487,8 +11442,6 @@ IDENT_sys:
-           IDENT { $$= $1; }
-         | IDENT_QUOTED
-           {
--            THD *thd= YYTHD;
--
-             if (thd->charset_is_system_charset)
-             {
-               CHARSET_INFO *cs= system_charset_info;
-@@ -11516,8 +11469,6 @@ IDENT_sys:
- TEXT_STRING_sys:
-           TEXT_STRING
-           {
--            THD *thd= YYTHD;
--
-             if (thd->charset_is_system_charset)
-               $$= $1;
-             else
-@@ -11532,8 +11483,6 @@ TEXT_STRING_sys:
- TEXT_STRING_literal:
-           TEXT_STRING
-           {
--            THD *thd= YYTHD;
--
-             if (thd->charset_is_collation_connection)
-               $$= $1;
-             else
-@@ -11548,8 +11497,6 @@ TEXT_STRING_literal:
- TEXT_STRING_filesystem:
-           TEXT_STRING
-           {
--            THD *thd= YYTHD;
--
-             if (thd->charset_is_character_set_filesystem)
-               $$= $1;
-             else
-@@ -11566,7 +11513,6 @@ ident:
-           IDENT_sys    { $$=$1; }
-         | keyword
-           {
--            THD *thd= YYTHD;
-             $$.str= thd->strmake($1.str, $1.length);
-             if ($$.str == NULL)
-               MYSQL_YYABORT;
-@@ -11578,7 +11524,6 @@ label_ident:
-           IDENT_sys    { $$=$1; }
-         | keyword_sp
-           {
--            THD *thd= YYTHD;
-             $$.str= thd->strmake($1.str, $1.length);
-             if ($$.str == NULL)
-               MYSQL_YYABORT;
-@@ -11595,7 +11540,6 @@ ident_or_text:
- user:
-           ident_or_text
-           {
--            THD *thd= YYTHD;
-             if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
-               MYSQL_YYABORT;
-             $$->user = $1;
-@@ -11609,7 +11553,6 @@ user:
-           }
-         | ident_or_text '@' ident_or_text
-           {
--            THD *thd= YYTHD;
-             if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
-               MYSQL_YYABORT;
-             $$->user = $1; $$->host=$3;
-@@ -11628,7 +11571,7 @@ user:
-           }
-         | CURRENT_USER optional_braces
-           {
--            if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
-+            if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
-               MYSQL_YYABORT;
-             /* 
-               empty LEX_USER means current_user and 
-@@ -11991,7 +11934,6 @@ option_value_list:
- 
- option_type_value:
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -12022,7 +11964,6 @@ option_type_value:
-           }
-           ext_option_value
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -12105,7 +12046,6 @@ ext_option_value:
- sys_option_value:
-           option_type internal_variable_name equal set_expr_or_default
-           {
--            THD *thd= YYTHD;
-             LEX *lex= Lex;
-             LEX_STRING *name= &$2.base_name;
- 
-@@ -12117,7 +12057,7 @@ sys_option_value:
-                 my_parse_error(ER(ER_SYNTAX_ERROR));
-                 MYSQL_YYABORT;
-               }
--              if (set_trigger_new_row(YYTHD, name, $4))
-+              if (set_trigger_new_row(thd, name, $4))
-                 MYSQL_YYABORT;
-             }
-             else if ($2.var)
-@@ -12147,7 +12087,6 @@ sys_option_value:
-           }
-         | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
-           {
--            THD *thd= YYTHD;
-             LEX *lex=Lex;
-             lex->option_type= $1;
-             Item *item= new (thd->mem_root) Item_int((int32) $5);
-@@ -12167,7 +12106,7 @@ option_value:
-           '@' ident_or_text equal expr
-           {
-             Item_func_set_user_var *item;
--            item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4);
-+            item= new (thd->mem_root) Item_func_set_user_var($2, $4);
-             if (item == NULL)
-               MYSQL_YYABORT;
-             set_var_user *var= new set_var_user(item);
-@@ -12177,7 +12116,6 @@ option_value:
-           }
-         | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
-           {
--            THD *thd= YYTHD;
-             struct sys_var_with_base tmp= $4;
-             /* Lookup if necessary: must be a system variable. */
-             if (tmp.var == NULL)
-@@ -12190,7 +12128,6 @@ option_value:
-           }
-         | charset old_or_new_charset_name_or_default
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             CHARSET_INFO *cs2;
-             cs2= $2 ? $2: global_system_variables.character_set_client;
-@@ -12238,7 +12175,6 @@ option_value:
-           }
-         | PASSWORD equal text_or_password
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             LEX_USER *user;
-             sp_pcontext *spc= lex->spcont;
-@@ -12278,7 +12214,6 @@ option_value:
- internal_variable_name:
-           ident
-           {
--            THD *thd= YYTHD;
-             sp_pcontext *spc= thd->lex->spcont;
-             sp_variable_t *spv;
- 
-@@ -12337,7 +12272,7 @@ internal_variable_name:
-             }
-             else
-             {
--              sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length);
-+              sys_var *tmp=find_sys_var(thd, $3.str, $3.length);
-               if (!tmp)
-                 MYSQL_YYABORT;
-               if (!tmp->is_struct())
-@@ -12348,7 +12283,7 @@ internal_variable_name:
-           }
-         | DEFAULT '.' ident
-           {
--            sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length);
-+            sys_var *tmp=find_sys_var(thd, $3.str, $3.length);
-             if (!tmp)
-               MYSQL_YYABORT;
-             if (!tmp->is_struct())
-@@ -12370,16 +12305,16 @@ text_or_password:
-           TEXT_STRING { $$=$1.str;}
-         | PASSWORD '(' TEXT_STRING ')'
-           {
--            $$= $3.length ? YYTHD->variables.old_passwords ?
--              Item_func_old_password::alloc(YYTHD, $3.str, $3.length) :
--              Item_func_password::alloc(YYTHD, $3.str, $3.length) :
-+            $$= $3.length ? thd->variables.old_passwords ?
-+              Item_func_old_password::alloc(thd, $3.str, $3.length) :
-+              Item_func_password::alloc(thd, $3.str, $3.length) :
-               $3.str;
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | OLD_PASSWORD '(' TEXT_STRING ')'
-           {
--            $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str,
-+            $$= $3.length ? Item_func_old_password::alloc(thd, $3.str,
-                                                           $3.length) :
-               $3.str;
-             if ($$ == NULL)
-@@ -12393,19 +12328,19 @@ set_expr_or_default:
-         | DEFAULT { $$=0; }
-         | ON
-           {
--            $$=new (YYTHD->mem_root) Item_string("ON",  2, system_charset_info);
-+            $$=new (thd->mem_root) Item_string("ON",  2, system_charset_info);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | ALL
-           {
--            $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info);
-+            $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-         | BINARY
-           {
--            $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info);
-+            $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
-@@ -12443,7 +12378,7 @@ table_lock:
-           table_ident opt_table_alias lock_option
-           {
-             thr_lock_type lock_type= (thr_lock_type) $3;
--            if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type))
-+            if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type))
-               MYSQL_YYABORT;
-             /* If table is to be write locked, protect from a impending GRL. */
-             if (lock_type >= TL_WRITE_ALLOW_WRITE)
-@@ -12514,7 +12449,7 @@ handler:
-             lex->expr_allows_subselect= FALSE;
-             lex->sql_command = SQLCOM_HA_READ;
-             lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */
--            Item *one= new (YYTHD->mem_root) Item_int((int32) 1);
-+            Item *one= new (thd->mem_root) Item_int((int32) 1);
-             if (one == NULL)
-               MYSQL_YYABORT;
-             lex->current_select->select_limit= one;
-@@ -12836,10 +12771,10 @@ grant_user:
-             $$=$1; $1->password=$4;
-             if ($4.length)
-             {
--              if (YYTHD->variables.old_passwords)
-+              if (thd->variables.old_passwords)
-               {
-                 char *buff= 
--                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
-+                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
-                 if (buff == NULL)
-                   MYSQL_YYABORT;
-                 my_make_scrambled_password_323(buff, $4.str, $4.length);
-@@ -12849,7 +12784,7 @@ grant_user:
-               else
-               {
-                 char *buff= 
--                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
-+                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
-                 if (buff == NULL)
-                   MYSQL_YYABORT;
-                 my_make_scrambled_password(buff, $4.str, $4.length);
-@@ -12881,7 +12816,7 @@ column_list:
- column_list_id:
-           ident
-           {
--            String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info);
-+            String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info);
-             if (new_str == NULL)
-               MYSQL_YYABORT;
-             List_iterator <LEX_COLUMN> iter(Lex->columns);
-@@ -12981,14 +12916,14 @@ opt_work:
- 
- opt_chain:
-           /* empty */
--          { $$= (YYTHD->variables.completion_type == 1); }
-+          { $$= (thd->variables.completion_type == 1); }
-         | AND_SYM NO_SYM CHAIN_SYM { $$=0; }
-         | AND_SYM CHAIN_SYM        { $$=1; }
-         ;
- 
- opt_release:
-           /* empty */
--          { $$= (YYTHD->variables.completion_type == 2); }
-+          { $$= (thd->variables.completion_type == 2); }
-         | RELEASE_SYM        { $$=1; }
-         | NO_SYM RELEASE_SYM { $$=0; }
- ;
-@@ -13102,7 +13037,6 @@ union_opt:
- 
- union_order_or_limit:
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
-             SELECT_LEX *sel= lex->current_select;
-@@ -13118,7 +13052,6 @@ union_order_or_limit:
-           }
-           order_or_limit
-           {
--            THD *thd= YYTHD;
-             thd->lex->current_select->no_table_names_allowed= 0;
-             thd->where= "";
-           }
-@@ -13255,14 +13188,14 @@ no_definer:
-               from older master servers (i.e. to create non-suid trigger in this
-               case).
-             */
--            YYTHD->lex->definer= 0;
-+            thd->lex->definer= 0;
-           }
-         ;
- 
- definer:
-           DEFINER_SYM EQ user
-           {
--            YYTHD->lex->definer= get_current_user(YYTHD, $3);
-+            thd->lex->definer= get_current_user(thd, $3);
-           }
-         ;
- 
-@@ -13307,7 +13240,6 @@ view_suid:
- view_tail:
-           view_suid VIEW_SYM table_ident
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             lex->sql_command= SQLCOM_CREATE_VIEW;
-             /* first table in list is target VIEW name */
-@@ -13347,7 +13279,6 @@ view_select:
-           }
-           view_select_aux view_check_option
-           {
--            THD *thd= YYTHD;
-             LEX *lex= Lex;
-             uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
-             void *create_view_select= thd->memdup(lex->create_view_select.str, len);
-@@ -13403,7 +13334,6 @@ trigger_tail:
-           EACH_SYM
-           ROW_SYM
-           { /* $15 */
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_head *sp;
-@@ -13437,8 +13367,8 @@ trigger_tail:
-             sp_head *sp= lex->sphead;
- 
-             lex->sql_command= SQLCOM_CREATE_TRIGGER;
--            sp->set_stmt_end(YYTHD);
--            sp->restore_thd_mem_root(YYTHD);
-+            sp->set_stmt_end(thd);
-+            sp->restore_thd_mem_root(thd);
- 
-             if (sp->is_not_allowed_in_function("trigger"))
-               MYSQL_YYABORT;
-@@ -13448,7 +13378,7 @@ trigger_tail:
-               sp_proc_stmt alternatives are not saving/restoring LEX, so
-               lex->query_tables can be wiped out.
-             */
--            if (!lex->select_lex.add_table_to_list(YYTHD, $9,
-+            if (!lex->select_lex.add_table_to_list(thd, $9,
-                                                    (LEX_STRING*) 0,
-                                                    TL_OPTION_UPDATING,
-                                                    TL_IGNORE))
-@@ -13466,7 +13396,6 @@ udf_tail:
-           AGGREGATE_SYM remember_name FUNCTION_SYM ident
-           RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             if (is_native_function(thd, & $4))
-             {
-@@ -13484,7 +13413,6 @@ udf_tail:
-         | remember_name FUNCTION_SYM ident
-           RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             if (is_native_function(thd, & $3))
-             {
-@@ -13507,7 +13435,6 @@ sf_tail:
-           sp_name /* $3 */
-           '(' /* $4 */
-           { /* $5 */
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_head *sp;
-@@ -13565,7 +13492,7 @@ sf_tail:
-               MYSQL_YYABORT;
-             }
- 
--            if (sp->fill_field_definition(YYTHD, lex,
-+            if (sp->fill_field_definition(thd, lex,
-                                           (enum enum_field_types) $11,
-                                           &sp->m_return_field_def))
-               MYSQL_YYABORT;
-@@ -13574,7 +13501,6 @@ sf_tail:
-           }
-           sp_c_chistics /* $13 */
-           { /* $14 */
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -13583,7 +13509,6 @@ sf_tail:
-           }
-           sp_proc_stmt /* $15 */
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             sp_head *sp= lex->sphead;
- 
-@@ -13654,10 +13579,10 @@ sp_tail:
-             sp= new sp_head();
-             if (sp == NULL)
-               MYSQL_YYABORT;
--            sp->reset_thd_mem_root(YYTHD);
-+            sp->reset_thd_mem_root(thd);
-             sp->init(lex);
-             sp->m_type= TYPE_ENUM_PROCEDURE;
--            sp->init_sp_name(YYTHD, $3);
-+            sp->init_sp_name(thd, $3);
- 
-             lex->sphead= sp;
-           }
-@@ -13672,7 +13597,6 @@ sp_tail:
-           sp_pdparam_list
-           ')'
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
- 
-             lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
-@@ -13680,7 +13604,6 @@ sp_tail:
-           }
-           sp_c_chistics
-           {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
- 
-             lex->sphead->m_chistics= &lex->sp_chistics;
-@@ -13691,9 +13614,9 @@ sp_tail:
-             LEX *lex= Lex;
-             sp_head *sp= lex->sphead;
- 
--            sp->set_stmt_end(YYTHD);
-+            sp->set_stmt_end(thd);
-             lex->sql_command= SQLCOM_CREATE_PROCEDURE;
--            sp->restore_thd_mem_root(YYTHD);
-+            sp->restore_thd_mem_root(thd);
-           }
-         ;
- 
-@@ -13730,21 +13653,21 @@ xid:
-           text_string
-           {
-             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE);
--            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
-+            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
-               MYSQL_YYABORT;
-             Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0);
-           }
-           | text_string ',' text_string
-           {
-             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE);
--            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
-+            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
-               MYSQL_YYABORT;
-             Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length());
-           }
-           | text_string ',' text_string ',' ulong_num
-           {
-             MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE);
--            if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
-+            if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
-               MYSQL_YYABORT;
-             Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length());
-           }
diff --git a/trunk/package/feeds/packages/nacl/Makefile b/trunk/package/feeds/packages/nacl/Makefile
deleted file mode 100644
index d91a2234..00000000
--- a/trunk/package/feeds/packages/nacl/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nacl
-PKG_VERSION:=20110221
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://hyperelliptic.org/nacl
-PKG_MD5SUM:=7efb5715561c3d10dafd3fa97b4f2d20
-
-PKG_LICENSE:=PublicDomain
-
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nacl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=NaCl Networking and Cryptography library
-  URL:=http://nacl.cace-project.eu/
-endef
-
-define Build/Compile
-	(cd $(PKG_BUILD_DIR) && \
-			CC="$(TARGET_CC)" \
-			CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-			AR="$(TARGET_CROSS)ar" \
-			RANLIB="$(TARGET_CROSS)ranlib" \
-		$(CURDIR)/do-openwrt \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/nacl
-	$(CP) $(PKG_BUILD_DIR)/build/include/*.h $(1)/usr/include/nacl/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/build/lib/libnacl.a $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,nacl))
diff --git a/trunk/package/feeds/packages/nacl/do-openwrt b/trunk/package/feeds/packages/nacl/do-openwrt
deleted file mode 100755
index ba4fde3b..00000000
--- a/trunk/package/feeds/packages/nacl/do-openwrt
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/sh
-set -e
-
-# nacl/do
-# D. J. Bernstein
-# Public domain.
-
-version=`cat version`
-project=nacl
-
-top="`pwd`/build"
-bin="$top/bin"
-lib="$top/lib"
-include="$top/include"
-work="$top/work"
-
-
-# and work around bug in GNU sort
-LANG=C
-export LANG
-
-rm -rf "$top"
-mkdir -p "$top"
-mkdir -p "$bin"
-mkdir -p "$lib"
-mkdir -p "$include"
-
-exec >"$top/log"
-exec 2>&1
-exec 5>"$top/data"
-exec </dev/null
-
-echo "=== `date` === starting"
-
-echo "=== `date` === building inttypes"
-for target in int8 int16 int32 int64 uint8 uint16 uint32 uint64; do
-  (
-    echo "#ifndef crypto_${target}_h"
-    echo "#define crypto_${target}_h"
-    echo ""
-    echo "#include <stdint.h>"
-    echo ""
-    echo "typedef ${target}_t crypto_${target};"
-    echo ""
-    echo "#endif"
-  ) > "$include/crypto_$target.h"
-done
-
-echo "=== `date` === building randombytes"
-rm -rf "$work"
-mkdir -p "$work"
-cp -pr randombytes/* "$work"
-(
-  cd "$work"
-
-  cp devurandom.c randombytes-impl.c
-  cp devurandom.h randombytes-impl.h
-  $CC $CFLAGS -c randombytes-impl.c
-  mkdir -p lib
-  mv randombytes-impl.o lib/randombytes.o
-  mkdir -p include
-  mv randombytes-impl.h include/randombytes.h
-)
-cp -pr "$work"/lib/* "$lib"
-cp -pr "$work"/include/* "$include"
-
-rm -rf "$work"
-mkdir -p "$work"
-echo 'void crypto_'"$project"'_base(void) { ; }' > "$work/${project}_base.c"
-( cd "$work" && $CC $CFLAGS -c ${project}_base.c )
-$AR cr "$lib/lib${project}.a" "$work/${project}_base.o"
-( $RANLIB "$lib/lib${project}.a" || exit 0 )
-
-# loop over operations
-cat OPERATIONS \
-| while read o
-do
-  [ -d "$o" ] || continue
-
-  # for each operation, loop over primitives
-  ls "$o" \
-  | sort \
-  | while read p
-  do
-    [ -d "$o/$p" ] || continue
-    op="${o}_${p}"
-
-    startdate=`date +%Y%m%d`
-
-    echo "=== `date` === $o/$p"
-
-    rm -rf "$work"
-    mkdir -p "$work"
-
-    if [ -d "$o/$p/ref" ]; then
-      implementationdir="$o/$p/ref"
-    else
-      implementationdir="$o/$p/portable"
-    fi
-
-    opi=`echo "$implementationdir" | tr ./- ___`
-
-    echo "=== `date` === $implementationdir"
-
-    cfiles=`ls "$implementationdir" | grep '\.c$' || :`
-    sfiles=`ls "$implementationdir" | grep '\.[sS]$' || :`
-
-    cp -p "$o"/*.c "$work"
-
-    cp -pr "$implementationdir"/* "$work"
-
-    cp -p MACROS "$work/MACROS"
-    cp -p PROTOTYPES.c "$work/PROTOTYPES.c"
-
-    (
-      cd "$work"
-      (
-	echo "#ifndef ${o}_H"
-	echo "#define ${o}_H"
-	echo ""
-	echo "#include \"${op}.h\""
-	echo ""
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < MACROS \
-	  | sed "s/$o/$op/" | while read mop
-	do
-	  echo "#define ${mop} ${mop}" | sed "s/$op/$o/"
-	done
-	echo "#define ${o}_PRIMITIVE \"${p}\""
-	echo "#define ${o}_IMPLEMENTATION ${op}_IMPLEMENTATION"
-	echo "#define ${o}_VERSION ${op}_VERSION"
-	echo ""
-	echo "#endif"
-      ) > "$o.h"
-      (
-	echo "#ifndef ${op}_H"
-	echo "#define ${op}_H"
-	echo ""
-	sed 's/[ 	]CRYPTO_/ '"${opi}"'_/g' < api.h
-	echo '#ifdef __cplusplus'
-	  #echo '#include <string>'
-	  #egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < PROTOTYPES.cpp \
-	  #    | sed "s/$o/$opi/"
-	echo 'extern "C" {'
-	echo '#endif'
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < PROTOTYPES.c \
-	  | sed "s/$o/$opi/"
-	echo '#ifdef __cplusplus'
-	echo '}'
-	echo '#endif'
-	echo ""
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < MACROS \
-	  | sed "s/$o/$opi/" | while read mopi
-	do
-	    echo "#define ${mopi} ${mopi}" | sed "s/$opi/$op/"
-	done
-	echo "#define ${op}_IMPLEMENTATION \"${implementationdir}\""
-	echo "#ifndef ${opi}_VERSION"
-	echo "#define ${opi}_VERSION \"-\""
-	echo "#endif"
-	echo "#define ${op}_VERSION ${opi}_VERSION"
-	echo ""
-	echo "#endif"
-      ) > "$op.h"
-
-      echo "=== `date` === $implementationdir $CC $CFLAGS"
-      for f in $cfiles $sfiles
-      do
-	ok=1
-	$CC $CFLAGS \
-	    -I. -I"$include" \
-	    -c "$f" >errors 2>&1 || ok=0
-	( if [ `wc -l < errors` -lt 25 ]
-	  then
-	    cat errors
-	  else
-	    head errors
-	    echo ...
-	    tail errors
-	  fi
-	) \
-	| while read err
-	do
-	  echo "$version $startdate $o $p fromcompiler $implementationdir $f $err" >&5
-	done
-
-	[ "$ok" = 1 ]
-      done
-
-      for f in *.o
-      do
-	mv "$f" "${opi}-$f"
-      done
-    )
-
-    echo "=== `date` === $implementationdir $CC $CFLAGS finishing"
-
-    $AR cr "$lib/lib${project}.a" "$work"/*.o \
-    && ( $RANLIB "$lib/lib${project}.a" || exit 0 ) \
-    && cp -p "$work/$op.h" "$include/$op.h" \
-    && [ -f "$o/$p/selected" ] \
-    && cp -p "$work/$o.h" "$include/$o.h" \
-    || :
-  done
-done
-
-echo "=== `date` === finishing"
diff --git a/trunk/package/feeds/packages/nail/Makefile b/trunk/package/feeds/packages/nail/Makefile
deleted file mode 100644
index 541d203c..00000000
--- a/trunk/package/feeds/packages/nail/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nail
-PKG_VERSION:=12.5
-PKG_RELEASE:=1
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_SOURCE:=heirloom-mailx_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/h/heirloom-mailx/
-PKG_MD5SUM:=29a6033ef1412824d02eb9d9213cb1f2
-PKG_BUILD_DIR:=$(BUILD_DIR)/heirloom-mailx-$(PKG_VERSION)
-
-PKG_INSTALL:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nail
-  SECTION:=mail
-  CATEGORY:=Mail
-  TITLE:=Heirloom mailx (nail)
-  URL:=http://heirloom.sourceforge.net/mailx.html
-  MAINTAINER:=Dmitry V. Zimin <pfzim@mail.ru>
-  DEPENDS:=+libopenssl
-endef
-
-define Package/nail/description
-  Heirloom mailx (formerly known as "nail") is intended provide
-  the functionality of the POSIX mailx command with additional
-  support for MIME messages, IMAP (including caching), POP3,
-  SMTP, S/MIME, message threading/sorting, scoring, and filtering
-endef
-
-define Package/nail/conffiles
-/etc/nail.rc
-endef
-
-define Build/Install
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/mailx $(PKG_INSTALL_DIR)/usr/bin/
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/etc
-	$(CP) $(PKG_BUILD_DIR)/nail.rc $(PKG_INSTALL_DIR)/etc/
-endef
-
-define Package/nail/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/
-endef
-
-$(eval $(call BuildPackage,nail))
-
diff --git a/trunk/package/feeds/packages/nail/patches/100-handle-openssl-without-sslv2.patch b/trunk/package/feeds/packages/nail/patches/100-handle-openssl-without-sslv2.patch
deleted file mode 100644
index 4352fe87..00000000
--- a/trunk/package/feeds/packages/nail/patches/100-handle-openssl-without-sslv2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/openssl.c
-+++ b/openssl.c
-@@ -216,9 +216,12 @@ ssl_select_method(const char *uhp)
- 
- 	cp = ssl_method_string(uhp);
- 	if (cp != NULL) {
-+#ifndef OPENSSL_NO_SSL2
- 		if (equal(cp, "ssl2"))
- 			method = SSLv2_client_method();
--		else if (equal(cp, "ssl3"))
-+		else
-+#endif
-+		if (equal(cp, "ssl3"))
- 			method = SSLv3_client_method();
- 		else if (equal(cp, "tls1"))
- 			method = TLSv1_client_method();
diff --git a/trunk/package/feeds/packages/nano/Makefile b/trunk/package/feeds/packages/nano/Makefile
deleted file mode 100644
index 6d000425..00000000
--- a/trunk/package/feeds/packages/nano/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nano
-PKG_VERSION:=2.4.0
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.4
-PKG_MD5SUM:=e5c9c6424ee2303663ae4b99ecd4b493
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nano
-  SUBMENU:=Editors
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=An enhanced clone of the Pico text editor
-  URL:=http://www.nano-editor.org/
-  MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
-  DEPENDS:=+libncurses
-endef
-
-define Package/nano/description
-  GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone
-  of the Pico text editor.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-tiny \
-	--disable-glibtest \
-	--disable-utf8 \
-        --without-slang \
-        --disable-color \
-
-CONFIGURE_VARS += \
-	ac_cv_header_regex_h=no \
-
-define Package/nano/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,nano))
-
diff --git a/trunk/package/feeds/packages/ncdu/Makefile b/trunk/package/feeds/packages/ncdu/Makefile
deleted file mode 100644
index edd85275..00000000
--- a/trunk/package/feeds/packages/ncdu/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ncdu
-PKG_VERSION:=1.10
-PKG_RELEASE=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.yorhel.nl/download
-PKG_MD5SUM:=7535decc8d54eca811493e82d4bfab2d
-
-PKG_INSTALL:=1
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ncdu
-  SUBMENU:=Filesystem
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncursesw
-  TITLE:=ncurses disk usage viewer
-  MAINTAINER:=Charles Lehner <celehner1@gmail.com>
-  URL:=http://dev.yorhel.nl/ncdu
-endef
-
-define Package/ncdu/description
-  Ncdu is a ncurses-based du viewer. It provides a fast and easy-to-use
-  interface through famous du utility. It allows one to browse through the
-  directories and show percentages of disk usage with ncurses library.
-endef
-
-define Package/ncdu/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncdu $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,ncdu))
diff --git a/trunk/package/feeds/packages/neon/Makefile b/trunk/package/feeds/packages/neon/Makefile
deleted file mode 100644
index 4d3bf8cf..00000000
--- a/trunk/package/feeds/packages/neon/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=neon
-PKG_VERSION:=0.30.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.webdav.org/neon
-PKG_MD5SUM:=fb60b3a124eeec441937a812c456fd94
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libneon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=HTTP and WebDAV client library
-  URL:=http://www.webdav.org/neon/
-  DEPENDS:=+libopenssl +libexpat
-  MAINTAINER:=Federico Di Marco <fededim@gmail.com>
-endef
-
-define Package/libneon/description
-  neon is an HTTP and WebDAV client library, with a C interface. Features:
-
-  - High-level wrappers for common HTTP and WebDAV operations (GET, MOVE, DELETE, etc)
-  - Low-level interface to the HTTP request/response engine, allowing the use of arbitrary HTTP methods, headers, etc.
-  - Authentication support including Basic and Digest support, along with GSSAPI-based Negotiate on Unix, and
-    SSPI-based Negotiate/NTLM on Win32
-  - SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer for verifying server certificates, handling client
-    certificates, and examining certificate properties. Smartcard-based client certificates are also supported via a
-    PKCS11 wrapper interface.
-  - Abstract interface to parsing XML using libxml2 or expat, and wrappers for simplifying handling XML HTTP response bodies
-  - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify property manipulation.
-endef
-
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-expat \
-	--with-ssl="openssl" \
-	--without-egd \
-	--without-libproxy
-
-CONFIGURE_VARS += \
-	LDFLAGS="$$$$LDFLAGS -lcrypto -lssl"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/neon $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/neon-config
-	$(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/neon-config
-endef
-
-define Package/libneon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libneon))
diff --git a/trunk/package/feeds/packages/net-snmp/Makefile b/trunk/package/feeds/packages/net-snmp/Makefile
deleted file mode 100644
index 5736e0d7..00000000
--- a/trunk/package/feeds/packages/net-snmp/Makefile
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=net-snmp
-PKG_VERSION:=5.4.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/net-snmp
-PKG_MD5SUM:=95aa054f3c99a1ce242807d7eaf98619
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=MIT BSD-3-Clause-Clear
-
-PKG_FIXUP = patch-libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/net-snmp/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.net-snmp.org/
-endef
-
-define Package/net-snmp/Default/description
- Simple Network Management Protocol (SNMP) is a widely used protocol for
- monitoring the health and welfare of network equipment (eg. routers),
- computer equipment and even devices like UPSs. Net-SNMP is a suite of
- applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both
- IPv4 and IPv6.
-endef
-
-
-define Package/libnetsnmp
-$(call Package/net-snmp/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Open source SNMP implementation (libraries)
-endef
-
-define Package/libnetsnmp/description
-$(call Package/net-snmp/Default/description)
- .
- This package contains shared libraries, needed by other programs.
-endef
-
-
-define Package/snmp-utils
-$(call Package/net-snmp/Default)
-  DEPENDS:=+libnetsnmp
-  TITLE:=Open source SNMP implementation (utilities)
-endef
-
-define Package/snmp-utils/description
-$(call Package/net-snmp/Default/description)
- .
- This package contains SNMP client utilities.
-endef
-
-
-define Package/snmpd
-$(call Package/net-snmp/Default)
-  DEPENDS:=+libnetsnmp
-  TITLE:=Open source SNMP implementation (daemon)
-endef
-
-define Package/snmpd/description
-$(call Package/net-snmp/Default/description)
- .
- This package contains the SNMP agent, dynamically linked.
-endef
-
-
-define Package/snmpd-static
-$(call Package/net-snmp/Default)
-  TITLE:=Open source SNMP implementation (daemon)
-endef
-
-define Package/snmpd-static/description
-$(call Package/net-snmp/Default/description)
- .
- This package contains the SNMP agent, statically linked.
-endef
-
-
-SNMP_MIB_MODULES_INCLUDED = \
-	host/hr_device \
-	host/hr_disk \
-	host/hr_filesys \
-	host/hr_network \
-	host/hr_partition \
-	host/hr_proc \
-	host/hr_storage \
-	host/hr_system \
-	ieee802dot11 \
-	if-mib/ifXTable \
-	mibII/at \
-	mibII/icmp \
-	mibII/ifTable \
-	mibII/ip \
-	mibII/snmp_mib \
-	mibII/sysORTable \
-	mibII/system_mib \
-	mibII/tcp \
-	mibII/udp \
-	mibII/vacm_context \
-	mibII/vacm_vars \
-	snmpv3/snmpEngine \
-	snmpv3/snmpMPDStats \
-	snmpv3/usmConf \
-	snmpv3/usmStats \
-	snmpv3/usmUser \
-	tunnel \
-	ucd-snmp/disk \
-	ucd-snmp/dlmod \
-	ucd-snmp/extensible \
-	ucd-snmp/loadave \
-	ucd-snmp/memory \
-	ucd-snmp/pass \
-	ucd-snmp/proc \
-	ucd-snmp/vmstat \
-	util_funcs \
-	utilities/execute \
-
-SNMP_MIB_MODULES_EXCLUDED = \
-	agent_mibs \
-	agentx \
-	disman/event \
-	disman/schedule \
-	hardware \
-	host \
-	if-mib \
-	mibII \
-	notification \
-	notification-log-mib \
-	snmpv3mibs \
-	target \
-	tcp-mib \
-	ucd_snmp \
-	udp-mib \
-	utilities \
-
-SNMP_TRANSPORTS_INCLUDED = Callback UDP
-
-SNMP_TRANSPORTS_EXCLUDED = TCP TCPIPv6 Unix
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-mfd-rewrites \
-	--enable-shared \
-	--enable-static \
-	--with-endianness=$(if $(CONFIG_BIG_ENDIAN),big,little) \
-	--with-logfile=/var/log/snmpd.log \
-	--with-persistent-directory=/usr/lib/snmp/ \
-	--with-default-snmp-version=1 \
-	--with-sys-contact=root@localhost \
-	--with-sys-location=Unknown \
-	--enable-applications \
-	--disable-debugging \
-	--disable-manuals \
-	--disable-mibs \
-	--disable-scripts \
-	--with-out-mib-modules="$(SNMP_MIB_MODULES_EXCLUDED)" \
-	--with-mib-modules="$(SNMP_MIB_MODULES_INCLUDED)" \
-	--with-out-transports="$(SNMP_TRANSPORTS_EXCLUDED)" \
-	--with-transports="$(SNMP_TRANSPORTS_INCLUDED)" \
-	--without-openssl \
-	--without-libwrap \
-	--without-rpm \
-	--without-zlib \
-	 $(call autoconf_bool,CONFIG_IPV6,ipv6) \
-
-ifeq ($(CONFIG_IPV6),y)
-SNMP_TRANSPORTS_INCLUDED+= UDPIPv6
-endif
-
-TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/usr/lib
-
-ifdef CONFIG_PACKAGE_snmpd-static
-  define Build/Compile/static
-	$(MAKE) -C $(PKG_BUILD_DIR)/agent \
-		LDFLAGS="$(TARGET_LDFLAGS) -lm -static" \
-		EXEEXT="-static" \
-		snmpd-static
-  endef
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -lm -lc" \
-		all install
-	$(Build/Compile/static)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(2)/bin/
-	$(SED) 's,=/usr,=$(STAGING_DIR)/usr,g' $(2)/bin/net-snmp-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libnetsnmp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(1)/usr/lib/
-endef
-
-define Package/snmpd/conffiles
-/etc/config/snmpd
-endef
-
-define Package/snmpd/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
-	$(INSTALL_DIR) $(1)/etc/snmp
-	ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/snmpd $(1)/usr/sbin/snmpd
-endef
-
-define Package/snmpd-static/conffiles
-/etc/config/snmpd
-endef
-
-define Package/snmpd-static/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
-	$(INSTALL_DIR) $(1)/etc/snmp
-	ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/agent/snmpd-static $(1)/usr/sbin/snmpd
-endef
-
-define Package/snmp-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libnetsnmp))
-$(eval $(call BuildPackage,snmp-utils))
-$(eval $(call BuildPackage,snmpd))
-$(eval $(call BuildPackage,snmpd-static))
diff --git a/trunk/package/feeds/packages/net-snmp/files/snmpd.conf b/trunk/package/feeds/packages/net-snmp/files/snmpd.conf
deleted file mode 100644
index 4bdc3d4d..00000000
--- a/trunk/package/feeds/packages/net-snmp/files/snmpd.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-config agent
-	option agentaddress UDP:161
-
-config com2sec public
-	option secname ro
-	option source default
-	option community public
-
-config com2sec private
-	option secname rw
-	option source localhost
-	option community private
-
-config group public_v1
-	option group public
-	option version v1
-	option secname ro
-
-config group public_v2c
-	option group public
-	option version v2c
-	option secname ro
-
-config group public_usm
-	option group public
-	option version usm
-	option secname ro
-
-config group private_v1
-	option group private
-	option version v1
-	option secname rw
-
-config group private_v2c
-	option group private
-	option version v2c
-	option secname rw
-
-config group private_usm
-	option group private
-	option version usm
-	option secname rw
-
-config view all
-	option viewname all
-	option type included
-	option oid .1
-
-config access public_access
-	option group public
-	option context none
-	option version any
-	option level noauth
-	option prefix exact
-	option read all
-	option write none
-	option notify none
-
-config access private_access
-	option group private
-	option context none
-	option version any
-	option level noauth
-	option prefix exact
-	option read all
-	option write all
-	option notify all
-
-config system
-	option sysLocation	'office'
-	option sysContact	'bofh@example.com'
-	option sysName		'HeartOfGold'
-#	option sysServices	72
-#	option sysDescr		'adult playground'
-#	option sysObjectID	'1.2.3.4'
-
-config exec
-	option name	filedescriptors
-	option prog	/bin/cat
-	option args	/proc/sys/fs/file-nr
-#	option miboid	1.2.3.4
-
diff --git a/trunk/package/feeds/packages/net-snmp/files/snmpd.init b/trunk/package/feeds/packages/net-snmp/files/snmpd.init
deleted file mode 100644
index 3dd8c41d..00000000
--- a/trunk/package/feeds/packages/net-snmp/files/snmpd.init
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
-START=50
-
-USE_PROCD=1
-PROG="/usr/sbin/snmpd"
-
-CONFIGFILE="/var/run/snmpd.conf"
-
-snmpd_agent_add() {
-	local cfg="$1"
-
-	config_get agentaddress "$cfg" agentaddress
-	[ -n "$agentaddress" ] || return 0
-	echo "agentaddress $agentaddress" >> $CONFIGFILE
-}
-
-snmpd_system_add() {
-	local cfg="$1"
-	config_get syslocation "$cfg" sysLocation
-	[ -n "$syslocation" ] && echo "sysLocation $syslocation" >> $CONFIGFILE
-	config_get syscontact "$cfg" sysContact
-	[ -n "$syscontact" ] && echo "sysContact $syscontact" >> $CONFIGFILE
-	config_get sysname "$cfg" sysName
-	[ -n "$sysname" ] && echo "sysName $sysname" >> $CONFIGFILE
-	config_get sysservice "$cfg" sysService
-	[ -n "$sysservice" ] && echo "sysService $sysservice" >> $CONFIGFILE
-	config_get sysdescr "$cfg" sysDescr
-	[ -n "$sysdescr" ] && echo "sysDescr $sysdescr" >> $CONFIGFILE
-	config_get sysobjectid "$cfg" sysObjectID
-	[ -n "$sysobjectid" ] && echo "sysObjectID $sysobjectid" >> $CONFIGFILE
-}
-
-snmpd_com2sec_add() {
-	local cfg="$1"
-	config_get secname "$cfg" secname
-	[ -n "$secname" ] || return 0
-	config_get source "$cfg" source
-	[ -n "$source" ] || return 0
-	config_get community "$cfg" community
-	[ -n "$community" ] || return 0
-	echo "com2sec $secname $source $community" >> $CONFIGFILE
-}
-
-snmpd_com2sec6_add() {
-	local cfg="$1"
-	config_get secname "$cfg" secname
-	[ -n "$secname" ] || return 0
-	config_get source "$cfg" source
-	[ -n "$source" ] || return 0
-	config_get community "$cfg" community
-	[ -n "$community" ] || return 0
-	echo "com2sec6 $secname $source $community" >> $CONFIGFILE
-}
-
-snmpd_group_add() {
-	local cfg="$1"
-	config_get group "$cfg" group
-	[ -n "$group" ] || return 0
-	config_get version "$cfg" version
-	[ -n "$version" ] || return 0
-	config_get secname "$cfg" secname
-	[ -n "$secname" ] || return 0
-	echo "group $group $version $secname" >> $CONFIGFILE
-}
-
-snmpd_view_add() {
-	local cfg="$1"
-	config_get viewname "$cfg" viewname
-	[ -n "$viewname" ] || return 0
-	config_get type "$cfg" type
-	[ -n "$type" ] || return 0
-	config_get oid "$cfg" oid
-	[ -n "$oid" ] || return 0
-	# optional mask
-	config_get mask "$cfg" mask
-	echo "view $viewname $type $oid $mask" >> $CONFIGFILE
-}
-
-snmpd_access_add() {
-	local cfg="$1"
-	config_get group "$cfg" group
-	[ -n "$group" ] || return 0
-	config_get context "$cfg" context
-	[ -n $context ] || return 0
-	[ "$context" == "none" ] && context='""'
-	config_get version "$cfg" version
-	[ -n "$version" ] || return 0
-	config_get level "$cfg" level
-	[ -n "$level" ] || return 0
-	config_get prefix "$cfg" prefix
-	[ -n "$prefix" ] || return 0
-	config_get read "$cfg" read
-	[ -n "$read" ] || return 0
-	config_get write "$cfg" write
-	[ -n "$write" ] || return 0
-	config_get notify "$cfg" notify
-	[ -n "$notify" ] || return 0
-	echo "access $group $context $version $level $prefix $read $write $notify" >> $CONFIGFILE
-}
-
-snmpd_pass_add() {
-	local cfg="$1"
-	local pass='pass'
-
-	config_get miboid "$cfg" miboid
-	[ -n "$miboid" ] || return 0
-	config_get prog "$cfg" prog
-	[ -n "$prog" ] || return 0
-	config_get_bool persist "$cfg" persist 0
-	[ $persist -ne 0 ] && pass='pass_persist'
-	config_get priority "$cfg" priority
-	priority=${priority:+-p $priority}
-	echo "$pass $priority $miboid $prog" >> $CONFIGFILE
-}
-
-snmpd_exec_add() {
-	local cfg="$1"
-
-	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
-	config_get prog "$cfg" prog
-	[ -n "$prog" ] || return 0
-	config_get args "$cfg" args
-	config_get miboid "$cfg" miboid
-	echo "exec $miboid $name $prog $args" >> $CONFIGFILE
-}
-
-snmpd_disk_add() {
-        local cfg="$1"
-        local disk='disk'
-
-        config_get partition "$cfg" partition
-        [ -n "$partition" ] || return 0
-        config_get size "$cfg" size
-        [ -n "$size" ] || return 0
-        echo "$disk $partition $size" >> $CONFIGFILE
-}
-
-start_service() {
-	[ -f "$CONFIGFILE" ] && rm -f "$CONFIGFILE"
-
-	procd_open_instance
-
-	config_load snmpd
-
-	config_foreach snmpd_agent_add agent
-	config_foreach snmpd_system_add system
-	config_foreach snmpd_com2sec_add com2sec
-	config_foreach snmpd_com2sec6_add com2sec6
-	config_foreach snmpd_group_add group
-	config_foreach snmpd_view_add view
-	config_foreach snmpd_access_add access
-	config_foreach snmpd_pass_add pass
-	config_foreach snmpd_exec_add exec
-	config_foreach snmpd_disk_add disk
-	
-	procd_set_param command $PROG -Lf /dev/null -f
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-
-	for iface in $(ls /sys/class/net 2>/dev/null); do
-		procd_append_param netdev "$iface"
-	done
-
-	procd_close_instance
-}
-
-stop_service() {
-	[ -f "$CONFIGFILE" ] && rm -f "$CONFIGFILE"
-}
diff --git a/trunk/package/feeds/packages/net-snmp/patches/100-debian-statistics.patch b/trunk/package/feeds/packages/net-snmp/patches/100-debian-statistics.patch
deleted file mode 100644
index c937fca0..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/100-debian-statistics.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/agent/mibgroup/mibII/interfaces.c
-+++ b/agent/mibgroup/mibII/interfaces.c
-@@ -1561,6 +1561,10 @@ Interface_Scan_Init(void)
-         struct ifnet   *nnew;
-         char           *stats, *ifstart = line;
- 
-+	/* Ignore interfaces with no statistics. */
-+	if (strstr(line, "No statistics available."))
-+	    continue;
-+
-         if (line[strlen(line) - 1] == '\n')
-             line[strlen(line) - 1] = '\0';
- 
-@@ -1594,7 +1598,7 @@ Interface_Scan_Init(void)
-                                                &coll) != 5)) {
-             if ((scan_line_to_use == scan_line_2_2)
-                 && !strstr(line, "No statistics available"))
--                snmp_log(LOG_ERR,
-+                snmp_log(LOG_DEBUG,
-                          "/proc/net/dev data format error, line ==|%s|",
-                          line);
-             continue;
diff --git a/trunk/package/feeds/packages/net-snmp/patches/110-debian-makefiles.patch b/trunk/package/feeds/packages/net-snmp/patches/110-debian-makefiles.patch
deleted file mode 100644
index 5ce771cc..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/110-debian-makefiles.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/local/Makefile.in
-+++ b/local/Makefile.in
-@@ -100,7 +100,7 @@ tkmib.made: $(srcdir)/tkmib
- 
- mib2c.made: $(srcdir)/mib2c
- 	if test "x$(PERL)" != "x" ; then \
--	  $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \
-+	  $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \
- 	else \
- 	  touch mib2c.made; \
-         fi
---- a/mibs/Makefile.in
-+++ b/mibs/Makefile.in
-@@ -48,11 +48,15 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-M
- UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
- 	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
- 
-+EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \
-+	OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \
-+	LM-SENSORS-MIB.txt
-+
- DEFAULTMIBS = @default_mibs_install@
- 
- MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
- 	$(AGENTMIBS) $(IANAMIBS) \
--	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
-+	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
- 
- all: standardall
- 
---- a/Makefile.top
-+++ b/Makefile.top
-@@ -26,6 +26,7 @@ man8dir		= $(mandir)/man8
- snmplibdir	= $(datadir)/snmp
- mibdir		= $(snmplibdir)/mibs
- persistentdir	= @PERSISTENT_DIRECTORY@
-+sysconfdir	= @sysconfdir@
- DESTDIR         = @INSTALL_PREFIX@
- INSTALL_PREFIX  = $(DESTDIR)
- 
diff --git a/trunk/package/feeds/packages/net-snmp/patches/120-debian-searchdirs.patch b/trunk/package/feeds/packages/net-snmp/patches/120-debian-searchdirs.patch
deleted file mode 100644
index d8c88f3e..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/120-debian-searchdirs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/local/mib2c
-+++ b/local/mib2c
-@@ -60,8 +60,9 @@ $currentlevel = -1;
- if($ENV{MIB2C_DIR}) {
-    push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR});
- }
--push @def_search_dirs, "/usr/local/share/snmp/";
--push @def_search_dirs, "/usr/local/share/snmp/mib2c-data";
-+push @def_search_dirs, "/etc/snmp/";
-+push @def_search_dirs, "/usr/share/snmp/";
-+push @def_search_dirs, "/usr/share/snmp/mib2c-data";
- push @def_search_dirs, "./mib2c-conf.d";
- 
- sub usage {
diff --git a/trunk/package/feeds/packages/net-snmp/patches/130-debian-extramibs.patch b/trunk/package/feeds/packages/net-snmp/patches/130-debian-extramibs.patch
deleted file mode 100644
index e741ee7b..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/130-debian-extramibs.patch
+++ /dev/null
@@ -1,6261 +0,0 @@
---- /dev/null
-+++ b/mibs/BGP4-MIB.txt
-@@ -0,0 +1,929 @@
-+    BGP4-MIB DEFINITIONS ::= BEGIN
-+
-+        IMPORTS
-+            MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE,
-+            IpAddress, Integer32, Counter32, Gauge32, mib-2
-+                FROM SNMPv2-SMI
-+            MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
-+                FROM SNMPv2-CONF;
-+
-+        bgp MODULE-IDENTITY
-+            LAST-UPDATED "9902100000Z"
-+            ORGANIZATION "IETF IDR Working Group"
-+            CONTACT-INFO "E-mail:  idr@merit.net
-+
-+                          Susan Hares  (Editor)
-+                          Merit Network
-+                          4251 Plymouth Road
-+                          Suite C
-+                          Ann Arbor, MI 48105-2785
-+                          Tel: +1 734 936 2095
-+                          Fax: +1 734 647 3185
-+                          E-mail: skh@merit.edu
-+
-+                          Jeff Johnson (Editor)
-+                          RedBack Networks, Inc.
-+                          1389 Moffett Park Drive
-+                          Sunnyvale, CA  94089-1134
-+                          Tel: +1 408 548 3516
-+                          Fax: +1 408 548 3599
-+                          E-mail: jeff@redback.com"
-+            DESCRIPTION
-+                    "The MIB module for BGP-4."
-+            REVISION    "9902100000Z"
-+            DESCRIPTION
-+                    "Corrected duplicate OBJECT IDENTIFIER
-+                     assignment in the conformance information."
-+            REVISION    "9601080000Z"
-+            DESCRIPTION
-+                    "1) Fixed the definitions of the traps to
-+                     make them equivalent to their initial
-+                     definition in RFC 1269.
-+                     2) Added compliance and conformance info."
-+            ::= { mib-2 15 }
-+
-+        bgpVersion OBJECT-TYPE
-+            SYNTAX     OCTET STRING (SIZE (1..255))
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Vector of supported BGP protocol version
-+                    numbers.  Each peer negotiates the version
-+                    from this vector.  Versions are identified
-+                    via the string of bits contained within this
-+                    object.  The first octet contains bits 0 to
-+                    7, the second octet contains bits 8 to 15,
-+                    and so on, with the most significant bit
-+                    referring to the lowest bit number in the
-+                    octet (e.g., the MSB of the first octet
-+                    refers to bit 0).  If a bit, i, is present
-+                    and set, then the version (i+1) of the BGP
-+                    is supported."
-+            ::= { bgp 1 }
-+
-+        bgpLocalAs OBJECT-TYPE
-+            SYNTAX     INTEGER (0..65535)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The local autonomous system number."
-+            ::= { bgp 2 }
-+
-+
-+
-+        -- BGP Peer table.  This table contains, one entry per BGP
-+        -- peer, information about the BGP peer.
-+
-+        bgpPeerTable OBJECT-TYPE
-+            SYNTAX     SEQUENCE OF BgpPeerEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     current
-+            DESCRIPTION
-+                    "BGP peer table.  This table contains,
-+                    one entry per BGP peer, information about the
-+                    connections with BGP peers."
-+            ::= { bgp 3 }
-+
-+        bgpPeerEntry OBJECT-TYPE
-+            SYNTAX     BgpPeerEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     current
-+            DESCRIPTION
-+                    "Entry containing information about the
-+                    connection with a BGP peer."
-+            INDEX { bgpPeerRemoteAddr }
-+            ::= { bgpPeerTable 1 }
-+
-+        BgpPeerEntry ::= SEQUENCE {
-+                bgpPeerIdentifier
-+                    IpAddress,
-+                bgpPeerState
-+                    INTEGER,
-+                bgpPeerAdminStatus
-+                    INTEGER,
-+                bgpPeerNegotiatedVersion
-+                    Integer32,
-+                bgpPeerLocalAddr
-+                    IpAddress,
-+                bgpPeerLocalPort
-+                    INTEGER,
-+                bgpPeerRemoteAddr
-+                    IpAddress,
-+                bgpPeerRemotePort
-+                    INTEGER,
-+                bgpPeerRemoteAs
-+                    INTEGER,
-+                bgpPeerInUpdates
-+                    Counter32,
-+                bgpPeerOutUpdates
-+                    Counter32,
-+                bgpPeerInTotalMessages
-+                    Counter32,
-+                bgpPeerOutTotalMessages
-+                    Counter32,
-+                bgpPeerLastError
-+                    OCTET STRING,
-+                bgpPeerFsmEstablishedTransitions
-+                    Counter32,
-+                bgpPeerFsmEstablishedTime
-+                    Gauge32,
-+                bgpPeerConnectRetryInterval
-+                    INTEGER,
-+                bgpPeerHoldTime
-+                    INTEGER,
-+                bgpPeerKeepAlive
-+                    INTEGER,
-+                bgpPeerHoldTimeConfigured
-+                    INTEGER,
-+                bgpPeerKeepAliveConfigured
-+                    INTEGER,
-+                bgpPeerMinASOriginationInterval
-+                    INTEGER,
-+                bgpPeerMinRouteAdvertisementInterval
-+                    INTEGER,
-+                bgpPeerInUpdateElapsedTime
-+                    Gauge32
-+                }
-+
-+        bgpPeerIdentifier OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The BGP Identifier of this entry's BGP peer."
-+            ::= { bgpPeerEntry 1 }
-+
-+        bgpPeerState OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                                idle(1),
-+                                connect(2),
-+                                active(3),
-+                                opensent(4),
-+                                openconfirm(5),
-+                                established(6)
-+                       }
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The BGP peer connection state."
-+            ::= { bgpPeerEntry 2 }
-+
-+        bgpPeerAdminStatus OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                                stop(1),
-+                                start(2)
-+                       }
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "The desired state of the BGP connection.  A
-+                    transition from 'stop' to 'start' will cause
-+                    the BGP Start Event to be generated.  A
-+                    transition from 'start' to 'stop' will cause
-+                    the BGP Stop Event to be generated.  This
-+                    parameter can be used to restart BGP peer
-+                    connections.  Care should be used in providing
-+                    write access to this object without adequate
-+                    authentication."
-+            ::= { bgpPeerEntry 3 }
-+
-+        bgpPeerNegotiatedVersion OBJECT-TYPE
-+            SYNTAX     Integer32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The negotiated version of BGP running between
-+                    the two peers."
-+            ::= { bgpPeerEntry 4 }
-+
-+        bgpPeerLocalAddr OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The local IP address of this entry's BGP
-+                    connection."
-+            ::= { bgpPeerEntry 5 }
-+
-+        bgpPeerLocalPort OBJECT-TYPE
-+            SYNTAX     INTEGER (0..65535)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The local port for the TCP connection between
-+                    the BGP peers."
-+            ::= { bgpPeerEntry 6 }
-+
-+        bgpPeerRemoteAddr OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The remote IP address of this entry's BGP
-+                    peer."
-+            ::= { bgpPeerEntry 7 }
-+
-+        bgpPeerRemotePort OBJECT-TYPE
-+            SYNTAX     INTEGER (0..65535)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The remote port for the TCP connection between
-+                    the BGP peers.  Note that the objects
-+                    bgpPeerLocalAddr, bgpPeerLocalPort,
-+                    bgpPeerRemoteAddr and bgpPeerRemotePort
-+                    provide the appropriate reference to the
-+                    standard MIB TCP connection table."
-+            ::= { bgpPeerEntry 8 }
-+
-+        bgpPeerRemoteAs OBJECT-TYPE
-+            SYNTAX     INTEGER (0..65535)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The remote autonomous system number."
-+            ::= { bgpPeerEntry 9 }
-+
-+        bgpPeerInUpdates OBJECT-TYPE
-+            SYNTAX     Counter32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The number of BGP UPDATE messages received on
-+                    this connection.  This object should be
-+                    initialized to zero (0) when the connection is
-+                    established."
-+            ::= { bgpPeerEntry 10 }
-+
-+        bgpPeerOutUpdates OBJECT-TYPE
-+            SYNTAX     Counter32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The number of BGP UPDATE messages transmitted
-+                    on this connection.  This object should be
-+                    initialized to zero (0) when the connection is
-+                    established."
-+            ::= { bgpPeerEntry 11 }
-+
-+        bgpPeerInTotalMessages OBJECT-TYPE
-+            SYNTAX     Counter32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The total number of messages received from the
-+                    remote peer on this connection.  This object
-+                    should be initialized to zero when the
-+                    connection is established."
-+            ::= { bgpPeerEntry 12 }
-+
-+        bgpPeerOutTotalMessages OBJECT-TYPE
-+            SYNTAX     Counter32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The total number of messages transmitted to
-+                    the remote peer on this connection.  This object
-+                    should be initialized to zero when the
-+                    connection is established."
-+            ::= { bgpPeerEntry 13 }
-+
-+        bgpPeerLastError OBJECT-TYPE
-+            SYNTAX     OCTET STRING (SIZE (2))
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The last error code and subcode seen by this
-+                    peer on this connection.  If no error has
-+                    occurred, this field is zero.  Otherwise, the
-+                    first byte of this two byte OCTET STRING
-+                    contains the error code, and the second byte
-+                    contains the subcode."
-+            ::= { bgpPeerEntry 14 }
-+
-+        bgpPeerFsmEstablishedTransitions OBJECT-TYPE
-+            SYNTAX     Counter32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The total number of times the BGP FSM
-+                    transitioned into the established state."
-+            ::= { bgpPeerEntry 15 }
-+
-+        bgpPeerFsmEstablishedTime OBJECT-TYPE
-+            SYNTAX     Gauge32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "This timer indicates how long (in seconds) this
-+                    peer has been in the Established state or how long
-+                    since this peer was last in the Established state.
-+                    It is set to zero when a new peer is configured or
-+                    the router is booted."
-+            ::= { bgpPeerEntry 16 }
-+
-+        bgpPeerConnectRetryInterval OBJECT-TYPE
-+            SYNTAX     INTEGER (1..65535)
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the ConnectRetry
-+                    timer.  The suggested value for this timer is
-+                    120 seconds."
-+            ::= { bgpPeerEntry 17 }
-+
-+        bgpPeerHoldTime OBJECT-TYPE
-+            SYNTAX     INTEGER  ( 0 | 3..65535 )
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the Hold Timer
-+                    established with the peer.  The value of this
-+                    object is calculated by this BGP speaker by
-+                    using the smaller of the value in
-+                    bgpPeerHoldTimeConfigured and the Hold Time
-+                    received in the OPEN message.  This value
-+                    must be at lease three seconds if it is not
-+                    zero (0) in which case the Hold Timer has
-+                    not been established with the peer, or, the
-+                    value of bgpPeerHoldTimeConfigured is zero (0)."
-+            ::= { bgpPeerEntry 18 }
-+
-+        bgpPeerKeepAlive OBJECT-TYPE
-+            SYNTAX     INTEGER ( 0 | 1..21845 )
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the KeepAlive
-+                    timer established with the peer.  The value of
-+                    this object is calculated by this BGP speaker
-+                    such that, when compared with bgpPeerHoldTime,
-+                    it has the same proportion as what
-+                    bgpPeerKeepAliveConfigured has when compared
-+                    with bgpPeerHoldTimeConfigured.  If the value
-+                    of this object is zero (0), it indicates that
-+                    the KeepAlive timer has not been established
-+                    with the peer, or, the value of
-+                    bgpPeerKeepAliveConfigured is zero (0)."
-+            ::= { bgpPeerEntry 19 }
-+
-+        bgpPeerHoldTimeConfigured OBJECT-TYPE
-+            SYNTAX     INTEGER ( 0 | 3..65535 )
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the Hold Time
-+                    configured for this BGP speaker with this peer.
-+                    This value is placed in an OPEN message sent to
-+                    this peer by this BGP speaker, and is compared
-+                    with the Hold Time field in an OPEN message
-+                    received from the peer when determining the Hold
-+                    Time (bgpPeerHoldTime) with the peer.  This value
-+                    must not be less than three seconds if it is not
-+                    zero (0) in which case the Hold Time is NOT to be
-+                    established with the peer.  The suggested value for
-+                    this timer is 90 seconds."
-+            ::= { bgpPeerEntry 20 }
-+
-+        bgpPeerKeepAliveConfigured OBJECT-TYPE
-+            SYNTAX     INTEGER ( 0 | 1..21845 )
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the KeepAlive timer
-+                    configured for this BGP speaker with this peer.
-+                    The value of this object will only determine the
-+                    KEEPALIVE messages' frequency relative to the value
-+                    specified in bgpPeerHoldTimeConfigured; the actual
-+                    time interval for the KEEPALIVE messages is
-+                    indicated by bgpPeerKeepAlive.  A reasonable
-+                    maximum value for this timer would be configured to
-+                    be one third of that of bgpPeerHoldTimeConfigured.
-+                    If the value of this object is zero (0), no
-+                    periodical KEEPALIVE messages are sent to the peer
-+                    after the BGP connection has been established.  The
-+                    suggested value for this timer is 30 seconds."
-+            ::= { bgpPeerEntry 21 }
-+
-+        bgpPeerMinASOriginationInterval OBJECT-TYPE
-+            SYNTAX     INTEGER (1..65535)
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the
-+                    MinASOriginationInterval timer.
-+                    The suggested value for this timer is 15 seconds."
-+            ::= { bgpPeerEntry 22 }
-+
-+        bgpPeerMinRouteAdvertisementInterval OBJECT-TYPE
-+            SYNTAX     INTEGER (1..65535)
-+            MAX-ACCESS read-write
-+            STATUS     current
-+            DESCRIPTION
-+                    "Time interval in seconds for the
-+                    MinRouteAdvertisementInterval timer.
-+                    The suggested value for this timer is 30 seconds."
-+            ::= { bgpPeerEntry 23 }
-+
-+        bgpPeerInUpdateElapsedTime OBJECT-TYPE
-+            SYNTAX     Gauge32
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Elapsed time in seconds since the last BGP
-+                    UPDATE message was received from the peer.
-+                    Each time bgpPeerInUpdates is incremented,
-+                    the value of this object is set to zero (0)."
-+            ::= { bgpPeerEntry 24 }
-+
-+
-+
-+        bgpIdentifier OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The BGP Identifier of local system."
-+            ::= { bgp 4 }
-+
-+
-+
-+        -- Received Path Attribute Table.  This table contains,
-+        -- one entry per path to a network, path attributes
-+        -- received from all peers running BGP version 3 or less.
-+        -- This table is obsolete, having been replaced in
-+        -- functionality with the bgp4PathAttrTable.
-+
-+        bgpRcvdPathAttrTable OBJECT-TYPE
-+            SYNTAX     SEQUENCE OF BgpPathAttrEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The BGP Received Path Attribute Table contains
-+                    information about paths to destination networks
-+                    received from all peers running BGP version 3 or
-+                    less."
-+            ::= { bgp 5 }
-+
-+        bgpPathAttrEntry OBJECT-TYPE
-+            SYNTAX     BgpPathAttrEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "Information about a path to a network."
-+            INDEX { bgpPathAttrDestNetwork,
-+                    bgpPathAttrPeer        }
-+            ::= { bgpRcvdPathAttrTable 1 }
-+
-+        BgpPathAttrEntry ::= SEQUENCE {
-+            bgpPathAttrPeer
-+                 IpAddress,
-+            bgpPathAttrDestNetwork
-+                 IpAddress,
-+            bgpPathAttrOrigin
-+                 INTEGER,
-+            bgpPathAttrASPath
-+                 OCTET STRING,
-+            bgpPathAttrNextHop
-+                 IpAddress,
-+            bgpPathAttrInterASMetric
-+                 Integer32
-+        }
-+
-+        bgpPathAttrPeer OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The IP address of the peer where the path
-+                    information was learned."
-+            ::= { bgpPathAttrEntry 1 }
-+
-+        bgpPathAttrDestNetwork OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The address of the destination network."
-+            ::= { bgpPathAttrEntry 2 }
-+
-+        bgpPathAttrOrigin OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                           igp(1),-- networks are interior
-+                           egp(2),-- networks learned via EGP
-+                           incomplete(3) -- undetermined
-+                       }
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                 "The ultimate origin of the path information."
-+            ::= { bgpPathAttrEntry 3 }
-+
-+        bgpPathAttrASPath OBJECT-TYPE
-+            SYNTAX     OCTET STRING (SIZE (2..255))
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The set of ASs that must be traversed to reach
-+                    the network.  This object is probably best
-+                    represented as SEQUENCE OF INTEGER.  For SMI
-+                    compatibility, though, it is represented as
-+                    OCTET STRING.  Each AS is represented as a pair
-+                    of octets according to the following algorithm:
-+
-+                        first-byte-of-pair = ASNumber / 256;
-+                        second-byte-of-pair = ASNumber & 255;"
-+            ::= { bgpPathAttrEntry 4 }
-+
-+        bgpPathAttrNextHop OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The address of the border router that should
-+                    be used for the destination network."
-+            ::= { bgpPathAttrEntry 5 }
-+
-+        bgpPathAttrInterASMetric OBJECT-TYPE
-+            SYNTAX     Integer32
-+            MAX-ACCESS read-only
-+            STATUS     obsolete
-+            DESCRIPTION
-+                    "The optional inter-AS metric.  If this
-+                    attribute has not been provided for this route,
-+                    the value for this object is 0."
-+            ::= { bgpPathAttrEntry 6 }
-+
-+
-+
-+        -- BGP-4 Received Path Attribute Table.  This table contains,
-+        -- one entry per path to a network, path attributes
-+        -- received from all peers running BGP-4.
-+
-+        bgp4PathAttrTable OBJECT-TYPE
-+            SYNTAX     SEQUENCE OF Bgp4PathAttrEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     current
-+            DESCRIPTION
-+                    "The BGP-4 Received Path Attribute Table contains
-+                    information about paths to destination networks
-+                    received from all BGP4 peers."
-+            ::= { bgp 6 }
-+
-+        bgp4PathAttrEntry OBJECT-TYPE
-+            SYNTAX     Bgp4PathAttrEntry
-+            MAX-ACCESS not-accessible
-+            STATUS     current
-+            DESCRIPTION
-+                    "Information about a path to a network."
-+            INDEX { bgp4PathAttrIpAddrPrefix,
-+                    bgp4PathAttrIpAddrPrefixLen,
-+                    bgp4PathAttrPeer            }
-+            ::= { bgp4PathAttrTable 1 }
-+
-+        Bgp4PathAttrEntry ::= SEQUENCE {
-+            bgp4PathAttrPeer
-+                 IpAddress,
-+            bgp4PathAttrIpAddrPrefixLen
-+                 INTEGER,
-+            bgp4PathAttrIpAddrPrefix
-+                 IpAddress,
-+            bgp4PathAttrOrigin
-+                 INTEGER,
-+            bgp4PathAttrASPathSegment
-+                 OCTET STRING,
-+            bgp4PathAttrNextHop
-+                 IpAddress,
-+            bgp4PathAttrMultiExitDisc
-+                 INTEGER,
-+            bgp4PathAttrLocalPref
-+                 INTEGER,
-+            bgp4PathAttrAtomicAggregate
-+                 INTEGER,
-+            bgp4PathAttrAggregatorAS
-+                 INTEGER,
-+            bgp4PathAttrAggregatorAddr
-+                 IpAddress,
-+            bgp4PathAttrCalcLocalPref
-+                 INTEGER,
-+            bgp4PathAttrBest
-+                 INTEGER,
-+            bgp4PathAttrUnknown
-+                 OCTET STRING
-+        }
-+
-+        bgp4PathAttrPeer OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The IP address of the peer where the path
-+                    information was learned."
-+            ::= { bgp4PathAttrEntry 1 }
-+        bgp4PathAttrIpAddrPrefixLen OBJECT-TYPE
-+            SYNTAX     INTEGER (0..32)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Length in bits of the IP address prefix in the
-+                    Network Layer Reachability Information field."
-+            ::= { bgp4PathAttrEntry 2 }
-+
-+        bgp4PathAttrIpAddrPrefix OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "An IP address prefix in the Network Layer
-+                    Reachability Information field.  This object
-+                    is an IP address containing the prefix with
-+                    length specified by bgp4PathAttrIpAddrPrefixLen.
-+                    Any bits beyond the length specified by
-+                    bgp4PathAttrIpAddrPrefixLen are zeroed."
-+            ::= { bgp4PathAttrEntry 3 }
-+
-+        bgp4PathAttrOrigin OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                                 igp(1),-- networks are interior
-+                                 egp(2),-- networks learned via EGP
-+                                 incomplete(3) -- undetermined
-+                               }
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The ultimate origin of the path information."
-+            ::= { bgp4PathAttrEntry 4 }
-+
-+        bgp4PathAttrASPathSegment OBJECT-TYPE
-+            SYNTAX     OCTET STRING (SIZE (2..255))
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The sequence of AS path segments.  Each AS
-+                    path segment is represented by a triple
-+                    <type, length, value>.
-+
-+                    The type is a 1-octet field which has two
-+                    possible values:
-+                         1      AS_SET: unordered set of ASs a
-+                                     route in the UPDATE message
-+                                     has traversed
-+                         2      AS_SEQUENCE: ordered set of ASs
-+                                     a route in the UPDATE message
-+                                     has traversed.
-+
-+                    The length is a 1-octet field containing the
-+                    number of ASs in the value field.
-+
-+                    The value field contains one or more AS
-+                    numbers, each AS is represented in the octet
-+                    string as a pair of octets according to the
-+                    following algorithm:
-+
-+                        first-byte-of-pair = ASNumber / 256;
-+                        second-byte-of-pair = ASNumber & 255;"
-+            ::= { bgp4PathAttrEntry 5 }
-+
-+        bgp4PathAttrNextHop OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The address of the border router that should
-+                    be used for the destination network."
-+            ::= { bgp4PathAttrEntry 6 }
-+
-+        bgp4PathAttrMultiExitDisc OBJECT-TYPE
-+            SYNTAX     INTEGER (-1..2147483647)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "This metric is used to discriminate between
-+                    multiple exit points to an adjacent autonomous
-+                    system.  A value of -1 indicates the absence of
-+                    this attribute."
-+            ::= { bgp4PathAttrEntry 7 }
-+
-+        bgp4PathAttrLocalPref OBJECT-TYPE
-+            SYNTAX     INTEGER (-1..2147483647)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The originating BGP4 speaker's degree of
-+                    preference for an advertised route.  A value of
-+                    -1 indicates the absence of this attribute."
-+            ::= { bgp4PathAttrEntry 8 }
-+
-+        bgp4PathAttrAtomicAggregate OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                           lessSpecificRrouteNotSelected(1),
-+                           lessSpecificRouteSelected(2)
-+                       }
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "Whether or not a system has selected
-+                    a less specific route without selecting a
-+                    more specific route."
-+            ::= { bgp4PathAttrEntry 9 }
-+
-+        bgp4PathAttrAggregatorAS OBJECT-TYPE
-+            SYNTAX     INTEGER (0..65535)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The AS number of the last BGP4 speaker that
-+                    performed route aggregation.  A value of zero (0)
-+                    indicates the absence of this attribute."
-+            ::= { bgp4PathAttrEntry 10 }
-+
-+        bgp4PathAttrAggregatorAddr OBJECT-TYPE
-+            SYNTAX     IpAddress
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The IP address of the last BGP4 speaker that
-+                     performed route aggregation.  A value of
-+                     0.0.0.0 indicates the absence of this attribute."
-+            ::= { bgp4PathAttrEntry 11 }
-+
-+        bgp4PathAttrCalcLocalPref OBJECT-TYPE
-+            SYNTAX     INTEGER (-1..2147483647)
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "The degree of preference calculated by the
-+                    receiving BGP4 speaker for an advertised route.
-+                    A value of -1 indicates the absence of this
-+                    attribute."
-+            ::= { bgp4PathAttrEntry 12 }
-+
-+        bgp4PathAttrBest OBJECT-TYPE
-+            SYNTAX     INTEGER {
-+                           false(1),-- not chosen as best route
-+                           true(2) -- chosen as best route
-+                       }
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "An indication of whether or not this route
-+                    was chosen as the best BGP4 route."
-+            ::= { bgp4PathAttrEntry 13 }
-+
-+        bgp4PathAttrUnknown OBJECT-TYPE
-+            SYNTAX     OCTET STRING (SIZE(0..255))
-+            MAX-ACCESS read-only
-+            STATUS     current
-+            DESCRIPTION
-+                    "One or more path attributes not understood
-+                     by this BGP4 speaker.  Size zero (0) indicates
-+                     the absence of such attribute(s).  Octets
-+                     beyond the maximum size, if any, are not
-+                     recorded by this object."
-+            ::= { bgp4PathAttrEntry 14 }
-+
-+
-+        -- Traps.
-+
-+        -- note that in RFC 1657, bgpTraps was incorrectly
-+        -- assigned a value of { bgp 7 }, and each of the
-+        -- traps had the bgpPeerRemoteAddr object inappropriately
-+        -- removed from their OBJECTS clause.  The following
-+        -- definitions restore the semantics of the traps as
-+        -- they were initially defined in RFC 1269.
-+
-+        -- { bgp 7 } is unused
-+
-+        bgpTraps          OBJECT IDENTIFIER ::= { bgp 0 }
-+
-+        bgpEstablished NOTIFICATION-TYPE
-+            OBJECTS { bgpPeerRemoteAddr,
-+                      bgpPeerLastError,
-+                      bgpPeerState      }
-+            STATUS  current
-+            DESCRIPTION
-+                    "The BGP Established event is generated when
-+                    the BGP FSM enters the ESTABLISHED state."
-+            ::= { bgpTraps 1 }
-+
-+        bgpBackwardTransition NOTIFICATION-TYPE
-+            OBJECTS { bgpPeerRemoteAddr,
-+                      bgpPeerLastError,
-+                      bgpPeerState      }
-+            STATUS  current
-+            DESCRIPTION
-+                    "The BGPBackwardTransition Event is generated
-+                    when the BGP FSM moves from a higher numbered
-+                    state to a lower numbered state."
-+            ::= { bgpTraps 2 }
-+
-+        -- conformance information
-+
-+        bgpMIBConformance OBJECT IDENTIFIER ::= { bgp 8 }
-+        bgpMIBCompliances OBJECT IDENTIFIER ::= { bgpMIBConformance 1 }
-+        bgpMIBGroups      OBJECT IDENTIFIER ::= { bgpMIBConformance 2 }
-+
-+        -- compliance statements
-+
-+        bgpMIBCompliance MODULE-COMPLIANCE
-+            STATUS  current
-+            DESCRIPTION
-+                    "The compliance statement for entities which
-+                     implement the BGP4 mib."
-+            MODULE  -- this module
-+                MANDATORY-GROUPS { bgp4MIBGlobalsGroup,
-+                                   bgp4MIBPeerGroup,
-+                                   bgp4MIBPathAttrGroup,
-+                                   bgp4MIBNotificationGroup }
-+            ::= { bgpMIBCompliances 1 }
-+
-+        -- units of conformance
-+
-+        bgp4MIBGlobalsGroup OBJECT-GROUP
-+            OBJECTS { bgpVersion,
-+                      bgpLocalAs,
-+                      bgpIdentifier }
-+            STATUS  current
-+            DESCRIPTION
-+                    "A collection of objects providing information
-+                     on global BGP state."
-+            ::= { bgpMIBGroups 1 }
-+
-+        bgp4MIBPeerGroup OBJECT-GROUP
-+            OBJECTS { bgpPeerIdentifier,
-+                      bgpPeerState,
-+                      bgpPeerAdminStatus,
-+                      bgpPeerNegotiatedVersion,
-+                      bgpPeerLocalAddr,
-+                      bgpPeerLocalPort,
-+                      bgpPeerRemoteAddr,
-+                      bgpPeerRemotePort,
-+                      bgpPeerRemoteAs,
-+                      bgpPeerInUpdates,
-+                      bgpPeerOutUpdates,
-+                      bgpPeerInTotalMessages,
-+                      bgpPeerOutTotalMessages,
-+                      bgpPeerLastError,
-+                      bgpPeerFsmEstablishedTransitions,
-+                      bgpPeerFsmEstablishedTime,
-+                      bgpPeerConnectRetryInterval,
-+                      bgpPeerHoldTime,
-+                      bgpPeerKeepAlive,
-+                      bgpPeerHoldTimeConfigured,
-+                      bgpPeerKeepAliveConfigured,
-+                      bgpPeerMinASOriginationInterval,
-+                      bgpPeerMinRouteAdvertisementInterval,
-+                      bgpPeerInUpdateElapsedTime }
-+            STATUS  current
-+            DESCRIPTION
-+                    "A collection of objects for managing
-+                     BGP peers."
-+            ::= { bgpMIBGroups 2 }
-+
-+        bgp4MIBRcvdPathAttrGroup OBJECT-GROUP
-+            OBJECTS { bgpPathAttrPeer,
-+                      bgpPathAttrDestNetwork,
-+                      bgpPathAttrOrigin,
-+                      bgpPathAttrASPath,
-+                      bgpPathAttrNextHop,
-+                      bgpPathAttrInterASMetric }
-+            STATUS  obsolete
-+            DESCRIPTION
-+                    "A collection of objects for managing BGP
-+                     path entries.
-+
-+                     This conformance group is obsolete,
-+                     replaced by bgp4MIBPathAttrGroup."
-+            ::= { bgpMIBGroups 3 }
-+
-+        bgp4MIBPathAttrGroup OBJECT-GROUP
-+            OBJECTS { bgp4PathAttrPeer,
-+                      bgp4PathAttrIpAddrPrefixLen,
-+                      bgp4PathAttrIpAddrPrefix,
-+                      bgp4PathAttrOrigin,
-+                      bgp4PathAttrASPathSegment,
-+                      bgp4PathAttrNextHop,
-+                      bgp4PathAttrMultiExitDisc,
-+                      bgp4PathAttrLocalPref,
-+                      bgp4PathAttrAtomicAggregate,
-+                      bgp4PathAttrAggregatorAS,
-+                      bgp4PathAttrAggregatorAddr,
-+                      bgp4PathAttrCalcLocalPref,
-+                      bgp4PathAttrBest,
-+                      bgp4PathAttrUnknown }
-+            STATUS  current
-+            DESCRIPTION
-+                    "A collection of objects for managing
-+                     BGP path entries."
-+            ::= { bgpMIBGroups 4 }
-+
-+        bgp4MIBNotificationGroup NOTIFICATION-GROUP
-+            NOTIFICATIONS { bgpEstablished,
-+                            bgpBackwardTransition }
-+            STATUS  current
-+            DESCRIPTION
-+                    "A collection of notifications for signaling
-+                    changes in BGP peer relationships."
-+            ::= { bgpMIBGroups 5 }
-+
-+    END
---- /dev/null
-+++ b/mibs/BRIDGE-MIB.txt
-@@ -0,0 +1,1075 @@
-+BRIDGE-MIB DEFINITIONS ::= BEGIN
-+
-+IMPORTS
-+           Counter, TimeTicks
-+                   FROM RFC1155-SMI
-+           mib-2
-+                   FROM RFC1213-MIB
-+           OBJECT-TYPE
-+                   FROM RFC-1212
-+           TRAP-TYPE
-+                   FROM RFC-1215;
-+
-+-- All representations of MAC addresses in this MIB Module
-+-- use, as a textual convention (i.e. this convention does
-+-- not affect their encoding), the data type:
-+MacAddress ::= OCTET STRING (SIZE (6))    -- a 6 octet address
-+                                          -- in the
-+                                          -- "canonical"
-+                                          -- order
-+-- defined by IEEE 802.1a, i.e., as if it were transmitted
-+-- least significant bit first, even though 802.5 (in
-+-- contrast to other n802.x protocols) requires MAC
-+-- addresses to be transmitted most significant bit first.
-+--
-+-- 16-bit addresses, if needed, are represented by setting
-+-- their upper 4 octets to all 0's, i.e., AAFF would be
-+-- represented as 00000000AAFF.
-+
-+-- Similarly, all representations of Bridge-Id in this MIB
-+-- Module use, as a textual convention (i.e. this
-+-- convention does not affect their encoding), the data
-+-- type:
-+BridgeId ::= OCTET STRING (SIZE (8))   -- the
-+                                       -- Bridge-Identifier
-+                                       -- as used in the
-+                                       -- Spanning Tree
-+-- Protocol to uniquely identify a bridge.  Its first two
-+-- octets (in network byte order) contain a priority
-+-- value and its last 6 octets contain the MAC address
-+-- used to refer to a bridge in a unique fashion
-+-- (typically, the numerically smallest MAC address
-+-- of all ports on the bridge).
-+
-+-- Several objects in this MIB module represent values of
-+-- timers used by the Spanning Tree Protocol.  In this
-+-- MIB, these timers have values in units of hundreths of
-+-- a second (i.e. 1/100 secs).
-+-- These timers, when stored in a Spanning Tree Protocol's
-+-- BPDU, are in units of 1/256 seconds.  Note, however,
-+-- that 802.1D-1990 specifies a settable granularity of
-+-- no more than 1 second for these timers.  To avoid
-+-- ambiguity, a data type is defined here as a textual
-+-- convention and all representation of these timers
-+-- in this MIB module are defined using this data type.  An
-+-- algorithm is also defined for converting between the
-+-- different units, to ensure a timer's value is not
-+-- distorted by multiple conversions.
-+-- The data type is:
-+
-+Timeout ::= INTEGER -- a STP timer in units of 1/100 seconds
-+
-+-- To convert a Timeout value into a value in units of
-+-- 1/256 seconds, the following algorithm should be used:
-+--
-+--      b  = floor( (n * 256) / 100)
-+--
-+-- where:
-+--      floor   =  quotient [ignore remainder]
-+--      n is the value in 1/100 second units
-+--      b is the value in 1/256 second units
-+--
-+-- To convert the value from 1/256 second units back to
-+-- 1/100 seconds, the following algorithm should be used:
-+--
-+--      n = ceiling( (b * 100) / 256)
-+--
-+-- where:
-+--      ceiling =  quotient [if remainder is 0], or
-+--                 quotient + 1 [if remainder is non-zero]
-+--      n is the value in 1/100 second units
-+--      b is the value in 1/256 second units
-+--
-+-- Note: it is important that the arithmetic operations are
-+-- done in the order specified (i.e., multiply first, divide
-+-- second).
-+
-+   dot1dBridge   OBJECT IDENTIFIER ::= { mib-2 17 }
-+
-+-- groups in the Bridge MIB
-+
-+dot1dBase     OBJECT IDENTIFIER ::= { dot1dBridge 1 }
-+
-+dot1dStp      OBJECT IDENTIFIER ::= { dot1dBridge 2 }
-+
-+dot1dSr       OBJECT IDENTIFIER ::= { dot1dBridge 3 }
-+-- separately documented
-+
-+dot1dTp       OBJECT IDENTIFIER ::= { dot1dBridge 4 }
-+
-+dot1dStatic   OBJECT IDENTIFIER ::= { dot1dBridge 5 }
-+
-+-- the dot1dBase group
-+
-+-- Implementation of the dot1dBase group is mandatory for all
-+-- bridges.
-+
-+dot1dBaseBridgeAddress OBJECT-TYPE
-+    SYNTAX  MacAddress
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The MAC address used by this bridge when it must
-+            be referred to in a unique fashion.   It is
-+            recommended that this be the numerically smallest
-+            MAC address of all ports that belong to this
-+            bridge.  However it is only required to be unique.
-+            When concatenated with dot1dStpPriority a unique
-+            BridgeIdentifier is formed which is used in the
-+            Spanning Tree Protocol."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Sections 6.4.1.1.3 and 3.12.5"
-+    ::= { dot1dBase 1 }
-+
-+dot1dBaseNumPorts OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of ports controlled by this bridging
-+            entity."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.4.1.1.3"
-+    ::= { dot1dBase 2 }
-+
-+dot1dBaseType OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                unknown(1),
-+                transparent-only(2),
-+                sourceroute-only(3),
-+                srt(4)
-+            }
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Indicates what type of bridging this bridge can
-+            perform.  If a bridge is actually performing a
-+            certain type of bridging this will be indicated by
-+            entries in the port table for the given type."
-+    ::= { dot1dBase 3 }
-+
-+-- The Generic Bridge Port Table
-+
-+dot1dBasePortTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dBasePortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains generic information about
-+            every port that is associated with this bridge.
-+            Transparent, source-route, and srt ports are
-+            included."
-+    ::= { dot1dBase 4 }
-+
-+dot1dBasePortEntry OBJECT-TYPE
-+    SYNTAX  Dot1dBasePortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A list of information for each port of the
-+            bridge."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.4.2, 6.6.1"
-+    INDEX  { dot1dBasePort }
-+    ::= { dot1dBasePortTable 1 }
-+
-+Dot1dBasePortEntry ::=
-+    SEQUENCE {
-+        dot1dBasePort
-+            INTEGER,
-+        dot1dBasePortIfIndex
-+            INTEGER,
-+        dot1dBasePortCircuit
-+
-+            OBJECT IDENTIFIER,
-+        dot1dBasePortDelayExceededDiscards
-+            Counter,
-+        dot1dBasePortMtuExceededDiscards
-+            Counter
-+    }
-+
-+dot1dBasePort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the port for which this entry
-+            contains bridge management information."
-+    ::= { dot1dBasePortEntry 1 }
-+
-+dot1dBasePortIfIndex OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value of the instance of the ifIndex object,
-+            defined in MIB-II, for the interface corresponding
-+            to this port."
-+    ::= { dot1dBasePortEntry 2 }
-+
-+dot1dBasePortCircuit OBJECT-TYPE
-+    SYNTAX  OBJECT IDENTIFIER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "For a port which (potentially) has the same value
-+            of dot1dBasePortIfIndex as another port on the
-+            same bridge, this object contains the name of an
-+            object instance unique to this port.  For example,
-+            in the case where multiple ports correspond one-
-+            to-one with multiple X.25 virtual circuits, this
-+            value might identify an (e.g., the first) object
-+            instance associated with the X.25 virtual circuit
-+            corresponding to this port.
-+
-+            For a port which has a unique value of
-+            dot1dBasePortIfIndex, this object can have the
-+            value { 0 0 }."
-+    ::= { dot1dBasePortEntry 3 }
-+
-+dot1dBasePortDelayExceededDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of frames discarded by this port due
-+            to excessive transit delay through the bridge.  It
-+            is incremented by both transparent and source
-+            route bridges."
-+    REFERENCE
-+             "IEEE 802.1D-1990: Section 6.6.1.1.3"
-+    ::= { dot1dBasePortEntry 4 }
-+
-+dot1dBasePortMtuExceededDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of frames discarded by this port due
-+            to an excessive size.  It is incremented by both
-+            transparent and source route bridges."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.6.1.1.3"
-+    ::= { dot1dBasePortEntry 5 }
-+
-+-- the dot1dStp group
-+
-+-- Implementation of the dot1dStp group is optional.  It is
-+-- implemented by those bridges that support the Spanning Tree
-+-- Protocol.
-+
-+dot1dStpProtocolSpecification OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                unknown(1),
-+                decLb100(2),
-+                ieee8021d(3)
-+            }
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "An indication of what version of the Spanning
-+            Tree Protocol is being run.  The value
-+            'decLb100(2)' indicates the DEC LANbridge 100
-+            Spanning Tree protocol.  IEEE 802.1d
-+            implementations will return 'ieee8021d(3)'.  If
-+            future versions of the IEEE Spanning Tree Protocol
-+            are released that are incompatible with the
-+            current version a new value will be defined."
-+
-+    ::= { dot1dStp 1 }
-+
-+dot1dStpPriority OBJECT-TYPE
-+    SYNTAX  INTEGER (0..65535)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value of the write-able portion of the Bridge
-+            ID, i.e., the first two octets of the (8 octet
-+            long) Bridge ID.  The other (last) 6 octets of the
-+            Bridge ID are given by the value of
-+            dot1dBaseBridgeAddress."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.7"
-+    ::= { dot1dStp 2 }
-+
-+dot1dStpTimeSinceTopologyChange OBJECT-TYPE
-+    SYNTAX  TimeTicks
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The time (in hundredths of a second) since the
-+            last time a topology change was detected by the
-+            bridge entity."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.8.1.1.3"
-+    ::= { dot1dStp 3 }
-+
-+dot1dStpTopChanges OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The total number of topology changes detected by
-+            this bridge since the management entity was last
-+            reset or initialized."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.8.1.1.3"
-+    ::= { dot1dStp 4 }
-+
-+dot1dStpDesignatedRoot OBJECT-TYPE
-+    SYNTAX  BridgeId
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The bridge identifier of the root of the spanning
-+            tree as determined by the Spanning Tree Protocol
-+            as executed by this node.  This value is used as
-+
-+            the Root Identifier parameter in all Configuration
-+            Bridge PDUs originated by this node."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.1"
-+    ::= { dot1dStp 5 }
-+
-+dot1dStpRootCost OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The cost of the path to the root as seen from
-+            this bridge."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.2"
-+    ::= { dot1dStp 6 }
-+
-+dot1dStpRootPort OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the port which offers the
-+            lowest cost path from this bridge to the root
-+            bridge."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.3"
-+    ::= { dot1dStp 7 }
-+
-+dot1dStpMaxAge OBJECT-TYPE
-+    SYNTAX  Timeout
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The maximum age of Spanning Tree Protocol
-+            information learned from the network on any port
-+            before it is discarded, in units of hundredths of
-+            a second.  This is the actual value that this
-+            bridge is currently using."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.4"
-+    ::= { dot1dStp 8 }
-+
-+dot1dStpHelloTime OBJECT-TYPE
-+    SYNTAX  Timeout
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+
-+            "The amount of time between the transmission of
-+            Configuration bridge PDUs by this node on any port
-+            when it is the root of the spanning tree or trying
-+            to become so, in units of hundredths of a second.
-+            This is the actual value that this bridge is
-+            currently using."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.5"
-+    ::= { dot1dStp 9 }
-+
-+dot1dStpHoldTime OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "This time value determines the interval length
-+            during which no more than two Configuration bridge
-+            PDUs shall be transmitted by this node, in units
-+            of hundredths of a second."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.14"
-+    ::= { dot1dStp 10 }
-+
-+dot1dStpForwardDelay OBJECT-TYPE
-+    SYNTAX  Timeout
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "This time value, measured in units of hundredths
-+            of a second, controls how fast a port changes its
-+            spanning state when moving towards the Forwarding
-+            state.  The value determines how long the port
-+            stays in each of the Listening and Learning
-+            states, which precede the Forwarding state.  This
-+            value is also used, when a topology change has
-+            been detected and is underway, to age all dynamic
-+            entries in the Forwarding Database.  [Note that
-+            this value is the one that this bridge is
-+            currently using, in contrast to
-+            dot1dStpBridgeForwardDelay which is the value that
-+            this bridge and all others would start using
-+            if/when this bridge were to become the root.]"
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.6"
-+    ::= { dot1dStp 11 }
-+
-+dot1dStpBridgeMaxAge OBJECT-TYPE
-+    SYNTAX  Timeout (600..4000)
-+
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value that all bridges use for MaxAge when
-+            this bridge is acting as the root.  Note that
-+            802.1D-1990 specifies that the range for this
-+            parameter is related to the value of
-+            dot1dStpBridgeHelloTime. The granularity of this
-+            timer is specified by 802.1D-1990 to be 1 second.
-+            An agent may return a badValue error if a set is
-+            attempted to a value which is not a whole number
-+            of seconds."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.8"
-+    ::= { dot1dStp 12 }
-+
-+dot1dStpBridgeHelloTime OBJECT-TYPE
-+    SYNTAX  Timeout (100..1000)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value that all bridges use for HelloTime when
-+            this bridge is acting as the root.  The
-+            granularity of this timer is specified by 802.1D-
-+            1990 to be 1 second.  An agent may return a
-+            badValue error if a set is attempted to a value
-+            which is not a whole number of seconds."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.9"
-+    ::= { dot1dStp 13 }
-+
-+dot1dStpBridgeForwardDelay OBJECT-TYPE
-+    SYNTAX  Timeout (400..3000)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value that all bridges use for ForwardDelay
-+            when this bridge is acting as the root.  Note that
-+            802.1D-1990 specifies that the range for this
-+            parameter is related to the value of
-+            dot1dStpBridgeMaxAge.  The granularity of this
-+            timer is specified by 802.1D-1990 to be 1 second.
-+            An agent may return a badValue error if a set is
-+            attempted to a value which is not a whole number
-+            of seconds."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.3.10"
-+    ::= { dot1dStp 14 }
-+
-+-- The Spanning Tree Port Table
-+
-+dot1dStpPortTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dStpPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains port-specific information
-+            for the Spanning Tree Protocol."
-+    ::= { dot1dStp 15 }
-+
-+dot1dStpPortEntry OBJECT-TYPE
-+    SYNTAX  Dot1dStpPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A list of information maintained by every port
-+            about the Spanning Tree Protocol state for that
-+            port."
-+    INDEX   { dot1dStpPort }
-+    ::= { dot1dStpPortTable 1 }
-+
-+Dot1dStpPortEntry ::=
-+    SEQUENCE {
-+        dot1dStpPort
-+            INTEGER,
-+        dot1dStpPortPriority
-+            INTEGER,
-+        dot1dStpPortState
-+            INTEGER,
-+        dot1dStpPortEnable
-+            INTEGER,
-+        dot1dStpPortPathCost
-+            INTEGER,
-+        dot1dStpPortDesignatedRoot
-+            BridgeId,
-+        dot1dStpPortDesignatedCost
-+            INTEGER,
-+        dot1dStpPortDesignatedBridge
-+            BridgeId,
-+        dot1dStpPortDesignatedPort
-+            OCTET STRING,
-+        dot1dStpPortForwardTransitions
-+            Counter
-+    }
-+
-+dot1dStpPort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the port for which this entry
-+            contains Spanning Tree Protocol management
-+            information."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.8.2.1.2"
-+    ::= { dot1dStpPortEntry 1 }
-+
-+dot1dStpPortPriority OBJECT-TYPE
-+    SYNTAX  INTEGER (0..255)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The value of the priority field which is
-+            contained in the first (in network byte order)
-+            octet of the (2 octet long) Port ID.  The other
-+            octet of the Port ID is given by the value of
-+            dot1dStpPort."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.1"
-+    ::= { dot1dStpPortEntry 2 }
-+
-+dot1dStpPortState OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                disabled(1),
-+                blocking(2),
-+                listening(3),
-+                learning(4),
-+                forwarding(5),
-+                broken(6)
-+            }
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port's current state as defined by
-+            application of the Spanning Tree Protocol.  This
-+            state controls what action a port takes on
-+            reception of a frame.  If the bridge has detected
-+            a port that is malfunctioning it will place that
-+            port into the broken(6) state.  For ports which
-+            are disabled (see dot1dStpPortEnable), this object
-+            will have a value of disabled(1)."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.2"
-+    ::= { dot1dStpPortEntry 3 }
-+
-+dot1dStpPortEnable OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                enabled(1),
-+                disabled(2)
-+            }
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The enabled/disabled status of the port."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.2"
-+    ::= { dot1dStpPortEntry 4 }
-+
-+dot1dStpPortPathCost OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The contribution of this port to the path cost of
-+            paths towards the spanning tree root which include
-+            this port.  802.1D-1990 recommends that the
-+            default value of this parameter be in inverse
-+            proportion to the speed of the attached LAN."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.3"
-+    ::= { dot1dStpPortEntry 5 }
-+
-+dot1dStpPortDesignatedRoot OBJECT-TYPE
-+    SYNTAX  BridgeId
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The unique Bridge Identifier of the Bridge
-+            recorded as the Root in the Configuration BPDUs
-+            transmitted by the Designated Bridge for the
-+            segment to which the port is attached."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.4"
-+    ::= { dot1dStpPortEntry 6 }
-+
-+dot1dStpPortDesignatedCost OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The path cost of the Designated Port of the
-+            segment connected to this port.  This value is
-+            compared to the Root Path Cost field in received
-+
-+            bridge PDUs."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.5"
-+    ::= { dot1dStpPortEntry 7 }
-+
-+dot1dStpPortDesignatedBridge OBJECT-TYPE
-+    SYNTAX  BridgeId
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The Bridge Identifier of the bridge which this
-+            port considers to be the Designated Bridge for
-+            this port's segment."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.6"
-+    ::= { dot1dStpPortEntry 8 }
-+
-+dot1dStpPortDesignatedPort OBJECT-TYPE
-+    SYNTAX  OCTET STRING (SIZE (2))
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The Port Identifier of the port on the Designated
-+            Bridge for this port's segment."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 4.5.5.7"
-+    ::= { dot1dStpPortEntry 9 }
-+
-+dot1dStpPortForwardTransitions OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of times this port has transitioned
-+            from the Learning state to the Forwarding state."
-+    ::= { dot1dStpPortEntry 10 }
-+
-+-- the dot1dTp group
-+
-+-- Implementation of the dot1dTp group is optional.  It is
-+-- implemented by those bridges that support the transparent
-+-- bridging mode.  A transparent or SRT bridge will implement
-+-- this group.
-+
-+dot1dTpLearnedEntryDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The total number of Forwarding Database entries,
-+            which have been or would have been learnt, but
-+            have been discarded due to a lack of space to
-+            store them in the Forwarding Database.  If this
-+            counter is increasing, it indicates that the
-+            Forwarding Database is regularly becoming full (a
-+            condition which has unpleasant performance effects
-+            on the subnetwork).  If this counter has a
-+            significant value but is not presently increasing,
-+            it indicates that the problem has been occurring
-+            but is not persistent."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.7.1.1.3"
-+    ::= { dot1dTp 1 }
-+
-+dot1dTpAgingTime OBJECT-TYPE
-+    SYNTAX   INTEGER (10..1000000)
-+    ACCESS   read-write
-+    STATUS   mandatory
-+    DESCRIPTION
-+            "The timeout period in seconds for aging out
-+            dynamically learned forwarding information.
-+            802.1D-1990 recommends a default of 300 seconds."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.7.1.1.3"
-+    ::= { dot1dTp 2 }
-+
-+--  The Forwarding Database for Transparent Bridges
-+
-+dot1dTpFdbTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dTpFdbEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains information about unicast
-+            entries for which the bridge has forwarding and/or
-+            filtering information.  This information is used
-+            by the transparent bridging function in
-+            determining how to propagate a received frame."
-+    ::= { dot1dTp 3 }
-+
-+dot1dTpFdbEntry OBJECT-TYPE
-+    SYNTAX  Dot1dTpFdbEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Information about a specific unicast MAC address
-+            for which the bridge has some forwarding and/or
-+            filtering information."
-+    INDEX   { dot1dTpFdbAddress }
-+    ::= { dot1dTpFdbTable 1 }
-+
-+Dot1dTpFdbEntry ::=
-+    SEQUENCE {
-+        dot1dTpFdbAddress
-+            MacAddress,
-+        dot1dTpFdbPort
-+            INTEGER,
-+        dot1dTpFdbStatus
-+            INTEGER
-+    }
-+
-+dot1dTpFdbAddress OBJECT-TYPE
-+    SYNTAX  MacAddress
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A unicast MAC address for which the bridge has
-+            forwarding and/or filtering information."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 3.9.1, 3.9.2"
-+    ::= { dot1dTpFdbEntry 1 }
-+
-+dot1dTpFdbPort OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Either the value '0', or the port number of the
-+            port on which a frame having a source address
-+            equal to the value of the corresponding instance
-+            of dot1dTpFdbAddress has been seen.  A value of
-+            '0' indicates that the port number has not been
-+            learned but that the bridge does have some
-+            forwarding/filtering information about this
-+            address (e.g. in the dot1dStaticTable).
-+            Implementors are encouraged to assign the port
-+            value to this object whenever it is learned even
-+            for addresses for which the corresponding value of
-+            dot1dTpFdbStatus is not learned(3)."
-+    ::= { dot1dTpFdbEntry 2 }
-+
-+dot1dTpFdbStatus OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                other(1),
-+                invalid(2),
-+                learned(3),
-+                self(4),
-+                mgmt(5)
-+            }
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The status of this entry.  The meanings of the
-+            values are:
-+              other(1)   : none of the following.  This would
-+                           include the case where some other
-+                           MIB object (not the corresponding
-+                           instance of dot1dTpFdbPort, nor an
-+                           entry in the dot1dStaticTable) is
-+                           being used to determine if and how
-+                           frames addressed to the value of
-+                           the corresponding instance of
-+                           dot1dTpFdbAddress are being
-+                           forwarded.
-+              invalid(2) : this entry is not longer valid
-+                           (e.g., it was learned but has since
-+                           aged-out), but has not yet been
-+                           flushed from the table.
-+              learned(3) : the value of the corresponding
-+                           instance of dot1dTpFdbPort was
-+                           learned, and is being used.
-+              self(4)    : the value of the corresponding
-+                           instance of dot1dTpFdbAddress
-+                           represents one of the bridge's
-+                           addresses.  The corresponding
-+                           instance of dot1dTpFdbPort
-+                           indicates which of the bridge's
-+                           ports has this address.
-+              mgmt(5)    : the value of the corresponding
-+                           instance of dot1dTpFdbAddress is
-+                           also the value of an existing
-+                           instance of dot1dStaticAddress."
-+    ::= { dot1dTpFdbEntry 3 }
-+
-+--  Port Table for Transparent Bridges
-+
-+dot1dTpPortTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dTpPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains information about every
-+            port that is associated with this transparent
-+            bridge."
-+    ::= { dot1dTp 4 }
-+
-+dot1dTpPortEntry OBJECT-TYPE
-+    SYNTAX  Dot1dTpPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A list of information for each port of a
-+            transparent bridge."
-+    INDEX   { dot1dTpPort }
-+    ::= { dot1dTpPortTable 1 }
-+
-+Dot1dTpPortEntry ::=
-+    SEQUENCE {
-+        dot1dTpPort
-+            INTEGER,
-+        dot1dTpPortMaxInfo
-+            INTEGER,
-+        dot1dTpPortInFrames
-+            Counter,
-+        dot1dTpPortOutFrames
-+            Counter,
-+        dot1dTpPortInDiscards
-+            Counter
-+    }
-+
-+dot1dTpPort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the port for which this entry
-+            contains Transparent bridging management
-+            information."
-+    ::= { dot1dTpPortEntry 1 }
-+
-+-- It would be nice if we could use ifMtu as the size of the
-+-- largest INFO field, but we can't because ifMtu is defined
-+-- to be the size that the (inter-)network layer can use which
-+-- can differ from the MAC layer (especially if several layers
-+-- of encapsulation are used).
-+
-+dot1dTpPortMaxInfo OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The maximum size of the INFO (non-MAC) field that
-+            this port will receive or transmit."
-+    ::= { dot1dTpPortEntry 2 }
-+
-+dot1dTpPortInFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of frames that have been received by
-+            this port from its segment. Note that a frame
-+            received on the interface corresponding to this
-+            port is only counted by this object if and only if
-+            it is for a protocol being processed by the local
-+            bridging function, including bridge management
-+            frames."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.6.1.1.3"
-+    ::= { dot1dTpPortEntry 3 }
-+
-+dot1dTpPortOutFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of frames that have been transmitted
-+            by this port to its segment.  Note that a frame
-+            transmitted on the interface corresponding to this
-+            port is only counted by this object if and only if
-+            it is for a protocol being processed by the local
-+            bridging function, including bridge management
-+            frames."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.6.1.1.3"
-+    ::= { dot1dTpPortEntry 4 }
-+
-+dot1dTpPortInDiscards OBJECT-TYPE
-+    SYNTAX   Counter
-+    ACCESS   read-only
-+    STATUS   mandatory
-+    DESCRIPTION
-+            "Count of valid frames received which were
-+            discarded (i.e., filtered) by the Forwarding
-+            Process."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.6.1.1.3"
-+    ::= { dot1dTpPortEntry 5 }
-+-- The Static (Destination-Address Filtering) Database
-+
-+-- Implementation of this group is optional.
-+
-+dot1dStaticTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dStaticEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table containing filtering information
-+            configured into the bridge by (local or network)
-+            management specifying the set of ports to which
-+            frames received from specific ports and containing
-+            specific destination addresses are allowed to be
-+            forwarded.  The value of zero in this table as the
-+            port number from which frames with a specific
-+            destination address are received, is used to
-+            specify all ports for which there is no specific
-+            entry in this table for that particular
-+            destination address.  Entries are valid for
-+            unicast and for group/broadcast addresses."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.7.2"
-+    ::= { dot1dStatic 1 }
-+
-+dot1dStaticEntry OBJECT-TYPE
-+    SYNTAX  Dot1dStaticEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Filtering information configured into the bridge
-+            by (local or network) management specifying the
-+            set of ports to which frames received from a
-+            specific port and containing a specific
-+            destination address are allowed to be forwarded."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 6.7.2"
-+    INDEX   { dot1dStaticAddress, dot1dStaticReceivePort }
-+    ::= { dot1dStaticTable 1 }
-+
-+Dot1dStaticEntry ::=
-+    SEQUENCE {
-+        dot1dStaticAddress
-+            MacAddress,
-+        dot1dStaticReceivePort
-+            INTEGER,
-+        dot1dStaticAllowedToGoTo
-+            OCTET STRING,
-+        dot1dStaticStatus
-+            INTEGER
-+    }
-+
-+dot1dStaticAddress OBJECT-TYPE
-+    SYNTAX  MacAddress
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The destination MAC address in a frame to which
-+            this entry's filtering information applies.  This
-+            object can take the value of a unicast address, a
-+            group address or the broadcast address."
-+    REFERENCE
-+            "IEEE 802.1D-1990: Section 3.9.1, 3.9.2"
-+    ::= { dot1dStaticEntry 1 }
-+
-+dot1dStaticReceivePort OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Either the value '0', or the port number of the
-+            port from which a frame must be received in order
-+            for this entry's filtering information to apply.
-+            A value of zero indicates that this entry applies
-+            on all ports of the bridge for which there is no
-+            other applicable entry."
-+    ::= { dot1dStaticEntry 2 }
-+
-+dot1dStaticAllowedToGoTo OBJECT-TYPE
-+    SYNTAX  OCTET STRING
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The set of ports to which frames received from a
-+            specific port and destined for a specific MAC
-+
-+            address, are allowed to be forwarded.  Each octet
-+            within the value of this object specifies a set of
-+            eight ports, with the first octet specifying ports
-+            1 through 8, the second octet specifying ports 9
-+            through 16, etc.  Within each octet, the most
-+            significant bit represents the lowest numbered
-+            port, and the least significant bit represents the
-+            highest numbered port.  Thus, each port of the
-+            bridge is represented by a single bit within the
-+            value of this object.  If that bit has a value of
-+            '1' then that port is included in the set of
-+            ports; the port is not included if its bit has a
-+            value of '0'.  (Note that the setting of the bit
-+            corresponding to the port from which a frame is
-+            received is irrelevant.)  The default value of
-+            this object is a string of ones of appropriate
-+            length."
-+    ::= { dot1dStaticEntry 3 }
-+
-+dot1dStaticStatus OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                other(1),
-+                invalid(2),
-+                permanent(3),
-+                deleteOnReset(4),
-+                deleteOnTimeout(5)
-+            }
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "This object indicates the status of this entry.
-+            The default value is permanent(3).
-+                 other(1) - this entry is currently in use but
-+                      the conditions under which it will
-+                      remain so are different from each of the
-+                      following values.
-+                 invalid(2) - writing this value to the object
-+                      removes the corresponding entry.
-+                 permanent(3) - this entry is currently in use
-+                      and will remain so after the next reset
-+                      of the bridge.
-+                 deleteOnReset(4) - this entry is currently in
-+                      use and will remain so until the next
-+                      reset of the bridge.
-+                 deleteOnTimeout(5) - this entry is currently
-+                      in use and will remain so until it is
-+                      aged out."
-+
-+    ::= { dot1dStaticEntry 4 }
-+
-+-- Traps for use by Bridges
-+
-+-- Traps for the Spanning Tree Protocol
-+
-+newRoot TRAP-TYPE
-+    ENTERPRISE  dot1dBridge
-+    DESCRIPTION
-+            "The newRoot trap indicates that the sending agent
-+            has become the new root of the Spanning Tree; the
-+            trap is sent by a bridge soon after its election
-+            as the new root, e.g., upon expiration of the
-+            Topology Change Timer immediately subsequent to
-+            its election.  Implementation of this trap is
-+            optional."
-+    ::= 1
-+
-+topologyChange TRAP-TYPE
-+    ENTERPRISE  dot1dBridge
-+    DESCRIPTION
-+            "A topologyChange trap is sent by a bridge when
-+            any of its configured ports transitions from the
-+            Learning state to the Forwarding state, or from
-+            the Forwarding state to the Blocking state.  The
-+            trap is not sent if a newRoot trap is sent for the
-+            same transition.  Implementation of this trap is
-+            optional."
-+    ::= 2
-+
-+END
---- /dev/null
-+++ b/mibs/GNOME-SMI.txt
-@@ -0,0 +1,88 @@
-+GNOME-SMI DEFINITIONS ::= BEGIN
-+
-+IMPORTS
-+	MODULE-IDENTITY,
-+	OBJECT-IDENTITY,
-+	enterprises
-+		FROM SNMPv2-SMI;
-+
-+gnome MODULE-IDENTITY
-+	LAST-UPDATED "200709070000Z"
-+	ORGANIZATION "GNOME project"
-+	CONTACT-INFO
-+		"GNU Network Object Model Environment project
-+		
-+		see http://www.gnome.org for contact persons of a particular
-+		area or subproject of GNOME.
-+
-+		Administrative contact for MIB module:
-+
-+		Jochen Friedrich
-+		Ramsaystr. 9
-+		63450 Hanau
-+		Germany 
-+
-+		email: jochen@scram.de"
-+	DESCRIPTION
-+		"The Structure of GNOME."
-+
-+	-- revision history
-+
-+	REVISION "200709070000Z"  -- Sep 07, 2007
-+	DESCRIPTION
-+		"Fixed wrong enterprise number (how comes this
-+		typo was unnoticed for so long?)."
-+
-+	REVISION "200505070000Z"  -- May 07, 2005
-+	DESCRIPTION
-+		"Added gnomeLDAP subtree for LDAP definitions."
-+
-+	REVISION "200312070000Z"  -- December 07, 2003
-+	DESCRIPTION
-+		"Added gnomeSysadmin subtree for GNOME project system administration.
-+		Updated contact info."
-+
-+	REVISION "9809010000Z"  -- September 01, 1998
-+	DESCRIPTION
-+		"Initial version."
-+
-+	::= { enterprises 3319 }	-- assigned by IANA
-+
-+gnomeProducts OBJECT-IDENTITY
-+	STATUS	current
-+	DESCRIPTION
-+		"gnomeProducts is the root OBJECT IDENTIFIER from
-+		which sysObjectID values are assigned."
-+	::= { gnome 1 }
-+
-+gnomeMgmt OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeMgmt defines the subtree for production GNOME related
-+		MIB registrations."
-+	::= { gnome 2 }
-+
-+gnomeTest OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeTest defines the subtree for testing GNOME related
-+		MIB registrations."
-+	::= { gnome 3 }
-+
-+gnomeSysadmin OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeSysadmin defines the subtree for GNOME related Sysadmin
-+		MIB registrations."
-+	::= { gnome 4 }
-+
-+gnomeLDAP OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeLDAP defines the subtree for GNOME related LDAP
-+		registrations."
-+	::= { gnome 5 }
-+
-+-- more to come if necessary.
-+
-+END
---- /dev/null
-+++ b/mibs/OSPF-MIB.txt
-@@ -0,0 +1,2723 @@
-+OSPF-MIB DEFINITIONS ::= BEGIN
-+
-+    IMPORTS
-+            MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32,
-+            Integer32, IpAddress
-+                FROM SNMPv2-SMI
-+            TEXTUAL-CONVENTION, TruthValue, RowStatus
-+                FROM SNMPv2-TC
-+            MODULE-COMPLIANCE, OBJECT-GROUP          FROM SNMPv2-CONF
-+            mib-2                                    FROM RFC1213-MIB;
-+
-+--  This MIB module uses the extended OBJECT-TYPE macro as
-+--  defined in [9].
-+
-+ospf MODULE-IDENTITY
-+        LAST-UPDATED "9501201225Z" -- Fri Jan 20 12:25:50 PST 1995
-+        ORGANIZATION "IETF OSPF Working Group"
-+        CONTACT-INFO
-+       "       Fred Baker
-+       Postal: Cisco Systems
-+               519 Lado Drive
-+               Santa Barbara, California 93111
-+       Tel:    +1 805 681 0115
-+       E-Mail: fred@cisco.com
-+
-+               Rob Coltun
-+       Postal: RainbowBridge Communications
-+       Tel:    (301) 340-9416
-+       E-Mail: rcoltun@rainbow-bridge.com"
-+    DESCRIPTION
-+       "The MIB module to describe the OSPF Version 2
-+       Protocol"
-+    ::= { mib-2 14 }
-+
-+--  The Area ID, in OSPF, has the same format as an IP Address,
-+--  but has the function of defining a summarization point for
-+--  Link State Advertisements
-+
-+AreaID ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "An OSPF Area Identifier."
-+    SYNTAX      IpAddress
-+
-+
-+--  The Router ID, in OSPF, has the same format as an IP Address,
-+--  but identifies the router independent of its IP Address.
-+
-+RouterID ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "A OSPF Router Identifier."
-+    SYNTAX      IpAddress
-+
-+
-+--  The OSPF Metric is defined as an unsigned value in the range
-+
-+Metric ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The OSPF Internal Metric."
-+    SYNTAX      Integer32 (0..'FFFF'h)
-+
-+BigMetric ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The OSPF External Metric."
-+    SYNTAX      Integer32 (0..'FFFFFF'h)
-+
-+--  Status Values
-+
-+Status ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The status of an interface: 'enabled' indicates that
-+       it is willing to communicate with other OSPF Routers,
-+       while 'disabled' indicates that it is not."
-+    SYNTAX      INTEGER { enabled (1), disabled (2) }
-+
-+--  Time Durations measured in seconds
-+
-+PositiveInteger ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "A positive integer. Values in excess are precluded as
-+       unnecessary and prone to interoperability issues."
-+    SYNTAX      Integer32 (0..'7FFFFFFF'h)
-+
-+HelloRange ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The range of intervals on which hello messages are
-+       exchanged."
-+    SYNTAX      Integer32 (1..'FFFF'h)
-+
-+UpToMaxAge ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The values that one might find or configure for
-+       variables bounded by the maximum age of an LSA."
-+    SYNTAX      Integer32 (0..3600)
-+
-+
-+--  The range of ifIndex
-+
-+InterfaceIndex ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The range of ifIndex."
-+    SYNTAX      Integer32
-+
-+
-+--  Potential Priorities for the Designated Router Election
-+
-+DesignatedRouterPriority ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "The values defined for the priority of a system for
-+       becoming the designated router."
-+    SYNTAX      Integer32 (0..'FF'h)
-+
-+TOSType ::= TEXTUAL-CONVENTION
-+    STATUS      current
-+    DESCRIPTION
-+       "Type of Service is defined as a mapping to the IP Type of
-+       Service Flags as defined in the IP Forwarding Table MIB
-+
-+       +-----+-----+-----+-----+-----+-----+-----+-----+
-+       |                 |                       |     |
-+       |   PRECEDENCE    |    TYPE OF SERVICE    |  0  |
-+       |                 |                       |     |
-+       +-----+-----+-----+-----+-----+-----+-----+-----+
-+
-+                IP TOS                IP TOS
-+           Field     Policy      Field     Policy
-+
-+           Contents    Code      Contents    Code
-+           0 0 0 0  ==>   0      0 0 0 1  ==>   2
-+           0 0 1 0  ==>   4      0 0 1 1  ==>   6
-+           0 1 0 0  ==>   8      0 1 0 1  ==>  10
-+           0 1 1 0  ==>  12      0 1 1 1  ==>  14
-+           1 0 0 0  ==>  16      1 0 0 1  ==>  18
-+           1 0 1 0  ==>  20      1 0 1 1  ==>  22
-+           1 1 0 0  ==>  24      1 1 0 1  ==>  26
-+           1 1 1 0  ==>  28      1 1 1 1  ==>  30
-+
-+       The remaining values are left for future definition."
-+    SYNTAX      Integer32 (0..30)
-+
-+
-+--  OSPF General Variables
-+
-+--      These parameters apply globally to the Router's
-+--      OSPF Process.
-+
-+ospfGeneralGroup OBJECT IDENTIFIER ::= { ospf 1 }
-+
-+
-+    ospfRouterId OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "A  32-bit  integer  uniquely  identifying  the
-+           router in the Autonomous System.
-+
-+           By  convention,  to  ensure  uniqueness,   this
-+           should  default  to  the  value  of  one of the
-+           router's IP interface addresses."
-+       REFERENCE
-+          "OSPF Version 2, C.1 Global parameters"
-+      ::= { ospfGeneralGroup 1 }
-+
-+
-+    ospfAdminStat OBJECT-TYPE
-+        SYNTAX   Status
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "The  administrative  status  of  OSPF  in  the
-+           router.   The  value 'enabled' denotes that the
-+           OSPF Process is active on at least  one  inter-
-+           face;  'disabled'  disables  it  on  all inter-
-+           faces."
-+       ::= { ospfGeneralGroup 2 }
-+
-+    ospfVersionNumber OBJECT-TYPE
-+        SYNTAX   INTEGER    { version2 (2) }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The current version number of the OSPF  proto-
-+           col is 2."
-+       REFERENCE
-+          "OSPF Version 2, Title"
-+      ::= { ospfGeneralGroup 3 }
-+
-+
-+    ospfAreaBdrRtrStatus OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A flag to note whether this router is an  area
-+           border router."
-+       REFERENCE
-+          "OSPF Version 2, Section 3 Splitting the AS into
-+          Areas"
-+      ::= { ospfGeneralGroup 4 }
-+
-+
-+    ospfASBdrRtrStatus OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "A flag to note whether this router is  config-
-+           ured as an Autonomous System border router."
-+       REFERENCE
-+          "OSPF Version 2, Section 3.3  Classification  of
-+          routers"
-+      ::= { ospfGeneralGroup 5 }
-+
-+    ospfExternLsaCount OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of external (LS type 5)  link-state
-+           advertisements in the link-state database."
-+       REFERENCE
-+          "OSPF Version 2, Appendix A.4.5 AS external link
-+          advertisements"
-+      ::= { ospfGeneralGroup 6 }
-+
-+
-+    ospfExternLsaCksumSum OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32-bit unsigned sum of the LS checksums of
-+           the  external  link-state  advertisements  con-
-+           tained in the link-state  database.   This  sum
-+           can  be  used  to determine if there has been a
-+           change in a router's link state  database,  and
-+           to  compare  the  link-state  database  of  two
-+           routers."
-+       ::= { ospfGeneralGroup 7 }
-+
-+
-+    ospfTOSSupport OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "The router's support for type-of-service rout-
-+           ing."
-+       REFERENCE
-+          "OSPF Version 2,  Appendix  F.1.2  Optional  TOS
-+          support"
-+      ::= { ospfGeneralGroup 8 }
-+
-+    ospfOriginateNewLsas OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of  new  link-state  advertisements
-+           that  have been originated.  This number is in-
-+           cremented each time the router originates a new
-+           LSA."
-+       ::= { ospfGeneralGroup 9 }
-+
-+
-+    ospfRxNewLsas OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of  link-state  advertisements  re-
-+           ceived  determined  to  be  new instantiations.
-+           This number does not include  newer  instantia-
-+           tions  of self-originated link-state advertise-
-+           ments."
-+       ::= { ospfGeneralGroup 10 }
-+
-+    ospfExtLsdbLimit OBJECT-TYPE
-+        SYNTAX   Integer32 (-1..'7FFFFFFF'h)
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "The  maximum   number   of   non-default   AS-
-+           external-LSAs entries that can be stored in the
-+           link-state database.  If the value is -1,  then
-+           there is no limit.
-+
-+           When the number of non-default AS-external-LSAs
-+           in   a  router's  link-state  database  reaches
-+           ospfExtLsdbLimit, the router  enters  Overflow-
-+           State.   The   router  never  holds  more  than
-+           ospfExtLsdbLimit  non-default  AS-external-LSAs
-+           in  its  database. OspfExtLsdbLimit MUST be set
-+           identically in all routers attached to the OSPF
-+           backbone  and/or  any regular OSPF area. (i.e.,
-+           OSPF stub areas and NSSAs are excluded)."
-+       DEFVAL { -1 }
-+       ::= { ospfGeneralGroup 11 }
-+
-+    ospfMulticastExtensions OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "A Bit Mask indicating whether  the  router  is
-+           forwarding  IP  multicast  (Class  D) datagrams
-+           based on the algorithms defined in  the  Multi-
-+           cast Extensions to OSPF.
-+
-+           Bit 0, if set, indicates that  the  router  can
-+           forward  IP multicast datagrams in the router's
-+           directly attached areas (called intra-area mul-
-+           ticast routing).
-+
-+           Bit 1, if set, indicates that  the  router  can
-+           forward  IP  multicast  datagrams  between OSPF
-+           areas (called inter-area multicast routing).
-+
-+           Bit 2, if set, indicates that  the  router  can
-+           forward  IP  multicast  datagrams between Auto-
-+           nomous Systems (called inter-AS multicast rout-
-+           ing).
-+
-+           Only certain combinations of bit  settings  are
-+           allowed,  namely: 0 (no multicast forwarding is
-+           enabled), 1 (intra-area multicasting  only),  3
-+           (intra-area  and  inter-area  multicasting),  5
-+           (intra-area and inter-AS  multicasting)  and  7
-+           (multicasting  everywhere). By default, no mul-
-+           ticast forwarding is enabled."
-+       DEFVAL { 0 }
-+       ::= { ospfGeneralGroup 12 }
-+
-+    ospfExitOverflowInterval OBJECT-TYPE
-+        SYNTAX   PositiveInteger
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of  seconds  that,  after  entering
-+           OverflowState,  a  router will attempt to leave
-+           OverflowState. This allows the router to  again
-+           originate  non-default  AS-external-LSAs.  When
-+           set to 0, the router will not  leave  Overflow-
-+           State until restarted."
-+       DEFVAL { 0 }
-+       ::= { ospfGeneralGroup 13 }
-+
-+
-+    ospfDemandExtensions OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "The router's support for demand routing."
-+       REFERENCE
-+          "OSPF Version 2, Appendix on Demand Routing"
-+      ::= { ospfGeneralGroup 14 }
-+
-+
-+--      The OSPF Area Data Structure contains information
-+--      regarding the various areas. The interfaces and
-+--      virtual links are configured as part of these areas.
-+--      Area 0.0.0.0, by definition, is the Backbone Area
-+
-+
-+    ospfAreaTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfAreaEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "Information describing the configured  parame-
-+           ters  and cumulative statistics of the router's
-+           attached areas."
-+       REFERENCE
-+          "OSPF Version 2, Section 6  The Area Data Struc-
-+          ture"
-+      ::= { ospf 2 }
-+
-+
-+    ospfAreaEntry OBJECT-TYPE
-+        SYNTAX   OspfAreaEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "Information describing the configured  parame-
-+           ters  and  cumulative  statistics of one of the
-+           router's attached areas."
-+       INDEX { ospfAreaId }
-+       ::= { ospfAreaTable 1 }
-+
-+OspfAreaEntry ::=
-+    SEQUENCE {
-+        ospfAreaId
-+            AreaID,
-+        ospfAuthType
-+            Integer32,
-+        ospfImportAsExtern
-+            INTEGER,
-+        ospfSpfRuns
-+            Counter32,
-+        ospfAreaBdrRtrCount
-+            Gauge32,
-+        ospfAsBdrRtrCount
-+            Gauge32,
-+        ospfAreaLsaCount
-+            Gauge32,
-+        ospfAreaLsaCksumSum
-+            Integer32,
-+        ospfAreaSummary
-+            INTEGER,
-+        ospfAreaStatus
-+            RowStatus
-+              }
-+
-+    ospfAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A 32-bit integer uniquely identifying an area.
-+           Area ID 0.0.0.0 is used for the OSPF backbone."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaEntry 1 }
-+
-+
-+    ospfAuthType OBJECT-TYPE
-+        SYNTAX   Integer32
-+                    -- none (0),
-+                    -- simplePassword (1)
-+                    -- md5 (2)
-+                    -- reserved for specification by IANA (> 2)
-+        MAX-ACCESS   read-create
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "The authentication type specified for an area.
-+           Additional authentication types may be assigned
-+           locally on a per Area basis."
-+       REFERENCE
-+          "OSPF Version 2, Appendix E Authentication"
-+      DEFVAL { 0 }        -- no authentication, by default
-+      ::= { ospfAreaEntry 2 }
-+
-+    ospfImportAsExtern OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    importExternal (1),
-+                    importNoExternal (2),
-+                    importNssa (3)
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The area's support for importing  AS  external
-+           link- state advertisements."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      DEFVAL { importExternal }
-+      ::= { ospfAreaEntry 3 }
-+
-+
-+    ospfSpfRuns OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of times that the intra-area  route
-+           table  has  been  calculated  using this area's
-+           link-state database.  This  is  typically  done
-+           using Dijkstra's algorithm."
-+       ::= { ospfAreaEntry 4 }
-+
-+
-+    ospfAreaBdrRtrCount OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The total number of area border routers reach-
-+           able within this area.  This is initially zero,
-+           and is calculated in each SPF Pass."
-+       ::= { ospfAreaEntry 5 }
-+
-+    ospfAsBdrRtrCount OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The total number of Autonomous  System  border
-+           routers  reachable  within  this area.  This is
-+           initially zero, and is calculated in  each  SPF
-+           Pass."
-+       ::= { ospfAreaEntry 6 }
-+
-+
-+    ospfAreaLsaCount OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The total number of link-state  advertisements
-+           in  this  area's link-state database, excluding
-+           AS External LSA's."
-+       ::= { ospfAreaEntry 7 }
-+
-+
-+    ospfAreaLsaCksumSum OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32-bit unsigned sum of the link-state  ad-
-+           vertisements'  LS  checksums  contained in this
-+           area's link-state database.  This sum  excludes
-+           external (LS type 5) link-state advertisements.
-+           The sum can be used to determine if  there  has
-+           been  a  change  in a router's link state data-
-+           base, and to compare the link-state database of
-+           two routers."
-+       DEFVAL   { 0 }
-+       ::= { ospfAreaEntry 8 }
-+
-+    ospfAreaSummary OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    noAreaSummary (1),
-+                    sendAreaSummary (2)
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The variable ospfAreaSummary controls the  im-
-+           port  of  summary LSAs into stub areas.  It has
-+           no effect on other areas.
-+
-+           If it is noAreaSummary, the router will neither
-+           originate  nor  propagate summary LSAs into the
-+           stub area.  It will rely entirely  on  its  de-
-+           fault route.
-+
-+           If it is sendAreaSummary, the router will  both
-+           summarize and propagate summary LSAs."
-+       DEFVAL   { noAreaSummary }
-+       ::= { ospfAreaEntry 9 }
-+
-+
-+    ospfAreaStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfAreaEntry 10 }
-+
-+
-+--  OSPF Area Default Metric Table
-+
-+--      The OSPF Area Default Metric Table describes the metrics
-+--      that a default Area Border Router will advertise into a
-+--      Stub area.
-+
-+
-+    ospfStubAreaTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfStubAreaEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The set of metrics that will be advertised  by
-+           a default Area Border Router into a stub area."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2, Area Parameters"
-+      ::= { ospf 3 }
-+
-+
-+    ospfStubAreaEntry OBJECT-TYPE
-+        SYNTAX   OspfStubAreaEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The metric for a given Type  of  Service  that
-+           will  be  advertised  by  a default Area Border
-+           Router into a stub area."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2, Area Parameters"
-+      INDEX { ospfStubAreaId, ospfStubTOS }
-+      ::= { ospfStubAreaTable 1 }
-+
-+OspfStubAreaEntry ::=
-+    SEQUENCE {
-+        ospfStubAreaId
-+            AreaID,
-+        ospfStubTOS
-+            TOSType,
-+        ospfStubMetric
-+            BigMetric,
-+        ospfStubStatus
-+            RowStatus,
-+        ospfStubMetricType
-+            INTEGER
-+              }
-+
-+    ospfStubAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32 bit identifier for the Stub  Area.   On
-+           creation,  this  can  be  derived  from the in-
-+           stance."
-+       ::= { ospfStubAreaEntry 1 }
-+
-+
-+    ospfStubTOS OBJECT-TYPE
-+        SYNTAX   TOSType
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The  Type  of  Service  associated  with   the
-+           metric.   On creation, this can be derived from
-+           the instance."
-+       ::= { ospfStubAreaEntry 2 }
-+
-+
-+    ospfStubMetric OBJECT-TYPE
-+        SYNTAX   BigMetric
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The metric value applied at the indicated type
-+           of  service.  By default, this equals the least
-+           metric at the type of service among the  inter-
-+           faces to other areas."
-+       ::= { ospfStubAreaEntry 3 }
-+
-+
-+    ospfStubStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfStubAreaEntry 4 }
-+
-+    ospfStubMetricType OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    ospfMetric (1),                -- OSPF Metric
-+                    comparableCost (2),        -- external type 1
-+                    nonComparable  (3)        -- external type 2
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the type of metric  ad-
-+           vertised as a default route."
-+       DEFVAL   { ospfMetric }
-+       ::= { ospfStubAreaEntry 5 }
-+
-+--  OSPF Link State Database
-+
-+--      The Link State Database contains the Link State
-+--      Advertisements from throughout the areas that the
-+--      device is attached to.
-+
-+
-+    ospfLsdbTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfLsdbEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF Process's Link State Database."
-+       REFERENCE
-+          "OSPF Version 2, Section 12  Link  State  Adver-
-+          tisements"
-+      ::= { ospf 4 }
-+
-+
-+    ospfLsdbEntry OBJECT-TYPE
-+        SYNTAX   OspfLsdbEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A single Link State Advertisement."
-+       INDEX { ospfLsdbAreaId, ospfLsdbType,
-+               ospfLsdbLsid, ospfLsdbRouterId }
-+       ::= { ospfLsdbTable 1 }
-+
-+OspfLsdbEntry ::=
-+    SEQUENCE {
-+        ospfLsdbAreaId
-+            AreaID,
-+        ospfLsdbType
-+            INTEGER,
-+        ospfLsdbLsid
-+            IpAddress,
-+        ospfLsdbRouterId
-+            RouterID,
-+        ospfLsdbSequence
-+            Integer32,
-+        ospfLsdbAge
-+            Integer32,
-+        ospfLsdbChecksum
-+            Integer32,
-+        ospfLsdbAdvertisement
-+            OCTET STRING
-+              }
-+    ospfLsdbAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32 bit identifier of the Area  from  which
-+           the LSA was received."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfLsdbEntry 1 }
-+
-+-- External Link State Advertisements are permitted
-+-- for backward compatibility, but should be displayed in
-+-- the ospfExtLsdbTable rather than here.
-+
-+    ospfLsdbType OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    routerLink (1),
-+                    networkLink (2),
-+                    summaryLink (3),
-+                    asSummaryLink (4),
-+                    asExternalLink (5), -- but see ospfExtLsdbTable
-+                    multicastLink (6),
-+                    nssaExternalLink (7)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The type  of  the  link  state  advertisement.
-+           Each  link state type has a separate advertise-
-+           ment format."
-+       REFERENCE
-+          "OSPF Version 2, Appendix A.4.1 The  Link  State
-+          Advertisement header"
-+      ::= { ospfLsdbEntry 2 }
-+
-+    ospfLsdbLsid OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Link State ID is an LS Type Specific field
-+           containing either a Router ID or an IP Address;
-+           it identifies the piece of the  routing  domain
-+           that is being described by the advertisement."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.4 Link State ID"
-+      ::= { ospfLsdbEntry 3 }
-+    ospfLsdbRouterId OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32 bit number that uniquely identifies the
-+           originating router in the Autonomous System."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.1 Global parameters"
-+      ::= { ospfLsdbEntry 4 }
-+
-+--  Note that the OSPF Sequence Number is a 32 bit signed
-+--  integer.  It starts with the value '80000001'h,
-+--  or -'7FFFFFFF'h, and increments until '7FFFFFFF'h
-+--  Thus, a typical sequence number will be very negative.
-+
-+    ospfLsdbSequence OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The sequence number field is a  signed  32-bit
-+           integer.   It  is used to detect old and dupli-
-+           cate link state advertisements.  The  space  of
-+           sequence  numbers  is  linearly  ordered.   The
-+           larger the sequence number the more recent  the
-+           advertisement."
-+       REFERENCE
-+          "OSPF Version  2,  Section  12.1.6  LS  sequence
-+          number"
-+      ::= { ospfLsdbEntry 5 }
-+
-+
-+    ospfLsdbAge OBJECT-TYPE
-+        SYNTAX   Integer32    -- Should be 0..MaxAge
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "This field is the age of the link state adver-
-+           tisement in seconds."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.1 LS age"
-+      ::= { ospfLsdbEntry 6 }
-+
-+    ospfLsdbChecksum OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "This field is the  checksum  of  the  complete
-+           contents  of  the  advertisement, excepting the
-+           age field.  The age field is excepted  so  that
-+           an   advertisement's  age  can  be  incremented
-+           without updating the  checksum.   The  checksum
-+           used  is  the same that is used for ISO connec-
-+           tionless datagrams; it is commonly referred  to
-+           as the Fletcher checksum."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.7 LS checksum"
-+      ::= { ospfLsdbEntry 7 }
-+
-+
-+    ospfLsdbAdvertisement OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE (1..65535))
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The entire Link State Advertisement, including
-+           its header."
-+       REFERENCE
-+          "OSPF Version 2, Section 12  Link  State  Adver-
-+          tisements"
-+      ::= { ospfLsdbEntry 8 }
-+
-+
-+--  Address Range Table
-+
-+--      The Address Range Table acts as an adjunct to the Area
-+--      Table; It describes those Address Range Summaries that
-+--      are configured to be propagated from an Area to reduce
-+--      the amount of information about it which is known beyond
-+--      its borders.
-+
-+    ospfAreaRangeTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfAreaRangeEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "A range if IP addresses  specified  by  an  IP
-+           address/IP  network  mask  pair.   For example,
-+           class B address range of X.X.X.X with a network
-+           mask  of  255.255.0.0 includes all IP addresses
-+           from X.X.0.0 to X.X.255.255"
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2  Area parameters"
-+      ::= { ospf 5 }
-+    ospfAreaRangeEntry OBJECT-TYPE
-+        SYNTAX   OspfAreaRangeEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "A range if IP addresses  specified  by  an  IP
-+           address/IP  network  mask  pair.   For example,
-+           class B address range of X.X.X.X with a network
-+           mask  of  255.255.0.0 includes all IP addresses
-+           from X.X.0.0 to X.X.255.255"
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2  Area parameters"
-+      INDEX { ospfAreaRangeAreaId, ospfAreaRangeNet }
-+      ::= { ospfAreaRangeTable 1 }
-+
-+OspfAreaRangeEntry ::=
-+    SEQUENCE {
-+        ospfAreaRangeAreaId
-+            AreaID,
-+        ospfAreaRangeNet
-+            IpAddress,
-+        ospfAreaRangeMask
-+            IpAddress,
-+        ospfAreaRangeStatus
-+            RowStatus,
-+        ospfAreaRangeEffect
-+            INTEGER
-+              }
-+
-+    ospfAreaRangeAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "The Area the Address  Range  is  to  be  found
-+           within."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaRangeEntry 1 }
-+
-+
-+    ospfAreaRangeNet OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "The IP Address of the Net or Subnet  indicated
-+           by the range."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaRangeEntry 2 }
-+
-+
-+    ospfAreaRangeMask OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-create
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "The Subnet Mask that pertains to  the  Net  or
-+           Subnet."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaRangeEntry 3 }
-+
-+    ospfAreaRangeStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfAreaRangeEntry 4 }
-+
-+
-+    ospfAreaRangeEffect OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    advertiseMatching (1),
-+                    doNotAdvertiseMatching (2)
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "Subnets subsumed by ranges either trigger  the
-+           advertisement  of the indicated summary (adver-
-+           tiseMatching), or result in  the  subnet's  not
-+           being advertised at all outside the area."
-+       DEFVAL   { advertiseMatching }
-+       ::= { ospfAreaRangeEntry 5 }
-+
-+
-+
-+--  OSPF Host Table
-+
-+--      The Host/Metric Table indicates what hosts are directly
-+--      attached to the Router, and what metrics and types of
-+--      service should be advertised for them.
-+
-+    ospfHostTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfHostEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The list of Hosts, and their metrics, that the
-+           router will advertise as host routes."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.6  Host route param-
-+          eters"
-+      ::= { ospf 6 }
-+
-+
-+    ospfHostEntry OBJECT-TYPE
-+        SYNTAX   OspfHostEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A metric to be advertised, for a given type of
-+           service, when a given host is reachable."
-+       INDEX { ospfHostIpAddress, ospfHostTOS }
-+       ::= { ospfHostTable 1 }
-+
-+OspfHostEntry ::=
-+    SEQUENCE {
-+        ospfHostIpAddress
-+            IpAddress,
-+        ospfHostTOS
-+            TOSType,
-+        ospfHostMetric
-+            Metric,
-+        ospfHostStatus
-+            RowStatus,
-+        ospfHostAreaID
-+            AreaID
-+              }
-+
-+    ospfHostIpAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address of the Host."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.6 Host route parame-
-+          ters"
-+      ::= { ospfHostEntry 1 }
-+
-+
-+    ospfHostTOS OBJECT-TYPE
-+        SYNTAX   TOSType
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Type of Service of the route being config-
-+           ured."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.6 Host route parame-
-+          ters"
-+      ::= { ospfHostEntry 2 }
-+
-+
-+    ospfHostMetric OBJECT-TYPE
-+        SYNTAX   Metric
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The Metric to be advertised."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.6 Host route parame-
-+          ters"
-+      ::= { ospfHostEntry 3 }
-+
-+    ospfHostStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfHostEntry 4 }
-+
-+
-+    ospfHostAreaID OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Area the Host Entry is to be found within.
-+           By  default, the area that a subsuming OSPF in-
-+           terface is in, or 0.0.0.0"
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfHostEntry 5 }
-+
-+
-+--  OSPF Interface Table
-+
-+--      The OSPF Interface Table augments the ipAddrTable
-+--             with OSPF specific information.
-+
-+    ospfIfTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfIfEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF Interface Table describes the  inter-
-+           faces from the viewpoint of OSPF."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.3  Router  interface
-+          parameters"
-+      ::= { ospf 7 }
-+
-+
-+    ospfIfEntry OBJECT-TYPE
-+        SYNTAX   OspfIfEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF Interface Entry describes one  inter-
-+           face from the viewpoint of OSPF."
-+       INDEX { ospfIfIpAddress, ospfAddressLessIf }
-+       ::= { ospfIfTable 1 }
-+
-+OspfIfEntry ::=
-+    SEQUENCE {
-+        ospfIfIpAddress
-+            IpAddress,
-+        ospfAddressLessIf
-+            Integer32,
-+        ospfIfAreaId
-+            AreaID,
-+        ospfIfType
-+            INTEGER,
-+        ospfIfAdminStat
-+            Status,
-+        ospfIfRtrPriority
-+            DesignatedRouterPriority,
-+        ospfIfTransitDelay
-+            UpToMaxAge,
-+        ospfIfRetransInterval
-+            UpToMaxAge,
-+        ospfIfHelloInterval
-+            HelloRange,
-+        ospfIfRtrDeadInterval
-+            PositiveInteger,
-+        ospfIfPollInterval
-+            PositiveInteger,
-+        ospfIfState
-+            INTEGER,
-+        ospfIfDesignatedRouter
-+            IpAddress,
-+        ospfIfBackupDesignatedRouter
-+            IpAddress,
-+        ospfIfEvents
-+            Counter32,
-+        ospfIfAuthType
-+            INTEGER,
-+        ospfIfAuthKey
-+            OCTET STRING,
-+        ospfIfStatus
-+            RowStatus,
-+        ospfIfMulticastForwarding
-+            INTEGER,
-+        ospfIfDemand
-+            TruthValue
-+              }
-+
-+    ospfIfIpAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP address of this OSPF interface."
-+       ::= { ospfIfEntry 1 }
-+
-+    ospfAddressLessIf OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "For the purpose of easing  the  instancing  of
-+           addressed   and  addressless  interfaces;  This
-+           variable takes the value 0 on  interfaces  with
-+           IP  Addresses,  and  the corresponding value of
-+           ifIndex for interfaces having no IP Address."
-+       ::= { ospfIfEntry 2 }
-+    ospfIfAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "A 32-bit integer uniquely identifying the area
-+           to  which  the  interface  connects.   Area  ID
-+           0.0.0.0 is used for the OSPF backbone."
-+       DEFVAL   { '00000000'H }    -- 0.0.0.0
-+       ::= { ospfIfEntry 3 }
-+
-+    ospfIfType OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    broadcast (1),
-+                    nbma (2),
-+                    pointToPoint (3),
-+                    pointToMultipoint (5)
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF interface type.
-+
-+           By way of a default, this field may be intuited
-+           from the corresponding value of ifType.  Broad-
-+           cast LANs, such as  Ethernet  and  IEEE  802.5,
-+           take  the  value  'broadcast', X.25 and similar
-+           technologies take the value 'nbma',  and  links
-+           that  are  definitively point to point take the
-+           value 'pointToPoint'."
-+       ::= { ospfIfEntry 4 }
-+
-+
-+    ospfIfAdminStat OBJECT-TYPE
-+        SYNTAX   Status
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF  interface's  administrative  status.
-+           The  value formed on the interface, and the in-
-+           terface will be advertised as an internal route
-+           to  some  area.   The  value 'disabled' denotes
-+           that the interface is external to OSPF."
-+       DEFVAL { enabled }
-+       ::= { ospfIfEntry 5 }
-+
-+    ospfIfRtrPriority OBJECT-TYPE
-+        SYNTAX   DesignatedRouterPriority
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The  priority  of  this  interface.   Used  in
-+           multi-access  networks,  this  field is used in
-+           the designated router election algorithm.   The
-+           value 0 signifies that the router is not eligi-
-+           ble to become the  designated  router  on  this
-+           particular  network.   In the event of a tie in
-+           this value, routers will use their Router ID as
-+           a tie breaker."
-+       DEFVAL { 1 }
-+       ::= { ospfIfEntry 6 }
-+
-+
-+    ospfIfTransitDelay OBJECT-TYPE
-+        SYNTAX   UpToMaxAge
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The estimated number of seconds  it  takes  to
-+           transmit  a  link state update packet over this
-+           interface."
-+       DEFVAL { 1 }
-+       ::= { ospfIfEntry 7 }
-+
-+
-+    ospfIfRetransInterval OBJECT-TYPE
-+        SYNTAX   UpToMaxAge
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of seconds between  link-state  ad-
-+           vertisement  retransmissions,  for  adjacencies
-+           belonging to this  interface.   This  value  is
-+           also used when retransmitting database descrip-
-+           tion and link-state request packets."
-+       DEFVAL { 5 }
-+       ::= { ospfIfEntry 8 }
-+
-+
-+    ospfIfHelloInterval OBJECT-TYPE
-+        SYNTAX   HelloRange
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The length of time, in  seconds,  between  the
-+           Hello  packets that the router sends on the in-
-+           terface.  This value must be the same  for  all
-+           routers attached to a common network."
-+       DEFVAL { 10 }
-+       ::= { ospfIfEntry 9 }
-+
-+
-+    ospfIfRtrDeadInterval OBJECT-TYPE
-+        SYNTAX   PositiveInteger
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of seconds that  a  router's  Hello
-+           packets  have  not been seen before it's neigh-
-+           bors declare the router down.  This  should  be
-+           some  multiple  of  the  Hello  interval.  This
-+           value must be the same for all routers attached
-+           to a common network."
-+       DEFVAL { 40 }
-+       ::= { ospfIfEntry 10 }
-+
-+
-+    ospfIfPollInterval OBJECT-TYPE
-+        SYNTAX   PositiveInteger
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The larger time interval, in seconds,  between
-+           the  Hello  packets  sent  to  an inactive non-
-+           broadcast multi- access neighbor."
-+       DEFVAL { 120 }
-+       ::= { ospfIfEntry 11 }
-+
-+
-+    ospfIfState OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    down (1),
-+                    loopback (2),
-+                    waiting (3),
-+                    pointToPoint (4),
-+                    designatedRouter (5),
-+                    backupDesignatedRouter (6),
-+                    otherDesignatedRouter (7)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF Interface State."
-+       DEFVAL { down }
-+       ::= { ospfIfEntry 12 }
-+
-+
-+    ospfIfDesignatedRouter OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address of the Designated Router."
-+       DEFVAL   { '00000000'H }    -- 0.0.0.0
-+       ::= { ospfIfEntry 13 }
-+
-+
-+    ospfIfBackupDesignatedRouter OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The  IP  Address  of  the  Backup   Designated
-+           Router."
-+       DEFVAL   { '00000000'H }    -- 0.0.0.0
-+       ::= { ospfIfEntry 14 }
-+
-+    ospfIfEvents OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of times this  OSPF  interface  has
-+           changed its state, or an error has occurred."
-+       ::= { ospfIfEntry 15 }
-+
-+
-+    ospfIfAuthKey OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE (0..256))
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The Authentication Key.  If the Area's Author-
-+           ization  Type  is  simplePassword,  and the key
-+           length is shorter than 8 octets, the agent will
-+           left adjust and zero fill to 8 octets.
-+
-+           Note that unauthenticated  interfaces  need  no
-+           authentication key, and simple password authen-
-+           tication cannot use a key of more  than  8  oc-
-+           tets.  Larger keys are useful only with authen-
-+           tication mechanisms not specified in this docu-
-+           ment.
-+
-+           When read, ospfIfAuthKey always returns an  Oc-
-+           tet String of length zero."
-+       REFERENCE
-+          "OSPF Version 2, Section 9  The  Interface  Data
-+          Structure"
-+      DEFVAL   { '0000000000000000'H }    -- 0.0.0.0.0.0.0.0
-+      ::= { ospfIfEntry 16 }
-+
-+    ospfIfStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfIfEntry 17 }
-+
-+
-+    ospfIfMulticastForwarding OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                            blocked (1),        -- no multicast forwarding
-+                            multicast (2),        -- using multicast address
-+                            unicast (3)        -- to each OSPF neighbor
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The way multicasts should  forwarded  on  this
-+           interface;  not  forwarded,  forwarded  as data
-+           link multicasts, or forwarded as data link uni-
-+           casts.   Data link multicasting is not meaning-
-+           ful on point to point and NBMA interfaces,  and
-+           setting ospfMulticastForwarding to 0 effective-
-+           ly disables all multicast forwarding."
-+       DEFVAL { blocked }
-+       ::= { ospfIfEntry 18 }
-+
-+
-+    ospfIfDemand OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "Indicates whether Demand OSPF procedures (hel-
-+           lo supression to FULL neighbors and setting the
-+           DoNotAge flag on proogated LSAs) should be per-
-+           formed on this interface."
-+       DEFVAL { false }
-+       ::= { ospfIfEntry 19 }
-+
-+
-+    ospfIfAuthType OBJECT-TYPE
-+        SYNTAX   INTEGER (0..255)
-+                    -- none (0),
-+                    -- simplePassword (1)
-+                    -- md5 (2)
-+                    -- reserved for specification by IANA (> 2)
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The authentication type specified for  an  in-
-+           terface.   Additional  authentication types may
-+           be assigned locally."
-+       REFERENCE
-+          "OSPF Version 2, Appendix E Authentication"
-+      DEFVAL { 0 }        -- no authentication, by default
-+      ::= { ospfIfEntry 20 }
-+
-+
-+--  OSPF Interface Metric Table
-+
-+--      The Metric Table describes the metrics to be advertised
-+--      for a specified interface at the various types of service.
-+--      As such, this table is an adjunct of the OSPF Interface
-+--      Table.
-+
-+-- Types of service, as defined by RFC 791, have the ability
-+-- to request low delay, high bandwidth, or reliable linkage.
-+
-+-- For the purposes of this specification, the measure of
-+-- bandwidth
-+
-+--      Metric = 10^8 / ifSpeed
-+
-+-- is the default value.  For multiple link interfaces, note
-+-- that ifSpeed is the sum of the individual link speeds.
-+-- This yields a number having the following typical values:
-+
-+--      Network Type/bit rate   Metric
-+
-+--      >= 100 MBPS                 1
-+--      Ethernet/802.3             10
-+--      E1                         48
-+--      T1 (ESF)                   65
-+--       64 KBPS                 1562
-+--       56 KBPS                 1785
-+--       19.2 KBPS               5208
-+--        9.6 KBPS              10416
-+
-+-- Routes that are not specified use the default (TOS 0) metric
-+
-+    ospfIfMetricTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfIfMetricEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The TOS metrics for  a  non-virtual  interface
-+           identified by the interface index."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.3  Router  interface
-+          parameters"
-+      ::= { ospf 8 }
-+
-+    ospfIfMetricEntry OBJECT-TYPE
-+        SYNTAX   OspfIfMetricEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A particular TOS metric for a non-virtual  in-
-+           terface identified by the interface index."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.3  Router  interface
-+          parameters"
-+      INDEX { ospfIfMetricIpAddress,
-+  ospfIfMetricAddressLessIf,
-+  ospfIfMetricTOS }
-+      ::= { ospfIfMetricTable 1 }
-+
-+OspfIfMetricEntry ::=
-+    SEQUENCE {
-+        ospfIfMetricIpAddress
-+            IpAddress,
-+        ospfIfMetricAddressLessIf
-+            Integer32,
-+        ospfIfMetricTOS
-+            TOSType,
-+        ospfIfMetricValue
-+            Metric,
-+        ospfIfMetricStatus
-+            RowStatus
-+              }
-+
-+    ospfIfMetricIpAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP address of this OSPF interface.  On row
-+           creation,  this  can  be  derived  from the in-
-+           stance."
-+       ::= { ospfIfMetricEntry 1 }
-+
-+    ospfIfMetricAddressLessIf OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "For the purpose of easing  the  instancing  of
-+           addressed   and  addressless  interfaces;  This
-+           variable takes the value 0 on  interfaces  with
-+           IP  Addresses, and the value of ifIndex for in-
-+           terfaces having no IP Address.   On  row  crea-
-+           tion, this can be derived from the instance."
-+       ::= { ospfIfMetricEntry 2 }
-+
-+
-+    ospfIfMetricTOS OBJECT-TYPE
-+        SYNTAX   TOSType
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The type of service metric  being  referenced.
-+           On  row  creation, this can be derived from the
-+           instance."
-+       ::= { ospfIfMetricEntry 3 }
-+
-+
-+    ospfIfMetricValue OBJECT-TYPE
-+        SYNTAX   Metric
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The metric of using this type  of  service  on
-+           this interface.  The default value of the TOS 0
-+           Metric is 10^8 / ifSpeed."
-+       ::= { ospfIfMetricEntry 4 }
-+
-+    ospfIfMetricStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfIfMetricEntry 5 }
-+
-+
-+--  OSPF Virtual Interface Table
-+
-+--      The Virtual Interface Table describes the virtual
-+--      links that the OSPF Process is configured to
-+--      carry on.
-+
-+    ospfVirtIfTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfVirtIfEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "Information about this router's virtual inter-
-+           faces."
-+       REFERENCE
-+          "OSPF Version  2,  Appendix  C.4   Virtual  link
-+          parameters"
-+      ::= { ospf 9 }
-+
-+
-+    ospfVirtIfEntry OBJECT-TYPE
-+        SYNTAX   OspfVirtIfEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "Information about a single Virtual Interface."
-+       INDEX { ospfVirtIfAreaId, ospfVirtIfNeighbor }
-+       ::= { ospfVirtIfTable 1 }
-+
-+OspfVirtIfEntry ::=
-+    SEQUENCE {
-+        ospfVirtIfAreaId
-+            AreaID,
-+        ospfVirtIfNeighbor
-+            RouterID,
-+        ospfVirtIfTransitDelay
-+            UpToMaxAge,
-+        ospfVirtIfRetransInterval
-+            UpToMaxAge,
-+        ospfVirtIfHelloInterval
-+            HelloRange,
-+        ospfVirtIfRtrDeadInterval
-+            PositiveInteger,
-+        ospfVirtIfState
-+            INTEGER,
-+        ospfVirtIfEvents
-+            Counter32,
-+        ospfVirtIfAuthType
-+            INTEGER,
-+        ospfVirtIfAuthKey
-+            OCTET STRING,
-+        ospfVirtIfStatus
-+            RowStatus
-+              }
-+
-+    ospfVirtIfAreaId OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The  Transit  Area  that  the   Virtual   Link
-+           traverses.  By definition, this is not 0.0.0.0"
-+       ::= { ospfVirtIfEntry 1 }
-+
-+
-+    ospfVirtIfNeighbor OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Router ID of the Virtual Neighbor."
-+       ::= { ospfVirtIfEntry 2 }
-+
-+
-+    ospfVirtIfTransitDelay OBJECT-TYPE
-+        SYNTAX   UpToMaxAge
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The estimated number of seconds  it  takes  to
-+           transmit  a link- state update packet over this
-+           interface."
-+       DEFVAL { 1 }
-+       ::= { ospfVirtIfEntry 3 }
-+
-+
-+    ospfVirtIfRetransInterval OBJECT-TYPE
-+        SYNTAX   UpToMaxAge
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of seconds between  link-state  ad-
-+           vertisement  retransmissions,  for  adjacencies
-+           belonging to this  interface.   This  value  is
-+           also used when retransmitting database descrip-
-+           tion  and  link-state  request  packets.   This
-+           value  should  be well over the expected round-
-+           trip time."
-+       DEFVAL { 5 }
-+       ::= { ospfVirtIfEntry 4 }
-+
-+
-+    ospfVirtIfHelloInterval OBJECT-TYPE
-+        SYNTAX   HelloRange
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The length of time, in  seconds,  between  the
-+           Hello  packets that the router sends on the in-
-+           terface.  This value must be the same  for  the
-+           virtual neighbor."
-+       DEFVAL { 10 }
-+       ::= { ospfVirtIfEntry 5 }
-+
-+
-+    ospfVirtIfRtrDeadInterval OBJECT-TYPE
-+        SYNTAX   PositiveInteger
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of seconds that  a  router's  Hello
-+           packets  have  not been seen before it's neigh-
-+           bors declare the router down.  This  should  be
-+           some  multiple  of  the  Hello  interval.  This
-+           value must be the same for the  virtual  neigh-
-+           bor."
-+       DEFVAL { 60 }
-+       ::= { ospfVirtIfEntry 6 }
-+
-+
-+    ospfVirtIfState OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    down (1),            -- these use the same encoding
-+                    pointToPoint (4)     -- as the ospfIfTable
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "OSPF virtual interface states."
-+       DEFVAL   { down }
-+       ::= { ospfVirtIfEntry 7 }
-+
-+
-+    ospfVirtIfEvents OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of state changes or error events on
-+           this Virtual Link"
-+       ::= { ospfVirtIfEntry 8 }
-+
-+
-+    ospfVirtIfAuthKey OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE(0..256))
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "If Authentication Type is simplePassword,  the
-+           device  will left adjust and zero fill to 8 oc-
-+           tets.
-+
-+           Note that unauthenticated  interfaces  need  no
-+           authentication key, and simple password authen-
-+           tication cannot use a key of more  than  8  oc-
-+           tets.  Larger keys are useful only with authen-
-+           tication mechanisms not specified in this docu-
-+           ment.
-+
-+           When  read,  ospfVifAuthKey  always  returns  a
-+           string of length zero."
-+       REFERENCE
-+          "OSPF Version 2, Section 9  The  Interface  Data
-+          Structure"
-+      DEFVAL   { '0000000000000000'H }    -- 0.0.0.0.0.0.0.0
-+      ::= { ospfVirtIfEntry 9 }
-+
-+
-+    ospfVirtIfStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfVirtIfEntry 10 }
-+
-+
-+    ospfVirtIfAuthType OBJECT-TYPE
-+        SYNTAX   INTEGER (0..255)
-+                    -- none (0),
-+                    -- simplePassword (1)
-+                    -- md5 (2)
-+                    -- reserved for specification by IANA (> 2)
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The authentication type specified for a virtu-
-+           al  interface.  Additional authentication types
-+           may be assigned locally."
-+       REFERENCE
-+          "OSPF Version 2, Appendix E Authentication"
-+      DEFVAL { 0 }        -- no authentication, by default
-+      ::= { ospfVirtIfEntry 11 }
-+
-+
-+--  OSPF Neighbor Table
-+
-+--      The OSPF Neighbor Table describes all neighbors in
-+--      the locality of the subject router.
-+
-+    ospfNbrTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfNbrEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A table of non-virtual neighbor information."
-+       REFERENCE
-+          "OSPF Version 2, Section 10  The  Neighbor  Data
-+          Structure"
-+      ::= { ospf 10 }
-+
-+
-+    ospfNbrEntry OBJECT-TYPE
-+        SYNTAX   OspfNbrEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The information regarding a single neighbor."
-+       REFERENCE
-+          "OSPF Version 2, Section 10  The  Neighbor  Data
-+          Structure"
-+      INDEX { ospfNbrIpAddr, ospfNbrAddressLessIndex }
-+      ::= { ospfNbrTable 1 }
-+
-+OspfNbrEntry ::=
-+    SEQUENCE {
-+        ospfNbrIpAddr
-+            IpAddress,
-+        ospfNbrAddressLessIndex
-+            InterfaceIndex,
-+        ospfNbrRtrId
-+            RouterID,
-+        ospfNbrOptions
-+            Integer32,
-+        ospfNbrPriority
-+            DesignatedRouterPriority,
-+        ospfNbrState
-+            INTEGER,
-+        ospfNbrEvents
-+            Counter32,
-+        ospfNbrLsRetransQLen
-+            Gauge32,
-+        ospfNbmaNbrStatus
-+            RowStatus,
-+        ospfNbmaNbrPermanence
-+            INTEGER,
-+        ospfNbrHelloSuppressed
-+            TruthValue
-+              }
-+
-+    ospfNbrIpAddr OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP address this neighbor is using  in  its
-+           IP  Source  Address.  Note that, on addressless
-+           links, this will not be 0.0.0.0,  but  the  ad-
-+           dress of another of the neighbor's interfaces."
-+       ::= { ospfNbrEntry 1 }
-+
-+
-+    ospfNbrAddressLessIndex OBJECT-TYPE
-+        SYNTAX   InterfaceIndex
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "On an interface having an  IP  Address,  zero.
-+           On  addressless  interfaces,  the corresponding
-+           value of ifIndex in the Internet Standard  MIB.
-+           On  row  creation, this can be derived from the
-+           instance."
-+       ::= { ospfNbrEntry 2 }
-+
-+
-+    ospfNbrRtrId OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A 32-bit integer (represented as a type  IpAd-
-+           dress)  uniquely  identifying  the  neighboring
-+           router in the Autonomous System."
-+       DEFVAL   { '00000000'H }    -- 0.0.0.0
-+       ::= { ospfNbrEntry 3 }
-+
-+
-+    ospfNbrOptions OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A Bit Mask corresponding to the neighbor's op-
-+           tions field.
-+
-+           Bit 0, if set, indicates that the  system  will
-+           operate  on  Type of Service metrics other than
-+           TOS 0.  If zero, the neighbor will  ignore  all
-+           metrics except the TOS 0 metric.
-+
-+           Bit 1, if set, indicates  that  the  associated
-+           area  accepts and operates on external informa-
-+           tion; if zero, it is a stub area.
-+
-+           Bit 2, if set, indicates that the system is ca-
-+           pable  of routing IP Multicast datagrams; i.e.,
-+           that it implements the Multicast Extensions  to
-+           OSPF.
-+
-+           Bit 3, if set, indicates  that  the  associated
-+           area  is  an  NSSA.  These areas are capable of
-+           carrying type 7 external advertisements,  which
-+           are  translated into type 5 external advertise-
-+           ments at NSSA borders."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.2 Options"
-+      DEFVAL { 0 }
-+      ::= { ospfNbrEntry 4 }
-+
-+
-+    ospfNbrPriority OBJECT-TYPE
-+        SYNTAX   DesignatedRouterPriority
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The priority of this neighbor in the designat-
-+           ed router election algorithm.  The value 0 sig-
-+           nifies that the neighbor is not eligible to be-
-+           come  the  designated router on this particular
-+           network."
-+       DEFVAL { 1 }
-+       ::= { ospfNbrEntry 5 }
-+
-+
-+    ospfNbrState OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    down (1),
-+                    attempt (2),
-+                    init (3),
-+                    twoWay (4),
-+                    exchangeStart (5),
-+                    exchange (6),
-+                    loading (7),
-+                    full (8)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The State of the relationship with this Neigh-
-+           bor."
-+       REFERENCE
-+          "OSPF Version 2, Section 10.1 Neighbor States"
-+      DEFVAL   { down }
-+      ::= { ospfNbrEntry 6 }
-+
-+
-+    ospfNbrEvents OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of times this neighbor relationship
-+           has changed state, or an error has occurred."
-+       ::= { ospfNbrEntry 7 }
-+
-+
-+    ospfNbrLsRetransQLen OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The  current  length  of  the   retransmission
-+           queue."
-+       ::= { ospfNbrEntry 8 }
-+
-+
-+    ospfNbmaNbrStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfNbrEntry 9 }
-+
-+
-+    ospfNbmaNbrPermanence OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    dynamic (1),        -- learned through protocol
-+                    permanent (2)       -- configured address
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.   'dynamic'  and  'permanent' refer to how
-+           the neighbor became known."
-+       DEFVAL { permanent }
-+       ::= { ospfNbrEntry 10 }
-+
-+
-+    ospfNbrHelloSuppressed OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "Indicates whether Hellos are being  suppressed
-+           to the neighbor"
-+       ::= { ospfNbrEntry 11 }
-+
-+
-+--  OSPF Virtual Neighbor Table
-+
-+--      This table describes all virtual neighbors.
-+--      Since Virtual Links are configured in the
-+--      virtual interface table, this table is read-only.
-+
-+    ospfVirtNbrTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfVirtNbrEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A table of virtual neighbor information."
-+       REFERENCE
-+          "OSPF Version 2, Section 15  Virtual Links"
-+      ::= { ospf 11 }
-+
-+
-+    ospfVirtNbrEntry OBJECT-TYPE
-+        SYNTAX   OspfVirtNbrEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "Virtual neighbor information."
-+       INDEX { ospfVirtNbrArea, ospfVirtNbrRtrId }
-+       ::= { ospfVirtNbrTable 1 }
-+
-+OspfVirtNbrEntry ::=
-+    SEQUENCE {
-+        ospfVirtNbrArea
-+            AreaID,
-+        ospfVirtNbrRtrId
-+            RouterID,
-+        ospfVirtNbrIpAddr
-+            IpAddress,
-+        ospfVirtNbrOptions
-+            Integer32,
-+        ospfVirtNbrState
-+            INTEGER,
-+        ospfVirtNbrEvents
-+            Counter32,
-+        ospfVirtNbrLsRetransQLen
-+            Gauge32,
-+        ospfVirtNbrHelloSuppressed
-+                TruthValue
-+              }
-+
-+    ospfVirtNbrArea OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Transit Area Identifier."
-+       ::= { ospfVirtNbrEntry 1 }
-+
-+
-+    ospfVirtNbrRtrId OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A  32-bit  integer  uniquely  identifying  the
-+           neighboring router in the Autonomous System."
-+       ::= { ospfVirtNbrEntry 2 }
-+
-+
-+    ospfVirtNbrIpAddr OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP address this Virtual  Neighbor  is  us-
-+           ing."
-+       ::= { ospfVirtNbrEntry 3 }
-+
-+
-+    ospfVirtNbrOptions OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "A Bit Mask corresponding to the neighbor's op-
-+           tions field.
-+
-+           Bit 1, if set, indicates that the  system  will
-+           operate  on  Type of Service metrics other than
-+           TOS 0.  If zero, the neighbor will  ignore  all
-+           metrics except the TOS 0 metric.
-+
-+           Bit 2, if set, indicates  that  the  system  is
-+           Network  Multicast  capable; ie, that it imple-
-+           ments OSPF Multicast Routing."
-+       ::= { ospfVirtNbrEntry 4 }
-+    ospfVirtNbrState OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    down (1),
-+                    attempt (2),
-+                    init (3),
-+                    twoWay (4),
-+                    exchangeStart (5),
-+                    exchange (6),
-+                    loading (7),
-+                    full (8)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The state of the  Virtual  Neighbor  Relation-
-+           ship."
-+       ::= { ospfVirtNbrEntry 5 }
-+
-+
-+    ospfVirtNbrEvents OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of  times  this  virtual  link  has
-+           changed its state, or an error has occurred."
-+       ::= { ospfVirtNbrEntry 6 }
-+
-+
-+    ospfVirtNbrLsRetransQLen OBJECT-TYPE
-+        SYNTAX   Gauge32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The  current  length  of  the   retransmission
-+           queue."
-+       ::= { ospfVirtNbrEntry 7 }
-+
-+
-+    ospfVirtNbrHelloSuppressed OBJECT-TYPE
-+        SYNTAX   TruthValue
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "Indicates whether Hellos are being  suppressed
-+           to the neighbor"
-+       ::= { ospfVirtNbrEntry 8 }
-+
-+--  OSPF Link State Database, External
-+
-+--      The Link State Database contains the Link State
-+--      Advertisements from throughout the areas that the
-+--      device is attached to.
-+
-+--             This table is identical to the OSPF LSDB Table in
-+--      format, but contains only External Link State
-+--             Advertisements.  The purpose is to allow external
-+--      LSAs to be displayed once for the router rather
-+--      than once in each non-stub area.
-+
-+    ospfExtLsdbTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfExtLsdbEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "The OSPF Process's Links State Database."
-+       REFERENCE
-+          "OSPF Version 2, Section 12  Link  State  Adver-
-+          tisements"
-+      ::= { ospf 12 }
-+
-+
-+    ospfExtLsdbEntry OBJECT-TYPE
-+        SYNTAX   OspfExtLsdbEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A single Link State Advertisement."
-+       INDEX { ospfExtLsdbType, ospfExtLsdbLsid, ospfExtLsdbRouterId }
-+       ::= { ospfExtLsdbTable 1 }
-+
-+OspfExtLsdbEntry ::=
-+    SEQUENCE {
-+        ospfExtLsdbType
-+            INTEGER,
-+        ospfExtLsdbLsid
-+            IpAddress,
-+        ospfExtLsdbRouterId
-+            RouterID,
-+        ospfExtLsdbSequence
-+            Integer32,
-+        ospfExtLsdbAge
-+            Integer32,
-+        ospfExtLsdbChecksum
-+            Integer32,
-+        ospfExtLsdbAdvertisement
-+            OCTET STRING
-+              }
-+
-+    ospfExtLsdbType OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    asExternalLink (5)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The type  of  the  link  state  advertisement.
-+           Each  link state type has a separate advertise-
-+           ment format."
-+       REFERENCE
-+          "OSPF Version 2, Appendix A.4.1 The  Link  State
-+          Advertisement header"
-+      ::= { ospfExtLsdbEntry 1 }
-+
-+
-+    ospfExtLsdbLsid OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Link State ID is an LS Type Specific field
-+           containing either a Router ID or an IP Address;
-+           it identifies the piece of the  routing  domain
-+           that is being described by the advertisement."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.4 Link State ID"
-+      ::= { ospfExtLsdbEntry 2 }
-+
-+
-+    ospfExtLsdbRouterId OBJECT-TYPE
-+        SYNTAX   RouterID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The 32 bit number that uniquely identifies the
-+           originating router in the Autonomous System."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.1 Global parameters"
-+      ::= { ospfExtLsdbEntry 3 }
-+
-+--  Note that the OSPF Sequence Number is a 32 bit signed
-+--  integer.  It starts with the value '80000001'h,
-+--  or -'7FFFFFFF'h, and increments until '7FFFFFFF'h
-+--  Thus, a typical sequence number will be very negative.
-+    ospfExtLsdbSequence OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The sequence number field is a  signed  32-bit
-+           integer.   It  is used to detect old and dupli-
-+           cate link state advertisements.  The  space  of
-+           sequence  numbers  is  linearly  ordered.   The
-+           larger the sequence number the more recent  the
-+           advertisement."
-+       REFERENCE
-+          "OSPF Version  2,  Section  12.1.6  LS  sequence
-+          number"
-+      ::= { ospfExtLsdbEntry 4 }
-+
-+
-+    ospfExtLsdbAge OBJECT-TYPE
-+        SYNTAX   Integer32    -- Should be 0..MaxAge
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "This field is the age of the link state adver-
-+           tisement in seconds."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.1 LS age"
-+      ::= { ospfExtLsdbEntry 5 }
-+
-+
-+    ospfExtLsdbChecksum OBJECT-TYPE
-+        SYNTAX   Integer32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "This field is the  checksum  of  the  complete
-+           contents  of  the  advertisement, excepting the
-+           age field.  The age field is excepted  so  that
-+           an   advertisement's  age  can  be  incremented
-+           without updating the  checksum.   The  checksum
-+           used  is  the same that is used for ISO connec-
-+           tionless datagrams; it is commonly referred  to
-+           as the Fletcher checksum."
-+       REFERENCE
-+          "OSPF Version 2, Section 12.1.7 LS checksum"
-+      ::= { ospfExtLsdbEntry 6 }
-+
-+
-+    ospfExtLsdbAdvertisement OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE(36))
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The entire Link State Advertisement, including
-+           its header."
-+       REFERENCE
-+          "OSPF Version 2, Section 12  Link  State  Adver-
-+          tisements"
-+      ::= { ospfExtLsdbEntry 7 }
-+
-+
-+--  OSPF Use of the CIDR Route Table
-+
-+ospfRouteGroup           OBJECT IDENTIFIER ::= { ospf 13 }
-+
-+-- The IP Forwarding Table defines a number of objects for use by
-+-- the routing protocol to externalize its information.  Most of
-+-- the variables (ipForwardDest, ipForwardMask, ipForwardPolicy,
-+-- ipForwardNextHop, ipForwardIfIndex, ipForwardType,
-+-- ipForwardProto, ipForwardAge, and ipForwardNextHopAS) are
-+-- defined there.
-+
-+-- Those that leave some discretion are defined here.
-+
-+-- ipCidrRouteProto is, of course, ospf (13).
-+
-+-- ipCidrRouteAge is the time since the route was first calculated,
-+-- as opposed to the time since the last SPF run.
-+
-+-- ipCidrRouteInfo is an OBJECT IDENTIFIER for use by the routing
-+-- protocol.  The following values shall be found there depending
-+-- on the way the route was calculated.
-+
-+ospfIntraArea      OBJECT IDENTIFIER ::= { ospfRouteGroup 1 }
-+ospfInterArea      OBJECT IDENTIFIER ::= { ospfRouteGroup 2 }
-+ospfExternalType1  OBJECT IDENTIFIER ::= { ospfRouteGroup 3 }
-+ospfExternalType2  OBJECT IDENTIFIER ::= { ospfRouteGroup 4 }
-+
-+-- ipCidrRouteMetric1 is, by definition, the primary routing
-+-- metric.  Therefore, it should be the metric that route
-+-- selection is based on.  For intra-area and inter-area routes,
-+-- it is an OSPF metric.  For External Type 1 (comparable value)
-+-- routes, it is an OSPF metric plus the External Metric.  For
-+-- external Type 2 (non-comparable value) routes, it is the
-+-- external metric.
-+
-+-- ipCidrRouteMetric2 is, by definition, a secondary routing
-+-- metric.  Therefore, it should be the metric that breaks a tie
-+-- among routes having equal metric1 values and the same
-+-- calculation rule.  For intra-area, inter-area routes, and
-+-- External Type 1 (comparable value) routes, it is unused.  For
-+-- external Type 2 (non-comparable value) routes, it is the metric
-+-- to the AS border router.
-+
-+-- ipCidrRouteMetric3, ipCidrRouteMetric4, and ipCidrRouteMetric5 are
-+-- unused.
-+
-+--
-+--      The OSPF Area Aggregate Table
-+--
-+--      This table replaces the OSPF Area Summary Table, being an
-+--      extension of that for CIDR routers.
-+
-+    ospfAreaAggregateTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF OspfAreaAggregateEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A range of IP addresses  specified  by  an  IP
-+           address/IP  network  mask  pair.   For example,
-+           class B address range of X.X.X.X with a network
-+           mask  of  255.255.0.0 includes all IP addresses
-+           from X.X.0.0  to  X.X.255.255.   Note  that  if
-+           ranges  are configured such that one range sub-
-+           sumes  another  range  (e.g.,   10.0.0.0   mask
-+           255.0.0.0  and  10.1.0.0 mask 255.255.0.0), the
-+           most specific match is the preferred one."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2  Area parameters"
-+      ::= { ospf 14 }
-+
-+
-+    ospfAreaAggregateEntry OBJECT-TYPE
-+        SYNTAX   OspfAreaAggregateEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A range of IP addresses  specified  by  an  IP
-+           address/IP  network  mask  pair.   For example,
-+           class B address range of X.X.X.X with a network
-+           mask  of  255.255.0.0 includes all IP addresses
-+           from X.X.0.0  to  X.X.255.255.   Note  that  if
-+           ranges are range configured such that one range
-+           subsumes another  range  (e.g.,  10.0.0.0  mask
-+           255.0.0.0  and  10.1.0.0 mask 255.255.0.0), the
-+           most specific match is the preferred one."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2  Area parameters"
-+      INDEX { ospfAreaAggregateAreaID, ospfAreaAggregateLsdbType,
-+              ospfAreaAggregateNet, ospfAreaAggregateMask }
-+      ::= { ospfAreaAggregateTable 1 }
-+
-+
-+OspfAreaAggregateEntry ::=
-+    SEQUENCE {
-+        ospfAreaAggregateAreaID
-+            AreaID,
-+        ospfAreaAggregateLsdbType
-+            INTEGER,
-+        ospfAreaAggregateNet
-+            IpAddress,
-+        ospfAreaAggregateMask
-+            IpAddress,
-+        ospfAreaAggregateStatus
-+            RowStatus,
-+        ospfAreaAggregateEffect
-+            INTEGER
-+              }
-+
-+    ospfAreaAggregateAreaID OBJECT-TYPE
-+        SYNTAX   AreaID
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Area the Address Aggregate is to be  found
-+           within."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaAggregateEntry 1 }
-+
-+
-+    ospfAreaAggregateLsdbType OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    summaryLink (3),
-+                    nssaExternalLink (7)
-+                  }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The type of the Address Aggregate.  This field
-+           specifies  the  Lsdb type that this Address Ag-
-+           gregate applies to."
-+       REFERENCE
-+          "OSPF Version 2, Appendix A.4.1 The  Link  State
-+          Advertisement header"
-+      ::= { ospfAreaAggregateEntry 2 }
-+
-+
-+    ospfAreaAggregateNet OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address of the Net or Subnet  indicated
-+           by the range."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaAggregateEntry 3 }
-+
-+
-+    ospfAreaAggregateMask OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The Subnet Mask that pertains to  the  Net  or
-+           Subnet."
-+       REFERENCE
-+          "OSPF Version 2, Appendix C.2 Area parameters"
-+      ::= { ospfAreaAggregateEntry 4 }
-+
-+
-+    ospfAreaAggregateStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable displays the status of  the  en-
-+           try.  Setting it to 'invalid' has the effect of
-+           rendering it inoperative.  The internal  effect
-+           (row removal) is implementation dependent."
-+       ::= { ospfAreaAggregateEntry 5 }
-+
-+
-+    ospfAreaAggregateEffect OBJECT-TYPE
-+        SYNTAX   INTEGER    {
-+                    advertiseMatching (1),
-+                    doNotAdvertiseMatching (2)
-+                  }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "Subnets subsumed by ranges either trigger  the
-+           advertisement  of  the indicated aggregate (ad-
-+           vertiseMatching), or result in the subnet's not
-+           being advertised at all outside the area."
-+       DEFVAL   { advertiseMatching }
-+       ::= { ospfAreaAggregateEntry 6 }
-+
-+
-+-- conformance information
-+
-+ospfConformance OBJECT IDENTIFIER ::= { ospf 15 }
-+
-+ospfGroups      OBJECT IDENTIFIER ::= { ospfConformance 1 }
-+ospfCompliances OBJECT IDENTIFIER ::= { ospfConformance 2 }
-+
-+-- compliance statements
-+
-+    ospfCompliance MODULE-COMPLIANCE
-+        STATUS  current
-+        DESCRIPTION
-+           "The compliance statement "
-+       MODULE  -- this module
-+       MANDATORY-GROUPS {
-+                    ospfBasicGroup,
-+                    ospfAreaGroup,
-+                    ospfStubAreaGroup,
-+                    ospfIfGroup,
-+                    ospfIfMetricGroup,
-+                    ospfVirtIfGroup,
-+                    ospfNbrGroup,
-+                    ospfVirtNbrGroup,
-+                    ospfAreaAggregateGroup
-+           }
-+       ::= { ospfCompliances 1 }
-+
-+
-+-- units of conformance
-+
-+    ospfBasicGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfRouterId,
-+                    ospfAdminStat,
-+                    ospfVersionNumber,
-+                    ospfAreaBdrRtrStatus,
-+                    ospfASBdrRtrStatus,
-+                    ospfExternLsaCount,
-+                    ospfExternLsaCksumSum,
-+                    ospfTOSSupport,
-+                    ospfOriginateNewLsas,
-+                    ospfRxNewLsas,
-+                    ospfExtLsdbLimit,
-+                    ospfMulticastExtensions,
-+                    ospfExitOverflowInterval,
-+                    ospfDemandExtensions
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 1 }
-+
-+
-+    ospfAreaGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfAreaId,
-+                    ospfImportAsExtern,
-+                    ospfSpfRuns,
-+                    ospfAreaBdrRtrCount,
-+                    ospfAsBdrRtrCount,
-+                    ospfAreaLsaCount,
-+                    ospfAreaLsaCksumSum,
-+                    ospfAreaSummary,
-+                    ospfAreaStatus
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  for  OSPF  systems
-+           supporting areas."
-+       ::= { ospfGroups 2 }
-+
-+
-+    ospfStubAreaGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfStubAreaId,
-+                    ospfStubTOS,
-+                    ospfStubMetric,
-+                    ospfStubStatus,
-+                    ospfStubMetricType
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  for  OSPF  systems
-+           supporting stub areas."
-+       ::= { ospfGroups 3 }
-+
-+
-+    ospfLsdbGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfLsdbAreaId,
-+                    ospfLsdbType,
-+                    ospfLsdbLsid,
-+                    ospfLsdbRouterId,
-+                    ospfLsdbSequence,
-+                    ospfLsdbAge,
-+                    ospfLsdbChecksum,
-+                    ospfLsdbAdvertisement
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  for  OSPF  systems
-+           that display their link state database."
-+       ::= { ospfGroups 4 }
-+
-+
-+    ospfAreaRangeGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfAreaRangeAreaId,
-+                    ospfAreaRangeNet,
-+                    ospfAreaRangeMask,
-+                    ospfAreaRangeStatus,
-+                    ospfAreaRangeEffect
-+        }
-+        STATUS  obsolete
-+        DESCRIPTION
-+           "These objects are required for  non-CIDR  OSPF
-+           systems that support multiple areas."
-+       ::= { ospfGroups 5 }
-+
-+
-+    ospfHostGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfHostIpAddress,
-+                    ospfHostTOS,
-+                    ospfHostMetric,
-+                    ospfHostStatus,
-+                    ospfHostAreaID
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  for  OSPF  systems
-+           that support attached hosts."
-+       ::= { ospfGroups 6 }
-+
-+
-+    ospfIfGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfIfAreaId,
-+                    ospfIfType,
-+                    ospfIfAdminStat,
-+                    ospfIfRtrPriority,
-+                    ospfIfTransitDelay,
-+                    ospfIfRetransInterval,
-+                    ospfIfHelloInterval,
-+                    ospfIfRtrDeadInterval,
-+                    ospfIfPollInterval,
-+                    ospfIfState,
-+                    ospfIfDesignatedRouter,
-+                    ospfIfBackupDesignatedRouter,
-+                    ospfIfEvents,
-+                    ospfIfAuthType,
-+                    ospfIfAuthKey,
-+                    ospfIfStatus,
-+                    ospfIfMulticastForwarding,
-+                    ospfIfDemand
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 7 }
-+
-+
-+    ospfIfMetricGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfIfMetricIpAddress,
-+                    ospfIfMetricAddressLessIf,
-+                    ospfIfMetricTOS,
-+                    ospfIfMetricValue,
-+                    ospfIfMetricStatus
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 8 }
-+
-+
-+    ospfVirtIfGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfVirtIfTransitDelay,
-+                    ospfVirtIfRetransInterval,
-+                    ospfVirtIfHelloInterval,
-+                    ospfVirtIfRtrDeadInterval,
-+                    ospfVirtIfState,
-+                    ospfVirtIfEvents,
-+                    ospfVirtIfAuthType,
-+                    ospfVirtIfAuthKey,
-+                    ospfVirtIfStatus
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 9 }
-+
-+
-+    ospfNbrGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfNbrIpAddr,
-+                    ospfNbrAddressLessIndex,
-+                    ospfNbrRtrId,
-+                    ospfNbrOptions,
-+                    ospfNbrPriority,
-+                    ospfNbrState,
-+                    ospfNbrEvents,
-+                    ospfNbrLsRetransQLen,
-+                    ospfNbmaNbrStatus,
-+                    ospfNbmaNbrPermanence,
-+                    ospfNbrHelloSuppressed
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 10 }
-+
-+
-+    ospfVirtNbrGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfVirtNbrArea,
-+                    ospfVirtNbrRtrId,
-+                    ospfVirtNbrIpAddr,
-+                    ospfVirtNbrOptions,
-+                    ospfVirtNbrState,
-+                    ospfVirtNbrEvents,
-+                    ospfVirtNbrLsRetransQLen,
-+                    ospfVirtNbrHelloSuppressed
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 11 }
-+
-+
-+    ospfExtLsdbGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfExtLsdbType,
-+                    ospfExtLsdbLsid,
-+                    ospfExtLsdbRouterId,
-+                    ospfExtLsdbSequence,
-+                    ospfExtLsdbAge,
-+                    ospfExtLsdbChecksum,
-+                    ospfExtLsdbAdvertisement
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  for  OSPF  systems
-+           that display their link state database."
-+       ::= { ospfGroups 12 }
-+
-+
-+    ospfAreaAggregateGroup    OBJECT-GROUP
-+        OBJECTS {
-+                    ospfAreaAggregateAreaID,
-+                    ospfAreaAggregateLsdbType,
-+                    ospfAreaAggregateNet,
-+                    ospfAreaAggregateMask,
-+                    ospfAreaAggregateStatus,
-+                    ospfAreaAggregateEffect
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required for OSPF systems."
-+       ::= { ospfGroups 13 }
-+
-+END
---- /dev/null
-+++ b/mibs/OSPF-TRAP-MIB.txt
-@@ -0,0 +1,443 @@
-+OSPF-TRAP-MIB DEFINITIONS ::= BEGIN
-+
-+    IMPORTS
-+            MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, IpAddress
-+                FROM SNMPv2-SMI
-+            MODULE-COMPLIANCE, OBJECT-GROUP
-+                FROM SNMPv2-CONF
-+            ospfRouterId, ospfIfIpAddress, ospfAddressLessIf, ospfIfState,
-+            ospfVirtIfAreaId, ospfVirtIfNeighbor, ospfVirtIfState,
-+            ospfNbrIpAddr, ospfNbrAddressLessIndex, ospfNbrRtrId,
-+            ospfNbrState, ospfVirtNbrArea, ospfVirtNbrRtrId, ospfVirtNbrState,
-+            ospfLsdbType, ospfLsdbLsid, ospfLsdbRouterId, ospfLsdbAreaId,
-+            ospfExtLsdbLimit, ospf
-+                FROM OSPF-MIB;
-+
-+    ospfTrap MODULE-IDENTITY
-+           LAST-UPDATED "9501201225Z" -- Fri Jan 20 12:25:50 PST 1995
-+           ORGANIZATION "IETF OSPF Working Group"
-+           CONTACT-INFO
-+           "                      Fred Baker
-+           Postal:                Cisco Systems
-+                                  519 Lado Drive
-+                                  Santa Barbara, California 93111
-+           Tel:                   +1 805 681 0115
-+           E-Mail:                fred@cisco.com
-+
-+                                  Rob Coltun
-+           Postal:                RainbowBridge Communications
-+           Tel:                   (301) 340-9416
-+           E-Mail:                rcoltun@rainbow-bridge.com"
-+       DESCRIPTION
-+          "The MIB module to describe traps for  the  OSPF
-+          Version 2 Protocol."
-+      ::= { ospf 16 }
-+
-+-- Trap Support Objects
-+
-+--         The following are support objects for the OSPF traps.
-+
-+ospfTrapControl OBJECT IDENTIFIER ::= { ospfTrap 1 }
-+ospfTraps OBJECT IDENTIFIER ::= { ospfTrap 2 }
-+
-+    ospfSetTrap OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE(4))
-+        MAX-ACCESS   read-write
-+        STATUS   current
-+        DESCRIPTION
-+           "A four-octet string serving as a bit  map  for
-+           the trap events defined by the OSPF traps. This
-+           object is used to enable and  disable  specific
-+           OSPF   traps   where  a  1  in  the  bit  field
-+           represents enabled.  The right-most bit  (least
-+           significant) represents trap 0."
-+       ::= { ospfTrapControl 1 }
-+
-+
-+    ospfConfigErrorType OBJECT-TYPE
-+        SYNTAX   INTEGER   {
-+                    badVersion (1),
-+                    areaMismatch (2),
-+                    unknownNbmaNbr (3), -- Router is Dr eligible
-+                    unknownVirtualNbr (4),
-+                    authTypeMismatch(5),
-+                    authFailure (6),
-+                    netMaskMismatch (7),
-+                    helloIntervalMismatch (8),
-+                    deadIntervalMismatch (9),
-+                    optionMismatch (10) }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "Potential types  of  configuration  conflicts.
-+           Used  by the ospfConfigError and ospfConfigVir-
-+           tError traps."
-+   ::= { ospfTrapControl 2 }
-+
-+
-+    ospfPacketType OBJECT-TYPE
-+        SYNTAX   INTEGER   {
-+                    hello (1),
-+                    dbDescript (2),
-+                    lsReq (3),
-+                    lsUpdate (4),
-+                    lsAck (5) }
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "OSPF packet types."
-+   ::= { ospfTrapControl 3 }
-+
-+
-+    ospfPacketSrc OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP address of an inbound packet that  can-
-+           not be identified by a neighbor instance."
-+       ::= { ospfTrapControl 4 }
-+
-+
-+-- Traps
-+
-+
-+    ospfIfStateChange NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfIfState   -- The new state
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfStateChange trap signifies that there
-+           has been a change in the state of a non-virtual
-+           OSPF interface. This trap should  be  generated
-+           when  the interface state regresses (e.g., goes
-+           from Dr to Down) or progresses  to  a  terminal
-+           state  (i.e.,  Point-to-Point, DR Other, Dr, or
-+           Backup)."
-+   ::= { ospfTraps 16 }
-+
-+
-+    ospfVirtIfStateChange NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfVirtIfState  -- The new state
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfStateChange trap signifies that there
-+           has  been a change in the state of an OSPF vir-
-+           tual interface.
-+           This trap should be generated when  the  inter-
-+           face  state  regresses  (e.g., goes from Point-
-+           to-Point to Down) or progresses to  a  terminal
-+           state (i.e., Point-to-Point)."
-+   ::= { ospfTraps 1 }
-+
-+
-+    ospfNbrStateChange NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfNbrIpAddr,
-+                    ospfNbrAddressLessIndex,
-+                    ospfNbrRtrId,
-+                    ospfNbrState  -- The new state
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An  ospfNbrStateChange  trap  signifies   that
-+           there  has been a change in the state of a non-
-+           virtual OSPF neighbor.   This  trap  should  be
-+           generated  when  the  neighbor  state regresses
-+           (e.g., goes from Attempt or Full  to  1-Way  or
-+           Down)  or progresses to a terminal state (e.g.,
-+           2-Way or Full).  When an  neighbor  transitions
-+           from  or  to Full on non-broadcast multi-access
-+           and broadcast networks, the trap should be gen-
-+           erated  by the designated router.  A designated
-+           router transitioning to Down will be  noted  by
-+           ospfIfStateChange."
-+   ::= { ospfTraps 2 }
-+
-+
-+    ospfVirtNbrStateChange NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtNbrArea,
-+                    ospfVirtNbrRtrId,
-+                    ospfVirtNbrState  -- The new state
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfStateChange trap signifies that there
-+           has  been a change in the state of an OSPF vir-
-+           tual neighbor.  This trap should  be  generated
-+           when  the  neighbor state regresses (e.g., goes
-+           from Attempt or  Full  to  1-Way  or  Down)  or
-+           progresses to a terminal state (e.g., Full)."
-+   ::= { ospfTraps 3 }
-+    ospfIfConfigError NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfPacketSrc,  -- The source IP address
-+                    ospfConfigErrorType, -- Type of error
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfConfigError  trap  signifies  that  a
-+           packet  has  been received on a non-virtual in-
-+           terface  from  a  router  whose   configuration
-+           parameters  conflict  with this router's confi-
-+           guration parameters.  Note that the  event  op-
-+           tionMismatch  should  cause  a  trap only if it
-+           prevents an adjacency from forming."
-+                  ::= { ospfTraps 4 }
-+
-+
-+    ospfVirtIfConfigError NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfConfigErrorType, -- Type of error
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfConfigError trap signifies that a pack-
-+           et  has  been  received  on a virtual interface
-+           from a router  whose  configuration  parameters
-+           conflict   with   this  router's  configuration
-+           parameters.  Note that the event optionMismatch
-+           should  cause a trap only if it prevents an ad-
-+           jacency from forming."
-+   ::= { ospfTraps 5 }
-+
-+
-+    ospfIfAuthFailure NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfPacketSrc,  -- The source IP address
-+                    ospfConfigErrorType, -- authTypeMismatch or
-+                                         -- authFailure
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfAuthFailure  trap  signifies  that  a
-+           packet  has  been received on a non-virtual in-
-+           terface from a router whose authentication  key
-+           or  authentication  type  conflicts  with  this
-+           router's authentication key  or  authentication
-+           type."
-+   ::= { ospfTraps 6 }
-+
-+
-+    ospfVirtIfAuthFailure NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfConfigErrorType, -- authTypeMismatch or
-+                                         -- authFailure
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfVirtIfAuthFailure trap signifies that a
-+           packet has been received on a virtual interface
-+           from a router whose authentication key  or  au-
-+           thentication  type conflicts with this router's
-+           authentication key or authentication type."
-+   ::= { ospfTraps 7 }
-+
-+
-+    ospfIfRxBadPacket NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfPacketSrc,  -- The source IP address
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfIfRxBadPacket trap  signifies  that  an
-+           OSPF  packet has been received on a non-virtual
-+           interface that cannot be parsed."
-+   ::= { ospfTraps 8 }
-+
-+    ospfVirtIfRxBadPacket NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfPacketType
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfRxBadPacket trap signifies that an OSPF
-+           packet has been received on a virtual interface
-+           that cannot be parsed."
-+   ::= { ospfTraps 9 }
-+
-+
-+    ospfTxRetransmit NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfIfIpAddress,
-+                    ospfAddressLessIf,
-+                    ospfNbrRtrId, -- Destination
-+                    ospfPacketType,
-+                    ospfLsdbType,
-+                    ospfLsdbLsid,
-+                    ospfLsdbRouterId
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfTxRetransmit  trap  signifies  than  an
-+           OSPF  packet  has  been retransmitted on a non-
-+           virtual interface.  All packets that may be re-
-+           transmitted  are associated with an LSDB entry.
-+           The LS type, LS ID, and Router ID are  used  to
-+           identify the LSDB entry."
-+   ::= { ospfTraps 10 }
-+
-+
-+    ospfVirtIfTxRetransmit NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfVirtIfAreaId,
-+                    ospfVirtIfNeighbor,
-+                    ospfPacketType,
-+                    ospfLsdbType,
-+                    ospfLsdbLsid,
-+                    ospfLsdbRouterId
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfTxRetransmit  trap  signifies  than  an
-+           OSPF packet has been retransmitted on a virtual
-+           interface.  All packets that may be retransmit-
-+           ted  are  associated with an LSDB entry. The LS
-+           type, LS ID, and Router ID are used to identify
-+           the LSDB entry."
-+   ::= { ospfTraps 11 }
-+
-+
-+    ospfOriginateLsa NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfLsdbAreaId,  -- 0.0.0.0 for AS Externals
-+                    ospfLsdbType,
-+                    ospfLsdbLsid,
-+                    ospfLsdbRouterId
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfOriginateLsa trap signifies that a  new
-+           LSA  has  been originated by this router.  This
-+           trap should not be invoked for simple refreshes
-+           of  LSAs  (which happesn every 30 minutes), but
-+           instead will only be invoked  when  an  LSA  is
-+           (re)originated due to a topology change.  Addi-
-+           tionally, this trap does not include LSAs  that
-+           are  being  flushed  because  they have reached
-+           MaxAge."
-+   ::= { ospfTraps 12 }
-+
-+
-+    ospfMaxAgeLsa NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfLsdbAreaId,  -- 0.0.0.0 for AS Externals
-+                    ospfLsdbType,
-+                    ospfLsdbLsid,
-+                    ospfLsdbRouterId
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfMaxAgeLsa trap signifies  that  one  of
-+           the LSA in the router's link-state database has
-+           aged to MaxAge."
-+   ::= { ospfTraps 13 }
-+
-+
-+    ospfLsdbOverflow NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfExtLsdbLimit
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfLsdbOverflow trap  signifies  that  the
-+           number of LSAs in the router's link-state data-
-+           base has exceeded ospfExtLsdbLimit."
-+   ::= { ospfTraps 14 }
-+
-+
-+    ospfLsdbApproachingOverflow NOTIFICATION-TYPE
-+        OBJECTS {
-+                    ospfRouterId, -- The originator of the trap
-+                    ospfExtLsdbLimit
-+                  }
-+        STATUS             current
-+        DESCRIPTION
-+           "An ospfLsdbApproachingOverflow trap  signifies
-+           that  the  number of LSAs in the router's link-
-+           state database has exceeded ninety  percent  of
-+           ospfExtLsdbLimit."
-+   ::= { ospfTraps 15 }
-+
-+
-+-- conformance information
-+
-+ospfTrapConformance OBJECT IDENTIFIER ::= { ospfTrap 3 }
-+
-+ospfTrapGroups      OBJECT IDENTIFIER ::= { ospfTrapConformance 1 }
-+ospfTrapCompliances OBJECT IDENTIFIER ::= { ospfTrapConformance 2 }
-+
-+-- compliance statements
-+
-+    ospfTrapCompliance MODULE-COMPLIANCE
-+        STATUS  current
-+        DESCRIPTION
-+           "The compliance statement "
-+       MODULE  -- this module
-+       MANDATORY-GROUPS { ospfTrapControlGroup }
-+
-+
-+        GROUP       ospfTrapControlGroup
-+        DESCRIPTION
-+           "This group is optional but recommended for all
-+           OSPF systems"
-+       ::= { ospfTrapCompliances 1 }
-+
-+
-+-- units of conformance
-+
-+    ospfTrapControlGroup    OBJECT-GROUP
-+        OBJECTS {
-+                           ospfSetTrap,
-+                           ospfConfigErrorType,
-+                           ospfPacketType,
-+                           ospfPacketSrc
-+        }
-+        STATUS  current
-+        DESCRIPTION
-+           "These objects are required  to  control  traps
-+           from OSPF systems."
-+       ::= { ospfTrapGroups 1 }
-+
-+
-+END
---- /dev/null
-+++ b/mibs/RIPv2-MIB.txt
-@@ -0,0 +1,530 @@
-+   RIPv2-MIB DEFINITIONS ::= BEGIN
-+
-+   IMPORTS
-+       MODULE-IDENTITY, OBJECT-TYPE, Counter32,
-+       TimeTicks, IpAddress                     FROM SNMPv2-SMI
-+       TEXTUAL-CONVENTION, RowStatus            FROM SNMPv2-TC
-+       MODULE-COMPLIANCE, OBJECT-GROUP          FROM SNMPv2-CONF
-+       mib-2                                    FROM RFC1213-MIB;
-+
-+   --  This MIB module uses the extended OBJECT-TYPE macro as
-+   --  defined in [9].
-+
-+   rip2  MODULE-IDENTITY
-+           LAST-UPDATED "9407272253Z"      -- Wed Jul 27 22:53:04 PDT 1994
-+           ORGANIZATION "IETF RIP-II Working Group"
-+           CONTACT-INFO
-+          "       Fred Baker
-+          Postal: Cisco Systems
-+                  519 Lado Drive
-+                  Santa Barbara, California 93111
-+          Tel:    +1 805 681 0115
-+          E-Mail: fbaker@cisco.com
-+
-+          Postal: Gary Malkin
-+                  Xylogics, Inc.
-+                  53 Third Avenue
-+                  Burlington, MA  01803
-+
-+          Phone:  (617) 272-8140
-+          EMail:  gmalkin@Xylogics.COM"
-+      DESCRIPTION
-+         "The MIB module to describe the RIP2 Version 2 Protocol"
-+     ::= { mib-2 23 }
-+
-+ --  RIP-2 Management Information Base
-+
-+ -- the RouteTag type represents the contents of the
-+ -- Route Domain field in the packet header or route entry.
-+ -- The use of the Route Domain is deprecated.
-+
-+ RouteTag ::= TEXTUAL-CONVENTION
-+     STATUS      current
-+     DESCRIPTION
-+        "the RouteTag type represents the contents of the Route Domain
-+        field in the packet header or route entry"
-+    SYNTAX      OCTET STRING (SIZE (2))
-+
-+--4.1 Global Counters
-+
-+--      The RIP-2 Globals Group.
-+--      Implementation of this group is mandatory for systems
-+--      which implement RIP-2.
-+
-+-- These counters are intended to facilitate debugging quickly
-+-- changing routes or failing neighbors
-+
-+rip2Globals OBJECT IDENTIFIER ::= { rip2 1 }
-+
-+    rip2GlobalRouteChanges OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of route changes made to the IP Route
-+           Database by RIP.  This does not include the refresh
-+           of a route's age."
-+       ::= { rip2Globals 1 }
-+
-+    rip2GlobalQueries OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of responses sent to RIP queries
-+           from other systems."
-+       ::= { rip2Globals 2 }
-+
-+--4.2 RIP Interface Tables
-+
-+--  RIP Interfaces Groups
-+--  Implementation of these Groups is mandatory for systems
-+--  which implement RIP-2.
-+
-+-- The RIP Interface Status Table.
-+
-+    rip2IfStatTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF Rip2IfStatEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A list of subnets which require separate
-+           status monitoring in RIP."
-+       ::= { rip2 2 }
-+
-+   rip2IfStatEntry OBJECT-TYPE
-+       SYNTAX   Rip2IfStatEntry
-+       MAX-ACCESS   not-accessible
-+       STATUS   current
-+       DESCRIPTION
-+          "A Single Routing Domain in a single Subnet."
-+      INDEX { rip2IfStatAddress }
-+      ::= { rip2IfStatTable 1 }
-+
-+    Rip2IfStatEntry ::=
-+        SEQUENCE {
-+            rip2IfStatAddress
-+                IpAddress,
-+            rip2IfStatRcvBadPackets
-+                Counter32,
-+            rip2IfStatRcvBadRoutes
-+                Counter32,
-+            rip2IfStatSentUpdates
-+                Counter32,
-+            rip2IfStatStatus
-+                RowStatus
-+    }
-+
-+    rip2IfStatAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address of this system on the indicated
-+           subnet. For unnumbered interfaces, the value 0.0.0.N,
-+           where the least significant 24 bits (N) is the ifIndex
-+           for the IP Interface in network byte order."
-+       ::= { rip2IfStatEntry 1 }
-+
-+    rip2IfStatRcvBadPackets OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of RIP response packets received by
-+           the RIP process which were subsequently discarded
-+           for any reason (e.g. a version 0 packet, or an
-+           unknown command type)."
-+       ::= { rip2IfStatEntry 2 }
-+
-+    rip2IfStatRcvBadRoutes OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of routes, in valid RIP packets,
-+           which were ignored for any reason (e.g. unknown
-+           address family, or invalid metric)."
-+       ::= { rip2IfStatEntry 3 }
-+
-+    rip2IfStatSentUpdates OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of triggered RIP updates actually
-+           sent on this interface.  This explicitly does
-+           NOT include full updates sent containing new
-+           information."
-+       ::= { rip2IfStatEntry 4 }
-+
-+    rip2IfStatStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "Writing invalid has the effect of deleting
-+           this interface."
-+       ::= { rip2IfStatEntry 5 }
-+
-+-- The RIP Interface Configuration Table.
-+
-+    rip2IfConfTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF Rip2IfConfEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A list of subnets which require separate
-+           configuration in RIP."
-+       ::= { rip2 3 }
-+
-+   rip2IfConfEntry OBJECT-TYPE
-+       SYNTAX   Rip2IfConfEntry
-+       MAX-ACCESS   not-accessible
-+       STATUS   current
-+       DESCRIPTION
-+          "A Single Routing Domain in a single Subnet."
-+      INDEX { rip2IfConfAddress }
-+      ::= { rip2IfConfTable 1 }
-+
-+    Rip2IfConfEntry ::=
-+        SEQUENCE {
-+            rip2IfConfAddress
-+                IpAddress,
-+            rip2IfConfDomain
-+                RouteTag,
-+            rip2IfConfAuthType
-+                INTEGER,
-+            rip2IfConfAuthKey
-+                OCTET STRING (SIZE(0..16)),
-+            rip2IfConfSend
-+                INTEGER,
-+            rip2IfConfReceive
-+                INTEGER,
-+            rip2IfConfDefaultMetric
-+                INTEGER,
-+            rip2IfConfStatus
-+                RowStatus,
-+            rip2IfConfSrcAddress
-+                IpAddress
-+    }
-+
-+    rip2IfConfAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address of this system on the indicated
-+           subnet.  For unnumbered interfaces, the value 0.0.0.N,
-+           where the least significant 24 bits (N) is the ifIndex
-+           for the IP Interface in network byte order."
-+       ::= { rip2IfConfEntry 1 }
-+
-+    rip2IfConfDomain OBJECT-TYPE
-+        SYNTAX   RouteTag
-+        MAX-ACCESS   read-create
-+        STATUS   obsolete
-+        DESCRIPTION
-+           "Value inserted into the Routing Domain field
-+           of all RIP packets sent on this interface."
-+       DEFVAL { '0000'h }
-+       ::= { rip2IfConfEntry 2 }
-+
-+    rip2IfConfAuthType OBJECT-TYPE
-+        SYNTAX   INTEGER {
-+                    noAuthentication (1),
-+                    simplePassword (2),
-+                    md5 (3)
-+                 }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The type of Authentication used on this
-+           interface."
-+       DEFVAL { noAuthentication }
-+       ::= { rip2IfConfEntry 3 }
-+
-+    rip2IfConfAuthKey OBJECT-TYPE
-+        SYNTAX   OCTET STRING (SIZE(0..16))
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The value to be used as the Authentication Key
-+           whenever the corresponding instance of
-+           rip2IfConfAuthType has a value other than
-+           noAuthentication.  A modification of the corresponding
-+           instance of rip2IfConfAuthType does not modify
-+           the rip2IfConfAuthKey value.  If a string shorter
-+           than 16 octets is supplied, it will be left-
-+           justified and padded to 16 octets, on the right,
-+           with nulls (0x00).
-+
-+           Reading this object always results in an  OCTET
-+           STRING of length zero; authentication may not
-+           be bypassed by reading the MIB object."
-+       DEFVAL { ''h }
-+       ::= { rip2IfConfEntry 4 }
-+
-+    rip2IfConfSend OBJECT-TYPE
-+        SYNTAX   INTEGER {
-+                    doNotSend (1),
-+                    ripVersion1 (2),
-+                    rip1Compatible (3),
-+                    ripVersion2 (4),
-+                    ripV1Demand (5),
-+                    ripV2Demand (6)
-+                 }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "What the router sends on this interface.
-+           ripVersion1 implies sending RIP updates compliant
-+           with  RFC  1058.   rip1Compatible implies
-+           broadcasting RIP-2 updates using RFC 1058 route
-+           subsumption rules.  ripVersion2 implies
-+           multicasting RIP-2 updates.  ripV1Demand indicates
-+           the use of Demand RIP on a WAN interface under RIP
-+           Version 1 rules.  ripV2Demand indicates the use of
-+           Demand RIP on a WAN interface under Version 2 rules."
-+       DEFVAL { rip1Compatible }
-+       ::= { rip2IfConfEntry 5 }
-+
-+    rip2IfConfReceive OBJECT-TYPE
-+        SYNTAX   INTEGER {
-+                    rip1 (1),
-+                    rip2 (2),
-+                    rip1OrRip2 (3),
-+                    doNotRecieve (4)
-+                 }
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This indicates which version of RIP updates
-+           are to be accepted.  Note that rip2 and
-+           rip1OrRip2 implies reception of multicast
-+           packets."
-+       DEFVAL { rip1OrRip2 }
-+       ::= { rip2IfConfEntry 6 }
-+
-+    rip2IfConfDefaultMetric OBJECT-TYPE
-+        SYNTAX   INTEGER ( 0..15 )
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "This variable indicates the metric that is to
-+           be used for the default route entry in RIP updates
-+           originated on this interface.  A value of zero
-+           indicates that no default route should be
-+           originated; in this case, a default route via
-+           another router may be propagated."
-+       ::= { rip2IfConfEntry 7 }
-+
-+    rip2IfConfStatus OBJECT-TYPE
-+        SYNTAX   RowStatus
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "Writing invalid has  the  effect  of  deleting
-+           this interface."
-+       ::= { rip2IfConfEntry 8 }
-+
-+    rip2IfConfSrcAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-create
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address this system will use as a source
-+            address on this interface.  If it is a numbered
-+            interface, this MUST be the same value as
-+            rip2IfConfAddress.  On unnumbered interfaces,
-+            it must be the value of rip2IfConfAddress for
-+            some interface on the system."
-+       ::= { rip2IfConfEntry 9 }
-+
-+--4.3 Peer Table
-+
-+--  Peer Table
-+
-+--      The RIP Peer Group
-+--      Implementation of this Group is Optional
-+
-+--      This group provides information about active peer
-+--      relationships intended to assist in debugging.  An
-+--      active peer is a router from which a valid RIP
-+--      updated has been heard in the last 180 seconds.
-+
-+    rip2PeerTable OBJECT-TYPE
-+        SYNTAX   SEQUENCE OF Rip2PeerEntry
-+        MAX-ACCESS   not-accessible
-+        STATUS   current
-+        DESCRIPTION
-+           "A list of RIP Peers."
-+       ::= { rip2 4 }
-+
-+   rip2PeerEntry OBJECT-TYPE
-+       SYNTAX   Rip2PeerEntry
-+       MAX-ACCESS   not-accessible
-+       STATUS   current
-+       DESCRIPTION
-+          "Information regarding a single routing peer."
-+      INDEX { rip2PeerAddress, rip2PeerDomain }
-+      ::= { rip2PeerTable 1 }
-+
-+    Rip2PeerEntry ::=
-+        SEQUENCE {
-+            rip2PeerAddress
-+                IpAddress,
-+            rip2PeerDomain
-+                RouteTag,
-+            rip2PeerLastUpdate
-+                TimeTicks,
-+            rip2PeerVersion
-+                INTEGER,
-+            rip2PeerRcvBadPackets
-+                Counter32,
-+            rip2PeerRcvBadRoutes
-+                Counter32
-+            }
-+
-+    rip2PeerAddress OBJECT-TYPE
-+        SYNTAX   IpAddress
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The IP Address that the peer is using as its source
-+            address.  Note that on an unnumbered link, this may
-+            not be a member of any subnet on the system."
-+       ::= { rip2PeerEntry 1 }
-+
-+    rip2PeerDomain OBJECT-TYPE
-+        SYNTAX   RouteTag
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The value in the Routing Domain field  in  RIP
-+           packets received from the peer.  As domain suuport
-+           is deprecated, this must be zero."
-+       ::= { rip2PeerEntry 2 }
-+
-+    rip2PeerLastUpdate OBJECT-TYPE
-+        SYNTAX   TimeTicks
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The value of sysUpTime when the most recent
-+           RIP update was received from this system."
-+       ::= { rip2PeerEntry 3 }
-+
-+    rip2PeerVersion OBJECT-TYPE
-+        SYNTAX   INTEGER ( 0..255 )
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The RIP version number in the header of the
-+           last RIP packet received."
-+       ::= { rip2PeerEntry 4 }
-+
-+    rip2PeerRcvBadPackets OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of RIP response packets from this
-+           peer discarded as invalid."
-+       ::= { rip2PeerEntry 5 }
-+
-+
-+    rip2PeerRcvBadRoutes OBJECT-TYPE
-+        SYNTAX   Counter32
-+        MAX-ACCESS   read-only
-+        STATUS   current
-+        DESCRIPTION
-+           "The number of routes from this peer that were
-+           ignored because the entry format was invalid."
-+       ::= { rip2PeerEntry 6 }
-+
-+-- conformance information
-+
-+rip2Conformance OBJECT IDENTIFIER ::= { rip2 5 }
-+
-+rip2Groups      OBJECT IDENTIFIER ::= { rip2Conformance 1 }
-+rip2Compliances OBJECT IDENTIFIER ::= { rip2Conformance 2 }
-+
-+-- compliance statements
-+rip2Compliance MODULE-COMPLIANCE
-+    STATUS  current
-+    DESCRIPTION
-+       "The compliance statement "
-+    MODULE  -- this module
-+    MANDATORY-GROUPS {
-+                 rip2GlobalGroup,
-+                 rip2IfStatGroup,
-+                 rip2IfConfGroup,
-+                 rip2PeerGroup
-+        }
-+    GROUP       rip2GlobalGroup
-+    DESCRIPTION
-+       "This group defines global controls for RIP-II systems."
-+    GROUP       rip2IfStatGroup
-+    DESCRIPTION
-+       "This group defines interface statistics for RIP-II systems."
-+    GROUP       rip2IfConfGroup
-+    DESCRIPTION
-+       "This group defines interface configuration for RIP-II systems."
-+    GROUP       rip2PeerGroup
-+    DESCRIPTION
-+       "This group defines peer information for RIP-II systems."
-+    ::= { rip2Compliances 1 }
-+
-+-- units of conformance
-+
-+rip2GlobalGroup    OBJECT-GROUP
-+    OBJECTS {
-+                rip2GlobalRouteChanges,
-+                rip2GlobalQueries
-+    }
-+    STATUS  current
-+    DESCRIPTION
-+       "This group defines global controls for RIP-II systems."
-+    ::= { rip2Groups 1 }
-+rip2IfStatGroup    OBJECT-GROUP
-+    OBJECTS {
-+            rip2IfStatAddress,
-+            rip2IfStatRcvBadPackets,
-+            rip2IfStatRcvBadRoutes,
-+            rip2IfStatSentUpdates,
-+            rip2IfStatStatus
-+    }
-+    STATUS  current
-+    DESCRIPTION
-+       "This group defines interface statistics for RIP-II systems."
-+    ::= { rip2Groups 2 }
-+rip2IfConfGroup    OBJECT-GROUP
-+    OBJECTS {
-+            rip2IfConfAddress,
-+            rip2IfConfAuthType,
-+            rip2IfConfAuthKey,
-+            rip2IfConfSend,
-+            rip2IfConfReceive,
-+            rip2IfConfDefaultMetric,
-+            rip2IfConfStatus,
-+            rip2IfConfSrcAddress
-+    }
-+    STATUS  current
-+    DESCRIPTION
-+       "This group defines interface configuration for RIP-II systems."
-+    ::= { rip2Groups 3 }
-+rip2PeerGroup    OBJECT-GROUP
-+    OBJECTS {
-+            rip2PeerAddress,
-+            rip2PeerDomain,
-+            rip2PeerLastUpdate,
-+            rip2PeerVersion,
-+            rip2PeerRcvBadPackets,
-+            rip2PeerRcvBadRoutes
-+    }
-+    STATUS  current
-+    DESCRIPTION
-+       "This group defines peer information for RIP-II systems."
-+    ::= { rip2Groups 4 }
-+END
---- /dev/null
-+++ b/mibs/SOURCE-ROUTING-MIB.txt
-@@ -0,0 +1,452 @@
-+SOURCE-ROUTING-MIB DEFINITIONS ::= BEGIN
-+
-+IMPORTS
-+        Counter, Gauge
-+                FROM RFC1155-SMI
-+        dot1dBridge, dot1dSr
-+                FROM BRIDGE-MIB
-+        OBJECT-TYPE
-+                FROM RFC-1212;
-+
-+-- groups in the SR MIB
-+
-+-- dot1dSr is imported from the Bridge MIB
-+
-+dot1dPortPair   OBJECT IDENTIFIER ::= { dot1dBridge 10 }
-+
-+-- the dot1dSr group
-+
-+-- this group is implemented by those bridges that
-+-- support the source route bridging mode, including Source
-+-- Routing and SRT bridges.
-+
-+dot1dSrPortTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dSrPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains information about every
-+            port that is associated with this source route
-+            bridge."
-+    ::= { dot1dSr 1 }
-+
-+dot1dSrPortEntry OBJECT-TYPE
-+    SYNTAX  Dot1dSrPortEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A list of information for each port of a source
-+            route bridge."
-+    INDEX   { dot1dSrPort }
-+
-+    ::= { dot1dSrPortTable 1 }
-+
-+Dot1dSrPortEntry ::=
-+    SEQUENCE {
-+        dot1dSrPort
-+            INTEGER,
-+        dot1dSrPortHopCount
-+            INTEGER,
-+        dot1dSrPortLocalSegment
-+            INTEGER,
-+        dot1dSrPortBridgeNum
-+            INTEGER,
-+        dot1dSrPortTargetSegment
-+            INTEGER,
-+        dot1dSrPortLargestFrame
-+            INTEGER,
-+        dot1dSrPortSTESpanMode
-+            INTEGER,
-+        dot1dSrPortSpecInFrames
-+            Counter,
-+        dot1dSrPortSpecOutFrames
-+            Counter,
-+        dot1dSrPortApeInFrames
-+            Counter,
-+        dot1dSrPortApeOutFrames
-+            Counter,
-+        dot1dSrPortSteInFrames
-+            Counter,
-+        dot1dSrPortSteOutFrames
-+            Counter,
-+        dot1dSrPortSegmentMismatchDiscards
-+            Counter,
-+        dot1dSrPortDuplicateSegmentDiscards
-+            Counter,
-+        dot1dSrPortHopCountExceededDiscards
-+            Counter,
-+        dot1dSrPortDupLanIdOrTreeErrors
-+            Counter,
-+        dot1dSrPortLanIdMismatches
-+            Counter
-+    }
-+
-+dot1dSrPort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the port for which this entry
-+
-+            contains Source Route management information."
-+    ::= { dot1dSrPortEntry 1 }
-+
-+dot1dSrPortHopCount OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The maximum number of routing descriptors allowed
-+            in an All Paths or Spanning Tree Explorer frames."
-+    ::= { dot1dSrPortEntry 2 }
-+
-+dot1dSrPortLocalSegment OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The segment number that uniquely identifies the
-+            segment to which this port is connected. Current
-+            source routing protocols limit this value to the
-+            range: 0 through 4095. (The value 0 is used by
-+            some management applications for special test
-+            cases.) A value of 65535 signifies that no segment
-+            number is assigned to this port."
-+    ::= { dot1dSrPortEntry 3 }
-+
-+dot1dSrPortBridgeNum OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A bridge number uniquely identifies a bridge when
-+            more than one bridge is used to span the same two
-+            segments.  Current source routing protocols limit
-+            this value to the range: 0 through 15. A value of
-+            65535 signifies that no bridge number is assigned
-+            to this bridge."
-+    ::= { dot1dSrPortEntry 4 }
-+
-+dot1dSrPortTargetSegment OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The segment number that corresponds to the target
-+            segment this port is considered to be connected to
-+            by the bridge.  Current source routing protocols
-+            limit this value to the range: 0 through 4095.
-+
-+            (The value 0 is used by some management
-+            applications for special test cases.) A value of
-+            65535 signifies that no target segment is assigned
-+            to this port."
-+    ::= { dot1dSrPortEntry 5 }
-+
-+-- It would be nice if we could use ifMtu as the size of the
-+-- largest frame, but we can't because ifMtu is defined to be
-+-- the size that the (inter-)network layer can use which can
-+-- differ from the MAC layer (especially if several layers of
-+-- encapsulation are used).
-+
-+dot1dSrPortLargestFrame OBJECT-TYPE
-+    SYNTAX  INTEGER
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The maximum size of the INFO field (LLC and
-+            above) that this port can send/receive.  It does
-+            not include any MAC level (framing) octets.  The
-+            value of this object is used by this bridge to
-+            determine whether a modification of the
-+            LargestFrame (LF, see [14]) field of the Routing
-+            Control field of the Routing Information Field is
-+            necessary.
-+
-+            64 valid values are defined by the IEEE 802.5M SRT
-+            Addendum: 516, 635, 754, 873, 993, 1112, 1231,
-+            1350, 1470, 1542, 1615, 1688, 1761, 1833, 1906,
-+            1979, 2052, 2345, 2638, 2932, 3225, 3518, 3812,
-+            4105, 4399, 4865, 5331, 5798, 6264, 6730, 7197,
-+            7663, 8130, 8539, 8949, 9358, 9768, 10178, 10587,
-+            10997, 11407, 12199, 12992, 13785, 14578, 15370,
-+            16163, 16956, 17749, 20730, 23711, 26693, 29674,
-+            32655, 35637, 38618, 41600, 44591, 47583, 50575,
-+            53567, 56559, 59551, and 65535.
-+
-+            An illegal value will not be accepted by the
-+            bridge."
-+    ::= { dot1dSrPortEntry 6 }
-+
-+dot1dSrPortSTESpanMode OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                auto-span(1),
-+                disabled(2),
-+                forced(3)
-+            }
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Determines how this port behaves when presented
-+            with a Spanning Tree Explorer frame.  The value
-+            'disabled(2)' indicates that the port will not
-+            accept or send Spanning Tree Explorer packets; any
-+            STE packets received will be silently discarded.
-+            The value 'forced(3)' indicates the port will
-+            always accept and propagate Spanning Tree Explorer
-+            frames.  This allows a manually configured
-+            Spanning Tree for this class of packet to be
-+            configured.  Note that unlike transparent
-+            bridging, this is not catastrophic to the network
-+            if there are loops.  The value 'auto-span(1)' can
-+            only be returned by a bridge that both implements
-+            the Spanning Tree Protocol and has use of the
-+            protocol enabled on this port. The behavior of the
-+            port for Spanning Tree Explorer frames is
-+            determined by the state of dot1dStpPortState.  If
-+            the port is in the 'forwarding' state, the frame
-+            will be accepted or propagated.  Otherwise, it
-+            will be silently discarded."
-+    ::= { dot1dSrPortEntry 7 }
-+
-+dot1dSrPortSpecInFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of Specifically Routed frames, also
-+            referred to as Source Routed Frames, that have
-+            been received from this port's segment."
-+    ::= { dot1dSrPortEntry 8 }
-+
-+dot1dSrPortSpecOutFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of Specifically Routed frames, also
-+            referred to as Source Routed Frames, that this
-+            port has transmitted on its segment."
-+    ::= { dot1dSrPortEntry 9 }
-+
-+dot1dSrPortApeInFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of All Paths Explorer frames, also
-+            referred to as All Routes Explorer frames, that
-+            have been received by this port from its segment."
-+    ::= { dot1dSrPortEntry 10 }
-+
-+dot1dSrPortApeOutFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of all Paths Explorer Frames, also
-+            referred to as All Routes Explorer frames, that
-+            have been transmitted by this port on its
-+            segment."
-+    ::= { dot1dSrPortEntry 11 }
-+
-+dot1dSrPortSteInFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of spanning tree explorer frames that
-+            have been received by this port from its segment."
-+    ::= { dot1dSrPortEntry 12 }
-+
-+dot1dSrPortSteOutFrames OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of spanning tree explorer frames that
-+            have been transmitted by this port on its
-+            segment."
-+    ::= { dot1dSrPortEntry 13 }
-+
-+dot1dSrPortSegmentMismatchDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of explorer frames that have been
-+            discarded by this port because the routing
-+            descriptor field contained an invalid adjacent
-+            segment value."
-+    ::= { dot1dSrPortEntry 14 }
-+
-+dot1dSrPortDuplicateSegmentDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of frames that have been discarded by
-+            this port because the routing descriptor field
-+            contained a duplicate segment identifier."
-+    ::= { dot1dSrPortEntry 15 }
-+
-+dot1dSrPortHopCountExceededDiscards OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of explorer frames that have been
-+            discarded by this port because the Routing
-+            Information Field has exceeded the maximum route
-+            descriptor length."
-+    ::= { dot1dSrPortEntry 16 }
-+
-+dot1dSrPortDupLanIdOrTreeErrors OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of duplicate LAN IDs or Tree errors.
-+            This helps in detection of problems in networks
-+            containing older IBM Source Routing Bridges."
-+    ::= { dot1dSrPortEntry 17 }
-+
-+dot1dSrPortLanIdMismatches OBJECT-TYPE
-+    SYNTAX  Counter
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The number of ARE and STE frames that were
-+            discarded because the last LAN ID in the routing
-+            information field did not equal the LAN-in ID.
-+            This error can occur in implementations which do
-+            only a LAN-in ID and Bridge Number check instead
-+            of a LAN-in ID, Bridge Number, and LAN-out ID
-+            check before they forward broadcast frames."
-+    ::= { dot1dSrPortEntry 18 }
-+
-+-- scalar object in dot1dSr
-+
-+dot1dSrBridgeLfMode OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                mode3(1),
-+                mode6(2)
-+            }
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "Indicates whether the bridge operates using older
-+            3 bit length negotiation fields or the newer 6 bit
-+            length field in its RIF."
-+    ::= { dot1dSr 2 }
-+
-+-- The Port-Pair Database
-+
-+-- Implementation of this group is optional.
-+
-+-- This group is implemented by those bridges that support
-+-- the direct multiport model of the source route bridging
-+-- mode as defined in the IEEE 802.5 SRT Addendum to
-+-- 802.1d.
-+
-+-- Bridges implementing this group may report 65535 for
-+-- dot1dSrPortBridgeNumber and dot1dSrPortTargetSegment,
-+-- indicating that those objects are not applicable.
-+
-+dot1dPortPairTableSize OBJECT-TYPE
-+    SYNTAX  Gauge
-+    ACCESS  read-only
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The total number of entries in the Bridge Port
-+            Pair Database."
-+    ::= { dot1dPortPair 1 }
-+
-+-- the Bridge Port-Pair table
-+
-+-- this table represents port pairs within a bridge forming
-+-- a unique bridge path, as defined in the IEEE 802.5M SRT
-+-- Addendum.
-+
-+dot1dPortPairTable OBJECT-TYPE
-+    SYNTAX  SEQUENCE OF Dot1dPortPairEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A table that contains information about every
-+
-+            port pair database entity associated with this
-+            source routing bridge."
-+    ::= { dot1dPortPair 2 }
-+
-+dot1dPortPairEntry OBJECT-TYPE
-+    SYNTAX  Dot1dPortPairEntry
-+    ACCESS  not-accessible
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A list of information for each port pair entity
-+            of a bridge."
-+    INDEX   { dot1dPortPairLowPort, dot1dPortPairHighPort }
-+    ::= { dot1dPortPairTable 1 }
-+
-+Dot1dPortPairEntry ::=
-+    SEQUENCE {
-+        dot1dPortPairLowPort
-+            INTEGER,
-+        dot1dPortPairHighPort
-+            INTEGER,
-+        dot1dPortPairBridgeNum
-+            INTEGER,
-+        dot1dPortPairBridgeState
-+            INTEGER
-+    }
-+
-+dot1dPortPairLowPort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the lower numbered port for
-+            which this entry contains port pair database
-+            information."
-+    ::= { dot1dPortPairEntry 1 }
-+
-+dot1dPortPairHighPort OBJECT-TYPE
-+    SYNTAX  INTEGER (1..65535)
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The port number of the higher numbered port for
-+            which this entry contains port pair database
-+            information."
-+    ::= { dot1dPortPairEntry 2 }
-+
-+dot1dPortPairBridgeNum OBJECT-TYPE
-+    SYNTAX  INTEGER
-+
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "A bridge number that uniquely identifies the path
-+            provided by this source routing bridge between the
-+            segments connected to dot1dPortPairLowPort and
-+            dot1dPortPairHighPort.  The purpose of bridge
-+            number is to disambiguate between multiple paths
-+            connecting the same two LANs."
-+    ::= { dot1dPortPairEntry 3 }
-+
-+dot1dPortPairBridgeState OBJECT-TYPE
-+    SYNTAX  INTEGER {
-+                enabled(1),
-+                disabled(2),
-+                invalid(3)
-+            }
-+    ACCESS  read-write
-+    STATUS  mandatory
-+    DESCRIPTION
-+            "The state of dot1dPortPairBridgeNum.  Writing
-+            'invalid(3)' to this object removes the
-+            corresponding entry."
-+    ::= { dot1dPortPairEntry 4 }
-+
-+END
diff --git a/trunk/package/feeds/packages/net-snmp/patches/160-no_ldconfig.patch b/trunk/package/feeds/packages/net-snmp/patches/160-no_ldconfig.patch
deleted file mode 100644
index 6a28ea03..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/160-no_ldconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -10216,7 +10216,7 @@ linux* | k*bsd*-gnu)
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  finish_cmds=''
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   # This implies no fast_install, which is unacceptable.
diff --git a/trunk/package/feeds/packages/net-snmp/patches/170-ldflags.patch b/trunk/package/feeds/packages/net-snmp/patches/170-ldflags.patch
deleted file mode 100644
index fa32544d..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/170-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.top
-+++ b/Makefile.top
-@@ -81,7 +81,7 @@ LIBCURRENT  = 16
- LIBAGE      = 1
- LIBREVISION = 3
- 
--LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
-+LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) $(LDFLAGS) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
- LIB_EXTENSION   = la
- LIB_VERSION     =
- LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
diff --git a/trunk/package/feeds/packages/net-snmp/patches/750-ieee802dot11.patch b/trunk/package/feeds/packages/net-snmp/patches/750-ieee802dot11.patch
deleted file mode 100644
index 9e0625cc..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/750-ieee802dot11.patch
+++ /dev/null
@@ -1,6156 +0,0 @@
---- /dev/null
-+++ b/agent/mibgroup/ieee802dot11.c
-@@ -0,0 +1,4915 @@
-+/****************************************************************************
-+*                                                                           *
-+*  File Name:           ieee802dot11.c                                      *
-+*  Used By:                                                                 *
-+*                                                                           *
-+*  Operating System:                                                        *
-+*  Purpose:                                                                 *
-+*                                                                           *
-+*  Comments:                                                                *
-+*                                                                           *
-+*  Author:              Larry Simmons                                       *
-+*                       lsimmons@avantcom.com                               *
-+*                       www.avantcom.com                                    *
-+*                                                                           *
-+*  Creation Date:       09/02/03                                            *
-+*                                                                           *
-+*   Ver    Date   Inits Modification                                        *
-+*  ----- -------- ----- ------------                                        *
-+*  0.0.1 09/02/03  LRS  created                                             *
-+*  0.0.2 09/24/03  LRS  wouldn't build after fresh ./configure              *
-+****************************************************************************/
-+/****************************************************************************
-+*                               Includes                                    *
-+****************************************************************************/
-+#include <net-snmp/net-snmp-config.h>
-+#include <net-snmp/net-snmp-includes.h>
-+#include <net-snmp/agent/net-snmp-agent-includes.h>
-+#include "ieee802dot11.h"
-+#include "iwlib.h"
-+
-+/****************************************************************************
-+*                                Defines                                    *
-+****************************************************************************/
-+#define DISPLAYWIEXT                        // display wireless ext info
-+#define TABLE_SIZE   1
-+//#define MINLOADFREQ 15                    // min reload frequency in seconds
-+#define MINLOADFREQ 5                       // min reload frequency in seconds      // for testing
-+#define PROC_NET_DEV      "/proc/net/dev"
-+#define PROC_NET_WIRELESS "/proc/net/wireless"
-+
-+#ifndef UCHAR
-+  typedef unsigned char UCHAR;
-+#endif
-+
-+/****************************************************************************
-+*                            Private Functions                              *
-+****************************************************************************/
-+static void loadTables();
-+static void loadWiExt ( int, char *, struct wireless_info * );
-+static void load80211Structs ( int, char *, struct wireless_info * );
-+static void initStructs();
-+
-+// Wireless Extensions Specific Functions
-+static void loadWiExtTo80211Structs ( int, char *, struct wireless_info * );
-+static void displayWiExt ( struct wireless_info );
-+
-+// Linked List Functions
-+static void addList ( char *, char *, int );
-+static void initLists();                    // initialize all the linked lists
-+static void flushLists();                   // flush all the linked lists
-+static void flushList ( char * );           // flush a single linked list
-+
-+// Utility Functions
-+static int  openSocket ( void );
-+static int  mWatt2dbm ( int );
-+static char *htob ( char * );
-+static int  hasChanged ( char *, int );
-+
-+/****************************************************************************
-+*                            Private Variables                              *
-+****************************************************************************/
-+static unsigned long lastLoad = 0;          // ET in secs at last table load
-+
-+static struct avNode *lastNode, *newNode, *np;
-+
-+/****************************************************************************
-+*                            External Functions                             *
-+****************************************************************************/
-+
-+/****************************************************************************
-+*   ieee802dot11_variables_oid:                                             *
-+*       this is the top level oid that we want to register under.  This     *
-+*       is essentially a prefix, with the suffix appearing in the           *
-+*       variable below.                                                     *
-+****************************************************************************/
-+oid ieee802dot11_variables_oid[] = { 1,2,840,10036 };
-+
-+/****************************************************************************
-+*   variable7 ieee802dot11_variables:                                       *
-+*     this variable defines function callbacks and type return information  *
-+*     for the ieee802dot11 mib section                                      *
-+****************************************************************************/
-+struct variable7 ieee802dot11_variables[] = {
-+/*  magic number        , variable type , ro/rw , callback fn  , L, oidsuffix */
-+#define   DOT11STATIONID        3
-+  { DOT11STATIONID      , ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,1 } },
-+#define   DOT11MEDIUMOCCUPANCYLIMIT  4
-+  { DOT11MEDIUMOCCUPANCYLIMIT, ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,2 } },
-+#define   DOT11CFPOLLABLE       5
-+  { DOT11CFPOLLABLE     , ASN_INTEGER   , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,3 } },
-+#define   DOT11CFPPERIOD        6
-+  { DOT11CFPPERIOD      , ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,4 } },
-+#define   DOT11CFPMAXDURATION   7
-+  { DOT11CFPMAXDURATION , ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,5 } },
-+#define   DOT11AUTHENTICATIONRESPONSETIMEOUT  8
-+  { DOT11AUTHENTICATIONRESPONSETIMEOUT, ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,6 } },
-+#define   DOT11PRIVACYOPTIONIMPLEMENTED  9
-+  { DOT11PRIVACYOPTIONIMPLEMENTED, ASN_INTEGER   , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,7 } },
-+#define   DOT11POWERMANAGEMENTMODE  10
-+  { DOT11POWERMANAGEMENTMODE, ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,8 } },
-+#define   DOT11DESIREDSSID      11
-+  { DOT11DESIREDSSID    , ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,9 } },
-+#define   DOT11DESIREDBSSTYPE   12
-+  { DOT11DESIREDBSSTYPE , ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,10 } },
-+#define   DOT11OPERATIONALRATESET  13
-+  { DOT11OPERATIONALRATESET, ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,11 } },
-+#define   DOT11BEACONPERIOD     14
-+  { DOT11BEACONPERIOD   , ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,12 } },
-+#define   DOT11DTIMPERIOD       15
-+  { DOT11DTIMPERIOD     , ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,13 } },
-+#define   DOT11ASSOCIATIONRESPONSETIMEOUT  16
-+  { DOT11ASSOCIATIONRESPONSETIMEOUT, ASN_INTEGER   , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,14 } },
-+#define   DOT11DISASSOCIATEREASON  17
-+  { DOT11DISASSOCIATEREASON, ASN_INTEGER   , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,15 } },
-+#define   DOT11DISASSOCIATESTATION  18
-+  { DOT11DISASSOCIATESTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,16 } },
-+#define   DOT11DEAUTHENTICATEREASON  19
-+  { DOT11DEAUTHENTICATEREASON, ASN_INTEGER   , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,17 } },
-+#define   DOT11DEAUTHENTICATESTATION  20
-+  { DOT11DEAUTHENTICATESTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,18 } },
-+#define   DOT11AUTHENTICATEFAILSTATUS  21
-+  { DOT11AUTHENTICATEFAILSTATUS, ASN_INTEGER   , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,19 } },
-+#define   DOT11AUTHENTICATEFAILSTATION  22
-+  { DOT11AUTHENTICATEFAILSTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,20 } },
-+
-+#define   DOT11AUTHENTICATIONALGORITHM  26
-+  { DOT11AUTHENTICATIONALGORITHM, ASN_INTEGER   , RONLY , var_dot11AuthenticationAlgorithmsTable, 4, { 1,2,1,2 } },
-+#define   DOT11AUTHENTICATIONALGORITHMSENABLE  27
-+  { DOT11AUTHENTICATIONALGORITHMSENABLE, ASN_INTEGER   , RWRITE, var_dot11AuthenticationAlgorithmsTable, 4, { 1,2,1,3 } },
-+
-+#define   DOT11WEPDEFAULTKEYVALUE  31
-+  { DOT11WEPDEFAULTKEYVALUE, ASN_OCTET_STR , RWRITE, var_dot11WEPDefaultKeysTable, 4, { 1,3,1,2 } },
-+
-+#define   DOT11WEPKEYMAPPINGADDRESS  35
-+  { DOT11WEPKEYMAPPINGADDRESS, ASN_OCTET_STR , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,2 } },
-+#define   DOT11WEPKEYMAPPINGWEPON  36
-+  { DOT11WEPKEYMAPPINGWEPON, ASN_INTEGER   , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,3 } },
-+#define   DOT11WEPKEYMAPPINGVALUE  37
-+  { DOT11WEPKEYMAPPINGVALUE, ASN_OCTET_STR , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,4 } },
-+#define   DOT11WEPKEYMAPPINGSTATUS  38
-+  { DOT11WEPKEYMAPPINGSTATUS, ASN_INTEGER   , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,5 } },
-+
-+#define   DOT11PRIVACYINVOKED   41
-+  { DOT11PRIVACYINVOKED , ASN_INTEGER   , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,1 } },
-+#define   DOT11WEPDEFAULTKEYID  42
-+  { DOT11WEPDEFAULTKEYID, ASN_INTEGER   , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,2 } },
-+#define   DOT11WEPKEYMAPPINGLENGTH  43
-+  { DOT11WEPKEYMAPPINGLENGTH, ASN_INTEGER   , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,3 } },
-+#define   DOT11EXCLUDEUNENCRYPTED  44
-+  { DOT11EXCLUDEUNENCRYPTED, ASN_INTEGER   , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,4 } },
-+#define   DOT11WEPICVERRORCOUNT  45
-+  { DOT11WEPICVERRORCOUNT, ASN_COUNTER   , RONLY , var_dot11PrivacyTable, 4, { 1,5,1,5 } },
-+#define   DOT11WEPEXCLUDEDCOUNT  46
-+  { DOT11WEPEXCLUDEDCOUNT, ASN_COUNTER   , RONLY , var_dot11PrivacyTable, 4, { 1,5,1,6 } },
-+
-+#define   DOT11MACADDRESS       49
-+  { DOT11MACADDRESS     , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,1 } },
-+#define   DOT11RTSTHRESHOLD     50
-+  { DOT11RTSTHRESHOLD   , ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,2 } },
-+#define   DOT11SHORTRETRYLIMIT  51
-+  { DOT11SHORTRETRYLIMIT, ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,3 } },
-+#define   DOT11LONGRETRYLIMIT   52
-+  { DOT11LONGRETRYLIMIT , ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,4 } },
-+#define   DOT11FRAGMENTATIONTHRESHOLD  53
-+  { DOT11FRAGMENTATIONTHRESHOLD, ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,5 } },
-+#define   DOT11MAXTRANSMITMSDULIFETIME  54
-+  { DOT11MAXTRANSMITMSDULIFETIME, ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,6 } },
-+#define   DOT11MAXRECEIVELIFETIME  55
-+  { DOT11MAXRECEIVELIFETIME, ASN_INTEGER   , RWRITE, var_dot11OperationTable, 4, { 2,1,1,7 } },
-+#define   DOT11MANUFACTURERID   56
-+  { DOT11MANUFACTURERID , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,8 } },
-+#define   DOT11PRODUCTID        57
-+  { DOT11PRODUCTID      , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,9 } },
-+
-+#define   DOT11TRANSMITTEDFRAGMENTCOUNT  60
-+  { DOT11TRANSMITTEDFRAGMENTCOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,1 } },
-+#define   DOT11MULTICASTTRANSMITTEDFRAMECOUNT  61
-+  { DOT11MULTICASTTRANSMITTEDFRAMECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,2 } },
-+#define   DOT11FAILEDCOUNT      62
-+  { DOT11FAILEDCOUNT    , ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,3 } },
-+#define   DOT11RETRYCOUNT       63
-+  { DOT11RETRYCOUNT     , ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,4 } },
-+#define   DOT11MULTIPLERETRYCOUNT  64
-+  { DOT11MULTIPLERETRYCOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,5 } },
-+#define   DOT11FRAMEDUPLICATECOUNT  65
-+  { DOT11FRAMEDUPLICATECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,6 } },
-+#define   DOT11RTSSUCCESSCOUNT  66
-+  { DOT11RTSSUCCESSCOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,7 } },
-+#define   DOT11RTSFAILURECOUNT  67
-+  { DOT11RTSFAILURECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,8 } },
-+#define   DOT11ACKFAILURECOUNT  68
-+  { DOT11ACKFAILURECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,9 } },
-+#define   DOT11RECEIVEDFRAGMENTCOUNT  69
-+  { DOT11RECEIVEDFRAGMENTCOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,10 } },
-+#define   DOT11MULTICASTRECEIVEDFRAMECOUNT  70
-+  { DOT11MULTICASTRECEIVEDFRAMECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,11 } },
-+#define   DOT11FCSERRORCOUNT    71
-+  { DOT11FCSERRORCOUNT  , ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,12 } },
-+#define   DOT11TRANSMITTEDFRAMECOUNT  72
-+  { DOT11TRANSMITTEDFRAMECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,13 } },
-+#define   DOT11WEPUNDECRYPTABLECOUNT  73
-+  { DOT11WEPUNDECRYPTABLECOUNT, ASN_COUNTER   , RONLY , var_dot11CountersTable, 4, { 2,2,1,14 } },
-+
-+#define   DOT11ADDRESS          77
-+  { DOT11ADDRESS        , ASN_OCTET_STR , RWRITE, var_dot11GroupAddressesTable, 4, { 2,3,1,2 } },
-+#define   DOT11GROUPADDRESSESSTATUS  78
-+  { DOT11GROUPADDRESSESSTATUS, ASN_INTEGER   , RWRITE, var_dot11GroupAddressesTable, 4, { 2,3,1,3 } },
-+
-+#define   DOT11RESOURCETYPEIDNAME  79
-+  { DOT11RESOURCETYPEIDNAME, ASN_OCTET_STR , RONLY , var_ieee802dot11, 3, { 3,1,1 } },
-+#define   DOT11MANUFACTUREROUI  82
-+  { DOT11MANUFACTUREROUI, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,1 } },
-+#define   DOT11MANUFACTURERNAME  83
-+  { DOT11MANUFACTURERNAME, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,2 } },
-+#define   DOT11MANUFACTURERPRODUCTNAME  84
-+  { DOT11MANUFACTURERPRODUCTNAME, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,3 } },
-+#define   DOT11MANUFACTURERPRODUCTVERSION  85
-+  { DOT11MANUFACTURERPRODUCTVERSION, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,4 } },
-+
-+#define   DOT11PHYTYPE          88
-+  { DOT11PHYTYPE        , ASN_INTEGER   , RONLY , var_dot11PhyOperationTable, 4, { 4,1,1,1 } },
-+#define   DOT11CURRENTREGDOMAIN  89
-+  { DOT11CURRENTREGDOMAIN, ASN_INTEGER   , RWRITE, var_dot11PhyOperationTable, 4, { 4,1,1,2 } },
-+#define   DOT11TEMPTYPE         90
-+  { DOT11TEMPTYPE       , ASN_INTEGER   , RONLY , var_dot11PhyOperationTable, 4, { 4,1,1,3 } },
-+#define   DOT11CURRENTTXANTENNA  93
-+  { DOT11CURRENTTXANTENNA, ASN_INTEGER   , RWRITE, var_dot11PhyAntennaTable, 4, { 4,2,1,1 } },
-+#define   DOT11DIVERSITYSUPPORT  94
-+  { DOT11DIVERSITYSUPPORT, ASN_INTEGER   , RONLY , var_dot11PhyAntennaTable, 4, { 4,2,1,2 } },
-+#define   DOT11CURRENTRXANTENNA  95
-+  { DOT11CURRENTRXANTENNA, ASN_INTEGER   , RWRITE, var_dot11PhyAntennaTable, 4, { 4,2,1,3 } },
-+#define   DOT11NUMBERSUPPORTEDPOWERLEVELS  98
-+  { DOT11NUMBERSUPPORTEDPOWERLEVELS, ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,1 } },
-+#define   DOT11TXPOWERLEVEL1    99
-+  { DOT11TXPOWERLEVEL1  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,2 } },
-+#define   DOT11TXPOWERLEVEL2    100
-+  { DOT11TXPOWERLEVEL2  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,3 } },
-+#define   DOT11TXPOWERLEVEL3    101
-+  { DOT11TXPOWERLEVEL3  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,4 } },
-+#define   DOT11TXPOWERLEVEL4    102
-+  { DOT11TXPOWERLEVEL4  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,5 } },
-+#define   DOT11TXPOWERLEVEL5    103
-+  { DOT11TXPOWERLEVEL5  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,6 } },
-+#define   DOT11TXPOWERLEVEL6    104
-+  { DOT11TXPOWERLEVEL6  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,7 } },
-+#define   DOT11TXPOWERLEVEL7    105
-+  { DOT11TXPOWERLEVEL7  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,8 } },
-+#define   DOT11TXPOWERLEVEL8    106
-+  { DOT11TXPOWERLEVEL8  , ASN_INTEGER   , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,9 } },
-+#define   DOT11CURRENTTXPOWERLEVEL  107
-+  { DOT11CURRENTTXPOWERLEVEL, ASN_INTEGER   , RWRITE, var_dot11PhyTxPowerTable, 4, { 4,3,1,10 } },
-+
-+#define   DOT11HOPTIME          110
-+  { DOT11HOPTIME        , ASN_INTEGER   , RONLY , var_dot11PhyFHSSTable, 4, { 4,4,1,1 } },
-+#define   DOT11CURRENTCHANNELNUMBER  111
-+  { DOT11CURRENTCHANNELNUMBER, ASN_INTEGER   , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,2 } },
-+#define   DOT11MAXDWELLTIME     112
-+  { DOT11MAXDWELLTIME   , ASN_INTEGER   , RONLY , var_dot11PhyFHSSTable, 4, { 4,4,1,3 } },
-+#define   DOT11CURRENTDWELLTIME  113
-+  { DOT11CURRENTDWELLTIME, ASN_INTEGER   , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,4 } },
-+#define   DOT11CURRENTSET       114
-+  { DOT11CURRENTSET     , ASN_INTEGER   , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,5 } },
-+#define   DOT11CURRENTPATTERN   115
-+  { DOT11CURRENTPATTERN , ASN_INTEGER   , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,6 } },
-+#define   DOT11CURRENTINDEX     116
-+  { DOT11CURRENTINDEX   , ASN_INTEGER   , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,7 } },
-+
-+#define   DOT11CURRENTCHANNEL   119
-+  { DOT11CURRENTCHANNEL , ASN_INTEGER   , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,1 } },
-+#define   DOT11CCAMODESUPPORTED  120
-+  { DOT11CCAMODESUPPORTED, ASN_INTEGER   , RONLY , var_dot11PhyDSSSTable, 4, { 4,5,1,2 } },
-+#define   DOT11CURRENTCCAMODE   121
-+  { DOT11CURRENTCCAMODE , ASN_INTEGER   , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,3 } },
-+#define   DOT11EDTHRESHOLD      122
-+  { DOT11EDTHRESHOLD    , ASN_INTEGER   , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,4 } },
-+
-+#define   DOT11CCAWATCHDOGTIMERMAX  125
-+  { DOT11CCAWATCHDOGTIMERMAX, ASN_INTEGER   , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,1 } },
-+#define   DOT11CCAWATCHDOGCOUNTMAX  126
-+  { DOT11CCAWATCHDOGCOUNTMAX, ASN_INTEGER   , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,2 } },
-+#define   DOT11CCAWATCHDOGTIMERMIN  127
-+  { DOT11CCAWATCHDOGTIMERMIN, ASN_INTEGER   , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,3 } },
-+#define   DOT11CCAWATCHDOGCOUNTMIN  128
-+  { DOT11CCAWATCHDOGCOUNTMIN, ASN_INTEGER   , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,4 } },
-+
-+#define   DOT11REGDOMAINSSUPPORTVALUE  132
-+  { DOT11REGDOMAINSSUPPORTVALUE, ASN_INTEGER   , RONLY , var_dot11RegDomainsSupportedTable, 4, { 4,7,1,2 } },
-+
-+#define   DOT11SUPPORTEDTXANTENNA  136
-+  { DOT11SUPPORTEDTXANTENNA, ASN_INTEGER   , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,2 } },
-+#define   DOT11SUPPORTEDRXANTENNA  137
-+  { DOT11SUPPORTEDRXANTENNA, ASN_INTEGER   , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,3 } },
-+#define   DOT11DIVERSITYSELECTIONRX  138
-+  { DOT11DIVERSITYSELECTIONRX, ASN_INTEGER   , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,4 } },
-+
-+#define   DOT11SUPPORTEDDATARATESTXVALUE  142
-+  { DOT11SUPPORTEDDATARATESTXVALUE, ASN_INTEGER   , RONLY , var_dot11SupportedDataRatesTxTable, 4, { 4,9,1,2 } },
-+
-+#define   DOT11SUPPORTEDDATARATESRXVALUE  146
-+  { DOT11SUPPORTEDDATARATESRXVALUE, ASN_INTEGER   , RONLY , var_dot11SupportedDataRatesRxTable, 4, { 4,10,1,2 } },
-+};
-+// ( L = length of the oidsuffix )
-+
-+/****************************************************************************
-+*                                                                           *
-+*         init_ieee802dot11() - perform any required initialization         *
-+*                                                                           *
-+****************************************************************************/
-+void init_ieee802dot11 ( void ) {
-+
-+  /* register ourselves with the agent to handle our mib tree */
-+  REGISTER_MIB("ieee802dot11", ieee802dot11_variables, variable7,
-+               ieee802dot11_variables_oid);
-+
-+  initLists();
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*    shutdown_ieee802dot11() - perform any required cleanup @ shutdown      *
-+*                                                                           *
-+****************************************************************************/
-+void shutdown_ieee802dot11 ( void )
-+{
-+  flushLists();
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_ieee802dot11() -                                                    *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_ieee802dot11 ( struct variable *vp, 
-+                    oid     *name, 
-+                    size_t  *length, 
-+                    int     exact, 
-+                    size_t  *var_len, 
-+                    WriteMethod **write_method)
-+{
-+  loadTables();                                               
-+
-+  if ( header_generic ( vp, name, length, exact,var_len,write_method )
-+                                  == MATCH_FAILED )
-+    return NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11RESOURCETYPEIDNAME:
-+      if ( !haveResourceTypeIDName )
-+        return NULL;
-+      *var_len = strlen ( resourceTypeIDName );
-+      return ( UCHAR * ) resourceTypeIDName;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*  var_dot11StationConfigTable() - return a variable value from the table   *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11StationConfigTable ( struct variable *vp,
-+                              oid     *name,
-+                              size_t  *length,
-+                              int     exact,
-+                              size_t  *var_len,
-+                              WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+  static char MACWork[17];
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &scList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    sc = ( struct scTbl_data * ) np->data;
-+    rName[vp->namelen] = sc->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) || 
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+
-+      switch ( vp->magic ) {      // found requested OID, now check for requested variable
-+        case DOT11STATIONID: 
-+          if ( sc->haveStationID                     ) found = TRUE; break;
-+        case DOT11MEDIUMOCCUPANCYLIMIT:
-+          if ( sc->haveMediumOccupancyLimit          ) found = TRUE; break;
-+        case DOT11CFPOLLABLE:
-+          if ( sc->haveCFPPollable                   ) found = TRUE; break;
-+        case DOT11CFPPERIOD:
-+          if ( sc->haveCFPPeriod                     ) found = TRUE; break;
-+        case DOT11CFPMAXDURATION:
-+          if ( sc->haveMaxDuration                   ) found = TRUE; break;
-+        case DOT11AUTHENTICATIONRESPONSETIMEOUT:
-+          if ( sc->haveAuthenticationResponseTimeOut ) found = TRUE; break;
-+        case DOT11PRIVACYOPTIONIMPLEMENTED:
-+          if ( sc->havePrivacyOptionImplemented      ) found = TRUE; break;
-+        case DOT11POWERMANAGEMENTMODE:
-+          if ( sc->havePowerManagementMode           ) found = TRUE; break;
-+        case DOT11DESIREDSSID:
-+          if ( sc->haveDesiredSSID                   ) found = TRUE; break;
-+        case DOT11DESIREDBSSTYPE:
-+          if ( sc->haveDesiredBSSType                ) found = TRUE; break;
-+        case DOT11OPERATIONALRATESET:
-+          if ( sc->haveOperationalRateSet            ) found = TRUE; break;
-+        case DOT11BEACONPERIOD: 
-+          if ( sc->haveBeaconPeriod                  ) found = TRUE; break;
-+        case DOT11DTIMPERIOD:
-+          if ( sc->haveDTIMPeriod                    ) found = TRUE; break;
-+        case DOT11ASSOCIATIONRESPONSETIMEOUT:
-+          if ( sc->haveAssociationResponseTimeOut    ) found = TRUE; break;
-+        case DOT11DISASSOCIATEREASON:
-+          if ( sc->disAssociationReason              ) found = TRUE; break;
-+        case DOT11DISASSOCIATESTATION:
-+          if ( sc->haveDisAssociationStation         ) found = TRUE; break;
-+        case DOT11DEAUTHENTICATEREASON:
-+          if ( sc->deAuthenticationReason            ) found = TRUE; break;
-+        case DOT11DEAUTHENTICATESTATION:
-+          if ( sc->haveDeAuthenticationStation       ) found = TRUE; break;
-+        case DOT11AUTHENTICATEFAILSTATUS:
-+          if ( sc->authenticateFailStatus            ) found = TRUE; break;
-+        case DOT11AUTHENTICATEFAILSTATION:
-+          if ( sc->haveAuthenticateFailStation       ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11STATIONID: 
-+//    *write_method = write_dot11StationID;
-+      MACWork[ 0] = sc->stationID [ 0];
-+      MACWork[ 1] = sc->stationID [ 1];
-+      MACWork[ 2] = sc->stationID [ 3];
-+      MACWork[ 3] = sc->stationID [ 4];
-+      MACWork[ 4] = sc->stationID [ 6];
-+      MACWork[ 5] = sc->stationID [ 7];
-+      MACWork[ 6] = sc->stationID [ 9];
-+      MACWork[ 7] = sc->stationID [10];
-+      MACWork[ 8] = sc->stationID [12];
-+      MACWork[ 9] = sc->stationID [13];
-+      MACWork[10] = sc->stationID [15];
-+      MACWork[11] = sc->stationID [16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    case DOT11MEDIUMOCCUPANCYLIMIT:
-+//    *write_method = write_dot11MediumOccupancyLimit;
-+      sc->mediumOccupancyLimit = 5;
-+      return ( UCHAR * ) &sc->mediumOccupancyLimit;
-+
-+    case DOT11CFPOLLABLE:
-+      return ( UCHAR * ) &sc->CFPPollable;
-+
-+    case DOT11CFPPERIOD:
-+//    *write_method = write_dot11CFPPeriod;
-+      return ( UCHAR * ) &sc->CFPPeriod;
-+
-+    case DOT11CFPMAXDURATION:
-+//    *write_method = write_dot11CFPMaxDuration;
-+      return ( UCHAR * ) &sc->maxDuration;
-+
-+    case DOT11AUTHENTICATIONRESPONSETIMEOUT:
-+//    *write_method = write_dot11AuthenticationResponseTimeOut;
-+      return ( UCHAR * ) &sc->authenticationResponseTimeOut;
-+
-+    case DOT11PRIVACYOPTIONIMPLEMENTED:
-+      return ( UCHAR * ) &sc->privacyOptionImplemented;
-+
-+    case DOT11POWERMANAGEMENTMODE:
-+//    *write_method = write_dot11PowerManagementMode;
-+      return ( UCHAR * ) &sc->powerManagementMode;
-+
-+    case DOT11DESIREDSSID:
-+//    *write_method = write_dot11DesiredSSID;
-+      *var_len = strlen ( sc->desiredSSID );
-+      return ( UCHAR * ) sc->desiredSSID;
-+
-+    case DOT11DESIREDBSSTYPE:
-+//    *write_method = write_dot11DesiredBSSType;
-+      return ( UCHAR * ) &sc->desiredBSSType;
-+
-+    case DOT11OPERATIONALRATESET:
-+//    *write_method = write_dot11OperationalRateSet;
-+      *var_len = strlen ( sc->operationalRateSet );
-+      return ( UCHAR * ) sc->operationalRateSet;
-+
-+    case DOT11BEACONPERIOD: 
-+//    *write_method = write_dot11BeaconPeriod;
-+      return ( UCHAR * ) &sc->beaconPeriod;
-+
-+    case DOT11DTIMPERIOD:
-+//    *write_method = write_dot11DTIMPeriod;
-+      return ( UCHAR * ) &sc->DTIMPeriod;
-+
-+    case DOT11ASSOCIATIONRESPONSETIMEOUT:
-+//    *write_method = write_dot11AssociationResponseTimeOut;
-+      return ( UCHAR * ) &sc->associationResponseTimeOut;
-+
-+    case DOT11DISASSOCIATEREASON:
-+      return ( UCHAR * ) &sc->disAssociationReason;
-+
-+    case DOT11DISASSOCIATESTATION:
-+      MACWork[ 0] = sc->disAssociationStation[ 0];
-+      MACWork[ 1] = sc->disAssociationStation[ 1];
-+      MACWork[ 2] = sc->disAssociationStation[ 3];
-+      MACWork[ 3] = sc->disAssociationStation[ 4];
-+      MACWork[ 4] = sc->disAssociationStation[ 6];
-+      MACWork[ 5] = sc->disAssociationStation[ 7];
-+      MACWork[ 6] = sc->disAssociationStation[ 9];
-+      MACWork[ 7] = sc->disAssociationStation[10];
-+      MACWork[ 8] = sc->disAssociationStation[12];
-+      MACWork[ 9] = sc->disAssociationStation[13];
-+      MACWork[10] = sc->disAssociationStation[15];
-+      MACWork[11] = sc->disAssociationStation[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    case DOT11DEAUTHENTICATEREASON:
-+      return ( UCHAR * ) &sc->deAuthenticationReason;
-+
-+    case DOT11DEAUTHENTICATESTATION:
-+      MACWork[ 0] = sc->deAuthenticationStation[ 0];
-+      MACWork[ 1] = sc->deAuthenticationStation[ 1];
-+      MACWork[ 2] = sc->deAuthenticationStation[ 3];
-+      MACWork[ 3] = sc->deAuthenticationStation[ 4];
-+      MACWork[ 4] = sc->deAuthenticationStation[ 6];
-+      MACWork[ 5] = sc->deAuthenticationStation[ 7];
-+      MACWork[ 6] = sc->deAuthenticationStation[ 9];
-+      MACWork[ 7] = sc->deAuthenticationStation[10];
-+      MACWork[ 8] = sc->deAuthenticationStation[12];
-+      MACWork[ 9] = sc->deAuthenticationStation[13];
-+      MACWork[10] = sc->deAuthenticationStation[15];
-+      MACWork[11] = sc->deAuthenticationStation[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    case DOT11AUTHENTICATEFAILSTATUS:
-+      return ( UCHAR * ) &sc->authenticateFailStatus;
-+
-+    case DOT11AUTHENTICATEFAILSTATION:
-+      MACWork[ 0] = sc->authenticateFailStation[ 0];
-+      MACWork[ 1] = sc->authenticateFailStation[ 1];
-+      MACWork[ 2] = sc->authenticateFailStation[ 3];
-+      MACWork[ 3] = sc->authenticateFailStation[ 4];
-+      MACWork[ 4] = sc->authenticateFailStation[ 6];
-+      MACWork[ 5] = sc->authenticateFailStation[ 7];
-+      MACWork[ 6] = sc->authenticateFailStation[ 9];
-+      MACWork[ 7] = sc->authenticateFailStation[10];
-+      MACWork[ 8] = sc->authenticateFailStation[12];
-+      MACWork[ 9] = sc->authenticateFailStation[13];
-+      MACWork[10] = sc->authenticateFailStation[15];
-+      MACWork[11] = sc->authenticateFailStation[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*  var_dot11AuthenticationAlgorithmsTable() -                               *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11AuthenticationAlgorithmsTable (  struct variable *vp,
-+                                          oid     *name,
-+                                          size_t  *length,
-+                                          int     exact,
-+                                          size_t  *var_len,
-+                                          WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &aaList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    aa = ( struct aaTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = aa->ifIndex;
-+    rName[vp->namelen + 1] = aa->authenticationAlgorithmsIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11AUTHENTICATIONALGORITHM:
-+          if ( aa->haveAuthenticationAlgorithm    ) found = TRUE; break;
-+        case DOT11AUTHENTICATIONALGORITHMSENABLE:
-+          if ( aa->authenticationAlgorithmsEnable ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11AUTHENTICATIONALGORITHM:
-+      return ( UCHAR * ) &aa->authenticationAlgorithm;
-+        
-+    case DOT11AUTHENTICATIONALGORITHMSENABLE:
-+//    *write_method = write_dot11AuthenticationAlgorithmsEnable;
-+      return ( UCHAR * ) &aa->authenticationAlgorithmsEnable;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*  var_dot11WEPDefaultKeysTable() -                                         *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11WEPDefaultKeysTable ( struct variable *vp,
-+                                oid     *name,
-+                                size_t  *length,
-+                                int     exact,
-+                                size_t  *var_len,
-+                                WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &dfList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    df = ( struct dfTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = df->ifIndex;
-+    rName[vp->namelen + 1] = df->WEPDefaultKeyIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11WEPDEFAULTKEYVALUE:
-+          if ( df->haveWEPDefaultKeyValue ) found = TRUE; break;
-+      }          
-+    }          
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11WEPDEFAULTKEYVALUE:
-+//    *write_method = write_dot11WEPDefaultKeyValue;
-+      *var_len = strlen ( df->WEPDefaultKeyValue );
-+      return ( UCHAR * ) df->WEPDefaultKeyValue;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*  var_dot11WEPKeyMappingsTable() -                                         *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11WEPKeyMappingsTable ( struct variable *vp,
-+                                oid     *name,
-+                                size_t  *length,
-+                                int     exact,
-+                                size_t  *var_len,
-+                                WriteMethod **write_method)
-+{
-+  static char MACWork[17];
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &kmList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    km = ( struct kmTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = km->ifIndex;
-+    rName[vp->namelen + 1] = km->WEPKeyMappingIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11WEPKEYMAPPINGADDRESS:
-+          if ( km->haveWEPKeyMappingAddress ) found = TRUE; break;
-+        case DOT11WEPKEYMAPPINGWEPON:
-+          if ( km->haveWEPKeyMappingWEPOn   ) found = TRUE; break;
-+        case DOT11WEPKEYMAPPINGVALUE:
-+          if ( km->haveWEPKeyMappingValue   ) found = TRUE; break;
-+        case DOT11WEPKEYMAPPINGSTATUS:
-+          if ( km->haveWEPKeyMappingStatus  ) found = TRUE; break; 
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11WEPKEYMAPPINGADDRESS:
-+//    *write_method = write_dot11WEPKeyMappingAddress;
-+      MACWork[ 0] = km->WEPKeyMappingAddress[ 0];
-+      MACWork[ 1] = km->WEPKeyMappingAddress[ 1];
-+      MACWork[ 2] = km->WEPKeyMappingAddress[ 3];
-+      MACWork[ 3] = km->WEPKeyMappingAddress[ 4];
-+      MACWork[ 4] = km->WEPKeyMappingAddress[ 6];
-+      MACWork[ 5] = km->WEPKeyMappingAddress[ 7];
-+      MACWork[ 6] = km->WEPKeyMappingAddress[ 9];
-+      MACWork[ 7] = km->WEPKeyMappingAddress[10];
-+      MACWork[ 8] = km->WEPKeyMappingAddress[12];
-+      MACWork[ 9] = km->WEPKeyMappingAddress[13];
-+      MACWork[10] = km->WEPKeyMappingAddress[15];
-+      MACWork[11] = km->WEPKeyMappingAddress[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    case DOT11WEPKEYMAPPINGWEPON:
-+//    *write_method = write_dot11WEPKeyMappingWEPOn;
-+      return ( UCHAR * ) &km->WEPKeyMappingWEPOn;
-+
-+    case DOT11WEPKEYMAPPINGVALUE:
-+//    *write_method = write_dot11WEPKeyMappingValue;
-+      *var_len = strlen ( km->WEPKeyMappingValue );
-+      return ( UCHAR * ) km->WEPKeyMappingValue;
-+
-+    case DOT11WEPKEYMAPPINGSTATUS:
-+//    *write_method = write_dot11WEPKeyMappingStatus;
-+      return ( UCHAR * ) &km->WEPKeyMappingStatus;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11PrivacyTable() -                                               *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PrivacyTable ( struct variable *vp,
-+                        oid     *name,
-+                        size_t  *length,
-+                        int     exact,
-+                        size_t  *var_len,
-+                        WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &prList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pr = ( struct prTbl_data * ) np->data;
-+    rName[vp->namelen] = pr->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11PRIVACYINVOKED:
-+          if ( pr->havePrivacyInvoked      ) found = TRUE; break;
-+        case DOT11WEPDEFAULTKEYID:
-+          if ( pr->haveWEPDefaultKeyID     ) found = TRUE; break;
-+        case DOT11WEPKEYMAPPINGLENGTH:
-+          if ( pr->haveWEPKeyMappingLength ) found = TRUE; break;
-+        case DOT11EXCLUDEUNENCRYPTED:
-+          if ( pr->haveExcludeUnencrypted  ) found = TRUE; break;
-+        case DOT11WEPICVERRORCOUNT:
-+          if ( pr->haveWEPICVErrorCount    ) found = TRUE; break;
-+        case DOT11WEPEXCLUDEDCOUNT:
-+          if ( pr->haveWEPExcludedCount    ) found = TRUE; break;
-+      }      
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11PRIVACYINVOKED:
-+//    *write_method = write_dot11PrivacyInvoked;
-+      return ( UCHAR * ) &pr->privacyInvoked;
-+
-+    case DOT11WEPDEFAULTKEYID:
-+//    *write_method = write_dot11WEPDefaultKeyID;
-+      return ( UCHAR * ) &pr->WEPDefaultKeyID;
-+
-+    case DOT11WEPKEYMAPPINGLENGTH:
-+//    *write_method = write_dot11WEPKeyMappingLength;
-+      return ( UCHAR * ) &pr->WEPKeyMappingLength;
-+
-+    case DOT11EXCLUDEUNENCRYPTED:
-+//    *write_method = write_dot11ExcludeUnencrypted;
-+      return ( UCHAR * ) &pr->excludeUnencrypted;
-+
-+    case DOT11WEPICVERRORCOUNT:
-+      return ( UCHAR * ) &pr->WEPICVErrorCount;
-+        
-+    case DOT11WEPEXCLUDEDCOUNT:
-+      return ( UCHAR * ) &pr->WEPExcludedCount;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11OperationTable() -                                             *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11OperationTable ( struct variable *vp,
-+                          oid     *name,
-+                          size_t  *length,
-+                          int     exact,
-+                          size_t  *var_len,
-+                          WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+  static char MACWork[17];
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &opList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    op = ( struct opTbl_data * ) np->data;
-+    rName[vp->namelen] = op->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+
-+      switch ( vp->magic ) {      // found requested OID, now check for requested variable
-+        case DOT11MACADDRESS:             
-+          if ( op->haveMACAddress              ) found = TRUE; break;
-+        case DOT11RTSTHRESHOLD:           
-+          if ( op->haveRTSThreshold            ) found = TRUE; break;
-+        case DOT11SHORTRETRYLIMIT: 
-+          if ( op->haveShortRetryLimit         ) found = TRUE; break;
-+        case DOT11LONGRETRYLIMIT:
-+          if ( op->haveLongRetryLimit          ) found = TRUE; break;
-+        case DOT11FRAGMENTATIONTHRESHOLD: 
-+          if ( op->haveFragmentationThreshold  ) found = TRUE; break;
-+        case DOT11MAXTRANSMITMSDULIFETIME: 
-+          if ( op->haveMaxTransmitMSDULifetime ) found = TRUE; break;
-+        case DOT11MAXRECEIVELIFETIME:
-+          if ( op->haveMaxReceiveLifetime      ) found = TRUE; break;
-+        case DOT11MANUFACTURERID:
-+          if ( op->haveManufacturerID          ) found = TRUE; break;
-+        case DOT11PRODUCTID:
-+          if ( op->haveProductID               ) found = TRUE; break;
-+      }
-+    }
-+    if ( found ) 
-+      break;
-+  }
-+
-+  if ( !found )
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11MACADDRESS:
-+      MACWork[ 0] = op->MACAddress[ 0];
-+      MACWork[ 1] = op->MACAddress[ 1];
-+      MACWork[ 2] = op->MACAddress[ 3];
-+      MACWork[ 3] = op->MACAddress[ 4];
-+      MACWork[ 4] = op->MACAddress[ 6];
-+      MACWork[ 5] = op->MACAddress[ 7];
-+      MACWork[ 6] = op->MACAddress[ 9];
-+      MACWork[ 7] = op->MACAddress[10];
-+      MACWork[ 8] = op->MACAddress[12];
-+      MACWork[ 9] = op->MACAddress[13];
-+      MACWork[10] = op->MACAddress[15];
-+      MACWork[11] = op->MACAddress[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+        
-+    case DOT11RTSTHRESHOLD:
-+//    *write_method = write_dot11RTSThreshold;
-+      return ( UCHAR * ) &op->RTSThreshold;
-+
-+    case DOT11SHORTRETRYLIMIT:
-+//    *write_method = write_dot11ShortRetryLimit;
-+      return ( UCHAR * ) &op->shortRetryLimit;
-+
-+    case DOT11LONGRETRYLIMIT:
-+//    *write_method = write_dot11LongRetryLimit;
-+      return ( UCHAR * ) &op->longRetryLimit;
-+
-+    case DOT11FRAGMENTATIONTHRESHOLD:
-+//    *write_method = write_dot11FragmentationThreshold;
-+      return ( UCHAR * ) &op->fragmentationThreshold;
-+
-+    case DOT11MAXTRANSMITMSDULIFETIME:
-+//    *write_method = write_dot11MaxTransmitMSDULifetime;
-+      return ( UCHAR * ) &op->maxTransmitMSDULifetime;
-+
-+    case DOT11MAXRECEIVELIFETIME:
-+//    *write_method = write_dot11MaxReceiveLifetime;
-+      return ( UCHAR * ) &op->maxReceiveLifetime;
-+
-+    case DOT11MANUFACTURERID:
-+      *var_len = strlen ( op->manufacturerID );
-+      return ( UCHAR * ) op->manufacturerID;
-+
-+    case DOT11PRODUCTID:
-+      *var_len = strlen ( op->productID );
-+      return ( UCHAR * ) op->productID;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11CountersTable() -                                              *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11CountersTable(struct variable *vp,
-+          oid     *name,
-+          size_t  *length,
-+          int     exact,
-+          size_t  *var_len,
-+          WriteMethod **write_method)
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &coList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    co = ( struct coTbl_data * ) np->data;
-+    rName[vp->namelen] = co->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11TRANSMITTEDFRAGMENTCOUNT:
-+          if ( co->haveTransmittedFragmentCount    ) found = TRUE; break;
-+        case DOT11MULTICASTTRANSMITTEDFRAMECOUNT:
-+          if ( co->haveTransmittedFrameCount       ) found = TRUE; break;
-+        case DOT11FAILEDCOUNT:
-+          if ( co->haveFailedCount                 ) found = TRUE; break;
-+        case DOT11RETRYCOUNT:
-+          if ( co->haveRetryCount                  ) found = TRUE; break;
-+        case DOT11MULTIPLERETRYCOUNT:
-+          if ( co->haveMultipleRetryCount          ) found = TRUE; break;
-+        case DOT11FRAMEDUPLICATECOUNT:
-+          if ( co->haveFrameDuplicateCount         ) found = TRUE; break;
-+        case DOT11RTSSUCCESSCOUNT:
-+          if ( co->haveRTSSuccessCount             ) found = TRUE; break;
-+        case DOT11RTSFAILURECOUNT:
-+          if ( co->haveRTSFailureCount             ) found = TRUE; break;
-+        case DOT11ACKFAILURECOUNT:
-+          if ( co->haveACKFailureCount             ) found = TRUE; break;
-+        case DOT11RECEIVEDFRAGMENTCOUNT:
-+          if ( co->haveReceivedFragmentCount       ) found = TRUE; break;
-+        case DOT11MULTICASTRECEIVEDFRAMECOUNT:
-+          if ( co->haveMulticastReceivedFrameCount ) found = TRUE; break;
-+        case DOT11FCSERRORCOUNT:
-+          if ( co->haveFCSErrorCount               ) found = TRUE; break;
-+        case DOT11TRANSMITTEDFRAMECOUNT:
-+          if ( co->haveTransmittedFrameCount       ) found = TRUE; break;
-+        case DOT11WEPUNDECRYPTABLECOUNT:
-+          if ( co->haveWEPUndecryptableCount       ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11TRANSMITTEDFRAGMENTCOUNT:       return ( UCHAR * ) &co->transmittedFragmentCount;
-+    case DOT11MULTICASTTRANSMITTEDFRAMECOUNT: return ( UCHAR * ) &co->transmittedFrameCount;
-+    case DOT11FAILEDCOUNT:                    return ( UCHAR * ) &co->failedCount;
-+    case DOT11RETRYCOUNT:                     return ( UCHAR * ) &co->retryCount;
-+    case DOT11MULTIPLERETRYCOUNT:             return ( UCHAR * ) &co->multipleRetryCount;
-+    case DOT11FRAMEDUPLICATECOUNT:            return ( UCHAR * ) &co->frameDuplicateCount;
-+    case DOT11RTSSUCCESSCOUNT:                return ( UCHAR * ) &co->RTSSuccessCount;
-+    case DOT11RTSFAILURECOUNT:                return ( UCHAR * ) &co->RTSFailureCount;
-+    case DOT11ACKFAILURECOUNT:                return ( UCHAR * ) &co->ACKFailureCount;
-+    case DOT11RECEIVEDFRAGMENTCOUNT:          return ( UCHAR * ) &co->receivedFragmentCount;
-+    case DOT11MULTICASTRECEIVEDFRAMECOUNT:    return ( UCHAR * ) &co->multicastReceivedFrameCount;
-+    case DOT11FCSERRORCOUNT:                  return ( UCHAR * ) &co->FCSErrorCount;
-+    case DOT11TRANSMITTEDFRAMECOUNT:          return ( UCHAR * ) &co->transmittedFrameCount;
-+    case DOT11WEPUNDECRYPTABLECOUNT:          return ( UCHAR * ) &co->WEPUndecryptableCount;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11GroupAddressesTable() -                                        *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11GroupAddressesTable(struct variable *vp,
-+          oid     *name,
-+          size_t  *length,
-+          int     exact,
-+          size_t  *var_len,
-+          WriteMethod **write_method)
-+{
-+  static char MACWork[17];
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &gaList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    ga = ( struct gaTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = ga->ifIndex;
-+    rName[vp->namelen + 1] = ga->groupAddressesIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11ADDRESS:
-+          if ( ga->haveAddress              ) found = TRUE; break;
-+        case DOT11GROUPADDRESSESSTATUS:
-+          if ( ga->haveGroupAddressesStatus ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11ADDRESS:
-+//    *write_method = write_dot11Address;
-+      MACWork[ 0] = ga->address[ 0];
-+      MACWork[ 1] = ga->address[ 1];
-+      MACWork[ 2] = ga->address[ 3];
-+      MACWork[ 3] = ga->address[ 4];
-+      MACWork[ 4] = ga->address[ 6];
-+      MACWork[ 5] = ga->address[ 7];
-+      MACWork[ 6] = ga->address[ 9];
-+      MACWork[ 7] = ga->address[10];
-+      MACWork[ 8] = ga->address[12];
-+      MACWork[ 9] = ga->address[13];
-+      MACWork[10] = ga->address[15];
-+      MACWork[11] = ga->address[16];
-+      MACWork[12] = '\0';
-+      *var_len = 6;
-+      return ( UCHAR * ) htob ( MACWork );
-+
-+    case DOT11GROUPADDRESSESSTATUS:
-+//    *write_method = write_dot11GroupAddressesStatus;
-+      return ( UCHAR * ) &ga->groupAddressesStatus;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11ResourceInfoTable() -                                          *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11ResourceInfoTable ( struct variable *vp,
-+                              oid     *name,
-+                              size_t  *length,
-+                              int     exact,
-+                              size_t  *var_len,
-+                              WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &riList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    ri = ( struct riTbl_data * ) np->data;
-+    rName[vp->namelen] = ri->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11MANUFACTUREROUI:
-+          if ( ri->haveManufacturerOUI            ) found = TRUE; break;
-+        case DOT11MANUFACTURERNAME:
-+          if ( ri->haveManufacturerName           ) found = TRUE; break;
-+        case DOT11MANUFACTURERPRODUCTNAME:
-+          if ( ri->haveManufacturerProductName    ) found = TRUE; break;
-+        case DOT11MANUFACTURERPRODUCTVERSION:
-+          if ( ri->haveManufacturerProductVersion ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11MANUFACTUREROUI:
-+      *var_len = strlen ( ri->manufacturerOUI );
-+      return ( UCHAR * ) ri->manufacturerOUI;
-+        
-+    case DOT11MANUFACTURERNAME:
-+      *var_len = strlen ( ri->manufacturerName );
-+      return ( UCHAR * ) ri->manufacturerName;
-+        
-+    case DOT11MANUFACTURERPRODUCTNAME:
-+      *var_len = strlen ( ri->manufacturerProductName );
-+      return ( UCHAR * ) ri->manufacturerProductName;
-+        
-+    case DOT11MANUFACTURERPRODUCTVERSION:
-+      *var_len = strlen ( ri->manufacturerProductVersion );
-+      return ( UCHAR * ) ri->manufacturerProductVersion;
-+        
-+    default: 
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11PhyOperationTable() -                                          *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyOperationTable ( struct variable *vp,
-+                              oid     *name,
-+                              size_t  *length,
-+                              int     exact,
-+                              size_t  *var_len,
-+                              WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &poList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    po = ( struct poTbl_data * ) np->data;
-+    rName[vp->namelen] = po->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11PHYTYPE:
-+          if ( po->havePHYType          ) found = TRUE; break;
-+        case DOT11CURRENTREGDOMAIN:
-+          if ( po->haveCurrentRegDomain ) found = TRUE; break;
-+        case DOT11TEMPTYPE:
-+          if ( po->haveTempType         ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11PHYTYPE:
-+      return ( UCHAR * ) &po->PHYType;
-+        
-+    case DOT11CURRENTREGDOMAIN:
-+//    *write_method = write_dot11CurrentRegDomain;
-+      return ( UCHAR * ) &po->currentRegDomain;
-+
-+    case DOT11TEMPTYPE:
-+      return ( UCHAR * ) &po->tempType;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11PhyAntennaTable() -                                            *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyAntennaTable ( struct variable *vp,
-+                            oid     *name,
-+                            size_t  *length,
-+                            int     exact,
-+                            size_t  *var_len,
-+                            WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &paList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pa = ( struct paTbl_data * ) np->data;
-+    rName[vp->namelen] = pa->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11CURRENTTXANTENNA:
-+          if ( pa->haveCurrentTxAntenna ) found = TRUE; break;
-+        case DOT11DIVERSITYSUPPORT:
-+          if ( pa->haveDiversitySupport ) found = TRUE; break;
-+        case DOT11CURRENTRXANTENNA:
-+          if ( pa->haveCurrentRxAntenna ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11CURRENTTXANTENNA:
-+//    *write_method = write_dot11CurrentTxAntenna;
-+      return ( UCHAR * ) &pa->currentTxAntenna;
-+
-+    case DOT11DIVERSITYSUPPORT:
-+      return ( UCHAR * ) &pa->diversitySupport;
-+        
-+    case DOT11CURRENTRXANTENNA:
-+//    *write_method = write_dot11CurrentRxAntenna;
-+      return ( UCHAR * ) &pa->currentRxAntenna;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*   var_dot11PhyTxPowerTable() -                                            *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyTxPowerTable ( struct variable *vp,
-+                            oid     *name,
-+                            size_t  *length,
-+                            int     exact,
-+                            size_t  *var_len,
-+                            WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &ptList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pt = ( struct ptTbl_data * ) np->data;
-+    rName[vp->namelen] = pt->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11NUMBERSUPPORTEDPOWERLEVELS:
-+          if ( pt->haveNumberSupportedPowerLevels ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL1:
-+          if ( pt->haveTxPowerLevel1   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL2:
-+          if ( pt->haveTxPowerLevel2   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL3:
-+          if ( pt->haveTxPowerLevel3   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL4:
-+          if ( pt->haveTxPowerLevel4   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL5:
-+          if ( pt->haveTxPowerLevel5   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL6:
-+          if ( pt->haveTxPowerLevel6   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL7:
-+          if ( pt->haveTxPowerLevel7   ) found = TRUE; break;
-+        case DOT11TXPOWERLEVEL8:
-+          if ( pt->haveTxPowerLevel8   ) found = TRUE; break;
-+        case DOT11CURRENTTXPOWERLEVEL:
-+          if ( pt->currentTxPowerLevel ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11NUMBERSUPPORTEDPOWERLEVELS: 
-+      return ( UCHAR * ) &pt->numberSupportedPowerLevels;
-+
-+    case DOT11TXPOWERLEVEL1: return ( UCHAR * ) &pt->TxPowerLevel1;
-+    case DOT11TXPOWERLEVEL2: return ( UCHAR * ) &pt->TxPowerLevel2;
-+    case DOT11TXPOWERLEVEL3: return ( UCHAR * ) &pt->TxPowerLevel3;
-+    case DOT11TXPOWERLEVEL4: return ( UCHAR * ) &pt->TxPowerLevel4;
-+    case DOT11TXPOWERLEVEL5: return ( UCHAR * ) &pt->TxPowerLevel5;
-+    case DOT11TXPOWERLEVEL6: return ( UCHAR * ) &pt->TxPowerLevel6;
-+    case DOT11TXPOWERLEVEL7: return ( UCHAR * ) &pt->TxPowerLevel7;
-+    case DOT11TXPOWERLEVEL8: return ( UCHAR * ) &pt->TxPowerLevel8;
-+        
-+    case DOT11CURRENTTXPOWERLEVEL:
-+//    *write_method = write_dot11CurrentTxPowerLevel;
-+      return ( UCHAR * ) &pt->currentTxPowerLevel;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11PhyFHSSTable() -                                             *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyFHSSTable ( struct variable *vp,
-+                        oid     *name,
-+                        size_t  *length,
-+                        int     exact,
-+                        size_t  *var_len,
-+                        WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &pfList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pf = ( struct pfTbl_data * ) np->data;
-+    rName[vp->namelen] = pf->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11HOPTIME:
-+          if ( pf->haveHopTime              ) found = TRUE; break;
-+        case DOT11CURRENTCHANNELNUMBER:
-+          if ( pf->haveCurrentChannelNumber ) found = TRUE; break;
-+        case DOT11MAXDWELLTIME:
-+          if ( pf->haveMaxDwellTime         ) found = TRUE; break;
-+        case DOT11CURRENTDWELLTIME:
-+          if ( pf->haveCurrentDwellTime     ) found = TRUE; break;
-+        case DOT11CURRENTSET:
-+          if ( pf->haveCurrentSet           ) found = TRUE; break;
-+        case DOT11CURRENTPATTERN:
-+          if ( pf->haveCurrentPattern       ) found = TRUE; break;
-+        case DOT11CURRENTINDEX:
-+          if ( pf->haveCurrentIndex         ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11HOPTIME:
-+      return ( UCHAR * ) &pf->hopTime;
-+        
-+    case DOT11CURRENTCHANNELNUMBER:
-+//    *write_method = write_dot11CurrentChannelNumber;
-+      return ( UCHAR * ) &pf->currentChannelNumber;
-+
-+    case DOT11MAXDWELLTIME:
-+      return ( UCHAR * ) &pf->maxDwellTime;
-+        
-+    case DOT11CURRENTDWELLTIME:
-+//    *write_method = write_dot11CurrentDwellTime;
-+      return ( UCHAR * ) &pf->currentDwellTime;
-+
-+    case DOT11CURRENTSET:
-+//    *write_method = write_dot11CurrentSet;
-+      return ( UCHAR * ) &pf->currentSet;
-+
-+    case DOT11CURRENTPATTERN:
-+//    *write_method = write_dot11CurrentPattern;
-+      return ( UCHAR * ) &pf->currentPattern;
-+
-+    case DOT11CURRENTINDEX:
-+//    *write_method = write_dot11CurrentIndex;
-+      return ( UCHAR * ) &pf->currentIndex;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11PhyDSSSTable() -                                             *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyDSSSTable ( struct variable *vp,
-+                        oid     *name,
-+                        size_t  *length,
-+                        int     exact,
-+                        size_t  *var_len,
-+                        WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &pdList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pd = ( struct pdTbl_data * ) np->data;
-+    rName[vp->namelen] = pd->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11CURRENTCHANNEL:
-+          if ( pd->haveCurrentChannel   ) found = TRUE; break;
-+        case DOT11CCAMODESUPPORTED:
-+          if ( pd->haveCCAModeSupported ) found = TRUE; break;
-+        case DOT11CURRENTCCAMODE:
-+          if ( pd->haveCurrentCCAMode   ) found = TRUE; break;
-+        case DOT11EDTHRESHOLD:
-+          if ( pd->haveEDThreshold      ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11CURRENTCHANNEL:
-+//    *write_method = write_dot11CurrentChannel;
-+      return ( UCHAR * ) &pd->currentChannel;
-+
-+    case DOT11CCAMODESUPPORTED:
-+      return ( UCHAR * ) &pd->CCAModeSupported;
-+        
-+    case DOT11CURRENTCCAMODE:
-+//    *write_method = write_dot11CurrentCCAMode;
-+      return ( UCHAR * ) &pd->currentCCAMode;
-+
-+    case DOT11EDTHRESHOLD:
-+//    *write_method = write_dot11EDThreshold;
-+      return ( UCHAR * ) &pd->EDThreshold;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11PhyIRTable() -                                             *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11PhyIRTable ( struct variable *vp,
-+                      oid     *name,
-+                      size_t  *length,
-+                      int     exact,
-+                      size_t  *var_len,
-+                      WriteMethod **write_method)
-+{
-+
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &piList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    pi = ( struct piTbl_data * ) np->data;
-+    rName[vp->namelen] = pi->ifIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11CCAWATCHDOGTIMERMAX:
-+          if ( pi->CCAWatchdogTimerMax ) found = TRUE; break;
-+        case DOT11CCAWATCHDOGCOUNTMAX:
-+          if ( pi->CCAWatchdogCountMax ) found = TRUE; break;
-+        case DOT11CCAWATCHDOGTIMERMIN:
-+          if ( pi->CCAWatchdogTimerMin ) found = TRUE; break;
-+        case DOT11CCAWATCHDOGCOUNTMIN:
-+          if ( pi->CCAWatchdogCountMin ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
-+  *length = vp->namelen + 1;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11CCAWATCHDOGTIMERMAX:
-+//    *write_method = write_dot11CCAWatchdogTimerMax;
-+      return ( UCHAR * ) &pi->CCAWatchdogTimerMax;
-+
-+    case DOT11CCAWATCHDOGCOUNTMAX:
-+//   *write_method = write_dot11CCAWatchdogCountMax;
-+      return ( UCHAR * ) &pi->CCAWatchdogCountMax;
-+
-+    case DOT11CCAWATCHDOGTIMERMIN:
-+//    *write_method = write_dot11CCAWatchdogTimerMin;
-+      return ( UCHAR * ) &pi->CCAWatchdogTimerMin;
-+
-+    case DOT11CCAWATCHDOGCOUNTMIN:
-+//    *write_method = write_dot11CCAWatchdogCountMin;
-+      return ( UCHAR * ) &pi->CCAWatchdogCountMin;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11RegDomainsSupportedTable() -                                 *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11RegDomainsSupportedTable ( struct variable *vp,
-+                                    oid     *name,
-+                                    size_t  *length,
-+                                    int     exact,
-+                                    size_t  *var_len,
-+                                    WriteMethod **write_method)
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &rdList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    rd = ( struct rdTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = rd->ifIndex;
-+    rName[vp->namelen + 1] = rd->regDomainsSupportIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11REGDOMAINSSUPPORTVALUE:
-+          if ( rd->haveRegDomainsSupportValue ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11REGDOMAINSSUPPORTVALUE:
-+      return ( UCHAR * ) &rd->regDomainsSupportValue;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11AntennasListTable() -                                        *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11AntennasListTable(struct variable *vp,
-+          oid     *name,
-+          size_t  *length,
-+          int     exact,
-+          size_t  *var_len,
-+          WriteMethod **write_method)
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &alList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    al = ( struct alTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = al->ifIndex;
-+    rName[vp->namelen + 1] = al->antennaListIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11SUPPORTEDTXANTENNA:
-+          if ( al->haveSupportedTxAntenna   ) found = TRUE; break;
-+        case DOT11SUPPORTEDRXANTENNA:
-+          if ( al->haveSupportedRxAntenna   ) found = TRUE; break;
-+        case DOT11DIVERSITYSELECTIONRX:
-+          if ( al->haveDiversitySelectionRx ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11SUPPORTEDTXANTENNA:
-+//    *write_method = write_dot11SupportedTxAntenna;
-+      return ( UCHAR * ) &al->supportedTxAntenna;
-+
-+    case DOT11SUPPORTEDRXANTENNA:
-+//    *write_method = write_dot11SupportedRxAntenna;
-+      return ( UCHAR * ) &al->supportedRxAntenna;
-+
-+    case DOT11DIVERSITYSELECTIONRX:
-+//    *write_method = write_dot11DiversitySelectionRx;
-+      return ( UCHAR * ) &al->diversitySelectionRx;
-+
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11SupportedDataRatesTxTable() -                                *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11SupportedDataRatesTxTable ( struct variable *vp,
-+                                      oid     *name,
-+                                      size_t  *length,
-+                                      int     exact,
-+                                      size_t  *var_len,
-+                                      WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &rtList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    rt = ( struct rtTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = rt->ifIndex;
-+    rName[vp->namelen + 1] = rt->supportedDataRatesTxIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+         case DOT11SUPPORTEDDATARATESTXVALUE:
-+          if ( rt->haveSupportedDataRatesTxValue ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11SUPPORTEDDATARATESTXVALUE:
-+      return ( UCHAR * ) &rt->supportedDataRatesTxValue;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*     var_dot11SupportedDataRatesRxTable() -                                *
-+*                                                                           *
-+****************************************************************************/
-+unsigned char *
-+var_dot11SupportedDataRatesRxTable ( struct variable *vp,
-+                                      oid     *name,
-+                                      size_t  *length,
-+                                      int     exact,
-+                                      size_t  *var_len,
-+                                      WriteMethod **write_method )
-+{
-+  int found = FALSE;
-+  oid rName [ MAX_OID_LEN ];                            // OID to be returned
-+
-+  loadTables();
-+  memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
-+  for ( np = LIST_FIRST ( &rrList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    rr = ( struct rrTbl_data * ) np->data;
-+    rName[vp->namelen + 0] = rr->ifIndex;
-+    rName[vp->namelen + 1] = rr->supportedDataRatesRxIndex;
-+    if ((  exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
-+        ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) >  0 ))) {
-+      switch ( vp->magic ) {
-+        case DOT11SUPPORTEDDATARATESRXVALUE:
-+          if ( rr->haveSupportedDataRatesRxValue ) found = TRUE; break;
-+      }
-+    }
-+    if ( found )
-+      break;
-+  }
-+
-+  if ( !found ) 
-+    return NULL;
-+
-+  memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
-+  *length = vp->namelen + 2;
-+  *var_len = sizeof ( long );
-+  *write_method = NULL;
-+
-+  switch ( vp->magic ) {
-+
-+    case DOT11SUPPORTEDDATARATESRXVALUE:
-+      return ( UCHAR * ) &rr->supportedDataRatesRxValue;
-+        
-+    default:
-+      ERROR_MSG ( "" );
-+  }
-+
-+  return NULL;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11StationID(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11StationID not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )) {
-+        fprintf ( stderr,"write to dot11StationID: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11MediumOccupancyLimit(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11MediumOccupancyLimit not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11MediumOccupancyLimit: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CFPPeriod(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CFPPeriod not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CFPPeriod: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CFPMaxDuration(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CFPMaxDuration not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CFPMaxDuration: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11AuthenticationResponseTimeOut(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11AuthenticationResponseTimeOut not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11AuthenticationResponseTimeOut: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11PowerManagementMode(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11PowerManagementMode not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )) {
-+        fprintf ( stderr, "write to dot11PowerManagementMode: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11DesiredSSID(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11DesiredSSID not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )){
-+        fprintf ( stderr, "write to dot11DesiredSSID: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11DesiredBSSType(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11DesiredBSSType not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11DesiredBSSType: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11OperationalRateSet(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11OperationalRateSet not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )){
-+        fprintf ( stderr, "write to dot11OperationalRateSet: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11BeaconPeriod(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11BeaconPeriod not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11BeaconPeriod: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11DTIMPeriod(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11DTIMPeriod not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11DTIMPeriod: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11AssociationResponseTimeOut(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11AssociationResponseTimeOut not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )) {
-+        fprintf ( stderr,"write to dot11AssociationResponseTimeOut: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11AuthenticationAlgorithmsEnable(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11AuthenticationAlgorithmsEnable not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11AuthenticationAlgorithmsEnable: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPDefaultKeyValue(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11WEPDefaultKeyValue not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )){
-+        fprintf ( stderr,"write to dot11WEPDefaultKeyValue: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPKeyMappingAddress(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingAddress not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )) {
-+        fprintf ( stderr,"write to dot11WEPKeyMappingAddress: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPKeyMappingWEPOn(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingWEPOn not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11WEPKeyMappingWEPOn: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPKeyMappingValue(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingValue not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingValue: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPKeyMappingStatus(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingStatus not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11WEPKeyMappingStatus: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11PrivacyInvoked(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11PrivacyInvoked not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11PrivacyInvoked: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPDefaultKeyID(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11WEPDefaultKeyID not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11WEPDefaultKeyID: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11WEPKeyMappingLength(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11WEPKeyMappingLength not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11WEPKeyMappingLength: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11ExcludeUnencrypted(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11ExcludeUnencrypted not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11ExcludeUnencrypted: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11RTSThreshold(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ){
-+        fprintf ( stderr, "write to dot11RTSThreshold not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11RTSThreshold: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11ShortRetryLimit(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11ShortRetryLimit not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11ShortRetryLimit: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11LongRetryLimit(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11LongRetryLimit not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11LongRetryLimit: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11FragmentationThreshold(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11FragmentationThreshold not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11FragmentationThreshold: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11MaxTransmitMSDULifetime(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11MaxTransmitMSDULifetime not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11MaxTransmitMSDULifetime: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11MaxReceiveLifetime(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11MaxReceiveLifetime not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11MaxReceiveLifetime: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11Address(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static unsigned char string[SPRINT_MAX_LEN];
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_OCTET_STR ) {
-+        fprintf ( stderr, "write to dot11Address not ASN_OCTET_STR\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( string )){
-+        fprintf ( stderr, "write to dot11Address: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11GroupAddressesStatus(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11GroupAddressesStatus not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11GroupAddressesStatus: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentRegDomain(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentRegDomain not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentRegDomain: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentTxAntenna(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentTxAntenna not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentTxAntenna: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentRxAntenna(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentRxAntenna not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11CurrentRxAntenna: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentTxPowerLevel(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentTxPowerLevel not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentTxPowerLevel: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentChannelNumber(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentChannelNumber not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11CurrentChannelNumber: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentDwellTime(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentDwellTime not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentDwellTime: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentSet(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentSet not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentSet: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentPattern(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentPattern not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentPattern: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentIndex(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentIndex not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentIndex: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentChannel(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentChannel not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CurrentChannel: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CurrentCCAMode(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CurrentCCAMode not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11CurrentCCAMode: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11EDThreshold(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11EDThreshold not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11EDThreshold: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CCAWatchdogTimerMax(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CCAWatchdogTimerMax not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CCAWatchdogTimerMax: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CCAWatchdogCountMax(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CCAWatchdogCountMax not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CCAWatchdogCountMax: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CCAWatchdogTimerMin(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CCAWatchdogTimerMin not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CCAWatchdogTimerMin: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11CCAWatchdogCountMin(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11CCAWatchdogCountMin not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11CCAWatchdogCountMin: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11SupportedTxAntenna(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11SupportedTxAntenna not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11SupportedTxAntenna: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11SupportedRxAntenna(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11SupportedRxAntenna not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr,"write to dot11SupportedRxAntenna: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+int
-+write_dot11DiversitySelectionRx(int      action,
-+            u_char   *var_val,
-+            u_char   var_val_type,
-+            size_t   var_val_len,
-+            u_char   *statP,
-+            oid      *name,
-+            size_t   name_len)
-+{
-+  static long *long_ret;
-+  int size;
-+
-+  switch ( action ) {
-+
-+    case RESERVE1:
-+      if ( var_val_type != ASN_INTEGER ) {
-+        fprintf ( stderr, "write to dot11DiversitySelectionRx not ASN_INTEGER\n" );
-+        return SNMP_ERR_WRONGTYPE;
-+      }
-+      if ( var_val_len > sizeof ( long_ret )){
-+        fprintf ( stderr, "write to dot11DiversitySelectionRx: bad length\n" );
-+        return SNMP_ERR_WRONGLENGTH;
-+      }
-+      break;
-+
-+    case RESERVE2:
-+    case FREE:
-+    case ACTION:
-+    case UNDO:
-+      break;
-+
-+    case COMMIT:
-+      break;
-+  }
-+
-+  return SNMP_ERR_NOERROR;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                      loadTables() - Load the Tables                       *
-+*                                                                           *
-+****************************************************************************/
-+static void loadTables()
-+{
-+  int skfd;                               // generic raw socket desc
-+  struct iwreq wrq;                       // ioctl request structure
-+  struct ifreq ifr;
-+  struct timeval et;                      // elapsed time
-+  struct wireless_info info;              // workarea for wireless ioctl information
-+  FILE *fp;
-+  char  bfr[1024], ifName[1024];
-+  char *s, *t;
-+
-+  gettimeofday ( &et, ( struct timezone * ) 0 );  // get time-of-day
-+  if ( et.tv_sec < lastLoad + MINLOADFREQ )       // only reload so often
-+    return;
-+  lastLoad = et.tv_sec;
-+
-+  skfd = openSocket();                            // open socket
-+  if ( skfd < 0 ) {
-+    syslog ( LOG_ERR, "SNMP ieee802dot11.loadTables() - %s\n", "socket open failure" );
-+    return;
-+  }
-+
-+  flushLists();
-+
-+  // find interfaces in /proc/net/dev and find the wireless interfaces
-+  fp = fopen ( PROC_NET_DEV, "r" );
-+  if ( fp ) {
-+    while ( fgets ( bfr, sizeof ( bfr ), fp )) {
-+      if ( strstr ( bfr, ":" )) {
-+        s = bfr; t = ifName;
-+        while ( isspace ( *s ))                     // discard white space
-+          *s++;
-+        while ( *s != ':' )                         // get interface name
-+          *t++ = *s++;
-+        *t = '\0';
-+
-+        // verify as a wireless device
-+        memset (( char * ) &info, 0, sizeof ( struct wireless_info ));
-+        strncpy ( wrq.ifr_name, ifName, IFNAMSIZ );
-+        if ( ioctl ( skfd, SIOCGIWNAME, &wrq ) >= 0 ) {
-+          printf ( "%s ifName: %s\n", "loadTables() -", ifName );
-+          initStructs();
-+          loadWiExt( skfd, ifName, &info );
-+          displayWiExt ( info );
-+          load80211Structs ( skfd, ifName, &info );
-+        }
-+      }
-+    }
-+    fclose ( fp );
-+  }
-+
-+  close ( skfd );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*              load80211Structs() - load the 802.11 structures              *
-+*                                                                           *
-+****************************************************************************/
-+static void 
-+load80211Structs ( int skfd, char *ifName, struct wireless_info *wi )
-+{
-+  int rc, ifIndex = 0;
-+  struct ifreq ifr;
-+  char  MACAddress [ MACADDR_LEN + 1 ];
-+
-+  strcpy ( ifr.ifr_name, ifName );
-+  rc = ioctl ( skfd, SIOCGIFHWADDR, &ifr );
-+  if ( rc >= 0 ) {
-+
-+    sprintf ( MACAddress, "%02X:%02X:%02X:%02X:%02X:%02X\0", 
-+                 ( UCHAR ) ifr.ifr_hwaddr.sa_data[0], ( UCHAR ) ifr.ifr_hwaddr.sa_data[1], 
-+                 ( UCHAR ) ifr.ifr_hwaddr.sa_data[2], ( UCHAR ) ifr.ifr_hwaddr.sa_data[3], 
-+                 ( UCHAR ) ifr.ifr_hwaddr.sa_data[4], ( UCHAR ) ifr.ifr_hwaddr.sa_data[5] );
-+
-+    nSc.haveStationID = TRUE;
-+    strcpy  ( nSc.stationID, MACAddress );
-+    nOp.haveMACAddress = TRUE;
-+    strcpy  ( nOp.MACAddress, MACAddress );
-+    nRi.haveManufacturerOUI = TRUE;
-+    strncpy ( nRi.manufacturerOUI, MACAddress, MAN_OUI_LEN ); 
-+
-+    ifIndex = if_nametoindex ( ifName );
-+    if ( !ifIndex ) {
-+      syslog ( LOG_ERR, "SNMP %s - %s %s\n", 
-+        "ieee802dot11.load80211Structs()", ifName, "has no ifIndex" );
-+      return;
-+    }
-+
-+    loadWiExtTo80211Structs ( ifIndex, ifName, wi );
-+
-+    if ( hasChanged (( char * ) &nSc, sizeof ( nSc ))) {
-+      nSc.ifIndex = ifIndex;
-+      sprintf ( nSc.UID, "%04d\0", nSc.ifIndex );
-+      strcpy ( nSc.ifName, ifName );
-+      addList (( char * ) &scList, ( char * ) &nSc, sizeof ( nSc ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPr, sizeof ( nPr ))) {
-+      nPr.ifIndex = ifIndex;
-+      sprintf ( nPr.UID, "%04d\0", nPr.ifIndex );
-+      strcpy ( nPr.ifName, ifName );
-+      addList (( char * ) &prList, ( char * ) &nPr, sizeof ( nPr ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nOp, sizeof ( nOp ))) {
-+      nOp.ifIndex = ifIndex;
-+      sprintf ( nOp.UID, "%04d\0", nOp.ifIndex );
-+      strcpy ( nOp.ifName, ifName );
-+      addList (( char * ) &opList, ( char * ) &nOp, sizeof ( nOp ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nCo, sizeof ( nCo ))) {
-+      nCo.ifIndex = ifIndex;
-+      sprintf ( nCo.UID, "%04d\0", nCo.ifIndex );
-+      strcpy ( nCo.ifName, ifName );
-+      addList (( char * ) &coList, ( char * ) &nCo, sizeof ( nCo ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nRi, sizeof ( nRi ))) {
-+      nRi.ifIndex = ifIndex;
-+      sprintf ( nRi.UID, "%04d\0", nRi.ifIndex );
-+      strcpy ( nRi.ifName, ifName );
-+      addList (( char * ) &riList, ( char * ) &nRi, sizeof ( nRi ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPo, sizeof ( nPo ))) {
-+      nPo.ifIndex = ifIndex;
-+      sprintf ( nPo.UID, "%04d\0", nPo.ifIndex );
-+      strcpy ( nPo.ifName, ifName );
-+      addList (( char * ) &poList, ( char * ) &nPo, sizeof ( nPo ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPa, sizeof ( nPa ))) {
-+      nPa.ifIndex = ifIndex;
-+      sprintf ( nPa.UID, "%04d\0", nPa.ifIndex );
-+      strcpy ( nPa.ifName, ifName );
-+      addList (( char * ) &paList, ( char * ) &nPa, sizeof ( nPa ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPt, sizeof ( nPt ))) {
-+      nPt.ifIndex = ifIndex;
-+      sprintf ( nPt.UID, "%04d\0", nPt.ifIndex );
-+      strcpy ( nPt.ifName, ifName );
-+      addList (( char * ) &ptList, ( char * ) &nPt, sizeof ( nPt ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPf, sizeof ( nPf ))) {
-+      nPf.ifIndex = ifIndex;
-+      sprintf ( nPf.UID, "%04d\0", nPf.ifIndex );
-+      strcpy ( nPf.ifName, ifName );
-+      addList (( char * ) &pfList, ( char * ) &nPf, sizeof ( nPf ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPd, sizeof ( nPd ))) {
-+      nPd.ifIndex = ifIndex;
-+      sprintf ( nPd.UID, "%04d\0", nPd.ifIndex );
-+      strcpy ( nPd.ifName, ifName );
-+      addList (( char * ) &pdList, ( char * ) &nPd, sizeof ( nPd ));
-+    }
-+
-+    if ( hasChanged (( char * ) &nPi, sizeof ( nPi ))) {
-+      nPi.ifIndex = ifIndex;
-+      sprintf ( nPi.UID, "%04d\0", nPi.ifIndex );
-+      strcpy ( nPi.ifName, ifName );
-+      addList (( char * ) &piList, ( char * ) &nPi, sizeof ( nPi ));
-+    }
-+  }
-+
-+//printf ( "%s - ifIndex: %d ifName: %s UID: %s\n", 
-+//         "load80211Structs() - HASCHANGED", ifIndex, ifName, nSc.UID );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                     initStructs() - initialize structures                 *
-+*                                                                           *
-+****************************************************************************/
-+static void initStructs()
-+{
-+  int i;
-+
-+  // 802.11 MIB Stuctures
-+  memset (( char * ) &nSc, 0, sizeof ( nSc ));  memset (( char * ) &nAa, 0, sizeof ( nAa ));
-+  memset (( char * ) &nDf, 0, sizeof ( nDf ));  memset (( char * ) &nKm, 0, sizeof ( nKm ));
-+  memset (( char * ) &nPr, 0, sizeof ( nPr ));  memset (( char * ) &nOp, 0, sizeof ( nOp ));
-+  memset (( char * ) &nCo, 0, sizeof ( nCo ));  memset (( char * ) &nGa, 0, sizeof ( nGa ));
-+  memset (( char * ) &nRi, 0, sizeof ( nRi ));  memset (( char * ) &nPo, 0, sizeof ( nPo ));
-+  memset (( char * ) &nPa, 0, sizeof ( nPa ));  memset (( char * ) &nPt, 0, sizeof ( nPt ));
-+  memset (( char * ) &nPf, 0, sizeof ( nPf ));  memset (( char * ) &nPd, 0, sizeof ( nPd ));
-+  memset (( char * ) &nPi, 0, sizeof ( nPi ));  memset (( char * ) &nRd, 0, sizeof ( nRd ));
-+  memset (( char * ) &nAl, 0, sizeof ( nAl ));  memset (( char * ) &nRt, 0, sizeof ( nRt ));
-+  memset (( char * ) &nRr, 0, sizeof ( nRr ));
-+
-+  // Wireless Extensions
-+  wepCurrentKey = 0;
-+  haveWepCurrentKey = FALSE;
-+  for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
-+    wep[i].len = 0;
-+    wep[i].key[0] = '\0';
-+    wep[i].haveKey = FALSE;
-+  }
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                Wireless Extensions Specific Functions                     *
-+*                                                                           *
-+****************************************************************************/
-+/****************************************************************************
-+*                                                                           *
-+* loadWiExtTo80211Structs() - load wireless extensions to 802.11 structures *
-+*                                                                           *
-+****************************************************************************/
-+static void 
-+loadWiExtTo80211Structs ( int ifIndex, char *ifName, struct wireless_info *wi )
-+{
-+  int i, j = 0;
-+
-+  // dot11Smt Group
-+  // dot11StationConfigTable
-+  nSc.havePrivacyOptionImplemented = TRUE;
-+  nSc.privacyOptionImplemented = 1;           // assume we support WEP
-+
-+  if ( wi->has_power ) {
-+    nSc.havePowerManagementMode = TRUE;
-+    nSc.powerManagementMode = 1;              // assume power is active
-+    if ( !wi->power.disabled && 
-+          wi->power.flags & IW_POWER_MIN )
-+      nSc.powerManagementMode = 2;            // power save mode
-+  }
-+
-+  if ( wi->has_essid && strlen ( wi->essid )) {
-+    nSc.haveDesiredSSID = TRUE;
-+    strcpy ( nSc.desiredSSID, wi->essid ); 
-+  }
-+
-+  if ( wi->has_mode ) {
-+    nSc.haveDesiredBSSType = TRUE;
-+    if ( wi->mode == IW_MODE_ADHOC ) 
-+      nSc.desiredBSSType = 2;         // independent
-+    else if ( wi->has_ap_addr )
-+      nSc.desiredBSSType = 1;         // infrastructure
-+    else
-+      nSc.desiredBSSType = 3;         // any
-+  }
-+
-+  if ( wi->has_range ) {
-+    for ( i = 0; i < wi->range.num_bitrates && j < 126; i++ ) {
-+      nSc.haveOperationalRateSet = TRUE;
-+      nSc.operationalRateSet[j++] = ( char ) ( wi->range.bitrate[i] / 500000L );
-+    }
-+  }
-+
-+  // dot11AuthenticationAlgorithmsTable
-+  nAa.haveAuthenticationAlgorithm = TRUE;           // it's a rule to always have 
-+  nAa.haveAuthenticationAlgorithmsEnable = TRUE;    //    'open' supported
-+  nAa.ifIndex = ifIndex;
-+  nAa.authenticationAlgorithmsIndex = 1;            // index number one
-+  nAa.authenticationAlgorithm = 1;                  // 1 => open key
-+  sprintf ( nAa.UID, "%04d%04d\0", nAa.ifIndex, nAa.authenticationAlgorithmsIndex );
-+  nAa.authenticationAlgorithmsEnable = 1;           // enabled by default
-+  if ( ( wi->has_key                        ) &&
-+       ( wi->key_size  != 0                 ) &&
-+      !( wi->key_flags & IW_ENCODE_DISABLED ))
-+    nAa.authenticationAlgorithmsEnable = 2;
-+  addList (( char * ) &aaList, ( char * ) &nAa, sizeof ( nAa ));
-+
-+  nAa.haveAuthenticationAlgorithm = TRUE;           // I'm gonna assume we always support WEP
-+  nAa.haveAuthenticationAlgorithmsEnable = TRUE;
-+  nAa.ifIndex = ifIndex;
-+  nAa.authenticationAlgorithmsIndex = 2;            // index number 2
-+  nAa.authenticationAlgorithm = 2;                  // 2 => shared key
-+  sprintf ( nAa.UID, "%04d%04d\0", nAa.ifIndex, nAa.authenticationAlgorithmsIndex );
-+  nAa.authenticationAlgorithmsEnable = 2;
-+  if ( ( wi->has_key                        ) &&
-+       ( wi->key_size  != 0                 ) &&
-+      !( wi->key_flags & IW_ENCODE_DISABLED ))
-+    nAa.authenticationAlgorithmsEnable = 1;         // disabled by default
-+  addList (( char * ) &aaList, ( char * ) &nAa, sizeof ( nAa ));
-+
-+  //dot11WEPDefaultKeysTable
-+  if ( wi->has_range ) {
-+    for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
-+      nDf.haveWEPDefaultKeyValue = TRUE;
-+      nDf.ifIndex = ifIndex;
-+      nDf.WEPDefaultKeyIndex = i + 1;               // index number
-+      sprintf ( nDf.UID, "%04d%04d\0", nDf.ifIndex, nDf.WEPDefaultKeyIndex );
-+      if ( wep[i].haveKey )
-+        strcpy ( nDf.WEPDefaultKeyValue, "*****" );
-+      else
-+        nDf.WEPDefaultKeyValue[0] = '\0';
-+      addList (( char * ) &dfList, ( char * ) &nDf, sizeof ( nDf ));
-+    }
-+  }
-+
-+  // dot11PrivacyTable
-+  nPr.havePrivacyInvoked = TRUE;
-+  nPr.privacyInvoked = 2;                   // 2 => FALSE
-+  nPr.haveWEPDefaultKeyID = TRUE;
-+  nPr.WEPDefaultKeyID = 0;
-+  nPr.haveExcludeUnencrypted = TRUE;
-+  nPr.excludeUnencrypted = 2;               // 2 => FALSE
-+  if ( wi->has_range ) {
-+    if ( ( wi->key_size != 0 ) &&
-+        !( wi->key_flags & IW_ENCODE_DISABLED )) {
-+       nPr.privacyInvoked = 1;
-+       if ( wi->key_flags & IW_ENCODE_RESTRICTED )
-+          nPr.excludeUnencrypted = 1;
-+       nPr.WEPDefaultKeyID = wepCurrentKey;
-+    }
-+  }
-+
-+  // dot11Mac Group
-+  // dot11OperationTable
-+  if ( wi->has_range ) {
-+    nOp.haveRTSThreshold = TRUE;
-+    nOp.RTSThreshold = wi->range.max_rts;
-+  }
-+
-+  if ( wi->has_frag && wi->frag.value ) {
-+    nOp.haveFragmentationThreshold = TRUE;
-+    nOp.fragmentationThreshold = wi->frag.value;
-+  }
-+
-+  // dot11Phy Group
-+  // dot11PhyOperationTable
-+  if ( strstr ( wi->name, "IEEE 802.11-FS"      )) nPo.PHYType = 1;   // So what if I
-+  if ( strstr ( wi->name, "IEEE 802.11-DS"      )) nPo.PHYType = 2;   // made up a couple?
-+  if ( strstr ( wi->name, "IEEE 802.11-IR"      )) nPo.PHYType = 3;   
-+  if ( strstr ( wi->name, "IEEE 802.11-OFDM"    )) nPo.PHYType = 4;   // 802.11a
-+  if ( strstr ( wi->name, "IEEE 802.11-OFDM/DS" )) nPo.PHYType = 5;   // 802.11g
-+  if ( strstr ( wi->name, "IEEE 802.11-TURBO"   )) nPo.PHYType = 6;   // Atheros TURBO mode
-+  if ( nPo.PHYType ) nPo.havePHYType = TRUE;
-+
-+  // dot11PhyDSSSTable
-+  if ( wi->has_range ) { // && wi->freq <= ( double ) 2483000000 ) {  // DSSS frequencies only
-+    for ( i = 0; i < wi->range.num_frequency; i++ ) {
-+      if ((( double ) ( wi->range.freq[i].e * 10 ) * ( double ) wi->range.freq[i].m ) == wi->freq ) {
-+        nPd.haveCurrentChannel = TRUE;
-+        nPd.currentChannel = wi->range.freq[i].i; 
-+      }
-+    }
-+  }
-+
-+  // dot11SupportedDataRatesTxTable
-+  if ( wi->has_range ) {
-+    for ( i = 0; i < wi->range.num_bitrates; i++ ) {
-+      nRt.ifIndex = ifIndex;
-+      nRt.supportedDataRatesTxIndex = i + 1;
-+      nRt.supportedDataRatesTxValue = wi->range.bitrate[i] / 500000L;
-+      nRt.haveSupportedDataRatesTxValue = TRUE;
-+      sprintf ( nRt.UID, "%04d%04d\0", nRt.ifIndex, nRt.supportedDataRatesTxIndex );
-+      strcpy ( nRt.ifName, ifName );
-+      addList (( char * ) &rtList, ( char * ) &nRt, sizeof ( nRt ));
-+    }
-+  }
-+
-+  // dot11SupportedDataRatesRxTable
-+  if ( wi->has_range ) {
-+    for ( i = 0; i < wi->range.num_bitrates; i++ ) {
-+      nRr.ifIndex = ifIndex;
-+      nRr.supportedDataRatesRxIndex = i + 1;
-+      nRr.supportedDataRatesRxValue = wi->range.bitrate[i] / 500000L;
-+      nRr.haveSupportedDataRatesRxValue = TRUE;
-+      sprintf ( nRr.UID, "%04d%04d\0", nRr.ifIndex, nRr.supportedDataRatesRxIndex );
-+      strcpy ( nRr.ifName, ifName );
-+      addList (( char * ) &rrList, ( char * ) &nRr, sizeof ( nRr ));
-+    }
-+  }
-+
-+//printf ( "%s max_encoding_tokens: %d\n", 
-+//          "loadWiExtTo80211Structs() - ", wi->range.max_encoding_tokens );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*      loadWiExt() - load wireless extensions structures;                   *
-+*                    use ioctl calls and read /proc/net/wireless            *
-+*                                                                           *
-+****************************************************************************/
-+static void loadWiExt ( int skfd, char *ifname, struct wireless_info *wi )
-+{
-+  struct iwreq wrq;                       // ioctl request structure
-+  FILE *fp;
-+  char  bfr[1024];
-+  char  buffer[sizeof ( iwrange ) * 2]; /* Large enough */
-+  char *s, *t;
-+  int i, j;
-+
-+  strncpy ( wrq.ifr_name, ifname, IFNAMSIZ );
-+
-+  /* Get wireless name */
-+  if ( ioctl ( skfd, SIOCGIWNAME, &wrq ) >= 0 ) {
-+    strncpy ( wi->name, wrq.u.name, IFNAMSIZ );
-+    wi->name[IFNAMSIZ] = '\0';
-+  }
-+
-+  /* Get ranges */    // NOTE: some version checking in iwlib.c
-+  memset ( buffer, 0, sizeof ( buffer ));
-+  wrq.u.data.pointer = ( caddr_t ) &buffer;
-+  wrq.u.data.length = sizeof ( buffer );
-+  wrq.u.data.flags = 0;
-+  if ( ioctl ( skfd, SIOCGIWRANGE, &wrq ) >= 0 ) {
-+    memcpy (( char * ) &wi->range, buffer, sizeof ( iwrange ));
-+    wi->has_range = 1;
-+  }
-+
-+  /* Get network ID */
-+  if ( ioctl ( skfd, SIOCGIWNWID, &wrq ) >= 0 ) {
-+    memcpy ( &wi->nwid, &wrq.u.nwid, sizeof ( iwparam ));
-+    wi->has_nwid = 1;
-+  }
-+
-+  /* Get frequency / channel */         // THIS NUMBER LOOKS FUNNY
-+  if ( ioctl ( skfd, SIOCGIWFREQ, &wrq ) >= 0 ) {
-+    wi->has_freq = 1;
-+    wi->freq = (( double ) wrq.u.freq.m ) * pow ( 10, wrq.u.freq.e );
-+  }
-+
-+  /* Get sensitivity */
-+  if ( ioctl ( skfd, SIOCGIWSENS, &wrq ) >= 0 ) {
-+    wi->has_sens = 1;
-+    memcpy ( &wi->sens, &wrq.u.sens, sizeof ( iwparam ));
-+  }
-+
-+  /* Get encryption information */
-+  wrq.u.data.pointer = ( caddr_t ) &wi->key;
-+  wrq.u.data.length = IW_ENCODING_TOKEN_MAX;
-+  wrq.u.data.flags = 0;
-+  if ( ioctl ( skfd, SIOCGIWENCODE, &wrq ) >= 0 ) {
-+    wi->has_key = 1;
-+    wi->key_size = wrq.u.data.length;
-+    wi->key_flags = wrq.u.data.flags;
-+    wepCurrentKey = wrq.u.data.flags & IW_ENCODE_INDEX;
-+  }
-+
-+  for ( i = 0; i < wi->range.max_encoding_tokens; i++ ) {
-+    wrq.u.data.pointer = ( caddr_t ) &wi->key;
-+    wrq.u.data.length = IW_ENCODING_TOKEN_MAX;
-+    wrq.u.data.flags = i;
-+    if ( ioctl ( skfd, SIOCGIWENCODE, &wrq ) >= 0 ) {
-+      if ( ( wrq.u.data.length != 0 ) &&
-+          !( wrq.u.data.flags & IW_ENCODE_DISABLED )) {
-+        wep[i].len = wrq.u.data.length;
-+        wep[i].haveKey = TRUE;
-+        t = wep[i].key;
-+        for ( j = 0; j < wrq.u.data.length; j++ ) {
-+          if (( j & 0x1 ) == 0 && j != 0 )
-+        	  strcpy ( t++, "-");
-+          sprintf ( t, "%.2X", wi->key[j] );
-+          t += 2;
-+        }
-+        t = '\0';
-+      }
-+    }
-+  }
-+
-+  /* Get ESSID */
-+  wrq.u.essid.pointer = ( caddr_t ) &wi->essid;
-+  wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1;
-+  wrq.u.essid.flags = 0;
-+  if ( ioctl ( skfd, SIOCGIWESSID, &wrq ) >= 0 ) {
-+    wi->has_essid = 1;
-+    wi->essid_on = wrq.u.data.flags;
-+  }
-+
-+  /* Get AP address */
-+  if ( ioctl ( skfd, SIOCGIWAP, &wrq ) >= 0 ) {
-+    wi->has_ap_addr = 1;
-+    memcpy ( &wi->ap_addr, &wrq.u.ap_addr, sizeof ( sockaddr ));
-+  }
-+
-+  /* Get NickName */
-+  wrq.u.essid.pointer = ( caddr_t ) &wi->nickname;
-+  wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1;
-+  wrq.u.essid.flags = 0;
-+  if ( ioctl ( skfd, SIOCGIWNICKN, &wrq ) >= 0 ) {
-+    if ( wrq.u.data.length > 1 )
-+      wi->has_nickname = 1;
-+  }
-+
-+  /* Get bit rate */
-+  if ( ioctl ( skfd, SIOCGIWRATE, &wrq ) >= 0 ) {
-+    wi->has_bitrate = 1;
-+    memcpy ( &wi->bitrate, &wrq.u.bitrate, sizeof ( iwparam ));
-+  }
-+
-+  /* Get RTS threshold */
-+  if ( ioctl ( skfd, SIOCGIWRTS, &wrq ) >= 0 ) {
-+    wi->has_rts = 1;
-+    memcpy ( &wi->rts, &wrq.u.rts, sizeof ( iwparam ));
-+  }
-+
-+  /* Get fragmentation threshold */
-+  if ( ioctl ( skfd, SIOCGIWFRAG, &wrq ) >= 0 ) {
-+      wi->has_frag = 1;
-+      memcpy ( &wi->frag, &wrq.u.frag, sizeof ( iwparam ));
-+    }
-+
-+  /* Get operation mode */
-+  if ( ioctl ( skfd, SIOCGIWMODE, &wrq ) >= 0 ) {
-+      wi->mode = wrq.u.mode;
-+      if ( wi->mode < IW_NUM_OPER_MODE && wi->mode >= 0 )
-+        wi->has_mode = 1;
-+  }
-+
-+  /* Get Power Management settings */                 // #if WIRELESS_EXT > 9
-+  wrq.u.power.flags = 0;
-+  if ( ioctl ( skfd, SIOCGIWPOWER, &wrq ) >= 0 ) {
-+    wi->has_power = 1;
-+    memcpy ( &wi->power, &wrq.u.power, sizeof ( iwparam ));
-+  }
-+
-+  /* Get retry limit/lifetime */                      // #if WIRELESS_EXT > 10
-+  if ( ioctl ( skfd, SIOCGIWRETRY, &wrq ) >= 0 ) {    
-+    wi->has_retry = 1;
-+    memcpy ( &wi->retry, &wrq.u.retry, sizeof ( iwparam ));
-+  }
-+
-+  /* Get stats */                                     // #if WIRELESS_EXT > 11
-+  wrq.u.data.pointer = ( caddr_t ) &wi->stats;
-+  wrq.u.data.length = 0;
-+  wrq.u.data.flags = 1;   /* Clear updated flag */
-+  if ( ioctl ( skfd, SIOCGIWSTATS, &wrq ) < 0 )
-+    wi->has_stats = 1;
-+
-+  if ( !wi->has_stats ) {                        // no ioctl support, go to file
-+    fp = fopen ( PROC_NET_WIRELESS, "r" );
-+    if ( fp ) {
-+      while ( fgets ( bfr, sizeof ( bfr ), fp )) {
-+        bfr [ sizeof ( bfr ) - 1 ] = '\0';        // no buffer overruns here!
-+        strtok (( char * ) &bfr, "\n" );          // '\n' => '\0'
-+        if ( strstr ( bfr, ifname ) && strstr ( bfr, ":" )) {
-+          wi->has_stats = 1;
-+          s = bfr;
-+          s = strchr ( s, ':' ); s++;             /* Skip ethX:   */
-+          s = strtok ( s, " " );                  /* ' ' => '\0'  */
-+          sscanf ( s, "%X", &wi->stats.status ); // status 
-+
-+          s = strtok ( NULL, " " );               // link quality
-+          if ( strchr ( s, '.' ) != NULL )
-+            wi->stats.qual.updated |= 1;
-+          sscanf ( s, "%d", &wi->stats.qual.qual );
-+
-+          s = strtok ( NULL, " " );               // signal level
-+          if ( strchr ( s,'.' ) != NULL )
-+            wi->stats.qual.updated |= 2;
-+          sscanf ( s, "%d", &wi->stats.qual.level );
-+
-+          s = strtok ( NULL, " " );               // noise level
-+          if ( strchr ( s, '.' ) != NULL )
-+            wi->stats.qual.updated += 4;
-+          sscanf ( s, "%d", &wi->stats.qual.noise );
-+
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.nwid     );
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.code     );
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.fragment );
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.retries  );
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.misc     );
-+          s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.miss.beacon      );
-+        }
-+      }
-+      fclose ( fp );
-+    }
-+  }
-+
-+// printf ( "%s bfr: %s\n", "loadTables()", bfr );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*       displayWiExt() - show what I got from Wireless Extensions           *
-+*                                                                           *
-+****************************************************************************/
-+static void displayWiExt ( struct wireless_info info )
-+{
-+#ifdef DISPLAYWIEXT
-+  int i;
-+  char title[] = "displayWiExt() -";
-+
-+  printf ( "========================================\n" );
-+  printf ( "===> Wireless Extension IOCTL calls <===\n" );
-+  printf ( "========================================\n" );
-+
-+  if ( strlen ( info.name ))
-+    printf ( "%s name: %s\n", "SIOCGIWNAME", info.name );
-+  else
-+    printf ( "%s\n", "no info.name support" );
-+
-+  if ( info.has_nickname = 1 )
-+    printf ( "%s nickname: %s\n", "SIOCGIWNICKN", info.nickname );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWNICKN", " ===> no info.nickname support" );
-+
-+  if ( info.has_essid ) 
-+    printf ( "%s essid_on: %d essid: %s\n", "SIOCGIWESSID", info.essid_on, info.essid );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWESSID", " ===> no info.essid support" );
-+
-+  if ( info.has_range ) {
-+    printf ( "%s throughput: %d\n",           "SIOCGIWRANGE", info.range.throughput );
-+    printf ( "%s min_nwid: %d\n",             "SIOCGIWRANGE", info.range.min_nwid  );
-+    printf ( "%s max_nwid: %d\n",             "SIOCGIWRANGE", info.range.max_nwid  );
-+    printf ( "%s sensitivity: %d\n",          "SIOCGIWRANGE", info.range.sensitivity );
-+    printf ( "%s num_bitrates: %d\n",         "SIOCGIWRANGE", info.range.num_bitrates );
-+    for ( i = 0; i < info.range.num_bitrates; i++ ) 
-+      printf ( "%s bitrate[%d]: %d\n",        "SIOCGIWRANGE", i, info.range.bitrate[i]  );
-+    printf ( "%s min_rts: %d\n",              "SIOCGIWRANGE", info.range.min_rts );
-+    printf ( "%s max_rts: %d\n",              "SIOCGIWRANGE", info.range.max_rts );
-+    printf ( "%s min_frag: %d\n",             "SIOCGIWRANGE", info.range.min_frag );
-+    printf ( "%s max_frag: %d\n",             "SIOCGIWRANGE", info.range.max_frag );
-+    printf ( "%s min_pmp: %d\n",              "SIOCGIWRANGE", info.range.min_pmp );
-+    printf ( "%s max_pmp: %d\n",              "SIOCGIWRANGE", info.range.max_pmp );
-+    printf ( "%s min_pmt: %d\n",              "SIOCGIWRANGE", info.range.min_pmt );
-+    printf ( "%s max_pmt: %d\n",              "SIOCGIWRANGE", info.range.max_pmt );
-+    printf ( "%s pmp_flags: %d\n",            "SIOCGIWRANGE", info.range.pmp_flags );
-+    printf ( "%s pmt_flags: %d\n",            "SIOCGIWRANGE", info.range.pmt_flags );
-+    printf ( "%s pm_capa: %d\n",              "SIOCGIWRANGE", info.range.pm_capa );
-+    printf ( "%s num_encoding_sizes: %d\n",   "SIOCGIWRANGE", info.range.num_encoding_sizes );
-+    for ( i = 0; i < info.range.num_encoding_sizes; i++ ) 
-+      printf ( "%s encoding_size[%d]: %d\n",  "SIOCGIWRANGE", i, info.range.encoding_size[i]  );
-+    printf ( "%s max_encoding_tokens: %d\n",  "SIOCGIWRANGE", info.range.max_encoding_tokens );
-+//  printf ( "%s encoding_login_index: %d\n", "SIOCGIWRANGE", info.range.encoding_login_index );
-+    printf ( "%s txpower_capa: %d\n",         "SIOCGIWRANGE", info.range.txpower_capa );
-+    printf ( "%s num_txpower: %d dBm\n",      "SIOCGIWRANGE", info.range.num_txpower );
-+    for ( i = 0; i < info.range.num_txpower; i++ ) 
-+      printf ( "%s txpower[%d]: %d\n",        "SIOCGIWRANGE", i, info.range.txpower[i]  );
-+    printf ( "%s we_version_compiled: %d\n",  "SIOCGIWRANGE", info.range.we_version_compiled );
-+    printf ( "%s we_version_source: %d\n",    "SIOCGIWRANGE", info.range.we_version_source );
-+    printf ( "%s retry_capa: %d\n",           "SIOCGIWRANGE", info.range.retry_capa );
-+    printf ( "%s retry_flags: %d\n",          "SIOCGIWRANGE", info.range.retry_flags );
-+    printf ( "%s r_time_flags: %d\n",         "SIOCGIWRANGE", info.range.r_time_flags );
-+    printf ( "%s min_retry: %d\n",            "SIOCGIWRANGE", info.range.min_retry );
-+    printf ( "%s max_retry: %d\n",            "SIOCGIWRANGE", info.range.max_retry );
-+    printf ( "%s min_r_time: %d\n",           "SIOCGIWRANGE", info.range.min_r_time );
-+    printf ( "%s max_r_time: %d\n",           "SIOCGIWRANGE", info.range.max_r_time );
-+    printf ( "%s num_channels: %d\n",         "SIOCGIWRANGE", info.range.num_channels );
-+    printf ( "%s num_frequency: %d\n",        "SIOCGIWRANGE", info.range.num_frequency );
-+    for ( i = 0; i < info.range.num_frequency; i++ ) 
-+      printf ( "%s freq[%d].i: %d freq[%d].e: %d freq[%d].m: %d\n", "SIOCGIWRANGE", 
-+                i, info.range.freq[i].i, i, info.range.freq[i].e, i, info.range.freq[i].m );
-+  }
-+  else
-+    printf ( "%s %s\n", "SIOCGIWRANGE", " ===> no info.range support" );
-+
-+  if ( info.has_nwid ) 
-+    printf ( "%s nwid - disabled: %d value: %X\n", "SIOCGIWNWID", info.nwid.disabled, info.nwid.value );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWNWID", " ===> no info.nwid support" );
-+
-+  if ( info.has_freq ) {
-+//  printf ( "%s freq: %g\n", "SIOCGIWFREQ", info.freq / GIGA );
-+    printf ( "%s freq: %g\n", "SIOCGIWFREQ", info.freq );
-+  }
-+  else
-+    printf ( "%s %s\n", "SIOCGIWFREQ", " ===> no info.freq support" );
-+
-+  if ( info.has_sens )
-+    printf ( "%s sens: %d\n", "SIOCGIWSENS", info.sens );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWSENS", " ===> no info.sens support" );
-+
-+  if ( info.has_key ) {
-+    printf ( "%s key_size: %d key_flags: %d wepCurrentKey: %d\n", 
-+              "SIOCGIWENCODE", info.key_size, info.key_flags, wepCurrentKey );
-+    printf ( "%s MODE: %d DISABLED: %d INDEX: %d OPEN: %d RESTRICTED: %d NOKEY: %d TEMP: %d\n",
-+              "SIOCGIWENCODE",                           info.key_flags & IW_ENCODE_MODE,
-+              info.key_flags & IW_ENCODE_DISABLED ? 1:0, info.key_flags & IW_ENCODE_INDEX,
-+              info.key_flags & IW_ENCODE_OPEN     ? 1:0, info.key_flags & IW_ENCODE_RESTRICTED ? 1:0,
-+              info.key_flags & IW_ENCODE_NOKEY    ? 1:0, info.key_flags & IW_ENCODE_TEMP       ? 1:0 );
-+  }
-+  else
-+    printf ( "%s %s\n", "SIOCGIWENCODE", " ===> no info.key support" );
-+
-+  for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
-+    if ( wep[i].haveKey )
-+      printf ( "%s wep[%d].len: %d wep[%d].key: %s\n", 
-+                "SIOCGIWENCODE", i, wep[i].len, i, wep[i].key );
-+  }
-+
-+  if ( info.has_ap_addr )
-+    printf ( "%s ap_addr.sa_data: %02X:%02X:%02X:%02X:%02X:%02X ap_addr.sa_family: %d\n", 
-+              "SIOCGIWAP",  ( UCHAR ) info.ap_addr.sa_data[0], ( UCHAR ) info.ap_addr.sa_data[1], 
-+                            ( UCHAR ) info.ap_addr.sa_data[2], ( UCHAR ) info.ap_addr.sa_data[3], 
-+                            ( UCHAR ) info.ap_addr.sa_data[4], ( UCHAR ) info.ap_addr.sa_data[5], 
-+                                      info.ap_addr.sa_family );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWAP", " ===> no ap_addr information" );
-+
-+  if ( info.has_bitrate )
-+    printf ( "%s bitrate: %d value: %d fixed: %d disabled: %d flags: %d\n", 
-+              "SIOCGIWRATE", info.bitrate, info.bitrate.value, info.bitrate.fixed, 
-+                             info.bitrate.disabled, info.bitrate.flags );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWRATE", " ===> no info.bitrate support" );
-+
-+  if ( info.has_rts )
-+    printf ( "%s rts: %d\n", "SIOCGIWRTS", info.rts );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWRTS", " ===> no info.rts support" );
-+
-+  if ( info.has_frag )
-+    printf ( "%s frag: %d\n", "SIOCGIWFRAG", info.frag );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWFRAG", " ===> no info.frag support" );
-+
-+  if ( info.has_mode ) 
-+    printf ( "%s mode: %d\n", "SIOCGIWMODE", info.mode );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWMODE", " ===> no info.mode support" );
-+
-+  if ( info.has_power ) {
-+    printf ( "%s power: %d\n", "SIOCGIWPOWER", info.power );
-+    printf ( "%s disabled: %d MIN: %d MAX: %d TIMEOUT: %d RELATIVE: %d\n",
-+              "SIOCGIWPOWER",
-+              info.power.disabled                  ? 1:0, 
-+              info.power.flags & IW_POWER_MIN      ? 1:0, 
-+              info.power.flags & IW_POWER_MAX      ? 1:0, 
-+              info.power.flags & IW_POWER_TIMEOUT  ? 1:0, 
-+              info.power.flags & IW_POWER_RELATIVE ? 1:0 ); 
-+    printf ( "%s UNICAST: %d MULTICAST: %d ALL: %d FORCE: %d REPEATER: %d\n",
-+              "SIOCGIWPOWER",
-+              info.power.flags & IW_POWER_UNICAST_R   ? 1:0, 
-+              info.power.flags & IW_POWER_MULTICAST_R ? 1:0, 
-+              info.power.flags & IW_POWER_ALL_R       ? 1:0, 
-+              info.power.flags & IW_POWER_FORCE_S     ? 1:0, 
-+              info.power.flags & IW_POWER_REPEATER    ? 1:0 ); 
-+  }
-+  else
-+    printf ( "%s %s\n", "SIOCGIWPOWER", " ===> no info.power support" );
-+
-+  if ( info.has_retry )
-+    printf ( "%s retry: %d\n", "SIOCGIWRETRY", info.retry );
-+  else
-+    printf ( "%s %s\n", "SIOCGIWRETRY", " ===> no info.retry support" );
-+
-+  if ( info.has_stats ) {
-+    printf ( "%s status: %d\n",           "SIOCGIWSTATS", info.stats.status           );
-+    printf ( "%s qual.level: %d\n",       "SIOCGIWSTATS", info.stats.qual.level       );
-+    printf ( "%s qual.noise: %d\n",       "SIOCGIWSTATS", info.stats.qual.noise       );
-+    printf ( "%s qual.qual: %d\n",        "SIOCGIWSTATS", info.stats.qual.qual        );
-+    printf ( "%s qual.updated: %d\n",     "SIOCGIWSTATS", info.stats.qual.updated     );
-+    printf ( "%s discard.code: %d\n",     "SIOCGIWSTATS", info.stats.discard.code     );
-+    printf ( "%s discard.fragment: %d\n", "SIOCGIWSTATS", info.stats.discard.fragment );
-+    printf ( "%s discard.misc: %d\n",     "SIOCGIWSTATS", info.stats.discard.misc     );
-+    printf ( "%s discard.nwid: %d\n",     "SIOCGIWSTATS", info.stats.discard.nwid     );
-+    printf ( "%s discard.retries: %d\n",  "SIOCGIWSTATS", info.stats.discard.retries  );
-+    printf ( "%s miss.beacon: %d\n",      "SIOCGIWSTATS", info.stats.miss.beacon      );
-+  }
-+  else
-+    printf ( "%s %s\n", "SIOCGIWSTATS", " ===> no info.stats support" );
-+
-+  if ( info.txpower.flags & IW_TXPOW_MWATT )
-+    printf ( "%s txpower1: %d dBm disabled: %d fixed: %d flags: %d\n", "SIOCGIWRANGE", 
-+      mWatt2dbm ( info.txpower.value ), info.txpower.disabled, info.txpower.fixed, info.txpower.flags);
-+  else
-+    printf ( "%s txpower2: %d dBm disabled: %d fixed: %d flags: %d\n", "SIOCGIWRANGE", info.txpower.value, info.txpower.disabled, info.txpower.fixed, info.txpower.flags );
-+
-+  if ( info.has_range ) 
-+    if ( info.sens.value < 0 )
-+      printf ( "%s sens: %d dBm\n", "SIOCGIWRANGE", info.sens.value );
-+    else
-+      printf ( "%s sens: %d/%d\n", "SIOCGIWRANGE", info.sens.value, info.range.sensitivity );
-+
-+  if ( info.has_range && ( info.stats.qual.level != 0 ))
-+      if ( info.stats.qual.level > info.range.max_qual.level )
-+        /* Statistics are in dBm (absolute power measurement) */
-+        printf ( "%s Quality: %d/%d Signal level: %d dBm Noise level: %d dBm\n",
-+                  "SIOCGIWRANGE",
-+                  info.stats.qual.qual, info.range.max_qual.qual,
-+                  info.stats.qual.level - 0x100,
-+                  info.stats.qual.noise - 0x100 );
-+      else
-+        printf (  "%s Quality: %d/%d Signal level: %d/%d Noise level: %d/%d",
-+                  "SIOCGIWRANGE",
-+                  info.stats.qual.qual,  info.range.max_qual.qual,
-+                  info.stats.qual.level, info.range.max_qual.level,
-+                  info.stats.qual.noise, info.range.max_qual.noise );
-+
-+#endif // #ifdef DISPLAYWIEXT
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                        Linked List Functions                              *
-+*                                                                           *
-+****************************************************************************/
-+/****************************************************************************
-+*                                                                           *
-+*                addList() - add an entry to a linked list                  *
-+*                                                                           *
-+****************************************************************************/
-+static void 
-+addList ( char *l, char *data, int len  )
-+{
-+  char uid[256];
-+  LIST_HEAD ( , avNode ) *list;       
-+
-+  // NOTE: this assumes the UID is at the begining of the 
-+  //       data structure and that UIDs are strings
-+  
-+  list = ( LIST_HEAD ( , avNode ) * ) l;            // NOTE: don't know how to get 
-+  strcpy ( uid, data );                             //  rid of compiler warning on
-+                                                    //  LISTHEAD typecast
-+  // create a new node and the data that goes in it
-+  newNode = malloc ( sizeof ( struct avNode ));
-+  newNode->data = malloc ( len );
-+  memcpy ( newNode->data, data, len );
-+
-+  // this deals with an empty list
-+  if ( LIST_EMPTY ( list )) {
-+    LIST_INSERT_HEAD ( list, newNode, nodes );
-+    return;
-+  }
-+
-+  // this deals with UIDs that match
-+  for ( np = LIST_FIRST ( list ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    if ( strncmp ( uid, np->data, strlen ( uid )) == 0 ) {                      // found matching UID
-+      LIST_INSERT_AFTER ( np, newNode, nodes );
-+      if ( np->data )
-+        free ( np->data );
-+      LIST_REMOVE ( np, nodes );
-+      free ( np );
-+      return;
-+    }
-+  }
-+
-+  // this deals with inserting a new UID in the list
-+  for ( np = LIST_FIRST ( list ); np != NULL; np = LIST_NEXT ( np, nodes )) {
-+    lastNode = np;
-+    if ( strncmp ( np->data, uid, strlen ( uid )) > 0 ) {                       // old ID > new ID AND
-+      LIST_INSERT_BEFORE ( np, newNode, nodes );
-+      return;
-+    }
-+  }
-+
-+  // this deals with a UID that needs to go on the end of the list
-+  LIST_INSERT_AFTER ( lastNode, newNode, nodes );
-+
-+  return;
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*              initLists() - initialize all the linked lists                *
-+*                                                                           *
-+****************************************************************************/
-+static void initLists()
-+{
-+  LIST_INIT ( &scList );  LIST_INIT ( &aaList );  LIST_INIT ( &dfList );
-+  LIST_INIT ( &kmList );  LIST_INIT ( &prList );
-+  LIST_INIT ( &opList );  LIST_INIT ( &coList );
-+  LIST_INIT ( &gaList );  LIST_INIT ( &riList );  LIST_INIT ( &poList );
-+  LIST_INIT ( &paList );  LIST_INIT ( &ptList );  LIST_INIT ( &pfList );
-+  LIST_INIT ( &pdList );  LIST_INIT ( &piList );  LIST_INIT ( &rdList );
-+  LIST_INIT ( &alList );  LIST_INIT ( &rtList );  LIST_INIT ( &rrList );
-+}
-+/****************************************************************************
-+*                                                                           *
-+*                 flushLists() - flush all linked lists                     *
-+*                                                                           *
-+****************************************************************************/
-+static void flushLists()
-+{
-+  flushList (( char * ) &scList );  flushList (( char * ) &aaList );
-+  flushList (( char * ) &dfList );  flushList (( char * ) &kmList );
-+  flushList (( char * ) &prList );
-+  flushList (( char * ) &opList );  flushList (( char * ) &coList );
-+  flushList (( char * ) &gaList );  flushList (( char * ) &riList );
-+  flushList (( char * ) &poList );  flushList (( char * ) &paList );
-+  flushList (( char * ) &ptList );  flushList (( char * ) &pfList );
-+  flushList (( char * ) &pdList );  flushList (( char * ) &piList );
-+  flushList (( char * ) &rdList );  flushList (( char * ) &alList );
-+  flushList (( char * ) &rtList );  flushList (( char * ) &rrList );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                   flushList() - flush a linked list                       *
-+*                                                                           *
-+****************************************************************************/
-+static void flushList ( char *l )
-+{
-+  LIST_HEAD ( , avNode ) *list;
-+  
-+  list = ( LIST_HEAD ( , avNode ) * ) l;    // NOTE: don't know how to get 
-+  while ( !LIST_EMPTY ( list )) {           //  rid of compiler warning on
-+    np = LIST_FIRST ( list );               //  LISTHEAD typecast
-+    if ( np->data )
-+      free ( np->data );
-+    LIST_REMOVE ( np, nodes );
-+    free ( np );
-+  }
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                            Utility Functions                              *
-+*                                                                           *
-+****************************************************************************/
-+/****************************************************************************
-+*                                                                           *
-+*        The following two routines were taken directly from iwlib.c        *
-+*                                                                           *
-+****************************************************************************/
-+ /*
-+ * Open a socket.
-+ * Depending on the protocol present, open the right socket. The socket
-+ * will allow us to talk to the driver.
-+ */
-+static int openSocket ( void )
-+{
-+  static const int families[] = {
-+    AF_INET, AF_IPX, AF_AX25, AF_APPLETALK
-+  };
-+  unsigned int  i;
-+  int   sock;
-+
-+  /*
-+   * Now pick any (exisiting) useful socket family for generic queries
-+   * Note : don't open all the socket, only returns when one matches,
-+   * all protocols might not be valid.
-+   * Workaround by Jim Kaba <jkaba@sarnoff.com>
-+   * Note : in 99% of the case, we will just open the inet_sock.
-+   * The remaining 1% case are not fully correct...
-+   */
-+
-+  /* Try all families we support */
-+  for(i = 0; i < sizeof(families)/sizeof(int); ++i) {
-+      /* Try to open the socket, if success returns it */
-+      sock = socket(families[i], SOCK_DGRAM, 0);
-+      if(sock >= 0)
-+  return sock;
-+  }
-+
-+  return -1;
-+}
-+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Convert a value in milliWatt to a value in dBm.
-+ */
-+static int mWatt2dbm ( int in )
-+{
-+#ifdef WE_NOLIBM
-+  /* Version without libm : slower */
-+  double  fin = (double) in;
-+  int   res = 0;
-+
-+  /* Split integral and floating part to avoid accumulating rounding errors */
-+  while(fin > 10.0)
-+    {
-+      res += 10;
-+      fin /= 10.0;
-+    }
-+  while(fin > 1.000001) /* Eliminate rounding errors, take ceil */
-+    {
-+      res += 1;
-+      fin /= LOG10_MAGIC;
-+    }
-+  return(res);
-+#else /* WE_NOLIBM */
-+  /* Version with libm : faster */
-+  return((int) (ceil(10.0 * log10((double) in))));
-+#endif  /* WE_NOLIBM */
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*                 htob - converts hex string to binary                      *
-+*                                                                           *
-+****************************************************************************/
-+static char *htob ( char *s )
-+{
-+    char nibl, *byt;
-+    static char bin[20];
-+
-+    byt = bin;
-+
-+    while ((nibl = *s++) && nibl != ' ') {    /* While not end of string. */
-+      nibl -= ( nibl > '9') ?  ('A' - 10): '0';
-+      *byt = nibl << 4;                              /* place high nibble */
-+      if((nibl = *s++) && nibl != ' ') {
-+        nibl -= ( nibl > '9') ?  ('A' - 10): '0';
-+        *byt |= nibl;                                /*  place low nibble */
-+      }
-+      else break;
-+      ++byt;
-+    }
-+    *++byt = '\0';
-+    return ( bin );
-+}
-+
-+/****************************************************************************
-+*                                                                           *
-+*           hasChanged() - see if area has been changed from NULLs          *
-+*                                                                           *
-+****************************************************************************/
-+static int hasChanged ( char *loc, int len )
-+{
-+  char *wrk;
-+  int changed = TRUE;
-+
-+  wrk = malloc ( len );
-+  memset ( wrk, 0, len );
-+  if ( memcmp ( loc, wrk, len ) == 0 )
-+    changed = FALSE;
-+  free ( wrk );
-+
-+  return ( changed );
-+}
-+
---- /dev/null
-+++ b/agent/mibgroup/ieee802dot11.h
-@@ -0,0 +1,730 @@
-+/****************************************************************************
-+*                                                                           *
-+*  File Name:           ieee802dot11.h                                      *
-+*  Used By:                                                                 *
-+*                                                                           *
-+*  Operating System:                                                        *
-+*  Purpose:                                                                 *
-+*                                                                           *
-+*  Comments:                                                                *
-+*                                                                           *
-+*  Author:              Larry Simmons                                       *
-+*                       lsimmons@avantcom.com                               *
-+*                       www.avantcom.com                                    *
-+*                                                                           *
-+*  Creation Date:       09/02/03                                            *
-+*                                                                           *
-+*   Ver    Date   Inits Modification                                        *
-+*  ----- -------- ----- ------------                                        *
-+*  0.0.1 09/02/03  LRS  created                                             *
-+*  0.0.2 09/24/03  LRS  wouldn't build after fresh ./configure              *
-+****************************************************************************/
-+/* This file was generated by mib2c and is intended for use as a mib module
-+  for the ucd-snmp snmpd agent. */
-+#ifndef _MIBGROUP_IEEE802DOT11_H
-+#define _MIBGROUP_IEEE802DOT11_H
-+/* we may use header_generic and header_simple_table from the util_funcs module */
-+
-+/****************************************************************************
-+*                               Includes                                    *
-+****************************************************************************/
-+#include <sys/queue.h>
-+
-+/****************************************************************************
-+*                             Linked List Defines                           *
-+****************************************************************************/
-+// here are some Linked List MACROS I wanted to use, 
-+// but curiously were not in /usr/includes/sys/queue.h
-+
-+#ifndef LIST_EMPTY
-+  #define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-+#endif
-+
-+#ifndef LIST_NEXT
-+  #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-+#endif
-+
-+#ifndef LIST_INSERT_BEFORE
-+  #define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-+	  (elm)->field.le_prev = (listelm)->field.le_prev;		\
-+	  LIST_NEXT((elm), field) = (listelm);				\
-+	  *(listelm)->field.le_prev = (elm);				\
-+	  (listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-+  } while (0)
-+#endif
-+
-+#ifndef LIST_FIRST
-+  #define	LIST_FIRST(head)	((head)->lh_first)
-+#endif
-+
-+/****************************************************************************
-+*                             802.11 MIB Defines                            *
-+****************************************************************************/
-+#define SYS_STRING_LEN                     256
-+#define MACADDR_LEN                        ( 6 * 2 ) + 5
-+#define OPER_RATE_SET_LEN                  126
-+#define MAN_OUI_LEN                        ( 3 * 2 ) + 2
-+#define WEP_STR_LEN                         64
-+#define SNMP_STR_LEN                       128
-+#define TEXT_LEN                            80
-+#define IFINDEX_LEN                          4
-+#define IFNAME_LEN                          16
-+#define MAX_WEP_KEYS                         4
-+
-+#define AUTHENICATION_ALGORITHMS_INDEX_LEN   4
-+#define WEP_DEFAULT_KEY_INDEX_LEN            4
-+#define WEP_KEY_MAPPING_INDEX_LEN            4
-+#define GROUP_ADDRESS_INDEX_LEN              4
-+#define REG_DOMAIN_SUPPORT_INDEX_LEN         4
-+#define ANTENNA_LIST_INDEX_LEN               4
-+#define SUPPORTED_DATA_RATES_TX_INDEX_LEN    4
-+#define SUPPORTED_DATA_RATES_RX_INDEX_LEN    4
-+
-+#define SC_UID_LEN  IFINDEX_LEN
-+#define AA_UID_LEN  IFINDEX_LEN + AUTHENICATION_ALGORITHMS_INDEX_LEN
-+#define DF_UID_LEN  IFINDEX_LEN + WEP_DEFAULT_KEY_INDEX_LEN
-+#define KM_UID_LEN  IFINDEX_LEN + WEP_KEY_MAPPING_INDEX_LEN
-+#define PR_UID_LEN  IFINDEX_LEN
-+#define OP_UID_LEN  IFINDEX_LEN
-+#define CO_UID_LEN  IFINDEX_LEN
-+#define GA_UID_LEN  IFINDEX_LEN + GROUP_ADDRESS_INDEX_LEN
-+#define RI_UID_LEN  IFINDEX_LEN
-+#define PO_UID_LEN  IFINDEX_LEN
-+#define PA_UID_LEN  IFINDEX_LEN
-+#define PT_UID_LEN  IFINDEX_LEN
-+#define PF_UID_LEN  IFINDEX_LEN
-+#define PD_UID_LEN  IFINDEX_LEN
-+#define PI_UID_LEN  IFINDEX_LEN
-+#define RD_UID_LEN  IFINDEX_LEN + REG_DOMAIN_SUPPORT_INDEX_LEN
-+#define AL_UID_LEN  IFINDEX_LEN + ANTENNA_LIST_INDEX_LEN
-+#define RT_UID_LEN  IFINDEX_LEN + SUPPORTED_DATA_RATES_TX_INDEX_LEN
-+#define RR_UID_LEN  IFINDEX_LEN + SUPPORTED_DATA_RATES_RX_INDEX_LEN
-+
-+/****************************************************************************
-+*                           Linked List Structure                           *
-+****************************************************************************/
-+static struct avNode {  
-+  LIST_ENTRY ( avNode ) nodes; 
-+  char *data;                                 // pointer to data
-+};
-+
-+typedef LIST_HEAD ( , avNode ) avList_t;
-+
-+/****************************************************************************
-+*                          802.11 MIB structures                            *
-+****************************************************************************/
-+/****************************************************************************
-+*                             dot11Smt Group                                *
-+****************************************************************************/
-+/****************************************************************************
-+*                          dot11StationConfigTable                          *
-+****************************************************************************/
-+static struct scTbl_data {
-+
-+  char  UID       [ SC_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  char  stationID [ MACADDR_LEN + 1 ];              // Default actual MacAddr
-+  long  mediumOccupancyLimit;
-+  long  CFPPollable;
-+  long  CFPPeriod;
-+  long  maxDuration;
-+  long  authenticationResponseTimeOut;
-+  long  privacyOptionImplemented;
-+  long  powerManagementMode;
-+  char  desiredSSID             [ SNMP_STR_LEN + 1 ];
-+  long  desiredBSSType;
-+  char  operationalRateSet      [ OPER_RATE_SET_LEN + 1];
-+  long  beaconPeriod;
-+  long  DTIMPeriod;
-+  long  associationResponseTimeOut;
-+  long  disAssociationReason;
-+  char  disAssociationStation   [ MACADDR_LEN + 1 ];
-+  long  deAuthenticationReason;
-+  char  deAuthenticationStation [ MACADDR_LEN + 1 ];
-+  long  authenticateFailStatus;
-+  char  authenticateFailStation [ MACADDR_LEN + 1 ];
-+
-+  long  haveStationID;
-+  long  haveMediumOccupancyLimit;
-+  long  haveCFPPollable;
-+  long  haveCFPPeriod;
-+  long  haveMaxDuration;
-+  long  haveAuthenticationResponseTimeOut;
-+  long  havePrivacyOptionImplemented;
-+  long  havePowerManagementMode;
-+  long  haveDesiredSSID;
-+  long  haveDesiredBSSType;
-+  long  haveOperationalRateSet;
-+  long  haveBeaconPeriod;
-+  long  haveDTIMPeriod;
-+  long  haveAssociationResponseTimeOut;
-+  long  haveDisAssociationReason;
-+  long  haveDisAssociationStation;
-+  long  haveDeAuthenticationReason;
-+  long  haveDeAuthenticationStation;
-+  long  haveAuthenticateFailStatus;
-+  long  haveAuthenticateFailStation;
-+
-+} nSc, *sc = &nSc;
-+
-+static avList_t scList;
-+
-+/****************************************************************************
-+*                    dot11AuthenticationAlgorithmsTable                     *
-+****************************************************************************/
-+static struct aaTbl_data {
-+
-+  char  UID       [ AA_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  authenticationAlgorithmsIndex;
-+
-+  long  authenticationAlgorithm;
-+  long  authenticationAlgorithmsEnable;
-+
-+  long  haveAuthenticationAlgorithm;
-+  long  haveAuthenticationAlgorithmsEnable;
-+
-+} nAa, *aa = &nAa;
-+
-+static avList_t aaList;
-+
-+/****************************************************************************
-+*                           dot11WEPDefaultKeysTable                        *
-+****************************************************************************/
-+static struct dfTbl_data {
-+
-+  char  UID       [ DF_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  WEPDefaultKeyIndex;
-+
-+  char  WEPDefaultKeyValue [ WEP_STR_LEN + 1 ];
-+  long  haveWEPDefaultKeyValue;
-+
-+} nDf, *df = &nDf;
-+
-+static avList_t dfList;
-+
-+/****************************************************************************
-+*                          dot11WEPKeyMappingsTable                         *
-+****************************************************************************/
-+static struct kmTbl_data {
-+
-+  char  UID       [ KM_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;
-+  long  WEPKeyMappingIndex;
-+
-+  char  WEPKeyMappingAddress  [ MACADDR_LEN + 1 ];
-+  long  WEPKeyMappingWEPOn;
-+  char  WEPKeyMappingValue    [ WEP_STR_LEN + 1 ];
-+  long  WEPKeyMappingStatus;
-+
-+  long  haveWEPKeyMappingIndex;
-+  long  haveWEPKeyMappingAddress;
-+  long  haveWEPKeyMappingWEPOn;
-+  long  haveWEPKeyMappingValue;
-+  long  haveWEPKeyMappingStatus;
-+
-+} nKm, *km = &nKm;
-+
-+static avList_t kmList;
-+
-+/****************************************************************************
-+*                                dot11PrivacyTable                          *
-+****************************************************************************/
-+static struct prTbl_data {
-+
-+  char          UID       [ PR_UID_LEN + 1 ];
-+  char          ifName    [ IFNAME_LEN + 1 ];
-+
-+  long          ifIndex;
-+
-+  long          privacyInvoked;
-+  long          WEPDefaultKeyID;
-+  long          WEPKeyMappingLength;
-+  long          excludeUnencrypted;
-+  unsigned long WEPICVErrorCount;
-+  unsigned long WEPExcludedCount;
-+
-+  long          havePrivacyInvoked;
-+  long          haveWEPDefaultKeyID;
-+  long          haveWEPKeyMappingLength;
-+  long          haveExcludeUnencrypted;
-+  long          haveWEPICVErrorCount;
-+  long          haveWEPExcludedCount;
-+
-+} nPr, *pr = &nPr;
-+
-+static avList_t prList;
-+
-+/****************************************************************************
-+*                               dot11Mac Group                              *
-+****************************************************************************/
-+/****************************************************************************
-+*                              dot11OperationTable                          *
-+****************************************************************************/
-+static struct opTbl_data {
-+
-+  char  UID       [ OP_UID_LEN + 1 ];                 // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];                 // ifName of card
-+
-+  long  ifIndex;                                      // ifindex of card
-+
-+  char  MACAddress      [ MACADDR_LEN + 1 ];
-+  long  RTSThreshold;
-+  long  shortRetryLimit;
-+  long  longRetryLimit;
-+  long  fragmentationThreshold;
-+  long  maxTransmitMSDULifetime;
-+  long  maxReceiveLifetime;
-+  char  manufacturerID  [ SNMP_STR_LEN + 1 ];
-+  char  productID       [ SNMP_STR_LEN + 1 ];
-+
-+  long  haveMACAddress;
-+  long  haveRTSThreshold;
-+  long  haveShortRetryLimit;
-+  long  haveLongRetryLimit;
-+  long  haveFragmentationThreshold;
-+  long  haveMaxTransmitMSDULifetime;
-+  long  haveMaxReceiveLifetime;
-+  long  haveManufacturerID;
-+  long  haveProductID;
-+
-+} nOp, *op = &nOp;
-+
-+static avList_t opList;
-+
-+/****************************************************************************
-+*                            dot11CountersTable                             *
-+****************************************************************************/
-+static struct coTbl_data {
-+
-+  char          UID       [ CO_UID_LEN + 1 ];     // unique ID
-+  char          ifName    [ IFNAME_LEN + 1 ];     // ifName of card
-+
-+  long          ifIndex;                          // ifindex of card
-+
-+  unsigned long  transmittedFragmentCount;
-+  unsigned long  multicastTransmittedFrameCount;
-+  unsigned long  failedCount;
-+  unsigned long  retryCount;
-+  unsigned long  multipleRetryCount;
-+  unsigned long  frameDuplicateCount;
-+  unsigned long  RTSSuccessCount;
-+  unsigned long  RTSFailureCount;
-+  unsigned long  ACKFailureCount;
-+  unsigned long  receivedFragmentCount;
-+  unsigned long  multicastReceivedFrameCount;
-+  unsigned long  FCSErrorCount;
-+  unsigned long  transmittedFrameCount;
-+  unsigned long  WEPUndecryptableCount;
-+
-+  long           haveTransmittedFragmentCount;
-+  long           haveMulticastTransmittedFrameCount;
-+  long           haveFailedCount;
-+  long           haveRetryCount;
-+  long           haveMultipleRetryCount;
-+  long           haveFrameDuplicateCount;
-+  long           haveRTSSuccessCount;
-+  long           haveRTSFailureCount;
-+  long           haveACKFailureCount;
-+  long           haveReceivedFragmentCount;
-+  long           haveMulticastReceivedFrameCount;
-+  long           haveFCSErrorCount;
-+  long           haveTransmittedFrameCount;
-+  long           haveWEPUndecryptableCount;
-+
-+} nCo, *co = &nCo;
-+
-+static avList_t coList;
-+
-+/****************************************************************************
-+*                        dot11GroupAddressesTable                           *
-+****************************************************************************/
-+static struct gaTbl_data {
-+
-+  char  UID       [ GA_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  groupAddressesIndex;
-+
-+  char  address   [ MACADDR_LEN + 1 ];
-+  long  groupAddressesStatus;
-+
-+  long  haveAddress;
-+  long  haveGroupAddressesStatus;
-+
-+} nGa, *ga = &nGa;
-+
-+static avList_t gaList;
-+
-+/****************************************************************************
-+*                               dot11Res Group                              *
-+****************************************************************************/
-+static char  resourceTypeIDName[] = "RTID";
-+static long  haveResourceTypeIDName = 1;
-+
-+/****************************************************************************
-+*                           dot11ResourceInfoTable                          *
-+****************************************************************************/
-+static struct riTbl_data {
-+
-+  char  UID       [ RI_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  char  manufacturerOUI            [ MAN_OUI_LEN    + 1 ];
-+  char  manufacturerName           [ SYS_STRING_LEN + 1 ];
-+  char  manufacturerProductName    [ SYS_STRING_LEN + 1 ];
-+  char  manufacturerProductVersion [ SYS_STRING_LEN + 1 ];
-+
-+  char  haveManufacturerOUI;
-+  char  haveManufacturerName;
-+  char  haveManufacturerProductName;
-+  char  haveManufacturerProductVersion;
-+
-+} nRi, *ri = &nRi;
-+
-+static avList_t riList;
-+
-+/****************************************************************************
-+*                               dot11Phy Group                              *
-+****************************************************************************/
-+/****************************************************************************
-+*                           dot11PhyOperationTable                          *
-+****************************************************************************/
-+static struct poTbl_data {
-+
-+  char  UID       [ PO_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  PHYType;
-+  long  currentRegDomain;
-+  long  tempType;
-+
-+  long  havePHYType;
-+  long  haveCurrentRegDomain;
-+  long  haveTempType;
-+
-+} nPo, *po = &nPo;
-+
-+static avList_t poList;
-+
-+/****************************************************************************
-+*                           dot11PhyAntennaEntry                            *
-+****************************************************************************/
-+static struct paTbl_data {
-+
-+  char  UID       [ PA_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  currentTxAntenna;
-+  long  diversitySupport;
-+  long  currentRxAntenna;
-+
-+  long  haveCurrentTxAntenna;
-+  long  haveDiversitySupport;
-+  long  haveCurrentRxAntenna;
-+
-+} nPa, *pa = &nPa;
-+
-+static avList_t paList;
-+
-+/****************************************************************************
-+*                             dot11PhyTxPowerTable                          *
-+****************************************************************************/
-+static struct ptTbl_data {
-+
-+  char  UID       [ PT_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  numberSupportedPowerLevels;
-+  long  TxPowerLevel1;
-+  long  TxPowerLevel2;
-+  long  TxPowerLevel3;
-+  long  TxPowerLevel4;
-+  long  TxPowerLevel5;
-+  long  TxPowerLevel6;
-+  long  TxPowerLevel7;
-+  long  TxPowerLevel8;
-+  long  currentTxPowerLevel;
-+
-+  long  haveNumberSupportedPowerLevels;
-+  long  haveTxPowerLevel1;
-+  long  haveTxPowerLevel2;
-+  long  haveTxPowerLevel3;
-+  long  haveTxPowerLevel4;
-+  long  haveTxPowerLevel5;
-+  long  haveTxPowerLevel6;
-+  long  haveTxPowerLevel7;
-+  long  haveTxPowerLevel8;
-+  long  haveCurrentTxPowerLevel ;
-+
-+} nPt, *pt = &nPt;
-+
-+static avList_t ptList;
-+
-+/****************************************************************************
-+*                               dot11PhyFHSSTable                           *
-+****************************************************************************/
-+static struct pfTbl_data {
-+
-+  char  UID       [ PF_UID_LEN + 1 ];              // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];              // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  hopTime;
-+  long  currentChannelNumber;
-+  long  maxDwellTime;
-+  long  currentDwellTime;
-+  long  currentSet;
-+  long  currentPattern;
-+  long  currentIndex;
-+
-+  long  haveHopTime;
-+  long  haveCurrentChannelNumber;
-+  long  haveMaxDwellTime;
-+  long  haveCurrentDwellTime;
-+  long  haveCurrentSet;
-+  long  haveCurrentPattern;
-+  long  haveCurrentIndex;
-+
-+} nPf, *pf = &nPf;
-+
-+static avList_t pfList;
-+
-+/****************************************************************************
-+*                              dot11PhyDSSSTable                            *
-+****************************************************************************/
-+static struct pdTbl_data {
-+
-+  char  UID       [ PD_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  currentChannel;
-+  long  CCAModeSupported;
-+  long  currentCCAMode;
-+  long  EDThreshold;
-+
-+  long  haveCurrentChannel;
-+  long  haveCCAModeSupported ;
-+  long  haveCurrentCCAMode;
-+  long  haveEDThreshold;
-+
-+} nPd, *pd = &nPd;
-+
-+static avList_t pdList;
-+
-+/****************************************************************************
-+*                              dot11PhyIRTable                              *
-+****************************************************************************/
-+static struct piTbl_data {
-+
-+  char  UID       [ PI_UID_LEN + 1 ];               // unique ID
-+  char  ifName    [ IFNAME_LEN + 1 ];               // ifName of card
-+
-+  long  ifIndex;                                    // ifindex of card
-+
-+  long  CCAWatchdogTimerMax;
-+  long  CCAWatchdogCountMax;
-+  long  CCAWatchdogTimerMin;
-+  long  CCAWatchdogCountMin;
-+
-+  long  haveCCAWatchdogTimerMax;
-+  long  haveCCAWatchdogCountMax;
-+  long  haveCCAWatchdogTimerMin;
-+  long  haveCCAWatchdogCountMin;
-+
-+} nPi, *pi = &nPi;
-+
-+static avList_t piList;
-+
-+/****************************************************************************
-+*                      dot11RegDomainsSupportedTable                        *
-+****************************************************************************/
-+static struct rdTbl_data {
-+
-+  char  UID       [ RD_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  regDomainsSupportIndex;
-+
-+  long  regDomainsSupportValue;
-+  long  haveRegDomainsSupportValue;
-+
-+} nRd, *rd = &nRd;
-+
-+static avList_t rdList;
-+
-+/****************************************************************************
-+*                             dot11AntennasListTable                        *
-+****************************************************************************/
-+static struct alTbl_data {
-+
-+  char  UID       [ AL_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  antennaListIndex;
-+
-+  long  supportedTxAntenna;
-+  long  supportedRxAntenna;
-+  long  diversitySelectionRx ;
-+
-+  long  haveSupportedTxAntenna;
-+  long  haveSupportedRxAntenna;
-+  long  haveDiversitySelectionRx ;
-+
-+} nAl, *al = &nAl;
-+
-+static avList_t alList;
-+
-+/****************************************************************************
-+*                    dot11SupportedDataRatesTxTable                         *
-+****************************************************************************/
-+static struct rtTbl_data {
-+
-+  char  UID       [ RT_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  supportedDataRatesTxIndex;
-+
-+  long  supportedDataRatesTxValue;
-+  long  haveSupportedDataRatesTxValue;
-+
-+} nRt, *rt = &nRt;
-+
-+static avList_t rtList;
-+
-+/****************************************************************************
-+*                    dot11SupportedDataRatesRxTable                         *
-+****************************************************************************/
-+static struct rrTbl_data {
-+
-+  char  UID       [ RR_UID_LEN + 1 ];
-+  char  ifName    [ IFNAME_LEN + 1 ];
-+
-+  long  ifIndex;                                    // ifindex of card
-+  long  supportedDataRatesRxIndex;
-+
-+  long  supportedDataRatesRxValue;
-+  long  haveSupportedDataRatesRxValue;
-+
-+} nRr, *rr = &nRr;
-+
-+static avList_t rrList;
-+
-+/****************************************************************************
-+*                       Wireless Extensions Structures                      *
-+****************************************************************************/
-+static long wepCurrentKey;
-+static long haveWepCurrentKey;
-+static struct wepTbl_data {
-+
-+  long len;
-+  char key [ WEP_STR_LEN + 1 ];
-+  long haveKey;
-+
-+} wep[4];
-+
-+/****************************************************************************
-+*                                                                           *
-+****************************************************************************/
-+config_require(util_funcs)
-+
-+/* function prototypes */
-+
-+void   init_ieee802dot11 ( void );
-+FindVarMethod var_ieee802dot11;
-+FindVarMethod var_dot11StationConfigTable;
-+FindVarMethod var_dot11AuthenticationAlgorithmsTable;
-+FindVarMethod var_dot11WEPDefaultKeysTable;
-+FindVarMethod var_dot11WEPKeyMappingsTable;
-+FindVarMethod var_dot11PrivacyTable;
-+FindVarMethod var_dot11OperationTable;
-+FindVarMethod var_dot11CountersTable;
-+FindVarMethod var_dot11GroupAddressesTable;
-+FindVarMethod var_dot11ResourceInfoTable;
-+FindVarMethod var_dot11PhyOperationTable;
-+FindVarMethod var_dot11PhyAntennaTable;
-+FindVarMethod var_dot11PhyTxPowerTable;
-+FindVarMethod var_dot11PhyFHSSTable;
-+FindVarMethod var_dot11PhyDSSSTable;
-+FindVarMethod var_dot11PhyIRTable;
-+FindVarMethod var_dot11RegDomainsSupportedTable;
-+FindVarMethod var_dot11AntennasListTable;
-+FindVarMethod var_dot11SupportedDataRatesTxTable;
-+FindVarMethod var_dot11SupportedDataRatesRxTable;
-+
-+WriteMethod write_dot11StationID;
-+WriteMethod write_dot11MediumOccupancyLimit;
-+WriteMethod write_dot11CFPPeriod;
-+WriteMethod write_dot11CFPMaxDuration;
-+WriteMethod write_dot11AuthenticationResponseTimeOut;
-+WriteMethod write_dot11PowerManagementMode;
-+WriteMethod write_dot11DesiredSSID;
-+WriteMethod write_dot11DesiredBSSType;
-+WriteMethod write_dot11OperationalRateSet;
-+WriteMethod write_dot11BeaconPeriod;
-+WriteMethod write_dot11DTIMPeriod;
-+WriteMethod write_dot11AssociationResponseTimeOut;
-+WriteMethod write_dot11AuthenticationAlgorithmsEnable;
-+WriteMethod write_dot11WEPDefaultKeyValue;
-+WriteMethod write_dot11WEPKeyMappingAddress;
-+WriteMethod write_dot11WEPKeyMappingWEPOn;
-+WriteMethod write_dot11WEPKeyMappingValue;
-+WriteMethod write_dot11WEPKeyMappingStatus;
-+WriteMethod write_dot11PrivacyInvoked;
-+WriteMethod write_dot11WEPDefaultKeyID;
-+WriteMethod write_dot11WEPKeyMappingLength;
-+WriteMethod write_dot11ExcludeUnencrypted;
-+WriteMethod write_dot11RTSThreshold;
-+WriteMethod write_dot11ShortRetryLimit;
-+WriteMethod write_dot11LongRetryLimit;
-+WriteMethod write_dot11FragmentationThreshold;
-+WriteMethod write_dot11MaxTransmitMSDULifetime;
-+WriteMethod write_dot11MaxReceiveLifetime;
-+WriteMethod write_dot11Address;
-+WriteMethod write_dot11GroupAddressesStatus;
-+WriteMethod write_dot11CurrentRegDomain;
-+WriteMethod write_dot11CurrentTxAntenna;
-+WriteMethod write_dot11CurrentRxAntenna;
-+WriteMethod write_dot11CurrentTxPowerLevel;
-+WriteMethod write_dot11CurrentChannelNumber;
-+WriteMethod write_dot11CurrentDwellTime;
-+WriteMethod write_dot11CurrentSet;
-+WriteMethod write_dot11CurrentPattern;
-+WriteMethod write_dot11CurrentIndex;
-+WriteMethod write_dot11CurrentChannel;
-+WriteMethod write_dot11CurrentCCAMode;
-+WriteMethod write_dot11EDThreshold;
-+WriteMethod write_dot11CCAWatchdogTimerMax;
-+WriteMethod write_dot11CCAWatchdogCountMax;
-+WriteMethod write_dot11CCAWatchdogTimerMin;
-+WriteMethod write_dot11CCAWatchdogCountMin;
-+WriteMethod write_dot11SupportedTxAntenna;
-+WriteMethod write_dot11SupportedRxAntenna;
-+WriteMethod write_dot11DiversitySelectionRx;
-+
-+#endif /* _MIBGROUP_IEEE802DOT11_H */
---- /dev/null
-+++ b/agent/mibgroup/iwlib.h
-@@ -0,0 +1,502 @@
-+/*
-+ *	Wireless Tools
-+ *
-+ *		Jean II - HPLB 97->99 - HPL 99->02
-+ *
-+ * Common header for the Wireless Extension library...
-+ *
-+ * This file is released under the GPL license.
-+ *     Copyright (c) 1997-2002 Jean Tourrilhes <jt@hpl.hp.com>
-+ */
-+
-+#ifndef IWLIB_H
-+#define IWLIB_H
-+
-+/*#include "CHANGELOG.h"*/
-+
-+/***************************** INCLUDES *****************************/
-+
-+/* Standard headers */
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <stdio.h>
-+#include <math.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <ctype.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <netdb.h>		/* gethostbyname, getnetbyname */
-+#include <net/ethernet.h>	/* struct ether_addr */
-+#include <sys/time.h>		/* struct timeval */
-+#include <unistd.h>
-+
-+/* This is our header selection. Try to hide the mess and the misery :-(
-+ * Don't look, you would go blind ;-) */
-+
-+#ifndef LINUX_VERSION_CODE
-+#include <linux/version.h>
-+#endif
-+
-+/* Kernel headers 2.4.X + Glibc 2.2 - Mandrake 8.0, Debian 2.3, RH 7.1
-+ * Kernel headers 2.2.X + Glibc 2.2 - Slackware 8.0 */
-+#if defined(__GLIBC__) \
-+    && __GLIBC__ == 2 \
-+    && __GLIBC_MINOR__ >= 2 \
-+    && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
-+//#define GLIBC22_HEADERS
-+#define GENERIC_HEADERS
-+
-+/* Kernel headers 2.4.X + Glibc 2.1 - Debian 2.2 upgraded, RH 7.0
-+ * Kernel headers 2.2.X + Glibc 2.1 - Debian 2.2, RH 6.1 */
-+#elif defined(__GLIBC__) \
-+      && __GLIBC__ == 2 \
-+      && __GLIBC_MINOR__ == 1 \
-+      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
-+//#define GLIBC_HEADERS
-+#define GENERIC_HEADERS
-+
-+/* Kernel headers 2.2.X + Glibc 2.0 - Debian 2.1 */
-+#elif defined(__GLIBC__) \
-+      && __GLIBC__ == 2 \
-+      && __GLIBC_MINOR__ == 0 \
-+      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
-+      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
-+#define GLIBC_HEADERS
-+#define KLUDGE_HEADERS
-+
-+/* Note : is it really worth supporting kernel 2.0.X, knowing that
-+ * we require WE v9, which is only available in 2.2.X and higher ?
-+ * I guess one could use 2.0.x with an upgraded wireless.h... */
-+
-+/* Kernel headers 2.0.X + Glibc 2.0 - Debian 2.0, RH 5 */
-+#elif defined(__GLIBC__) \
-+      && __GLIBC__ == 2 \
-+      && __GLIBC_MINOR__ == 0 \
-+      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) \
-+      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0)
-+#define GLIBC_HEADERS
-+
-+/* Kernel headers 2.0.X + libc5 - old systems */
-+#elif defined(_LINUX_C_LIB_VERSION_MAJOR) \
-+      && _LINUX_C_LIB_VERSION_MAJOR == 5 \
-+      && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
-+      && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
-+#define LIBC5_HEADERS
-+
-+/* Unsupported combination */
-+#else
-+#error "Your kernel/libc combination is not supported"
-+#endif
-+
-+#ifdef GENERIC_HEADERS 
-+/* Proposed by Dr. Michael Rietz <rietz@mail.amps.de>, 27.3.2 */
-+/* If this works for all, it might be more stable on the long term - Jean II */
-+#include <net/if_arp.h>		/* For ARPHRD_ETHER */
-+#include <sys/socket.h>		/* For AF_INET & struct sockaddr */
-+#include <netinet/in.h>         /* For struct sockaddr_in */
-+#include <netinet/if_ether.h>
-+#endif /* GENERIC_HEADERS */    
-+
-+#ifdef GLIBC22_HEADERS 
-+/* Added by Ross G. Miller <Ross_Miller@baylor.edu>, 3/28/01 */
-+#include <linux/if_arp.h> 	/* For ARPHRD_ETHER */
-+#include <linux/socket.h>	/* For AF_INET & struct sockaddr */
-+#include <sys/socket.h>
-+#endif /* GLIBC22_HEADERS */    
-+
-+#ifdef KLUDGE_HEADERS
-+#include <socketbits.h>
-+#endif	/* KLUDGE_HEADERS */
-+
-+#ifdef GLIBC_HEADERS
-+#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
-+#include <linux/socket.h>	/* For AF_INET & struct sockaddr */
-+#include <linux/in.h>		/* For struct sockaddr_in */
-+#endif	/* KLUDGE_HEADERS || GLIBC_HEADERS */
-+
-+#ifdef LIBC5_HEADERS
-+#include <sys/socket.h>		/* For AF_INET & struct sockaddr & socket() */
-+#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
-+#include <linux/in.h>		/* For struct sockaddr_in */
-+#endif	/* LIBC5_HEADERS */
-+
-+/* Those 3 headers were previously included in wireless.h */
-+#include <linux/types.h>		/* for "caddr_t" et al		*/
-+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-+#include <linux/if.h>			/* for IFNAMSIZ and co... */
-+
-+#ifdef WEXT_HEADER
-+/* Private copy of Wireless extensions */
-+#include WEXT_HEADER
-+#else	/* !WEXT_HEADER */
-+/* System wide Wireless extensions */
-+#include <linux/wireless.h>
-+#endif	/* !WEXT_HEADER */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/****************************** DEBUG ******************************/
-+
-+
-+/************************ CONSTANTS & MACROS ************************/
-+
-+/* Paths */
-+#define PROC_NET_WIRELESS	"/proc/net/wireless"
-+#define PROC_NET_DEV		"/proc/net/dev"
-+
-+/* Some usefull constants */
-+#define KILO	1e3
-+#define MEGA	1e6
-+#define GIGA	1e9
-+/* For doing log10/exp10 without libm */
-+#define LOG10_MAGIC	1.25892541179
-+
-+/* Backward compatibility for Wireless Extension 9 */
-+#ifndef IW_POWER_MODIFIER
-+#define IW_POWER_MODIFIER	0x000F	/* Modify a parameter */
-+#define IW_POWER_MIN		0x0001	/* Value is a minimum  */
-+#define IW_POWER_MAX		0x0002	/* Value is a maximum */
-+#define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
-+#endif /* IW_POWER_MODIFIER */
-+
-+#ifndef IW_ENCODE_NOKEY
-+#define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not here */
-+#define IW_ENCODE_MODE		0xF000	/* Modes defined below */
-+#endif /* IW_ENCODE_NOKEY */
-+#ifndef IW_ENCODE_TEMP
-+#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
-+#endif /* IW_ENCODE_TEMP */
-+
-+/* More backward compatibility */
-+#ifndef SIOCSIWCOMMIT
-+#define SIOCSIWCOMMIT	SIOCSIWNAME
-+#endif /* SIOCSIWCOMMIT */
-+
-+/****************************** TYPES ******************************/
-+
-+/* Shortcuts */
-+typedef struct iw_statistics	iwstats;
-+typedef struct iw_range		iwrange;
-+typedef struct iw_param		iwparam;
-+typedef struct iw_freq		iwfreq;
-+typedef struct iw_quality	iwqual;
-+typedef struct iw_priv_args	iwprivargs;
-+typedef struct sockaddr		sockaddr;
-+
-+/* Structure for storing all wireless information for each device
-+ * This is pretty exhaustive... */
-+typedef struct wireless_info
-+{
-+  char		name[IFNAMSIZ + 1];	/* Wireless/protocol name */
-+  int		has_nwid;
-+  iwparam	nwid;			/* Network ID */
-+  int		has_freq;
-+  double	freq;			/* Frequency/channel */
-+  int		has_sens;
-+  iwparam	sens;			/* sensitivity */
-+  int		has_key;
-+  unsigned char	key[IW_ENCODING_TOKEN_MAX];	/* Encoding key used */
-+  int		key_size;		/* Number of bytes */
-+  int		key_flags;		/* Various flags */
-+  int		has_essid;
-+  int		essid_on;
-+  char		essid[IW_ESSID_MAX_SIZE + 1];	/* ESSID (extended network) */
-+  int		has_nickname;
-+  char		nickname[IW_ESSID_MAX_SIZE + 1]; /* NickName */
-+  int		has_ap_addr;
-+  sockaddr	ap_addr;		/* Access point address */
-+  int		has_bitrate;
-+  iwparam	bitrate;		/* Bit rate in bps */
-+  int		has_rts;
-+  iwparam	rts;			/* RTS threshold in bytes */
-+  int		has_frag;
-+  iwparam	frag;			/* Fragmentation threshold in bytes */
-+  int		has_mode;
-+  int		mode;			/* Operation mode */
-+  int		has_power;
-+  iwparam	power;			/* Power management parameters */
-+  int		has_txpower;
-+  iwparam	txpower;		/* Transmit Power in dBm */
-+  int		has_retry;
-+  iwparam	retry;			/* Retry limit or lifetime */
-+
-+  /* Stats */
-+  iwstats	stats;
-+  int		has_stats;
-+  iwrange	range;
-+  int		has_range;
-+} wireless_info;
-+
-+/* Structure for storing all wireless information for each device
-+ * This is a cut down version of the one above, containing only
-+ * the things *truly* needed to configure a card.
-+ * Don't add other junk, I'll remove it... */
-+typedef struct wireless_config
-+{
-+  char		name[IFNAMSIZ + 1];	/* Wireless/protocol name */
-+  int		has_nwid;
-+  iwparam	nwid;			/* Network ID */
-+  int		has_freq;
-+  double	freq;			/* Frequency/channel */
-+  int		has_key;
-+  unsigned char	key[IW_ENCODING_TOKEN_MAX];	/* Encoding key used */
-+  int		key_size;		/* Number of bytes */
-+  int		key_flags;		/* Various flags */
-+  int		has_essid;
-+  int		essid_on;
-+  char		essid[IW_ESSID_MAX_SIZE + 1];	/* ESSID (extended network) */
-+  int		has_mode;
-+  int		mode;			/* Operation mode */
-+} wireless_config;
-+
-+typedef struct stream_descr
-+{
-+  char *	end;		/* End of the stream */
-+  char *	current;	/* Current event in stream of events */
-+  char *	value;		/* Current value in event */
-+} stream_descr;
-+
-+/* Prototype for handling display of each single interface on the
-+ * system - see iw_enum_devices() */
-+typedef int (*iw_enum_handler)(int	skfd,
-+			       char *	ifname,
-+			       char *	args[],
-+			       int	count);
-+
-+/**************************** PROTOTYPES ****************************/
-+/*
-+ * All the functions in iwcommon.c
-+ */
-+
-+/* ---------------------- SOCKET SUBROUTINES -----------------------*/
-+int
-+	iw_sockets_open(void);
-+void
-+	iw_enum_devices(int		skfd,
-+			iw_enum_handler fn,
-+			char *		args[],
-+			int		count);
-+/* --------------------- WIRELESS SUBROUTINES ----------------------*/
-+int
-+	iw_get_range_info(int		skfd,
-+			  char *	ifname,
-+			  iwrange *	range);
-+int
-+	iw_print_version_info(char *	toolname);
-+int
-+	iw_get_priv_info(int		skfd,
-+			 char *		ifname,
-+			 iwprivargs *	priv,
-+			 int		maxpriv);
-+int
-+	iw_get_basic_config(int			skfd,
-+			    char *		ifname,
-+			    wireless_config *	info);
-+int
-+	iw_set_basic_config(int			skfd,
-+			    char *		ifname,
-+			    wireless_config *	info);
-+/* --------------------- PROTOCOL SUBROUTINES --------------------- */
-+int
-+	iw_protocol_compare(char *	protocol1,
-+			    char *	protocol2);
-+/* -------------------- FREQUENCY SUBROUTINES --------------------- */
-+void
-+	iw_float2freq(double	in,
-+		   iwfreq *	out);
-+double
-+	iw_freq2float(iwfreq *	in);
-+void
-+	iw_print_freq(char *	buffer,
-+		      double	freq);
-+int
-+	iw_freq_to_channel(double		freq,
-+			   struct iw_range *	range);
-+void
-+	iw_print_bitrate(char *	buffer,
-+			 int	bitrate);
-+/* ---------------------- POWER SUBROUTINES ----------------------- */
-+int
-+	iw_dbm2mwatt(int	in);
-+int
-+	iw_mwatt2dbm(int	in);
-+/* -------------------- STATISTICS SUBROUTINES -------------------- */
-+int
-+	iw_get_stats(int	skfd,
-+		     char *	ifname,
-+		     iwstats *	stats);
-+void
-+	iw_print_stats(char *		buffer,
-+		       iwqual *		qual,
-+		       iwrange *	range,
-+		       int		has_range);
-+/* --------------------- ENCODING SUBROUTINES --------------------- */
-+void
-+	iw_print_key(char *		buffer,
-+		     unsigned char *	key,
-+		     int		key_size,
-+		     int		key_flags);
-+int
-+	iw_in_key(char *		input,
-+		  unsigned char *	key);
-+int
-+	iw_in_key_full(int		skfd,
-+		       char *		ifname,
-+		       char *		input,
-+		       unsigned char *	key,
-+		       __u16 *		flags);
-+/* ----------------- POWER MANAGEMENT SUBROUTINES ----------------- */
-+void
-+	iw_print_pm_value(char *	buffer,
-+			  int		value,
-+			  int		flags);
-+void
-+	iw_print_pm_mode(char *		buffer,
-+			 int		flags);
-+/* --------------- RETRY LIMIT/LIFETIME SUBROUTINES --------------- */
-+#if WIRELESS_EXT > 10
-+void
-+	iw_print_retry_value(char *	buffer,
-+			     int	value,
-+			     int	flags);
-+#endif
-+/* ----------------------- TIME SUBROUTINES ----------------------- */
-+void
-+	iw_print_timeval(char *			buffer,
-+			 const struct timeval *	time);
-+/* --------------------- ADDRESS SUBROUTINES ---------------------- */
-+int
-+	iw_check_mac_addr_type(int	skfd,
-+			       char *	ifname);
-+int
-+	iw_check_if_addr_type(int	skfd,
-+			      char *	ifname);
-+#if 0
-+int
-+	iw_check_addr_type(int		skfd,
-+			   char *	ifname);
-+#endif
-+void
-+	iw_ether_ntop(const struct ether_addr* eth, char* buf);
-+char*
-+	iw_ether_ntoa(const struct ether_addr* eth);
-+int
-+	iw_ether_aton(const char* bufp, struct ether_addr* eth);
-+int
-+	iw_in_inet(char *bufp, struct sockaddr *sap);
-+int
-+	iw_in_addr(int			skfd,
-+		   char *		ifname,
-+		   char *		bufp,
-+		   struct sockaddr *	sap);
-+/* ----------------------- MISC SUBROUTINES ------------------------ */
-+int
-+	iw_get_priv_size(int		args);
-+
-+#if WIRELESS_EXT > 13
-+/* ---------------------- EVENT SUBROUTINES ---------------------- */
-+void
-+	iw_init_event_stream(struct stream_descr *	stream,
-+			     char *			data,
-+			     int			len);
-+int
-+	iw_extract_event_stream(struct stream_descr *	stream,
-+				struct iw_event *	iwe);
-+#endif /* WIRELESS_EXT > 13 */
-+
-+/**************************** VARIABLES ****************************/
-+
-+extern const char * const	iw_operation_mode[];
-+#define IW_NUM_OPER_MODE	7
-+
-+/************************* INLINE FUNTIONS *************************/
-+/*
-+ * Functions that are so simple that it's more efficient inlining them
-+ */
-+
-+/*
-+ * Note : I've defined wrapper for the ioctl request so that
-+ * it will be easier to migrate to other kernel API if needed
-+ */
-+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Wrapper to push some Wireless Parameter in the driver
-+ */
-+static inline int
-+iw_set_ext(int			skfd,		/* Socket to the kernel */
-+	   char *		ifname,		/* Device name */
-+	   int			request,	/* WE ID */
-+	   struct iwreq *	pwrq)		/* Fixed part of the request */
-+{
-+  /* Set device name */
-+  strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
-+  /* Do the request */
-+  return(ioctl(skfd, request, pwrq));
-+}
-+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Wrapper to extract some Wireless Parameter out of the driver
-+ */
-+static inline int
-+iw_get_ext(int			skfd,		/* Socket to the kernel */
-+	   char *		ifname,		/* Device name */
-+	   int			request,	/* WE ID */
-+	   struct iwreq *	pwrq)		/* Fixed part of the request */
-+{
-+  /* Set device name */
-+  strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
-+  /* Do the request */
-+  return(ioctl(skfd, request, pwrq));
-+}
-+
-+/*------------------------------------------------------------------*/
-+/* Backwards compatability
-+ * Actually, those form are much easier to use when dealing with
-+ * struct sockaddr... */
-+static inline char*
-+iw_pr_ether(char* bufp, const unsigned char* addr)
-+{
-+  iw_ether_ntop((const struct ether_addr *) addr, bufp);
-+  return bufp;
-+}
-+/* Backwards compatability */
-+static inline int
-+iw_in_ether(const char *bufp, struct sockaddr *sap)
-+{
-+  sap->sa_family = ARPHRD_ETHER;
-+  return iw_ether_aton(bufp, (struct ether_addr *) sap->sa_data) ? 0 : -1;
-+}
-+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Create an Ethernet broadcast address
-+ */
-+static inline void
-+iw_broad_ether(struct sockaddr *sap)
-+{
-+  sap->sa_family = ARPHRD_ETHER;
-+  memset((char *) sap->sa_data, 0xFF, ETH_ALEN);
-+}
-+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Create an Ethernet NULL address
-+ */
-+static inline void
-+iw_null_ether(struct sockaddr *sap)
-+{
-+  sap->sa_family = ARPHRD_ETHER;
-+  memset((char *) sap->sa_data, 0x00, ETH_ALEN);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif	/* IWLIB_H */
diff --git a/trunk/package/feeds/packages/net-snmp/patches/800-format-security.patch b/trunk/package/feeds/packages/net-snmp/patches/800-format-security.patch
deleted file mode 100644
index 87a3e928..00000000
--- a/trunk/package/feeds/packages/net-snmp/patches/800-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/agent/mibgroup/host/hr_filesys.c
-+++ b/agent/mibgroup/host/hr_filesys.c
-@@ -322,13 +322,13 @@ var_hrfilesys(struct variable *vp,
-         long_return = fsys_idx;
-         return (u_char *) & long_return;
-     case HRFSYS_MOUNT:
--        snprintf(string, sizeof(string), HRFS_entry->HRFS_mount);
-+        snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_mount);
-         string[ sizeof(string)-1 ] = 0;
-         *var_len = strlen(string);
-         return (u_char *) string;
-     case HRFSYS_RMOUNT:
-         if (Check_HR_FileSys_NFS()) {
--            snprintf(string, sizeof(string), HRFS_entry->HRFS_name);
-+            snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_name);
-             string[ sizeof(string)-1 ] = 0;
-         } else
-             string[0] = '\0';
---- a/agent/mibgroup/ucd-snmp/extensible.c
-+++ b/agent/mibgroup/ucd-snmp/extensible.c
-@@ -513,7 +513,7 @@ fixExecError(int action,
-         }
-         tmp = *((long *) var_val);
-         if ((tmp == 1) && (action == COMMIT) && (exten->fixcmd[0] != 0)) {
--            sprintf(ex.command, exten->fixcmd);
-+            sprintf(ex.command, "%s", exten->fixcmd);
-             if ((fd = get_exec_output(&ex)) != -1) {
-                 file = fdopen(fd, "r");
-                 while (fgets(ex.output, sizeof(ex.output), file) != NULL);
diff --git a/trunk/package/feeds/packages/netatalk/Makefile b/trunk/package/feeds/packages/netatalk/Makefile
deleted file mode 100644
index 8729053c..00000000
--- a/trunk/package/feeds/packages/netatalk/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2009-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=netatalk
-PKG_VERSION:=2.2.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/netatalk
-PKG_MD5SUM:=40753a32340c24e4ec395aeb55ef056e
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netatalk
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  DEPENDS:=+attr +libdb47 +libgcrypt +libopenssl $(LIBRPC_DEPENDS)
-  TITLE:=netatalk
-  URL:=http://netatalk.sourceforge.net
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/netatalk/decription
-  Netatalk is a freely-available Open Source AFP fileserver.
-  It also provides a kernel level implementation of the AppleTalk
-  Protocol Suite.
-endef
-
-define Package/netatalk/conffiles
-/etc/netatalk/afpd.conf
-endef
-
-TARGET_CFLAGS += -std=gnu99
-TARGET_LDFLAGS += $(LIBRPC)
-
-CONFIGURE_ARGS += \
-	--disable-afs \
-	--enable-hfs \
-	--disable-debugging \
-	--disable-shell-check \
-	--disable-timelord \
-	--disable-a2boot \
-	--disable-cups \
-	--disable-tcp-wrappers \
-	--with-cnid-default-backend=dbd \
-	--with-bdb="$(STAGING_DIR)/usr/" \
-	--with-libgcrypt-dir="$(STAGING_DIR)/usr" \
-	--with-ssl-dir="$(STAGING_DIR)/usr" \
-	--with-uams-path="/usr/lib/uams" \
-	--without-acls \
-	--without-pam \
-	--disable-admin-group \
-	--disable-srvloc \
-	--disable-zeroconf \
-	$(if $(CONFIG_SHADOW_PASSWORDS),--with-shadow,--without-shadow) \
-	--without-ldap
-
-define Package/netatalk/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib/uams
-	$(INSTALL_DIR) $(1)/etc/netatalk
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/afppasswd $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/afpd $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/
-	$(CP) ./files/AppleVolumes.default $(1)/etc/netatalk/
-	$(CP) $(PKG_INSTALL_DIR)/etc/netatalk/AppleVolumes.system $(1)/etc/netatalk/
-	$(INSTALL_CONF) ./files/afpd.conf $(1)/etc/netatalk/
-	$(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd
-endef
-
-$(eval $(call BuildPackage,netatalk))
diff --git a/trunk/package/feeds/packages/netatalk/files/AppleVolumes.default b/trunk/package/feeds/packages/netatalk/files/AppleVolumes.default
deleted file mode 100644
index 5835163a..00000000
--- a/trunk/package/feeds/packages/netatalk/files/AppleVolumes.default
+++ /dev/null
@@ -1,2 +0,0 @@
--
-/tmp Temp allow:root,nobody cnidscheme:dbd
diff --git a/trunk/package/feeds/packages/netatalk/files/afpd.conf b/trunk/package/feeds/packages/netatalk/files/afpd.conf
deleted file mode 100644
index 097e954e..00000000
--- a/trunk/package/feeds/packages/netatalk/files/afpd.conf
+++ /dev/null
@@ -1 +0,0 @@
-- -noddp -uampath /usr/lib/uams -uamlist uams_guest.so,uams_passwd.so,uams_dhx_passwd.so,uams_randnum.so,uams_dhx2.so -passwdfile /etc/netatalk/afppasswd -savepassword -passwdminlen 0 -nosetpassword -defaultvol /etc/netatalk/AppleVolumes.default -systemvol /etc/netatalk/AppleVolumes.system -nouservol -guestname "nobody" -sleep 1 -icon
diff --git a/trunk/package/feeds/packages/netatalk/files/afpd.init b/trunk/package/feeds/packages/netatalk/files/afpd.init
deleted file mode 100644
index 8b133398..00000000
--- a/trunk/package/feeds/packages/netatalk/files/afpd.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2012 OpenWrt.org
-
-START=70
-
-MAXCONS="7"
-
-start()
-{
-	service_start /usr/sbin/cnid_metad
-	service_start /usr/sbin/afpd -c ${MAXCONS}
-}
-
-stop()
-{
-	service_stop /usr/sbin/afpd
-	service_stop /usr/sbin/cnid_metad
-}
-
-reload()
-{
-	service_reload /usr/sbin/afpd
-}
diff --git a/trunk/package/feeds/packages/netatalk/patches/001-automake-compat.patch b/trunk/package/feeds/packages/netatalk/patches/001-automake-compat.patch
deleted file mode 100644
index 28c107a3..00000000
--- a/trunk/package/feeds/packages/netatalk/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/macros/iconv.m4
-+++ b/macros/iconv.m4
-@@ -115,6 +115,5 @@ int main() {
- 
-         CFLAGS="$savedcflags"
-         LDFLAGS="$savedldflags"
--	CPPFLAGS="$saved_CPPFLAGS"
- 	
- ])
diff --git a/trunk/package/feeds/packages/netatalk/patches/002-ld_library_path.patch b/trunk/package/feeds/packages/netatalk/patches/002-ld_library_path.patch
deleted file mode 100644
index 381a85b6..00000000
--- a/trunk/package/feeds/packages/netatalk/patches/002-ld_library_path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/macros/db3-check.m4
-+++ b/macros/db3-check.m4
-@@ -148,9 +148,9 @@ AC_DEFUN([AC_PATH_BDB],[
-                         dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly
-                         dnl -- portable hopefully. Reference:
-                         dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html
--                        eval export $shlibpath_var=$bdblibdir
-+#                        eval export $shlibpath_var=$bdblibdir
-                         NETATALK_BDB_TRY_LINK
--                        eval export $shlibpath_var=$saved_shlibpath_var
-+#                        eval export $shlibpath_var=$saved_shlibpath_var
- 
-                         if test x"${atalk_cv_bdb_version}" = x"yes"; then
-                             BDB_CFLAGS="-I${bdbdir}/include${subdir}"
-@@ -171,9 +171,9 @@ AC_DEFUN([AC_PATH_BDB],[
-                            CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
-                            LDFLAGS="-L$bdblibdir $LDFLAGS"
- 
--                           eval export $shlibpath_var=$bdblibdir
-+#                           eval export $shlibpath_var=$bdblibdir
-                            NETATALK_BDB_TRY_LINK
--                           eval export $shlibpath_var=$saved_shlibpath_var
-+#                           eval export $shlibpath_var=$saved_shlibpath_var
- 
-                            if test x"${atalk_cv_bdb_version}" = x"yes"; then
-                               BDB_CFLAGS="-I${bdbdir}/include${subdir}"
diff --git a/trunk/package/feeds/packages/netcat/Makefile b/trunk/package/feeds/packages/netcat/Makefile
deleted file mode 100644
index 0248f0d1..00000000
--- a/trunk/package/feeds/packages/netcat/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=netcat
-PKG_VERSION:=0.7.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=0a29eff1736ddb5effd0b1ec1f6fe0ef
-PKG_MAINTAINER:=Adam Gensler <openwrt@a.gnslr.us>
-PKG_LICENSE:=GPL-2.0
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netcat
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A feature-rich network debugging and exploration tool.
-  URL:=http://netcat.sourceforge.net/
-endef
-
-define Package/netcat/description
-		Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.
-	It is designed to be a reliable "back-end" tool that can be used directly or easily driven by other programs and scripts. At the same time, it is a feature-rich network debugging and exploration tool, since it can create almost any kind of connection you would need and has several interesting built-in capabilities.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-rpath \
-		--with-included-getopt \
-	)
-endef
-
-define Package/netcat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/netcat \
-		$(1)/usr/bin
-endef
-
-define Package/netcat/postinst
-#!/bin/sh
-if [ -e $${IPKG_INSTROOT}/usr/bin/nc ]; then
-  rm -rf $${IPKG_INSTROOT}/usr/bin/nc;
-fi
-ln -s ./netcat $${IPKG_INSTROOT}/usr/bin/nc
-endef
-
-define Package/netcat/postrm
-#!/bin/sh
-rm $${IPKG_INSTROOT}/usr/bin/nc
-ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/nc
-$${IPKG_INSTROOT}/usr/bin/nc 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/nc
-exit 0
-endef
-
-
-$(eval $(call BuildPackage,netcat))
diff --git a/trunk/package/feeds/packages/netcat/patches/001-netcat_flag_count.patch b/trunk/package/feeds/packages/netcat/patches/001-netcat_flag_count.patch
deleted file mode 100644
index 44ee9e1f..00000000
--- a/trunk/package/feeds/packages/netcat/patches/001-netcat_flag_count.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: netcat-0.7.1/src/flagset.c
-===================================================================
---- netcat-0.7.1.orig/src/flagset.c	2009-02-06 19:56:01.000000000 +0100
-+++ netcat-0.7.1/src/flagset.c	2009-02-06 19:56:13.000000000 +0100
-@@ -134,7 +134,7 @@
- 
- int netcat_flag_count(void)
- {
--  register char c;
-+  register unsigned char c;
-   register int i;
-   int ret = 0;
- 
-@@ -154,7 +154,7 @@
- 	Assumed that the bit number 1 is the sign, and that we will shift the
- 	bit 1 (or the bit that takes its place later) until the the most right,
- 	WHY it has to keep the wrong sign? */
--      ret -= (c >> 7);
-+      ret += (c >> 7);
-       c <<= 1;
-     }
-   }
diff --git a/trunk/package/feeds/packages/nfs-kernel-server/Makefile b/trunk/package/feeds/packages/nfs-kernel-server/Makefile
deleted file mode 100644
index fb67bb4e..00000000
--- a/trunk/package/feeds/packages/nfs-kernel-server/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nfs-kernel-server
-PKG_VERSION:=1.3.2
-PKG_RELEASE:=2
-PKG_MD5SUM:=1e2f3c1ed468dee02d00c534c002ea10
-
-PKG_SOURCE_URL:=@SF/nfs
-PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/nfs-utils-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION)
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=$(PKG_NAME)/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nfs-kernel-server/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  DEPENDS:=+libwrap +libblkid +libuuid $(LIBRPC_DEPENDS)
-  URL:=http://nfs.sourceforge.net/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/nfs-kernel-server
-  $(call Package/nfs-kernel-server/Default)
-  TITLE:=Kernel NFS server support
-  DEPENDS+= +kmod-fs-nfsd +kmod-fs-nfs +portmap
-endef
-
-define Package/nfs-kernel-server/description
-  Kernel NFS server support
-endef
-
-define Package/nfs-kernel-server-utils
-  $(call Package/nfs-kernel-server/Default)
-  TITLE:=NFS server utils
-  DEPENDS:=nfs-kernel-server
-endef
-
-define Package/nfs-kernel-server-utils/description
-  NFS server utils
-endef
-
-define Package/nfs-kernel-server/conffiles
-/etc/exports
-endef
-
-define Package/nfs-utils
-  $(call Package/nfs-kernel-server/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS+= +libevent +USE_UCLIBC:librpc
-  TITLE:=updated mount utility (includes nfs4)
-endef
-
-define Package/nfs-utils/description
-  Updated mount.nfs command - allows mounting nfs4 volumes
-endef
-
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib -I$(STAGING_DIR)/usr/include/libevent \
-		 -I$(STAGING_DIR)/usr/include/ -Drpc_uint=uint
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(LIBRPC) \
-		  -L$(STAGING_DIR)/usr/lib/libevent
-
-CONFIGURE_ARGS += \
-	--disable-gss \
-	--disable-nfsv4 \
-	--disable-nfsv41 \
-	--disable-ipv6 \
-	--enable-static \
-	--enable-shared \
-	--disable-caps \
-	--disable-tirpc \
-	--disable-nfsdcld
-
-CONFIGURE_VARS += \
-	libblkid_cv_is_recent=yes \
-	CONFIG_SQLITE3_TRUE="\#" \
-	CONFIG_NFSDCLD_TRUE="\#"
-
-MAKE_FLAGS += \
-	OPT="$(TARGET_CFLAGS)" \
-	INSTALLSUID="install -m 4755" \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	RPCGEN_PATH=$(STAGING_DIR_HOST)/bin/rpcgen \
-	RPCGEN=$(STAGING_DIR_HOST)/bin/rpcgen
-
-HOST_CFLAGS += -Dlinux
-
-HOST_CONFIGURE_ARGS += \
-	--disable-gss \
-	--disable-nfsv4 \
-	--disable-nfsv41 \
-	--disable-ipv6 \
-	--disable-tirpc \
-	--without-tcp-wrappers
-
-HOST_CONFIGURE_VARS += \
-	ac_cv_lib_event_event_dispatch=yes \
-	ac_cv_lib_nfsidmap_nfs4_init_name_mapping=yes \
-	ac_cv_lib_blkid_blkid_get_library_version=yes \
-	ac_cv_header_event_h=yes \
-	ac_cv_header_nfsidmap_h=yes \
-	ac_cv_header_blkid_blkid_h=yes \
-	GSSGLUE_CFLAGS=" " \
-	GSSGLUE_LIBS=" " \
-	RPCSECGSS_CFLAGS=" " \
-	RPCSECGSS_LIBS=" " \
-	CONFIG_SQLITE3_TRUE="\#" \
-	CONFIG_NFSDCLD_TRUE="\#"
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)/tools/rpcgen all
-endef
-
-define Host/Install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/rpcgen/rpcgen $(STAGING_DIR_HOST)/bin/rpcgen
-endef
-
-define Package/nfs-kernel-server/install
-	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
-	$(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
-	$(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/sm-notify $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/exportfs/exportfs $(1)/usr/sbin/
-endef
-
-define Package/nfs-kernel-server-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/showmount/showmount $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsstat/nfsstat $(1)/usr/sbin
-endef
-
-define Package/nfs-utils/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/
-	(cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4)
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,nfs-kernel-server))
-$(eval $(call BuildPackage,nfs-kernel-server-utils))
-$(eval $(call BuildPackage,nfs-utils))
diff --git a/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.exports b/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.exports
deleted file mode 100644
index 0453e04c..00000000
--- a/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.exports
+++ /dev/null
@@ -1 +0,0 @@
-/mnt	*(ro,all_squash,insecure,sync)
diff --git a/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.init b/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.init
deleted file mode 100644
index af36c12c..00000000
--- a/trunk/package/feeds/packages/nfs-kernel-server/files/nfsd.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=99
-STOP=60
-
-USE_PROCD=1
-
-NFS_D=/var/lib/nfs
-LOCK_D=/var/lib/nfs/sm
-
-start_service() {
-	grep -q /proc/fs/nfsd /proc/mounts || \
-		mount -t nfsd nfsd /proc/fs/nfsd
-	mkdir -p $NFS_D
-	mkdir -p $LOCK_D
-	touch $NFS_D/rmtab
-
-        sysctl -w fs.nfs.nlm_tcpport=32777 fs.nfs.nlm_udpport=32777 > /dev/null
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/rpc.statd -p 32778 -o 32779 -F
-	procd_close_instance
-
-	/usr/sbin/exportfs -r
-	/usr/sbin/rpc.nfsd
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/rpc.mountd -p 32780 -F
-	procd_close_instance
-}
-
-stop_service() {
-	rpc.nfsd 0 2> /dev/null
-	/usr/sbin/exportfs -au
-	grep -q /proc/fs/nfsd /proc/mounts && \
-		umount /proc/fs/nfsd
-}
diff --git a/trunk/package/feeds/packages/nfs-kernel-server/patches/100-no_malloc_h.patch b/trunk/package/feeds/packages/nfs-kernel-server/patches/100-no_malloc_h.patch
deleted file mode 100644
index afe4c98e..00000000
--- a/trunk/package/feeds/packages/nfs-kernel-server/patches/100-no_malloc_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/rpcgen/rpc_cout.c
-+++ b/tools/rpcgen/rpc_cout.c
-@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <ctype.h>
- #include "rpc_parse.h"
- #include "rpc_util.h"
diff --git a/trunk/package/feeds/packages/nginx/Config.in b/trunk/package/feeds/packages/nginx/Config.in
deleted file mode 100644
index b135e42d..00000000
--- a/trunk/package/feeds/packages/nginx/Config.in
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-menu "Configuration"
-        depends on PACKAGE_nginx
-
-config NGINX_STUB_STATUS
-	bool
-	prompt "Enable stub status module"
-	help
-		Enable the stub status module which gives some status from the server.
-
-config NGINX_FLV
-	bool
-	prompt "Enable FLV module"
-	help
-		Provides the ability to seek within FLV (Flash) files using time-based offsets.
-
-config NGINX_SSL
-	bool
-	prompt "Enable SSL module"
-	help
-		Enable HTTPS/SSL support.
-
-config NGINX_DAV
-	bool
-	prompt "Enable WebDAV module"
-	help
-		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
-
-config NGINX_LUA
-	bool
-	prompt "Enable LUA module"
-	help
-		Enable support for LUA scripts.
-
-config NGINX_PCRE
-	bool
-	prompt "Enable PCRE library usage"
-	default y
-
-config NGINX_HTTP_CACHE
-	bool
-	prompt "Enable HTTP cache"
-
-config NGINX_HTTP_CHARSET
-	bool
-	prompt "Enable HTTP charset module"
-	default y
-
-config NGINX_HTTP_GZIP
-	bool
-	prompt "Enable HTTP gzip module"
-	default y
-
-config NGINX_HTTP_SSI
-	bool
-	prompt "Enable HTTP ssi module"
-	default y
-
-config NGINX_HTTP_USERID
-	bool
-	prompt "Enable HTTP userid module"
-	default y
-
-config NGINX_HTTP_ACCESS
-	bool
-	prompt "Enable HTTP access module"
-	default y
-
-config NGINX_HTTP_AUTH_BASIC
-	bool
-	prompt "Enable HTTP auth basic"
-	default y
-
-config NGINX_HTTP_AUTOINDEX
-	bool
-	prompt "Enable HTTP autoindex module"
-	default y
-
-config NGINX_HTTP_GEO
-	bool
-	prompt "Enable HTTP geo module"
-	default y
-
-config NGINX_HTTP_MAP
-	bool
-	prompt "Enable HTTP map module"
-	default y
-
-config NGINX_HTTP_SPLIT_CLIENTS
-	bool
-	prompt "Enable HTTP split clients"
-	default y
-
-config NGINX_HTTP_REFERER
-	bool
-	prompt "Enable HTTP referer module"
-	default y
-
-config NGINX_HTTP_REWRITE
-	bool
-	prompt "Enable HTTP rewrite module"
-	select NGINX_PCRE
-	default y
-
-config NGINX_HTTP_PROXY
-	bool
-	prompt "Enable HTTP proxy module"
-	default y
-
-config NGINX_HTTP_FASTCGI
-	bool
-	prompt "Enable HTTP fastcgi module"
-	default y
-
-config NGINX_HTTP_UWSGI
-	bool
-	prompt "Enable HTTP uwsgi module"
-	default y
-
-config NGINX_HTTP_SCGI
-	bool
-	prompt "Enable HTTP scgi module"
-	default y
-
-config NGINX_HTTP_MEMCACHED
-	bool
-	prompt "Enable HTTP memcached module"
-	default y
-
-config NGINX_HTTP_LIMIT_CONN
-	bool
-	prompt "Enable HTTP limit conn"
-	default y
-
-config NGINX_HTTP_LIMIT_REQ
-	bool
-	prompt "Enable HTTP limit req"
-	default y
-
-config NGINX_HTTP_EMPTY_GIF
-	bool
-	prompt "Enable HTTP empty gif"
-	default y
-
-config NGINX_HTTP_BROWSER
-	bool
-	prompt "Enable HTTP browser module"
-	default y
-
-config NGINX_HTTP_UPSTREAM_IP_HASH
-	bool
-	prompt "Enable HTTP IP hash module"
-	default y
-
-config NGINX_NAXSI
-	bool
-	prompt "Enable NAXSI module"
-	select PACKAGE_nginx-naxsi
-	default y
-	help
-		Enable support for NAXSI WAF.
-
-config NGINX_PROXYPROTOCOL
-	bool
-	prompt "Enable HAProxy proxyprotocol"
-	select PACKAGE_nginx-proxyprotocol
-	select NGINX_SSL
-	default n
-	help
-		Enable support for PROXY PROTOCOL
-
-config NGINX_SYSLOG
-	bool
-	prompt "Enable Syslog module"
-	select PACKAGE_nginx-syslog
-	default y
-	help
-		Provides the ability log to a remote destination
-
-config NGINX_HTTP_UPSTREAM_CHECK
-	bool
-	select NGINX_SSL
-	prompt "Enable HTTP upstream check module"
-	default n
-
-endmenu
diff --git a/trunk/package/feeds/packages/nginx/Makefile b/trunk/package/feeds/packages/nginx/Makefile
deleted file mode 100644
index e93326e5..00000000
--- a/trunk/package/feeds/packages/nginx/Makefile
+++ /dev/null
@@ -1,334 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nginx
-PKG_VERSION:=1.4.7
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://nginx.org/download/
-PKG_MD5SUM:=aee151d298dcbfeb88b3f7dd3e7a4d17
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=2-clause BSD-like license
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := \
-	CONFIG_NGINX_STUB_STATUS \
-	CONFIG_NGINX_FLV \
-	CONFIG_NGINX_SSL \
-	CONFIG_NGINX_DAV \
-	CONFIG_NGINX_LUA \
-	CONFIG_NGINX_PCRE \
-	CONFIG_NGINX_HTTP_CACHE \
-	CONFIG_NGINX_HTTP_CHARSET \
-	CONFIG_NGINX_HTTP_GZIP \
-	CONFIG_NGINX_HTTP_SSI \
-	CONFIG_NGINX_HTTP_USERID \
-	CONFIG_NGINX_HTTP_ACCESS \
-	CONFIG_NGINX_HTTP_AUTH_BASIC \
-	CONFIG_NGINX_HTTP_AUTOINDEX \
-	CONFIG_NGINX_HTTP_GEO \
-	CONFIG_NGINX_HTTP_MAP \
-	CONFIG_NGINX_HTTP_SPLIT_CLIENTS \
-	CONFIG_NGINX_HTTP_REFERER \
-	CONFIG_NGINX_HTTP_REWRITE \
-	CONFIG_NGINX_HTTP_PROXY \
-	CONFIG_NGINX_HTTP_FASTCGI \
-	CONFIG_NGINX_HTTP_UWSGI \
-	CONFIG_NGINX_HTTP_SCGI \
-	CONFIG_NGINX_HTTP_MEMCACHED \
-	CONFIG_NGINX_HTTP_LIMIT_CONN \
-	CONFIG_NGINX_HTTP_LIMIT_REQ \
-	CONFIG_NGINX_HTTP_EMPTY_GIF \
-	CONFIG_NGINX_HTTP_BROWSER \
-	CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nginx
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=Nginx web server
-  URL:=http://nginx.org/
-  DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl +NGINX_HTTP_GZIP:zlib +libpthread +NGINX_LUA:liblua
-  MENU:=1
-endef
-
-define Package/nginx/description
- nginx is an HTTP and reverse proxy server, as well as a mail proxy server,
- written by Igor Sysoev.
-endef
-
-define Package/nginx/config
-  source "$(SOURCE)/Config.in"
-endef
-
-config_files=nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf
-
-define Package/nginx/conffiles
-/etc/nginx/
-endef
-
-ADDITIONAL_MODULES:=
-ifeq ($(CONFIG_NGINX_NAXSI),y)
-  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
-endif
-ifeq ($(CONFIG_IPV6),y)
-  ADDITIONAL_MODULES += --with-ipv6
-endif
-ifeq ($(CONFIG_NGINX_STUB_STATUS),y)
-  ADDITIONAL_MODULES += --with-http_stub_status_module
-endif
-ifeq ($(CONFIG_NGINX_FLV),y)
-  ADDITIONAL_MODULES += --with-http_flv_module
-endif
-ifeq ($(CONFIG_NGINX_SSL),y)
-  ADDITIONAL_MODULES += --with-http_ssl_module
-endif
-ifeq ($(CONFIG_NGINX_DAV),y)
-  ADDITIONAL_MODULES += --with-http_dav_module
-endif
-ifeq ($(CONFIG_NGINX_LUA),y)
-  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
-endif
-ifneq ($(CONFIG_NGINX_HTTP_CACHE),y)
-  ADDITIONAL_MODULES += --without-http-cache
-endif
-ifneq ($(CONFIG_NGINX_PCRE),y)
-  ADDITIONAL_MODULES += --without-pcre
-endif
-ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y)
-  ADDITIONAL_MODULES += --without-http_charset_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_GZIP),y)
-  ADDITIONAL_MODULES += --without-http_gzip_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_SSI),y)
-  ADDITIONAL_MODULES += --without-http_ssi_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_USERID),y)
-  ADDITIONAL_MODULES += --without-http_userid_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y)
-  ADDITIONAL_MODULES += --without-http_access_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y)
-  ADDITIONAL_MODULES += --without-http_auth_basic_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y)
-  ADDITIONAL_MODULES += --without-http_autoindex_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_GEO),y)
-  ADDITIONAL_MODULES += --without-http_geo_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_MAP),y)
-  ADDITIONAL_MODULES += --without-http_map_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y)
-  ADDITIONAL_MODULES += --without-http_split_clients_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_REFERER),y)
-  ADDITIONAL_MODULES += --without-http_referer_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y)
-  ADDITIONAL_MODULES += --without-http_rewrite_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_PROXY),y)
-  ADDITIONAL_MODULES += --without-http_proxy_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y)
-  ADDITIONAL_MODULES += --without-http_fastcgi_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
-  ADDITIONAL_MODULES += --without-http_uwsgi_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
-  ADDITIONAL_MODULES += --without-http_scgi_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y)
-  ADDITIONAL_MODULES += --without-http_memcached_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y)
-  ADDITIONAL_MODULES += --without-http_limit_conn_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y)
-  ADDITIONAL_MODULES += --without-http_limit_req_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y)
-  ADDITIONAL_MODULES += --without-http_empty_gif_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y)
-  ADDITIONAL_MODULES += --without-http_browser_module
-endif
-ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y)
-  ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module
-endif
-ifeq ($(CONFIG_NGINX_PROXYPROTOCOL),y)
-  ADDITIONAL_MODULES += --with-proxy-protocol
-endif
-ifeq ($(CONFIG_NGINX_SYSLOG),y)
-  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-syslog
-endif
-ifeq ($(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),y)
-  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-upstream-check
-endif
-
-define Build/Configure
-	# TODO: fix --crossbuild
-	(cd $(PKG_BUILD_DIR) ;\
-		$(if $(CONFIG_NGINX_LUA),LUA_INC=$(STAGING_DIR)/usr/include LUA_LIB=$(STAGING_DIR)/usr/lib) \
-		./configure \
-			--crossbuild=Linux::$(ARCH) \
-			--prefix=/usr \
-			--conf-path=/etc/nginx/nginx.conf \
-			$(ADDITIONAL_MODULES) \
-			--error-log-path=/var/log/nginx/error.log \
-			--pid-path=/var/run/nginx.pid \
-			--lock-path=/var/lock/nginx.lock \
-			--http-log-path=/var/log/nginx/access.log \
-			--http-client-body-temp-path=/var/lib/nginx/body \
-			--http-proxy-temp-path=/var/lib/nginx/proxy \
-			--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-			--with-cc="$(TARGET_CC)" \
-			--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-			--with-ld-opt="$(TARGET_LDFLAGS)" )
-endef
-
-define Package/nginx/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/nginx
-	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(if $(CONFIG_NGINX_LUA),$(call Prepare/lua-nginx))
-	$(if $(CONFIG_NGINX_NAXSI),$(call Prepare/nginx-naxsi))
-	$(if $(CONFIG_NGINX_SYSLOG),$(call Prepare/nginx-syslog))
-	$(if $(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),$(call Prepare/nginx-upstream-check))
-endef
-
-define Download/lua-nginx
-	VERSION:=d3ab0edd45bffe1b9a36abdf5bff544de436ccee
-	SUBDIR:=lua-nginx
-	FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
-	URL:=https://github.com/chaoslawful/lua-nginx-module.git
-	PROTO:=git
-endef
-
-define  Prepare/lua-nginx
-	$(eval $(call Download,lua-nginx))
-	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-	$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
-endef
-
-define Download/nginx-upstream-check
-	VERSION:=d40b9f956d9d978005bb15616d2f283d4e3d2031
-	SUBDIR:=nginx-upstream-check
-	FILE:=nginx-upstream-check-$(PKG_VERSION)-$$(VERSION).tar.gz
-	URL:=https://github.com/yaoweibin/nginx_upstream_check_module.git
-	PROTO:=git
-endef
-
-define  Prepare/nginx-upstream-check
-	$(eval $(call Download,nginx-upstream-check))
-	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-	$(call PatchDir,$(PKG_BUILD_DIR),./patches-nginx-upstream-check)
-endef
-
-
-define Package/nginx-naxsi
-        MENU:=1
-        $(call Package/nginx)
-        TITLE:=nginx-naxsi
-        DEPENDS:=nginx @NGINX_NAXSI
-endef
-
-define Package/nginx-naxsi/description
-        NGINX WAF NAXSI
-endef
-
-define Package/nginx-proxyprotocol
-        MENU:=1
-        $(call Package/nginx)
-        TITLE:=nginx 
-        DEPENDS:=nginx @NGINX_PROXYPROTOCOL
-endef
-
-define Package/nginx-proxyprotocol/description
-        IMPLEMENT Proxy Protocol
-endef
-
-define Package/nginx-syslog
-        MENU:=1
-        $(call Package/nginx)
-        TITLE:=nginx-syslog
-        DEPENDS:=nginx @NGINX_SYSLOG
-endef
-
-define Package/nginx-syslog/description
-        IMPLEMENT Syslog Protocol
-endef
-
-define Download/nginx-naxsi
-	VERSION:=34dcb45fe4fdcb144c5258d83672f8e1e1c8db2e
-	SUBDIR:=nginx-naxsi
-	FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz
-	URL:=https://github.com/nbs-system/naxsi.git
-	PROTO:=git
-endef
-
-define  Prepare/nginx-naxsi
-	$(eval $(call Download,nginx-naxsi))
-	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-endef
-
-define Package/nginx-naxsi/install
-	$(INSTALL_DIR) $(1)/etc/nginx
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
-	chmod 0640 $(1)/etc/nginx/naxsi_core.rules
-endef
-
-define Download/nginx-syslog
-	VERSION:=7abf48e52552c40a21463e1a8c608e0e575261cd
-	SUBDIR:=nginx-syslog
-	FILE:=nginx-syslog-module-$(PKG_VERSION)-$$(VERSION).tar.gz
-	URL:=https://github.com/splitice/nginx_syslog_patch.git
-	PROTO:=git
-endef
-
-define  Prepare/nginx-syslog
-	$(eval $(call Download,nginx-syslog))
-	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-endef
-
-define Package/nginx-proxyprotocol/install
-	$(INSTALL_DIR) $(1)/etc/nginx
-	$(INSTALL_BIN) ./files/nginx.proxyprotocol.example $(1)/etc/nginx/nginx.conf.proxyprotocol
-	chmod 0640 $(1)/etc/nginx/nginx.conf.proxyprotocol
-endef
-
-define Package/nginx-syslog/install
-	$(INSTALL_DIR) $(1)/etc/nginx
-	$(INSTALL_BIN) ./files/nginx.syslog.example $(1)/etc/nginx/nginx.conf.syslog
-	chmod 0640 $(1)/etc/nginx/nginx.conf.syslog
-endef
-
-
-$(eval $(call BuildPackage,nginx))
-$(eval $(call BuildPackage,nginx-naxsi))
-$(eval $(call BuildPackage,nginx-proxyprotocol))
-$(eval $(call BuildPackage,nginx-syslog))
-
diff --git a/trunk/package/feeds/packages/nginx/files/nginx.init b/trunk/package/feeds/packages/nginx/files/nginx.init
deleted file mode 100644
index adf36b44..00000000
--- a/trunk/package/feeds/packages/nginx/files/nginx.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
-
-START=50
-NGINX_BIN=/usr/sbin/nginx
-
-start() {
-	mkdir -p /var/log/nginx
-	mkdir -p /var/lib/nginx
-	$NGINX_BIN
-}
-
-stop() {
-	$NGINX_BIN -s stop
-}
-
-reload() {
-	$NGINX_BIN -s reload
-}
-
-shutdown() {
-	$NGINX_BIN -s quit
-}
-
diff --git a/trunk/package/feeds/packages/nginx/files/nginx.proxyprotocol.example b/trunk/package/feeds/packages/nginx/files/nginx.proxyprotocol.example
deleted file mode 100644
index ab4bad62..00000000
--- a/trunk/package/feeds/packages/nginx/files/nginx.proxyprotocol.example
+++ /dev/null
@@ -1,40 +0,0 @@
-worker_processes  1;
-pid /tmp/nginx.pid;
-daemon off;
-master_process off;
-error_log stderr debug_core;
-
-events {
- debug_connection <YOUR IPv4>;
- debug_connection <YOUR IPV6>;
- worker_connections  1024;
-}
-
-http {
- default_type  application/octet-stream;
- client_body_temp_path /tmp/body 1;
-
- access_log /tmp/nginx_access.log;
-
- server {
-#  listen       8082 ssl;
-# proxy protocol configuration for nginx 1.4.x:
-  listen       8082 accept_proxy_protocol=on;
-# same with spdy enabled:
-#  listen       8082 spdy ssl accept_proxy_protocol=on;
-  listen       [::]:8082 ipv6only=on;
-  ssl_certificate /your/certificate;
-  ssl_certificate_key /your/key;
-  server_name  localhost;
-# proxy protocol configuration for nginx 1.2.x:
-#  accept_proxy_protocol on;
- 
-  location / {
-   proxy_pass        http://127.0.0.1:8084;
-   proxy_set_header  X-Real-IP  $remote_addr;
-   proxy_connect_timeout 10s;
-   proxy_read_timeout 10s;
-   send_proxy_protocol on;
-  }
- }
-}
diff --git a/trunk/package/feeds/packages/nginx/files/nginx.syslog.example b/trunk/package/feeds/packages/nginx/files/nginx.syslog.example
deleted file mode 100644
index 05943448..00000000
--- a/trunk/package/feeds/packages/nginx/files/nginx.syslog.example
+++ /dev/null
@@ -1,59 +0,0 @@
-worker_processes  1;
-
-syslog local6 nginx;
-
-events {
-        worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
-        '"$status" $body_bytes_sent "$http_referer" '
-        '"$http_user_agent" "$http_x_forwarded_for"';
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        #send the log to syslog and file.
-        access_log  syslog:notice|logs/host1.access.log main;
-
-        # pre 1.5.x
-        error_log syslog:notice|logs/host1.error.log;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-
-    server {
-        listen       80;
-        server_name  www.example.com;
-
-        access_log  syslog:warn|logs/host2.access.log main;
-        error_log syslog:warn|logs/host2.error.log;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-
-    server {
-        listen       80;
-        server_name  www.test.com;
-
-        #send the log just to syslog.
-        access_log  syslog:error main;
-        error_log syslog:error;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-}
diff --git a/trunk/package/feeds/packages/nginx/patches-lua-nginx/300-ldl.patch b/trunk/package/feeds/packages/nginx/patches-lua-nginx/300-ldl.patch
deleted file mode 100644
index d826bcf2..00000000
--- a/trunk/package/feeds/packages/nginx/patches-lua-nginx/300-ldl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lua-nginx/config
-+++ b/lua-nginx/config
-@@ -1,5 +1,5 @@
- ngx_feature="Lua library"
--ngx_feature_libs="-llua -lm"
-+ngx_feature_libs="-llua -lm -ldl"
- ngx_feature_name=
- ngx_feature_run=no
- ngx_feature_incs="#include <lauxlib.h>"
-@@ -47,9 +47,9 @@ else
-         ngx_feature="Lua library in $LUA_LIB and $LUA_INC (specified by the LUA_LIB and LUA_INC env)"
-         ngx_feature_path="$LUA_INC"
-         if [ $NGX_RPATH = YES ]; then
--            ngx_feature_libs="-R$LUA_LIB -L$LUA_LIB -llua -lm"
-+            ngx_feature_libs="-R$LUA_LIB -L$LUA_LIB -llua -lm -ldl"
-         else
--            ngx_feature_libs="-L$LUA_LIB -llua -lm"
-+            ngx_feature_libs="-L$LUA_LIB -llua -lm -ldl"
-         fi
- 
-         . auto/feature
diff --git a/trunk/package/feeds/packages/nginx/patches-nginx-upstream-check/check_1.2.6+.patch b/trunk/package/feeds/packages/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
deleted file mode 100644
index 3ab91347..00000000
--- a/trunk/package/feeds/packages/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
-index 89ccc2b..a552044 100644
---- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
-+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
-@@ -9,6 +9,10 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
-+
- 
- typedef struct {
-     /* the round robin data must be first */
-@@ -208,6 +212,12 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
- 
-             if (!peer->down) {
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                               "get ip_hash peer, check_index: %ui",
-+                               peer->check_index);
-+                if (!ngx_http_check_peer_down(peer->check_index)) {
-+#endif
-                 if (peer->max_fails == 0 || peer->fails < peer->max_fails) {
-                     break;
-                 }
-@@ -216,6 +226,9 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
-                     peer->checked = now;
-                     break;
-                 }
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+                }
-+#endif
-             }
- 
-             iphp->rrp.tried[n] |= m;
-diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
-index 21156ae..c57393d 100644
---- a/src/http/modules/ngx_http_upstream_least_conn_module.c
-+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
-@@ -9,6 +9,10 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
-+
- 
- typedef struct {
-     ngx_uint_t                        *conns;
-@@ -203,6 +207,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
-             continue;
-         }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                "get least_conn peer, check_index: %ui",
-+                peer->check_index);
-+
-+        if (ngx_http_check_peer_down(peer->check_index)) {
-+            continue;
-+        }
-+#endif
-+
-         if (peer->max_fails
-             && peer->fails >= peer->max_fails
-             && now - peer->checked <= peer->fail_timeout)
-@@ -256,6 +270,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
-                 continue;
-             }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                    "get least_conn peer, check_index: %ui",
-+                    peer->check_index);
-+
-+            if (ngx_http_check_peer_down(peer->check_index)) {
-+                continue;
-+            }
-+#endif
-+
-             if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) {
-                 continue;
-             }
-diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
-index 4b78cff..f077b46 100644
---- a/src/http/ngx_http_upstream_round_robin.c
-+++ b/src/http/ngx_http_upstream_round_robin.c
-@@ -9,6 +9,9 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
-     const void *two);
-@@ -87,7 +90,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
-                 peers->peer[n].weight = server[i].weight;
-                 peers->peer[n].effective_weight = server[i].weight;
-                 peers->peer[n].current_weight = 0;
--                n++;
-+
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+                if (!server[i].down) {
-+                    peers->peer[n].check_index =
-+                        ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
-+                }
-+                else {
-+                    peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+                }
-+#endif
-+               n++;
-             }
-         }
- 
-@@ -145,6 +158,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
-                 backup->peer[n].max_fails = server[i].max_fails;
-                 backup->peer[n].fail_timeout = server[i].fail_timeout;
-                 backup->peer[n].down = server[i].down;
-+
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+                if (!server[i].down) {
-+                    backup->peer[n].check_index =
-+                        ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
-+                }
-+                else {
-+                    backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+                }
-+#endif
-+
-                 n++;
-             }
-         }
-@@ -206,6 +230,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
-         peers->peer[i].current_weight = 0;
-         peers->peer[i].max_fails = 1;
-         peers->peer[i].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+        peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
-     }
- 
-     us->peer.data = peers;
-@@ -323,6 +350,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
-         peers->peer[0].current_weight = 0;
-         peers->peer[0].max_fails = 1;
-         peers->peer[0].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+        peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
- 
-     } else {
- 
-@@ -356,6 +386,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
-             peers->peer[i].current_weight = 0;
-             peers->peer[i].max_fails = 1;
-             peers->peer[i].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+            peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
-         }
-     }
- 
-@@ -434,6 +467,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
-             goto failed;
-         }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+        if (ngx_http_check_peer_down(peer->check_index)) {
-+            goto failed;
-+        }
-+#endif
-+
-     } else {
- 
-         /* there are several peers */
-@@ -531,6 +570,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
-             continue;
-         }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+        if (ngx_http_check_peer_down(peer->check_index)) {
-+            continue;
-+        }
-+#endif
-+
-         if (peer->max_fails
-             && peer->fails >= peer->max_fails
-             && now - peer->checked <= peer->fail_timeout)
-diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
-index 3f8cbf8..1613168 100644
---- a/src/http/ngx_http_upstream_round_robin.h
-+++ b/src/http/ngx_http_upstream_round_robin.h
-@@ -30,6 +30,10 @@ typedef struct {
-     ngx_uint_t                      max_fails;
-     time_t                          fail_timeout;
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+    ngx_uint_t                      check_index;
-+#endif
-+
-     ngx_uint_t                      down;          /* unsigned  down:1; */
- 
- #if (NGX_HTTP_SSL)
diff --git a/trunk/package/feeds/packages/nginx/patches/101-feature_test_fix.patch b/trunk/package/feeds/packages/nginx/patches/101-feature_test_fix.patch
deleted file mode 100644
index 8e15fe96..00000000
--- a/trunk/package/feeds/packages/nginx/patches/101-feature_test_fix.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/auto/cc/name
-+++ b/auto/cc/name
-@@ -7,7 +7,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
- 
-     ngx_feature="C compiler"
-     ngx_feature_name=
--    ngx_feature_run=yes
-+    ngx_feature_run=
-     ngx_feature_incs=
-     ngx_feature_path=
-     ngx_feature_libs=
---- a/auto/cc/conf
-+++ b/auto/cc/conf
-@@ -155,7 +155,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
-     else
-         ngx_feature="C99 variadic macros"
-         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
--        ngx_feature_run=yes
-+        ngx_feature_run=no
-         ngx_feature_incs="#include <stdio.h>
- #define var(dummy, ...)  sprintf(__VA_ARGS__)"
-         ngx_feature_path=
-@@ -169,7 +169,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
- 
-     ngx_feature="gcc variadic macros"
-     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
--    ngx_feature_run=yes
-+    ngx_feature_run=no
-     ngx_feature_incs="#include <stdio.h>
- #define var(dummy, args...)  sprintf(args)"
-     ngx_feature_path=
---- a/auto/os/linux
-+++ b/auto/os/linux
-@@ -48,7 +48,7 @@ fi
- 
- ngx_feature="epoll"
- ngx_feature_name="NGX_HAVE_EPOLL"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/epoll.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -73,7 +73,7 @@ fi
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
- ngx_feature="sendfile()"
- ngx_feature_name="NGX_HAVE_SENDFILE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
-                   #include <errno.h>"
- ngx_feature_path=
-@@ -94,7 +94,7 @@ fi
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
- ngx_feature="sendfile64()"
- ngx_feature_name="NGX_HAVE_SENDFILE64"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
-                   #include <errno.h>"
- ngx_feature_path=
-@@ -112,7 +112,7 @@ ngx_include="sys/prctl.h"; . auto/includ
- 
- ngx_feature="prctl(PR_SET_DUMPABLE)"
- ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/prctl.h>"
- ngx_feature_path=
- ngx_feature_libs=
---- a/auto/unix
-+++ b/auto/unix
-@@ -618,7 +618,7 @@ ngx_feature_test="void *p; p = memalign(
- 
- ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
- ngx_feature_name="NGX_HAVE_MAP_ANON"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/mman.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -631,7 +631,7 @@ ngx_feature_test="void *p;
- 
- ngx_feature='mmap("/dev/zero", MAP_SHARED)'
- ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/mman.h>
-                   #include <sys/stat.h>
-                   #include <fcntl.h>"
-@@ -646,7 +646,7 @@ ngx_feature_test='void *p; int  fd;
- 
- ngx_feature="System V shared memory"
- ngx_feature_name="NGX_HAVE_SYSVSHM"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/ipc.h>
-                   #include <sys/shm.h>"
- ngx_feature_path=
-@@ -660,7 +660,7 @@ ngx_feature_test="int  id;
- 
- ngx_feature="POSIX semaphores"
- ngx_feature_name="NGX_HAVE_POSIX_SEM"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <semaphore.h>"
- ngx_feature_path=
- ngx_feature_libs=
diff --git a/trunk/package/feeds/packages/nginx/patches/102-sizeof_test_fix.patch b/trunk/package/feeds/packages/nginx/patches/102-sizeof_test_fix.patch
deleted file mode 100644
index 0cd93cc4..00000000
--- a/trunk/package/feeds/packages/nginx/patches/102-sizeof_test_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/auto/types/sizeof
-+++ b/auto/types/sizeof
-@@ -25,8 +25,13 @@ $NGX_INCLUDE_UNISTD_H
- $NGX_INCLUDE_INTTYPES_H
- $NGX_INCLUDE_AUTO_CONFIG_H
- 
-+char object_code_block[] = {
-+	'\n', 'e', '4', 'V', 'A',
-+	'0', 'x', ('0' + sizeof($ngx_type)),
-+	'Y', '3', 'p', 'M', '\n'
-+};
-+
- int main() {
--    printf("%d", (int) sizeof($ngx_type));
-     return 0;
- }
- 
-@@ -40,7 +45,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&
- 
- 
- if [ -x $NGX_AUTOTEST ]; then
--    ngx_size=`$NGX_AUTOTEST`
-+    ngx_size=`sed -ne 's/^e4VA0x\(.\)Y3pM$/\1/p' < $NGX_AUTOTEST`
-     echo " $ngx_size bytes"
- fi
- 
diff --git a/trunk/package/feeds/packages/nginx/patches/103-sys_nerr.patch b/trunk/package/feeds/packages/nginx/patches/103-sys_nerr.patch
deleted file mode 100644
index 5f5d106f..00000000
--- a/trunk/package/feeds/packages/nginx/patches/103-sys_nerr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/os/unix/ngx_errno.c
-+++ b/src/os/unix/ngx_errno.c
-@@ -8,6 +8,9 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
- 
-+#ifndef NGX_SYS_NERR
-+#define NGX_SYS_NERR  128
-+#endif
- 
- /*
-  * The strerror() messages are copied because:
diff --git a/trunk/package/feeds/packages/nginx/patches/200-config.patch b/trunk/package/feeds/packages/nginx/patches/200-config.patch
deleted file mode 100644
index f3500957..00000000
--- a/trunk/package/feeds/packages/nginx/patches/200-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/conf/nginx.conf
-+++ b/conf/nginx.conf
-@@ -1,5 +1,5 @@
- 
--#user  nobody;
-+user nobody nogroup;
- worker_processes  1;
- 
- #error_log  logs/error.log;
-@@ -16,7 +16,7 @@ events {
- 
- http {
-     include       mime.types;
--    default_type  application/octet-stream;
-+    #default_type  application/octet-stream;
- 
-     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-     #                  '$status $body_bytes_sent "$http_referer" '
diff --git a/trunk/package/feeds/packages/nginx/patches/300-crosscompile_ccflags.patch b/trunk/package/feeds/packages/nginx/patches/300-crosscompile_ccflags.patch
deleted file mode 100644
index 4a06a769..00000000
--- a/trunk/package/feeds/packages/nginx/patches/300-crosscompile_ccflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/auto/endianness
-+++ b/auto/endianness
-@@ -21,7 +21,7 @@ int main() {
- 
- END
- 
--ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
-+ngx_test="$CC $NGX_CC_OPT $CC_TEST_FLAGS $CC_AUX_FLAGS \
-           -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
- 
- eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
---- a/auto/feature
-+++ b/auto/feature
-@@ -39,7 +39,7 @@ int main() {
- END
- 
- 
--ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
-+ngx_test="$CC $NGX_CC_OPT $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
-           -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_TEST_LD_OPT $ngx_feature_libs"
- 
- ngx_feature_inc_path=
---- a/auto/include
-+++ b/auto/include
-@@ -27,7 +27,7 @@ int main() {
- END
- 
- 
--ngx_test="$CC -o $NGX_AUTOTEST $NGX_AUTOTEST.c"
-+ngx_test="$CC $NGX_CC_OPT -o $NGX_AUTOTEST $NGX_AUTOTEST.c"
- 
- eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
- 
diff --git a/trunk/package/feeds/packages/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch b/trunk/package/feeds/packages/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
deleted file mode 100644
index ba63834e..00000000
--- a/trunk/package/feeds/packages/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
+++ /dev/null
@@ -1,1183 +0,0 @@
-Index: nginx-1.4.7/auto/modules
-===================================================================
---- nginx-1.4.7.orig/auto/modules
-+++ nginx-1.4.7/auto/modules
-@@ -297,6 +297,10 @@ if [ $HTTP_SSL = YES ]; then
-     HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS"
- fi
- 
-+if [ $PROXY_PROTOCOL = YES ]; then
-+    have=NGX_PROXY_PROTOCOL . auto/have
-+fi
-+
- if [ $HTTP_PROXY = YES ]; then
-     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-     #USE_MD5=YES
-Index: nginx-1.4.7/auto/options
-===================================================================
---- nginx-1.4.7.orig/auto/options
-+++ nginx-1.4.7/auto/options
-@@ -47,6 +47,8 @@ USE_THREADS=NO
- NGX_FILE_AIO=NO
- NGX_IPV6=NO
- 
-+PROXY_PROTOCOL=NO
-+
- HTTP=YES
- 
- NGX_HTTP_LOG_PATH=
-@@ -192,6 +194,8 @@ do
-         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
-         --with-ipv6)                     NGX_IPV6=YES               ;;
- 
-+        --with-proxy-protocol)           PROXY_PROTOCOL=YES         ;;
-+
-         --without-http)                  HTTP=NO                    ;;
-         --without-http-cache)            HTTP_CACHE=NO              ;;
- 
-@@ -350,6 +354,8 @@ cat << END
-   --with-file-aio                    enable file AIO support
-   --with-ipv6                        enable IPv6 support
- 
-+  --with-proxy-protocol              enable proxy protocol support
-+
-   --with-http_ssl_module             enable ngx_http_ssl_module
-   --with-http_spdy_module            enable ngx_http_spdy_module
-   --with-http_realip_module          enable ngx_http_realip_module
-Index: nginx-1.4.7/auto/sources
-===================================================================
---- nginx-1.4.7.orig/auto/sources
-+++ nginx-1.4.7/auto/sources
-@@ -36,7 +36,8 @@ CORE_DEPS="src/core/nginx.h \
-            src/core/ngx_conf_file.h \
-            src/core/ngx_resolver.h \
-            src/core/ngx_open_file_cache.h \
--           src/core/ngx_crypt.h"
-+           src/core/ngx_crypt.h \
-+           src/core/ngx_proxy_protocol.h"
- 
- 
- CORE_SRCS="src/core/nginx.c \
-@@ -67,7 +68,8 @@ CORE_SRCS="src/core/nginx.c \
-            src/core/ngx_conf_file.c \
-            src/core/ngx_resolver.c \
-            src/core/ngx_open_file_cache.c \
--           src/core/ngx_crypt.c"
-+           src/core/ngx_crypt.c \
-+           src/core/ngx_proxy_protocol.c"
- 
- 
- REGEX_MODULE=ngx_regex_module
-Index: nginx-1.4.7/src/core/ngx_connection.h
-===================================================================
---- nginx-1.4.7.orig/src/core/ngx_connection.h
-+++ nginx-1.4.7/src/core/ngx_connection.h
-@@ -63,6 +63,10 @@ struct ngx_listening_s {
-     unsigned            shared:1;    /* shared between threads or processes */
-     unsigned            addr_ntop:1;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    unsigned            accept_proxy_protocol:2; /* proxy_protocol flag */
-+#endif
-+
- #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-     unsigned            ipv6only:1;
- #endif
-@@ -148,6 +152,10 @@ struct ngx_connection_s {
- 
-     ngx_uint_t          requests;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    ngx_uint_t          proxy_protocol;
-+#endif
-+
-     unsigned            buffered:8;
- 
-     unsigned            log_error:3;     /* ngx_connection_log_error_e */
-Index: nginx-1.4.7/src/core/ngx_core.h
-===================================================================
---- nginx-1.4.7.orig/src/core/ngx_core.h
-+++ nginx-1.4.7/src/core/ngx_core.h
-@@ -77,6 +77,9 @@ typedef void (*ngx_connection_handler_pt
- #include <ngx_open_file_cache.h>
- #include <ngx_os.h>
- #include <ngx_connection.h>
-+#if (NGX_PROXY_PROTOCOL)
-+#include <ngx_proxy_protocol.h>
-+#endif
- 
- 
- #define LF     (u_char) 10
-Index: nginx-1.4.7/src/core/ngx_proxy_protocol.c
-===================================================================
---- /dev/null
-+++ nginx-1.4.7/src/core/ngx_proxy_protocol.c
-@@ -0,0 +1,430 @@
-+
-+/*
-+ * Copyright (C) Baptiste Assmann
-+ * Copyright (C) Exceliance
-+ */
-+
-+
-+#include <ngx_config.h>
-+#include <ngx_core.h>
-+#include <ngx_event.h>
-+
-+#if (NGX_PROXY_PROTOCOL)
-+
-+int
-+ngx_recv_proxy_protocol(ngx_connection_t *c, u_char *buf, ssize_t n)
-+{
-+    u_char *end, *p, *t;
-+    size_t len;
-+    ssize_t s;
-+    int step = 0;
-+    ngx_proxy_protocol_t pp;
-+
-+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "processing proxy protocol");
-+
-+    /* 16 is the minimal length of the proxy protocol string */
-+    if (n < 18) {
-+        step = 1;
-+        goto fail;
-+    }
-+
-+    s = n;
-+    end = memchr(buf, '\n', n);
-+    if (end == NULL) {
-+        step = 2;
-+        goto fail;
-+    }
-+
-+    p = buf;
-+    if (memcmp(p, "PROXY ", 6) != 0) {
-+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
-+            "incorrect proxy protocol header string");
-+        step = 3;
-+        goto fail;
-+    }
-+    p += 6;
-+    s -= 6;
-+    if (s <= 0) {
-+        step = 4;
-+        goto fail;
-+    }
-+
-+    ngx_memzero(&pp, sizeof(ngx_proxy_protocol_t));
-+
-+    if (memcmp(p, "TCP4 ", 5) == 0) {
-+        struct sockaddr_in *sin_src;
-+        struct sockaddr_in *sin_dst;
-+
-+        pp.pp_proto = NGX_PP_PROTO_TCP4;
-+        pp.pp_src3.ss_family = AF_INET;
-+        pp.pp_dst3.ss_family = AF_INET;
-+        sin_src = (struct sockaddr_in *) &pp.pp_src3;
-+        sin_dst = (struct sockaddr_in *) &pp.pp_dst3;
-+
-+        p += 5;
-+        s -= 5;
-+        if (s <= 0) {
-+            step = 5;
-+            goto fail;
-+        }
-+
-+        /* l3 source address */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 6;
-+            goto fail;
-+        }
-+        len = t - p;
-+        if ((sin_src->sin_addr.s_addr = ngx_inet_addr(p, len)) == INADDR_NONE) {
-+            step = 7;
-+            goto fail;
-+        }
-+        pp.pp_src3_text.data = ngx_pcalloc(c->pool, len + 1);
-+        ngx_memcpy(pp.pp_src3_text.data, p, len);
-+        pp.pp_src3_text.len = len;
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 8;
-+            goto fail;
-+        }
-+
-+        /* l3 destination address */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 9;
-+            goto fail;
-+        }
-+        len = t - p;
-+        if ((sin_dst->sin_addr.s_addr = ngx_inet_addr(p, len)) == INADDR_NONE) {
-+            step = 10;
-+            goto fail;
-+        }
-+// FIXME pointer shift ???
-+        pp.pp_dst3_text.data = ngx_pcalloc(c->pool, len + 1);
-+        ngx_memcpy(pp.pp_dst3_text.data, p, len);
-+        pp.pp_dst3_text.len = len;
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 11;
-+            goto fail;
-+        }
-+
-+        /* l4 source port */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 12;
-+            goto fail;
-+        }
-+        len = t - p;
-+        pp.pp_src4 = ngx_atoi(p, len);
-+        if ((pp.pp_src4 < 1024)
-+                || (pp.pp_src4 > 65535)) {
-+            step = 13;
-+            goto fail;
-+        }
-+        sin_src->sin_port = htons(pp.pp_src4);
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 14;
-+            goto fail;
-+        }
-+
-+        /* l4 destination port */
-+        if ( (t = (u_char *)memchr(p, '\r', s)) == NULL ) {
-+            step = 15;
-+            goto fail;
-+        }
-+        len = t - p;
-+        pp.pp_dst4 = ngx_atoi(p, len);
-+        if (pp.pp_dst4 > 65535) {
-+            step = 16;
-+            goto fail;
-+        }
-+        sin_dst->sin_port = htons(pp.pp_dst4);
-+
-+        if (p[len + 1] != '\n') {
-+            step = 17;
-+            goto fail;
-+        }
-+
-+        p += (len + 2);
-+        s -= (len + 2);
-+
-+
-+        /* if we managed to get there, then we can safely replace the
-+         * information in the connection structure
-+         */
-+
-+        /* updating connection with source information provided by proxy protocol */
-+        if (pp.pp_src3_text.len > c->addr_text.len) {
-+            ngx_pfree(c->pool, c->addr_text.data);
-+            c->addr_text.data = ngx_pcalloc(c->pool, pp.pp_src3_text.len);
-+        } else {
-+            ngx_memzero(c->addr_text.data, c->addr_text.len);
-+        }
-+        ngx_memcpy(c->addr_text.data, pp.pp_src3_text.data, pp.pp_src3_text.len);
-+        c->addr_text.len = pp.pp_src3_text.len;
-+
-+        ngx_pfree(c->pool, c->sockaddr);
-+        c->socklen = NGX_SOCKADDRLEN;
-+        c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
-+        ngx_memcpy(c->sockaddr, sin_src, c->socklen);
-+
-+        if (c->sockaddr->sa_family != AF_INET) {
-+            ngx_pfree(c->pool, c->sockaddr);
-+            c->socklen = NGX_SOCKADDRLEN;
-+            c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
-+        } else {
-+            ngx_memzero(c->sockaddr, sizeof(struct sockaddr_in));
-+            c->socklen = NGX_SOCKADDRLEN;
-+        }
-+        ngx_memcpy(c->sockaddr, sin_src, c->socklen);
-+
-+        /* updating connection with destination information provided by proxy protocol */
-+        ngx_pfree(c->pool, c->local_sockaddr);
-+        c->local_sockaddr = ngx_pcalloc(c->pool, NGX_SOCKADDRLEN);
-+        ngx_memcpy(c->local_sockaddr, sin_dst, NGX_SOCKADDRLEN);
-+
-+    }
-+
-+#if (NGX_HAVE_INET6)
-+
-+     else if (memcmp(p, "TCP6 ", 5) == 0) {
-+
-+        struct sockaddr_in6 *sin6_src;
-+        struct sockaddr_in6 *sin6_dst;
-+
-+        pp.pp_proto = NGX_PP_PROTO_TCP6;
-+        pp.pp_src3.ss_family = AF_INET6;
-+        pp.pp_dst3.ss_family = AF_INET6;
-+        sin6_src = (struct sockaddr_in6 *) &pp.pp_src3;
-+        sin6_dst = (struct sockaddr_in6 *) &pp.pp_dst3;
-+
-+        p += 5;
-+        s -= 5;
-+        if (s <= 0) {
-+            step = 18;
-+            goto fail;
-+        }
-+
-+        /* l3 source address */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 19;
-+            goto fail;
-+        }
-+        len = t - p;
-+        if (ngx_inet6_addr(p, len, sin6_src->sin6_addr.s6_addr) != NGX_OK) {
-+            step = 20;
-+            goto fail;
-+        }
-+        pp.pp_src3_text.data = ngx_pcalloc(c->pool, len + 1);
-+        ngx_memcpy(pp.pp_src3_text.data, p, len);
-+        pp.pp_src3_text.len = len;
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 21;
-+            goto fail;
-+        }
-+
-+        /* l3 destination address */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 22;
-+            goto fail;
-+        }
-+        len = t - p;
-+        if (ngx_inet6_addr(p, len, sin6_dst->sin6_addr.s6_addr) != NGX_OK) {
-+            step = 23;
-+            goto fail;
-+        }
-+        pp.pp_dst3_text.data = ngx_pcalloc(c->pool, len + 1);
-+        ngx_memcpy(pp.pp_dst3_text.data, p, len);
-+        pp.pp_dst3_text.len = len;
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 24;
-+            goto fail;
-+        }
-+
-+        /* l4 source port */
-+        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
-+            step = 25;
-+            goto fail;
-+        }
-+        len = t - p;
-+        pp.pp_src4 = ngx_atoi(p, len);
-+        if ((pp.pp_src4 < 1024)
-+                || (pp.pp_src4 > 65535)) {
-+            step = 26;
-+            goto fail;
-+        }
-+        sin6_src->sin6_port = htons(pp.pp_src4);
-+
-+        p += (len + 1);
-+        s -= (len + 1);
-+        if (s <= 0) {
-+            step = 27;
-+            goto fail;
-+        }
-+
-+        /* l4 destination port */
-+        if ( (t = (u_char *)memchr(p, '\r', s)) == NULL ) {
-+            step = 28;
-+            goto fail;
-+        }
-+        len = t - p;
-+        pp.pp_dst4 = ngx_atoi(p, len);
-+        if (pp.pp_dst4 > 65535) {
-+            step = 29;
-+            goto fail;
-+        }
-+        sin6_dst->sin6_port = htons(pp.pp_dst4);
-+
-+        if (p[len + 1] != '\n') {
-+            step = 30;
-+            goto fail;
-+        }
-+
-+        p += (len + 2);
-+        s -= (len + 2);
-+
-+        /* if we managed to get there, then we can safely replace the
-+         * information in the connection structure
-+         */
-+
-+        /* updating connection with source provided by proxy protocol */
-+        if (pp.pp_src3_text.len > c->addr_text.len) {
-+            ngx_pfree(c->pool, c->addr_text.data);
-+            c->addr_text.data = ngx_pcalloc(c->pool, pp.pp_src3_text.len);
-+        } else {
-+            ngx_memzero(c->addr_text.data, c->addr_text.len);
-+        }
-+        ngx_memcpy(c->addr_text.data, pp.pp_src3_text.data, pp.pp_src3_text.len);
-+        c->addr_text.len = pp.pp_src3_text.len;
-+
-+        ngx_pfree(c->pool, c->sockaddr);
-+        c->socklen = NGX_SOCKADDRLEN;
-+        c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
-+        ngx_memcpy(c->sockaddr, sin6_src, c->socklen);
-+
-+        /* updating connection with destination provided by proxy protocol */
-+        if (c->sockaddr->sa_family != AF_INET6) {
-+            ngx_pfree(c->pool, c->local_sockaddr);
-+            c->local_sockaddr = ngx_pcalloc(c->pool, NGX_SOCKADDRLEN);
-+        } else {
-+            ngx_memzero(c->sockaddr, sizeof(struct sockaddr_in6));
-+            c->socklen = NGX_SOCKADDRLEN;
-+        }
-+//        ngx_memcpy(c->local_sockaddr, sin6_dst, NGX_SOCKADDRLEN);
-+//FIXME must be finished here
-+
-+    }
-+
-+#endif
-+
-+    else {
-+        step = 31;
-+        goto fail;
-+    }
-+
-+    ngx_print_proxy_protocol(&pp, c->log);
-+
-+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-+            "proxy_protocol, asking to remove %z chars",
-+            end + 1 - buf);
-+
-+    return (end + 1 - buf);
-+
-+fail:
-+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-+            "proxy_protocol error at step: %d", step);
-+
-+    return 0;
-+
-+}
-+
-+
-+void
-+ngx_print_proxy_protocol(ngx_proxy_protocol_t *p, ngx_log_t *log)
-+{
-+    switch (p->pp_proto) {
-+        case NGX_PP_PROTO_TCP4:
-+           ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
-+               "proxy_protocol, proto: TCP4");
-+        break;
-+        case NGX_PP_PROTO_TCP6:
-+           ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
-+               "proxy_protocol, proto: TCP6");
-+       break;
-+   }
-+
-+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
-+       "proxy_protocol, string length: %d", ngx_proxy_protocol_string_length(p));
-+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
-+       "proxy_protocol, src3: %s, %d", p->pp_src3_text.data, p->pp_src3_text.len);
-+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
-+       "proxy_protocol, dst3: %s, %d", p->pp_dst3_text.data, p->pp_dst3_text.len);
-+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
-+       "proxy_protocol, src4: %d", p->pp_src4);
-+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
-+       "proxy_protocol, dst4: %d", p->pp_dst4);
-+}
-+
-+
-+int
-+ngx_proxy_protocol_string_length(ngx_proxy_protocol_t *p)
-+{
-+    int len = 0;
-+
-+    /* 'PROXY ' */
-+    len += (sizeof("PROXY ") - 1);
-+
-+    /* protocol version (TCP4 or TCP6) + space */
-+    len += (sizeof("TCP0 ") - 1);
-+
-+    /* src3 + space */
-+    len += p->pp_src3_text.len;
-+    len += 1;
-+
-+    /* dst3 + space */
-+    len += p->pp_dst3_text.len;
-+    len += 1;
-+
-+    /* src4 */
-+    if (p->pp_src4 < 10000)
-+        /* 4 digits + 1 space */
-+        len += (sizeof("0000 ") - 1);
-+    else
-+        /* 5 digits + 1 space */
-+        len += (sizeof("00000 ") - 1);
-+
-+    /* dst4 */
-+    if (p->pp_dst4 >= 10000)
-+        /* 5 digits */
-+        len += (sizeof("00000 ") - 1);
-+    else if (p->pp_dst4 >= 1000)
-+        /* 4 digits */
-+        len += (sizeof("0000 ") - 1);
-+    else if (p->pp_dst4 >= 100)
-+        /* 3 digits */
-+        len += (sizeof("000 ") - 1);
-+    else if (p->pp_dst4 >= 10)
-+        /* 2 digits */
-+        len += (sizeof("00 ") - 1);
-+    else
-+        /* 1 digit */
-+        len += (sizeof("0 ") - 1);
-+
-+    /* CRLF */
-+    len += (sizeof(CRLF) - 1);
-+
-+    return len - 1;
-+}
-+
-+#endif
-Index: nginx-1.4.7/src/core/ngx_proxy_protocol.h
-===================================================================
---- /dev/null
-+++ nginx-1.4.7/src/core/ngx_proxy_protocol.h
-@@ -0,0 +1,45 @@
-+
-+/*
-+ * Copyright (C) Baptiste Assmann
-+ * Copyright (C) Exceliance
-+ */
-+
-+
-+#ifndef _NGX_PROXY_PROTOCOL_H_INCLUDED_
-+#define _NGX_PROXY_PROTOCOL_H_INCLUDED_
-+
-+
-+#include <ngx_config.h>
-+#include <ngx_core.h>
-+
-+
-+#if (NGX_PROXY_PROTOCOL)
-+
-+typedef struct ngx_proxy_protocol_s ngx_proxy_protocol_t;
-+
-+typedef enum {
-+    NGX_PP_PROTO_TCP4 = 1,
-+    NGX_PP_PROTO_TCP6
-+} ngx_pp_proto;
-+
-+
-+struct ngx_proxy_protocol_s {
-+    unsigned int	    pp_proto;	/* proxy protocol related information */
-+    struct sockaddr_storage pp_src3;
-+    ngx_str_t		    pp_src3_text;
-+    struct sockaddr_storage pp_dst3;
-+    ngx_str_t		    pp_dst3_text;
-+    unsigned int	    pp_src4;
-+    unsigned int	    pp_dst4;
-+};
-+
-+
-+int  ngx_recv_proxy_protocol(ngx_connection_t *, u_char *, ssize_t);
-+void ngx_print_proxy_protocol(ngx_proxy_protocol_t *, ngx_log_t *);
-+int  ngx_proxy_protocol_string_length(ngx_proxy_protocol_t *);
-+
-+
-+#endif
-+
-+#endif /* _NGX_CONNECTION_H_INCLUDED_ */
-+
-Index: nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c
-===================================================================
---- nginx-1.4.7.orig/src/http/modules/ngx_http_proxy_module.c
-+++ nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c
-@@ -8,7 +8,9 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
- #include <ngx_http.h>
--
-+#if (NGX_PROXY_PROTOCOL)
-+#include <ngx_proxy_protocol.h>
-+#endif
- 
- typedef struct ngx_http_proxy_rewrite_s  ngx_http_proxy_rewrite_t;
- 
-@@ -365,6 +367,17 @@ static ngx_command_t  ngx_http_proxy_com
-       offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf),
-       NULL },
- 
-+#if (NGX_PROXY_PROTOCOL)
-+
-+    { ngx_string("send_proxy_protocol"),
-+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-+      ngx_conf_set_flag_slot,
-+      NGX_HTTP_LOC_CONF_OFFSET,
-+      offsetof(ngx_http_proxy_loc_conf_t, upstream.send_proxy_protocol),
-+      NULL },
-+
-+#endif
-+
- #if (NGX_HTTP_CACHE)
- 
-     { ngx_string("proxy_cache"),
-@@ -2420,6 +2433,11 @@ ngx_http_proxy_create_loc_conf(ngx_conf_
-     conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
- 
-     conf->upstream.intercept_errors = NGX_CONF_UNSET;
-+
-+#if (NGX_PROXY_PROTOCOL)
-+    conf->upstream.send_proxy_protocol = NGX_CONF_UNSET;
-+#endif
-+
- #if (NGX_HTTP_SSL)
-     conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
- #endif
-@@ -2695,6 +2713,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
-     ngx_conf_merge_value(conf->upstream.intercept_errors,
-                               prev->upstream.intercept_errors, 0);
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    ngx_conf_merge_value(conf->upstream.send_proxy_protocol,
-+                              prev->upstream.send_proxy_protocol, 0);
-+#endif
-+
- #if (NGX_HTTP_SSL)
-     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
-                               prev->upstream.ssl_session_reuse, 1);
-Index: nginx-1.4.7/src/http/ngx_http.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http.c
-+++ nginx-1.4.7/src/http/ngx_http.c
-@@ -1228,6 +1228,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
- #if (NGX_HTTP_SPDY)
-     ngx_uint_t             spdy;
- #endif
-+#if (NGX_PROXY_PROTOCOL)
-+    ngx_uint_t             accept_proxy_protocol;
-+#endif
- 
-     /*
-      * we cannot compare whole sockaddr struct's as kernel
-@@ -1283,6 +1286,10 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
- #if (NGX_HTTP_SPDY)
-         spdy = lsopt->spdy || addr[i].opt.spdy;
- #endif
-+#if (NGX_PROXY_PROTOCOL)
-+        accept_proxy_protocol = lsopt->accept_proxy_protocol
-+                                || addr[i].opt.accept_proxy_protocol;
-+#endif
- 
-         if (lsopt->set) {
- 
-@@ -1316,6 +1323,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
- #if (NGX_HTTP_SPDY)
-         addr[i].opt.spdy = spdy;
- #endif
-+#if (NGX_PROXY_PROTOCOL)
-+        addr[i].opt.accept_proxy_protocol = accept_proxy_protocol;
-+#endif
- 
-         return NGX_OK;
-     }
-@@ -1762,6 +1772,11 @@ ngx_http_add_listening(ngx_conf_t *cf, n
-     ls->pool_size = cscf->connection_pool_size;
-     ls->post_accept_timeout = cscf->client_header_timeout;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+// CLEANUP:    ls->accept_proxy_protocol = cscf->accept_proxy_protocol;
-+    ls->accept_proxy_protocol = addr->opt.accept_proxy_protocol;
-+#endif
-+
-     clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index];
- 
-     ls->logp = clcf->error_log;
-@@ -1840,6 +1855,9 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_h
- #if (NGX_HTTP_SPDY)
-         addrs[i].conf.spdy = addr[i].opt.spdy;
- #endif
-+#if (NGX_PROXY_PROTOCOL)
-+        addrs[i].conf.accept_proxy_protocol = addr[i].opt.accept_proxy_protocol;
-+#endif
- 
-         if (addr[i].hash.buckets == NULL
-             && (addr[i].wc_head == NULL
-@@ -1904,6 +1922,9 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_
- #if (NGX_HTTP_SPDY)
-         addrs6[i].conf.spdy = addr[i].opt.spdy;
- #endif
-+#if (NGX_PROXY_PROTOCOL)
-+        addrs6[i].conf.accept_proxy_protocol = addr[i].opt.accept_proxy_protocol;
-+#endif
- 
-         if (addr[i].hash.buckets == NULL
-             && (addr[i].wc_head == NULL
-Index: nginx-1.4.7/src/http/ngx_http_core_module.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_core_module.c
-+++ nginx-1.4.7/src/http/ngx_http_core_module.c
-@@ -4090,6 +4090,15 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx
-             continue;
-         }
- 
-+#if (NGX_PROXY_PROTOCOL)
-+        if (ngx_strncmp(value[n].data, "accept_proxy_protocol=on", 24) == 0) {
-+            lsopt.accept_proxy_protocol = 1;
-+            lsopt.set = 1;
-+            lsopt.bind = 1;
-+            continue;
-+        }
-+#endif
-+
-         if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) {
- #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-             struct sockaddr  *sa;
-Index: nginx-1.4.7/src/http/ngx_http_core_module.h
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_core_module.h
-+++ nginx-1.4.7/src/http/ngx_http_core_module.h
-@@ -78,6 +78,11 @@ typedef struct {
- #if (NGX_HTTP_SPDY)
-     unsigned                   spdy:1;
- #endif
-+
-+#if (NGX_PROXY_PROTOCOL)
-+    unsigned                   accept_proxy_protocol:2;
-+#endif
-+
- #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-     unsigned                   ipv6only:1;
- #endif
-@@ -234,6 +239,10 @@ struct ngx_http_addr_conf_s {
- 
-     ngx_http_virtual_names_t  *virtual_names;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    ngx_flag_t                  accept_proxy_protocol;
-+#endif
-+
- #if (NGX_HTTP_SSL)
-     unsigned                   ssl:1;
- #endif
-Index: nginx-1.4.7/src/http/ngx_http_request.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_request.c
-+++ nginx-1.4.7/src/http/ngx_http_request.c
-@@ -63,6 +63,9 @@ static void ngx_http_ssl_handshake(ngx_e
- static void ngx_http_ssl_handshake_handler(ngx_connection_t *c);
- #endif
- 
-+#if (NGX_PROXY_PROTOCOL)
-+static void ngx_http_proxy_protocol(ngx_event_t *rev);
-+#endif
- 
- static char *ngx_http_client_errors[] = {
- 
-@@ -343,6 +346,14 @@ ngx_http_init_connection(ngx_connection_
-     }
- #endif
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    {
-+        if (hc->addr_conf->accept_proxy_protocol) {
-+            rev->handler = ngx_http_proxy_protocol;
-+        }
-+    }
-+#endif
-+
-     if (rev->ready) {
-         /* the deferred accept(), rtsig, aio, iocp */
- 
-@@ -364,7 +375,6 @@ ngx_http_init_connection(ngx_connection_
-     }
- }
- 
--
- static void
- ngx_http_wait_request_handler(ngx_event_t *rev)
- {
-@@ -469,6 +479,12 @@ ngx_http_wait_request_handler(ngx_event_
-     }
- 
-     rev->handler = ngx_http_process_request_line;
-+
-+#if (NGX_PROXY_PROTOCOL)
-+    if (hc->addr_conf->accept_proxy_protocol)
-+        rev->handler = ngx_http_proxy_protocol;
-+#endif
-+
-     ngx_http_process_request_line(rev);
- }
- 
-@@ -582,6 +598,67 @@ ngx_http_create_request(ngx_connection_t
-     return r;
- }
- 
-+#if (NGX_PROXY_PROTOCOL)
-+
-+static void
-+ngx_http_proxy_protocol(ngx_event_t *rev)
-+{
-+    ssize_t                n;
-+    size_t                 size = 1024;
-+    u_char                 tmpbuf[size];
-+    ngx_connection_t      *c;
-+    ngx_http_connection_t *hc;
-+
-+    c = rev->data;
-+    hc = c->data;
-+    rev->handler = ngx_http_wait_request_handler;
-+
-+#if (NGX_HTTP_SPDY)
-+    {
-+        if (hc->addr_conf->spdy) {
-+            rev->handler = ngx_http_spdy_init;
-+        }
-+    }
-+#endif
-+
-+#if (NGX_HTTP_SSL)
-+    {
-+        if (hc->addr_conf->ssl) {
-+            rev->handler = ngx_http_ssl_handshake;
-+        }
-+    }
-+#endif
-+
-+    n = recv(c->fd, tmpbuf, size, MSG_PEEK);
-+
-+    if ((n <= 0) && (c->listening)
-+            && (hc->addr_conf->accept_proxy_protocol)
-+	    && (!c->proxy_protocol)) {
-+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required but not found");
-+        return;
-+    }
-+    if ((n > 0) && (c->listening)
-+            && (hc->addr_conf->accept_proxy_protocol)
-+	    && (!c->proxy_protocol)) {
-+        ssize_t m;
-+        if (!(m = ngx_recv_proxy_protocol(c, tmpbuf, n))) {
-+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required but not found");
-+            ngx_http_close_connection(c);
-+            return;
-+        }
-+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required and found");
-+
-+        c->proxy_protocol = 1;
-+
-+        /* strip the proxy protocol string from the buffer */
-+        recv(c->fd, tmpbuf, m, 0);
-+    }
-+
-+    rev->handler(rev);
-+}
-+
-+#endif
-+
- 
- #if (NGX_HTTP_SSL)
- 
-Index: nginx-1.4.7/src/http/ngx_http_upstream.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_upstream.c
-+++ nginx-1.4.7/src/http/ngx_http_upstream.c
-@@ -31,6 +31,10 @@ static ngx_int_t ngx_http_upstream_reini
-     ngx_http_upstream_t *u);
- static void ngx_http_upstream_send_request(ngx_http_request_t *r,
-     ngx_http_upstream_t *u);
-+#if (NGX_PROXY_PROTOCOL)
-+static void ngx_http_upstream_send_proxy_protocol(ngx_http_request_t *r,
-+    ngx_http_upstream_t *u);
-+#endif
- static void ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
-     ngx_http_upstream_t *u);
- static void ngx_http_upstream_process_header(ngx_http_request_t *r,
-@@ -1255,6 +1259,13 @@ ngx_http_upstream_connect(ngx_http_reque
- 
-     u->request_sent = 0;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    if (u->conf->send_proxy_protocol && !(u->ssl && c->ssl == NULL)) {
-+        ngx_http_upstream_send_proxy_protocol(r, u);
-+	return;
-+    }
-+#endif
-+
-     if (rc == NGX_AGAIN) {
-         ngx_add_timer(c->write, u->conf->connect_timeout);
-         return;
-@@ -1498,6 +1509,228 @@ ngx_http_upstream_send_request(ngx_http_
- }
- 
- 
-+#if (NGX_PROXY_PROTOCOL)
-+
-+static void
-+ngx_http_upstream_send_proxy_protocol(ngx_http_request_t *r, ngx_http_upstream_t *u)
-+{
-+    size_t                   len;
-+    ngx_int_t                rc;
-+    ngx_connection_t        *uc;
-+    ngx_connection_t        *cc;
-+    ngx_chain_t             *pp_string;
-+    ngx_proxy_protocol_t     pp;
-+    ngx_buf_t               *b;
-+    char                     port[6];
-+    u_char                  *addr;
-+    struct sockaddr_storage  sa_src;
-+    struct sockaddr_storage  sa_dst;
-+    socklen_t                addrlen = NGX_SOCKADDRLEN;
-+    struct sockaddr_in      *sin_src;
-+    struct sockaddr_in      *sin_dst;
-+
-+#if (NGX_HAVE_INET6)
-+
-+    struct sockaddr_in6     *sin6_src;
-+    struct sockaddr_in6     *sin6_dst;
-+
-+#endif
-+
-+
-+    uc = u->peer.connection;
-+    cc = r->connection;
-+
-+    if ( !(u->conf->send_proxy_protocol) ) {
-+        return;
-+    }
-+
-+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
-+                   "http upstream send proxy protocol");
-+
-+    if (!u->request_sent && ngx_http_upstream_test_connect(uc) != NGX_OK) {
-+        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
-+        return;
-+    }
-+
-+    uc->log->action = "sending proxy protocol to upstream";
-+
-+    len = 0;
-+
-+    if (r->connection->proxy_protocol) {
-+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
-+                   "PP: got proxy-protocol from client connection");
-+
-+        switch (cc->sockaddr->sa_family) {
-+
-+#if (NGX_HAVE_INET6)
-+
-+            case AF_INET6:
-+
-+                pp.pp_proto = NGX_PP_PROTO_TCP6;
-+                sin6_dst = (struct sockaddr_in6 *) cc->local_sockaddr;
-+                sin6_src = (struct sockaddr_in6 *) cc->sockaddr;
-+
-+                break;
-+
-+#endif
-+
-+            default:
-+                pp.pp_proto = NGX_PP_PROTO_TCP4;
-+                sin_dst = (struct sockaddr_in *) cc->local_sockaddr;
-+                sin_src = (struct sockaddr_in *) cc->sockaddr;
-+
-+        }
-+
-+    } else {
-+
-+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
-+                   "PP: collecting information from socket fd");
-+
-+        getsockname(cc->fd, (struct sockaddr *) &sa_dst, &addrlen);
-+
-+        switch (sa_dst.ss_family) {
-+
-+#if (NGX_HAVE_INET6)
-+
-+            case AF_INET6:
-+
-+                pp.pp_proto = NGX_PP_PROTO_TCP6;
-+                sin6_dst = (struct sockaddr_in6 *) &sa_dst;
-+
-+                getpeername(cc->fd, (struct sockaddr *) &sa_src, &addrlen);
-+                sin6_src = (struct sockaddr_in6 *) &sa_src;
-+
-+                break;
-+
-+#endif
-+
-+            default:
-+
-+                pp.pp_proto = NGX_PP_PROTO_TCP4;
-+                sin_dst = (struct sockaddr_in *) &sa_dst;
-+                getpeername(cc->fd, (struct sockaddr *) &sa_src, &addrlen);
-+                sin_src = (struct sockaddr_in *) &sa_src;
-+        }
-+
-+
-+    }
-+
-+    switch (pp.pp_proto) {
-+
-+#if (NGX_HAVE_INET6)
-+
-+        case NGX_PP_PROTO_TCP6:
-+
-+            /* dst3 and dst4 */
-+            addr = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
-+            ngx_inet_ntop(AF_INET6, &sin6_dst->sin6_addr, addr, NGX_INET6_ADDRSTRLEN);
-+            pp.pp_dst3_text.data = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
-+            pp.pp_dst3_text.len = ngx_strlen(addr);
-+            ngx_memcpy(pp.pp_dst3_text.data, addr, pp.pp_dst3_text.len);
-+            pp.pp_dst4 = htons(sin6_dst->sin6_port);
-+
-+            ngx_memzero(addr, NGX_INET6_ADDRSTRLEN);
-+
-+            /* src3 and src4 */
-+            ngx_inet_ntop(AF_INET6, &sin6_src->sin6_addr, addr, NGX_INET6_ADDRSTRLEN);
-+            pp.pp_src3_text.data = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
-+            pp.pp_src3_text.len = ngx_strlen(addr);
-+            ngx_memcpy(pp.pp_src3_text.data, addr, pp.pp_src3_text.len);
-+            pp.pp_src4 = htons(sin6_src->sin6_port);
-+
-+        break;
-+
-+#endif
-+
-+        default:
-+
-+            /* dst3 and dst4 */
-+            addr = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
-+            ngx_inet_ntop(AF_INET, &sin_dst->sin_addr, addr, NGX_INET_ADDRSTRLEN);
-+            pp.pp_dst3_text.data = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
-+            pp.pp_dst3_text.len = ngx_strlen(addr);
-+            ngx_memcpy(pp.pp_dst3_text.data, addr, pp.pp_dst3_text.len);
-+            pp.pp_dst4 = htons(sin_dst->sin_port);
-+
-+            ngx_memzero(addr, NGX_INET_ADDRSTRLEN);
-+
-+            /* src3 and src4 */
-+            ngx_inet_ntop(AF_INET, &sin_src->sin_addr, addr, NGX_INET_ADDRSTRLEN);
-+            pp.pp_src3_text.data = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
-+            pp.pp_src3_text.len = ngx_strlen(addr);
-+            ngx_memcpy(pp.pp_src3_text.data, addr, pp.pp_src3_text.len);
-+            pp.pp_src4 = htons(sin_src->sin_port);
-+
-+    }
-+
-+    len += ngx_proxy_protocol_string_length(&pp);
-+
-+    ngx_print_proxy_protocol(&pp, uc->log);
-+
-+    b = ngx_create_temp_buf(uc->pool, len);
-+    if (b == NULL) {
-+        return;
-+    }
-+
-+    pp_string = ngx_alloc_chain_link(uc->pool);
-+    if (pp_string == NULL) {
-+        return;
-+    }
-+
-+    pp_string->buf = b;
-+    pp_string->next = NULL;
-+
-+    b->last = ngx_cpymem(b->last, "PROXY ", sizeof("PROXY ") - 1);
-+
-+    switch (pp.pp_proto) {
-+        case NGX_PP_PROTO_TCP4:
-+            b->last = ngx_cpymem(b->last, "TCP4 ", sizeof("TCP4 ") - 1);
-+        break;
-+        case NGX_PP_PROTO_TCP6:
-+            b->last = ngx_cpymem(b->last, "TCP6 ", sizeof("TCP6 ") - 1);
-+        break;
-+    }
-+
-+    /* src3 */
-+    b->last = ngx_cpymem(b->last, pp.pp_src3_text.data, pp.pp_src3_text.len);
-+    b->last = ngx_cpymem(b->last, " ", 1);
-+
-+    /* dst3 */
-+    b->last = ngx_cpymem(b->last, pp.pp_dst3_text.data, pp.pp_dst3_text.len);
-+    b->last = ngx_cpymem(b->last, " ", 1);
-+
-+    /* src4 */
-+    ngx_memzero(port, 6);
-+    sprintf(port,"%d", pp.pp_src4);
-+    b->last = ngx_cpymem(b->last, port, strlen(port));
-+    b->last = ngx_cpymem(b->last, " ", 1);
-+
-+    /* dst4 */
-+    ngx_memzero(port, 6);
-+    sprintf(port,"%d", pp.pp_dst4);
-+    b->last = ngx_cpymem(b->last, port, strlen(port));
-+
-+    /* CRLF */
-+    b->last = ngx_cpymem(b->last, CRLF, sizeof(CRLF) - 1);
-+
-+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, uc->log, 0,
-+            "http upstream send proxy protocol: %d -%*s-",
-+            ngx_proxy_protocol_string_length(&pp),
-+            ngx_proxy_protocol_string_length(&pp) - 2,
-+            b->start);
-+
-+    rc = ngx_output_chain(&u->output, pp_string);
-+
-+    if (rc == NGX_ERROR) {
-+        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
-+        return;
-+    }
-+
-+}
-+
-+#endif
-+
-+
- static void
- ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
-     ngx_http_upstream_t *u)
-Index: nginx-1.4.7/src/http/ngx_http_upstream.h
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_upstream.h
-+++ nginx-1.4.7/src/http/ngx_http_upstream.h
-@@ -188,6 +188,10 @@ typedef struct {
-     unsigned                         intercept_404:1;
-     unsigned                         change_buffering:1;
- 
-+#if (NGX_PROXY_PROTOCOL)
-+    ngx_flag_t                       send_proxy_protocol;
-+#endif
-+
- #if (NGX_HTTP_SSL)
-     ngx_ssl_t                       *ssl;
-     ngx_flag_t                       ssl_session_reuse;
-Index: nginx-1.4.7/auto/cc/gcc
-===================================================================
---- nginx-1.4.7.orig/auto/cc/gcc
-+++ nginx-1.4.7/auto/cc/gcc
-@@ -168,7 +168,7 @@ esac
- 
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS"
- 
- # debug
- CFLAGS="$CFLAGS -g"
-Index: nginx-1.4.7/auto/cc/icc
-===================================================================
---- nginx-1.4.7.orig/auto/cc/icc
-+++ nginx-1.4.7/auto/cc/icc
-@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
- esac
- 
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS "
- 
- # debug
- CFLAGS="$CFLAGS -g"
diff --git a/trunk/package/feeds/packages/nginx/patches/401-nginx-1.4.0-syslog.patch b/trunk/package/feeds/packages/nginx/patches/401-nginx-1.4.0-syslog.patch
deleted file mode 100644
index 941c79ae..00000000
--- a/trunk/package/feeds/packages/nginx/patches/401-nginx-1.4.0-syslog.patch
+++ /dev/null
@@ -1,698 +0,0 @@
-Index: nginx-1.4.7/src/core/ngx_cycle.c
-===================================================================
---- nginx-1.4.7.orig/src/core/ngx_cycle.c
-+++ nginx-1.4.7/src/core/ngx_cycle.c
-@@ -85,6 +85,12 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
-     cycle->pool = pool;
-     cycle->log = log;
-     cycle->new_log.log_level = NGX_LOG_ERR;
-+#if (NGX_ENABLE_SYSLOG)
-+    cycle->new_log.facility = SYSLOG_FACILITY;
-+    cycle->new_log.facility = ERR_SYSLOG_PRIORITY;
-+    cycle->new_log.syslog_on = 0;
-+    cycle->new_log.syslog_set = 0;
-+#endif
-     cycle->old_cycle = old_cycle;
- 
-     cycle->conf_prefix.len = old_cycle->conf_prefix.len;
-Index: nginx-1.4.7/src/core/ngx_log.c
-===================================================================
---- nginx-1.4.7.orig/src/core/ngx_log.c
-+++ nginx-1.4.7/src/core/ngx_log.c
-@@ -10,6 +10,15 @@
- 
- 
- static char *ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-+#if (NGX_ENABLE_SYSLOG)
-+static char *ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-+void log_exit(ngx_cycle_t *cycle);
-+
-+typedef struct{
-+    ngx_str_t     name;
-+    ngx_int_t     macro;
-+} ngx_string_to_macro_t;
-+#endif
- 
- 
- static ngx_command_t  ngx_errlog_commands[] = {
-@@ -21,6 +30,15 @@ static ngx_command_t  ngx_errlog_command
-      0,
-      NULL},
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    {ngx_string("syslog"),
-+     NGX_MAIN_CONF|NGX_CONF_TAKE12,
-+     ngx_set_syslog,
-+     0,
-+     0,
-+     NULL},
-+#endif
-+
-     ngx_null_command
- };
- 
-@@ -43,7 +61,11 @@ ngx_module_t  ngx_errlog_module = {
-     NULL,                                  /* init thread */
-     NULL,                                  /* exit thread */
-     NULL,                                  /* exit process */
--    NULL,                                  /* exit master */
-+#if (NGX_ENABLE_SYSLOG)
-+    log_exit,                              /* exit master */
-+#else
-+    NULL,
-+#endif
-     NGX_MODULE_V1_PADDING
- };
- 
-@@ -52,6 +74,48 @@ static ngx_log_t        ngx_log;
- static ngx_open_file_t  ngx_log_file;
- ngx_uint_t              ngx_use_stderr = 1;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+static ngx_string_to_macro_t ngx_syslog_facilities[] = {
-+    {ngx_string("auth"),     LOG_AUTH},
-+#if !(NGX_SOLARIS)
-+    {ngx_string("authpriv"), LOG_AUTHPRIV},
-+#endif
-+    {ngx_string("cron"),     LOG_CRON},
-+    {ngx_string("daemon"),   LOG_DAEMON},
-+#if !(NGX_SOLARIS)
-+    {ngx_string("ftp"),      LOG_FTP},
-+#endif
-+    {ngx_string("kern"),     LOG_KERN},
-+    {ngx_string("local0"),   LOG_LOCAL0},
-+    {ngx_string("local1"),   LOG_LOCAL1},
-+    {ngx_string("local2"),   LOG_LOCAL2},
-+    {ngx_string("local3"),   LOG_LOCAL3},
-+    {ngx_string("local4"),   LOG_LOCAL4},
-+    {ngx_string("local5"),   LOG_LOCAL5},
-+    {ngx_string("local6"),   LOG_LOCAL6},
-+    {ngx_string("local7"),   LOG_LOCAL7},
-+    {ngx_string("lpr"),      LOG_LPR},
-+    {ngx_string("mail"),     LOG_MAIL},
-+    {ngx_string("news"),     LOG_NEWS},
-+    {ngx_string("syslog"),   LOG_SYSLOG},
-+    {ngx_string("user"),     LOG_USER},
-+    {ngx_string("uucp"),     LOG_UUCP},
-+    { ngx_null_string, 0}
-+};
-+
-+static ngx_string_to_macro_t ngx_syslog_priorities[] = {
-+    {ngx_string("emerg"), LOG_EMERG},
-+    {ngx_string("alert"), LOG_ALERT},
-+    {ngx_string("crit"),  LOG_CRIT},
-+    {ngx_string("error"), LOG_ERR},
-+    {ngx_string("err"),   LOG_ERR},
-+    {ngx_string("warn"),  LOG_WARNING},
-+    {ngx_string("notice"),LOG_NOTICE},
-+    {ngx_string("info"),  LOG_INFO},
-+    {ngx_string("debug"), LOG_DEBUG},
-+    { ngx_null_string, 0}
-+};
-+#endif
- 
- static ngx_str_t err_levels[] = {
-     ngx_null_string,
-@@ -89,11 +153,16 @@ ngx_log_error_core(ngx_uint_t level, ngx
-     va_list  args;
- #endif
-     u_char  *p, *last, *msg;
-+#if (NGX_ENABLE_SYSLOG)
-+    u_char *errstr_syslog;
-+#endif
-     u_char   errstr[NGX_MAX_ERROR_STR];
- 
-+#if !(NGX_ENABLE_SYSLOG)
-     if (log->file->fd == NGX_INVALID_FILE) {
-         return;
-     }
-+#endif
- 
-     last = errstr + NGX_MAX_ERROR_STR;
- 
-@@ -102,6 +171,10 @@ ngx_log_error_core(ngx_uint_t level, ngx
- 
-     p = errstr + ngx_cached_err_log_time.len;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    errstr_syslog = p;
-+#endif
-+
-     p = ngx_slprintf(p, last, " [%V] ", &err_levels[level]);
- 
-     /* pid#tid */
-@@ -140,11 +213,27 @@ ngx_log_error_core(ngx_uint_t level, ngx
- 
-     ngx_linefeed(p);
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    if (log->file != NULL && log->file->name.len != 0) {
-     (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
-+    }
-+
-+    /* Don't send the debug level info to syslog */
-+    if (log->syslog_on && level < NGX_LOG_DEBUG) {
-+        /* write to syslog */
-+        syslog(log->priority, "%.*s", (int)(p - errstr_syslog), errstr_syslog);
-+    }
-+#else
-+    (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
-+#endif
- 
-     if (!ngx_use_stderr
-         || level > NGX_LOG_WARN
-+#if (NGX_ENABLE_SYSLOG)
-+        || (log->file != NULL && log->file->fd == ngx_stderr))
-+#else
-         || log->file->fd == ngx_stderr)
-+#endif
-     {
-         return;
-     }
-@@ -367,6 +456,50 @@ ngx_log_create(ngx_cycle_t *cycle, ngx_s
- }
- 
- 
-+#if (NGX_ENABLE_SYSLOG)
-+ngx_int_t
-+ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority)
-+{
-+    ngx_int_t  p = 0;
-+    ngx_uint_t n, match = 0;
-+
-+    for (n = 0; ngx_syslog_priorities[n].name.len != 0; n++) {
-+        if (ngx_strncmp(priority->data, ngx_syslog_priorities[n].name.data, 
-+                    ngx_syslog_priorities[n].name.len) == 0) {
-+            p = ngx_syslog_priorities[n].macro;
-+            match = 1;
-+        }
-+    }
-+
-+    if (!match) {
-+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+                "invalid syslog priority \"%V\"", priority);
-+        return -1;
-+    }
-+
-+    return p;
-+}
-+
-+
-+char *
-+ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t *log)
-+{
-+    log->priority = ERR_SYSLOG_PRIORITY;
-+
-+    if (priority->len == 0) {
-+        return NGX_CONF_OK;
-+    }
-+
-+    log->priority = ngx_log_get_priority(cf, priority);
-+    if (log->priority == (-1)) {
-+        return NGX_CONF_ERROR;
-+    }
-+
-+    return NGX_CONF_OK;
-+}
-+#endif
-+
-+
- char *
- ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log)
- {
-@@ -429,6 +562,13 @@ static char *
- ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- {
-     ngx_str_t  *value, name;
-+#if (NGX_ENABLE_SYSLOG)
-+    u_char     *off = NULL;
-+    ngx_str_t  priority;
-+
-+    ngx_str_null(&name);
-+    ngx_str_null(&priority);
-+#endif
- 
-     if (cf->cycle->new_log.file) {
-         return "is duplicate";
-@@ -436,7 +576,44 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman
- 
-     value = cf->args->elts;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
-+        if (!cf->cycle->new_log.syslog_set) {
-+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+                    "You must set the syslog directive and enable it first.");
-+            return NGX_CONF_ERROR;
-+        }
-+
-+        cf->cycle->new_log.syslog_on = 1;
-+
-+        if (value[1].data[sizeof("syslog") - 1] == ':') {
-+            priority.len = value[1].len - sizeof("syslog");
-+            priority.data = value[1].data + sizeof("syslog");
-+
-+            off = (u_char *)ngx_strchr(priority.data, (int) '|');
-+            if (off != NULL) {
-+                priority.len = off - priority.data;
-+
-+                off++;
-+                name.len = value[1].data + value[1].len - off;
-+                name.data = off;
-+            }
-+        }
-+        else {
-+            if (value[1].len > sizeof("syslog")) {
-+                name.len = value[1].len - sizeof("syslog");
-+                name.data = value[1].data + sizeof("syslog");
-+            }
-+        }
-+
-+        if (ngx_log_set_priority(cf, &priority, &cf->cycle->new_log) == NGX_CONF_ERROR) {
-+            return NGX_CONF_ERROR;
-+        }
-+    }
-+    else if (ngx_strcmp(value[1].data, "stderr") == 0) {
-+#else
-     if (ngx_strcmp(value[1].data, "stderr") == 0) {
-+#endif
-         ngx_str_null(&name);
- 
-     } else {
-@@ -457,3 +634,63 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman
- 
-     return ngx_log_set_levels(cf, &cf->cycle->new_log);
- }
-+
-+
-+#if (NGX_ENABLE_SYSLOG)
-+
-+#define SYSLOG_IDENT_NAME "nginx"
-+
-+static char *
-+ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-+{
-+    char       *program;
-+    ngx_str_t  *value;
-+    ngx_int_t   facility, match = 0;
-+    ngx_uint_t  n;
-+
-+    value = cf->args->elts;
-+
-+    if (cf->cycle->new_log.syslog_set) {
-+        return "is duplicate";
-+    }
-+
-+    cf->cycle->new_log.syslog_set = 1;
-+
-+    for (n = 0; ngx_syslog_facilities[n].name.len != 0; n++) {
-+        if (ngx_strncmp(value[1].data, ngx_syslog_facilities[n].name.data, 
-+                    ngx_syslog_facilities[n].name.len) == 0) {
-+            facility = ngx_syslog_facilities[n].macro;
-+            match = 1;
-+            break;
-+        }
-+    }
-+
-+    if (match) {
-+        cf->cycle->new_log.facility = facility;
-+        cf->cycle->new_log.priority = ERR_SYSLOG_PRIORITY;
-+    }
-+    else {
-+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+                "invalid syslog facility \"%V\"", &value[1]);
-+        return NGX_CONF_ERROR;
-+    }
-+
-+    program = SYSLOG_IDENT_NAME; 
-+    if (cf->args->nelts > 2) {
-+        program = (char *) value[2].data;
-+    }
-+
-+    openlog(program, LOG_ODELAY, facility);
-+
-+    return NGX_CONF_OK;
-+}
-+
-+
-+void log_exit(ngx_cycle_t *cycle)
-+{
-+    if (cycle->new_log.syslog_set) {
-+        closelog();
-+    }
-+}
-+#endif
-+
-Index: nginx-1.4.7/src/core/ngx_log.h
-===================================================================
---- nginx-1.4.7.orig/src/core/ngx_log.h
-+++ nginx-1.4.7/src/core/ngx_log.h
-@@ -12,6 +12,13 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
- 
-+#if (NGX_ENABLE_SYSLOG)
-+#include <syslog.h>
-+
-+#define SYSLOG_FACILITY LOG_LOCAL5
-+#define ERR_SYSLOG_PRIORITY LOG_ERR
-+#endif
-+
- 
- #define NGX_LOG_STDERR            0
- #define NGX_LOG_EMERG             1
-@@ -61,6 +68,13 @@ struct ngx_log_s {
-      */
- 
-     char                *action;
-+
-+#if (NGX_ENABLE_SYSLOG)
-+    ngx_int_t           priority;
-+    ngx_int_t           facility;
-+    unsigned            syslog_on:1;      /* unsigned :1 syslog_on */
-+    unsigned            syslog_set:1;      /*unsigned :1 syslog_set */
-+#endif
- };
- 
- 
-@@ -221,6 +235,10 @@ void ngx_cdecl ngx_log_debug_core(ngx_lo
- 
- ngx_log_t *ngx_log_init(u_char *prefix);
- ngx_log_t *ngx_log_create(ngx_cycle_t *cycle, ngx_str_t *name);
-+#if (NGX_ENABLE_SYSLOG)
-+ngx_int_t ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority);
-+char * ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t *log);
-+#endif
- char *ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log);
- void ngx_cdecl ngx_log_abort(ngx_err_t err, const char *fmt, ...);
- void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...);
-Index: nginx-1.4.7/src/http/modules/ngx_http_log_module.c
-===================================================================
---- nginx-1.4.7.orig/src/http/modules/ngx_http_log_module.c
-+++ nginx-1.4.7/src/http/modules/ngx_http_log_module.c
-@@ -13,6 +13,11 @@
- #include <zlib.h>
- #endif
- 
-+#if (NGX_ENABLE_SYSLOG)
-+#include <syslog.h>
-+
-+#define HTTP_SYSLOG_PRIORITY LOG_NOTICE
-+#endif
- 
- typedef struct ngx_http_log_op_s  ngx_http_log_op_t;
- 
-@@ -67,6 +72,11 @@ typedef struct {
-     time_t                      disk_full_time;
-     time_t                      error_log_time;
-     ngx_http_log_fmt_t         *format;
-+
-+#if (NGX_ENABLE_SYSLOG)
-+    ngx_int_t                   priority;
-+    unsigned                    syslog_on:1;      /* unsigned :1 syslog_on */
-+#endif
- } ngx_http_log_t;
- 
- 
-@@ -348,6 +358,14 @@ ngx_http_log_write(ngx_http_request_t *r
-     time_t               now;
-     ssize_t              n;
-     ngx_err_t            err;
-+
-+#if (NGX_ENABLE_SYSLOG)
-+    n = 0;
-+    if (log->syslog_on) {
-+        syslog(log->priority, "%.*s", (int)len, buf);
-+    }
-+#endif
-+
- #if (NGX_ZLIB)
-     ngx_http_log_buf_t  *buffer;
- #endif
-@@ -355,6 +373,9 @@ ngx_http_log_write(ngx_http_request_t *r
-     if (log->script == NULL) {
-         name = log->file->name.data;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+        if (name != NULL) {
-+#endif
- #if (NGX_ZLIB)
-         buffer = log->file->data;
- 
-@@ -367,7 +388,11 @@ ngx_http_log_write(ngx_http_request_t *r
- #else
-         n = ngx_write_fd(log->file->fd, buf, len);
- #endif
--
-+#if (NGX_ENABLE_SYSLOG)
-+        } else {
-+            n = len;
-+        }
-+#endif
-     } else {
-         name = NULL;
-         n = ngx_http_log_script_write(r, log->script, &name, buf, len);
-@@ -1068,6 +1093,10 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *
-     log->script = NULL;
-     log->disk_full_time = 0;
-     log->error_log_time = 0;
-+#if (NGX_ENABLE_SYSLOG)
-+    log->priority = HTTP_SYSLOG_PRIORITY;
-+    log->syslog_on = 0;
-+#endif
- 
-     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
-     fmt = lmcf->formats.elts;
-@@ -1096,6 +1125,13 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
-     ngx_http_log_main_conf_t   *lmcf;
-     ngx_http_script_compile_t   sc;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    u_char                     *off;
-+    ngx_str_t                   priority;
-+    ngx_uint_t                  syslog_on = 0;
-+    name = priority = (ngx_str_t)ngx_null_string;
-+#endif
-+
-     value = cf->args->elts;
- 
-     if (ngx_strcmp(value[1].data, "off") == 0) {
-@@ -1108,6 +1144,38 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
-                            "invalid parameter \"%V\"", &value[2]);
-         return NGX_CONF_ERROR;
-     }
-+#if (NGX_ENABLE_SYSLOG)
-+    else if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
-+        if (!cf->cycle->new_log.syslog_set) {
-+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+                               "You must set the syslog directive and enable it first.");
-+            return NGX_CONF_ERROR;
-+        }
-+
-+        syslog_on = 1;
-+        if (value[1].data[sizeof("syslog") - 1] == ':') {
-+            priority.len = value[1].len - sizeof("syslog");
-+            priority.data = value[1].data + sizeof("syslog");
-+
-+            off = (u_char*) ngx_strchr(priority.data, '|'); 
-+            if (off != NULL) {
-+                priority.len = off - priority.data;
-+                
-+                off++;
-+                name.len = value[1].data + value[1].len - off;
-+                name.data = off;
-+            }
-+        }
-+        else {
-+            if (value[1].len > sizeof("syslog")) {
-+                name.len = value[1].len - sizeof("syslog");
-+                name.data = value[1].data + sizeof("syslog");
-+            }
-+        }
-+    } else {
-+        name = value[1];
-+    }
-+#endif
- 
-     if (llcf->logs == NULL) {
-         llcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t));
-@@ -1125,6 +1193,52 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
- 
-     ngx_memzero(log, sizeof(ngx_http_log_t));
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    log->syslog_on = syslog_on;
-+
-+    if (priority.len == 0) {
-+        log->priority = HTTP_SYSLOG_PRIORITY;
-+    }
-+    else {
-+        log->priority = ngx_log_get_priority(cf, &priority);
-+    }
-+
-+    if (name.len != 0) {
-+        n = ngx_http_script_variables_count(&name);
-+
-+        if (n == 0) {
-+            log->file = ngx_conf_open_file(cf->cycle, &name);
-+            if (log->file == NULL) {
-+                return NGX_CONF_ERROR;
-+            }
-+        } else {
-+            if (ngx_conf_full_name(cf->cycle, &name, 0) != NGX_OK) {
-+                return NGX_CONF_ERROR;
-+            }
-+            log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t));
-+            if (log->script == NULL) {
-+                return NGX_CONF_ERROR;
-+            }
-+            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-+            sc.cf = cf;
-+            sc.source = &name;
-+            sc.lengths = &log->script->lengths;
-+            sc.values = &log->script->values;
-+            sc.variables = n;
-+            sc.complete_lengths = 1;
-+            sc.complete_values = 1;
-+            if (ngx_http_script_compile(&sc) != NGX_OK) {
-+                return NGX_CONF_ERROR;
-+            }
-+        }
-+    }
-+    else {
-+        log->file = ngx_conf_open_file(cf->cycle, &name);
-+        if (log->file == NULL) {
-+            return NGX_CONF_ERROR;
-+        }
-+    }
-+#else
-     n = ngx_http_script_variables_count(&value[1]);
- 
-     if (n == 0) {
-@@ -1157,6 +1271,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
-             return NGX_CONF_ERROR;
-         }
-     }
-+#endif
- 
-     if (cf->args->nelts >= 3) {
-         name = value[2];
-Index: nginx-1.4.7/src/http/ngx_http_core_module.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_core_module.c
-+++ nginx-1.4.7/src/http/ngx_http_core_module.c
-@@ -1462,6 +1462,9 @@ ngx_http_update_location_config(ngx_http
- 
-     if (r == r->main) {
-         ngx_http_set_connection_log(r->connection, clcf->error_log);
-+#if (NGX_ENABLE_SYSLOG)
-+        r->connection->log->priority = clcf->error_log->priority;
-+#endif
-     }
- 
-     if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) {
-@@ -4901,6 +4904,15 @@ ngx_http_core_error_log(ngx_conf_t *cf,
- 
-     ngx_str_t  *value, name;
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    u_char     *off = NULL;
-+    ngx_int_t   syslog_on = 0;
-+    ngx_str_t   priority;
-+
-+    name = priority = (ngx_str_t) ngx_null_string;
-+#endif
-+
-+
-     if (clcf->error_log) {
-         return "is duplicate";
-     }
-@@ -4910,6 +4922,36 @@ ngx_http_core_error_log(ngx_conf_t *cf,
-     if (ngx_strcmp(value[1].data, "stderr") == 0) {
-         ngx_str_null(&name);
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    } else if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
-+        if (!cf->cycle->new_log.syslog_set) {
-+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+                    "You must set the syslog directive and enable it first.");
-+            return NGX_CONF_ERROR;
-+        }
-+
-+        syslog_on = 1;
-+
-+        if (value[1].data[sizeof("syslog") - 1] == ':') {
-+            priority.len = value[1].len - sizeof("syslog");
-+            priority.data = value[1].data + sizeof("syslog");
-+
-+            off = (u_char*) ngx_strchr(priority.data, '|'); 
-+            if (off != NULL) {
-+                priority.len = off - priority.data;
-+
-+                off++;
-+                name.len = value[1].data + value[1].len - off;
-+                name.data = off;
-+            }
-+        }
-+        else {
-+            if (value[1].len > sizeof("syslog")) {
-+                name.len = value[1].len - sizeof("syslog");
-+                name.data = value[1].data + sizeof("syslog");
-+            }
-+        }
-+#endif
-     } else {
-         name = value[1];
-     }
-@@ -4919,6 +4961,17 @@ ngx_http_core_error_log(ngx_conf_t *cf,
-         return NGX_CONF_ERROR;
-     }
- 
-+#if (NGX_ENABLE_SYSLOG)
-+    if (syslog_on) {
-+        clcf->error_log->syslog_on = 1;
-+        if (ngx_log_set_priority(cf, &priority, clcf->error_log) == NGX_CONF_ERROR) {
-+            return NGX_CONF_ERROR;
-+        }
-+    }
-+
-+    clcf->error_log->log_level = 0;
-+#endif
-+
-     if (cf->args->nelts == 2) {
-         clcf->error_log->log_level = NGX_LOG_ERR;
-         return NGX_CONF_OK;
-Index: nginx-1.4.7/src/http/ngx_http_request.c
-===================================================================
---- nginx-1.4.7.orig/src/http/ngx_http_request.c
-+++ nginx-1.4.7/src/http/ngx_http_request.c
-@@ -533,6 +533,9 @@ ngx_http_create_request(ngx_connection_t
-     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
- 
-     ngx_http_set_connection_log(r->connection, clcf->error_log);
-+#if (NGX_ENABLE_SYSLOG)
-+    c->log->priority = clcf->error_log->priority;
-+#endif
- 
-     r->header_in = hc->nbusy ? hc->busy[0] : c->buffer;
- 
-@@ -872,6 +875,9 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *
-     clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module);
- 
-     ngx_http_set_connection_log(c, clcf->error_log);
-+#if (NGX_ENABLE_SYSLOG)
-+    c->log->priority = clcf->error_log->priority;
-+#endif
- 
-     sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
- 
-@@ -2077,6 +2083,9 @@ ngx_http_set_virtual_server(ngx_http_req
-     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
- 
-     ngx_http_set_connection_log(r->connection, clcf->error_log);
-+#if (NGX_ENABLE_SYSLOG)
-+    r->connection->log->priority = clcf->error_log->priority;
-+#endif
- 
-     return NGX_OK;
- }
diff --git a/trunk/package/feeds/packages/nmap/Makefile b/trunk/package/feeds/packages/nmap/Makefile
deleted file mode 100644
index 251b91e2..00000000
--- a/trunk/package/feeds/packages/nmap/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-#TODO
-#
-# * uClibcpp not supported, performance +100x slower. libstdcpp is being used. https://bugs.busybox.net/show_bug.cgi?id=2545
-# * liblua is still not recognized/blindly accepted. Impossible to compile with support
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nmap
-PKG_VERSION:=6.47
-PKG_RELEASE:=2
-PKG_MAINTAINER=Nuno Goncalves <nunojpg@gmail.com>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://nmap.org/dist/
-PKG_MD5SUM:=edfe81f6763223c0a29bfa15a8526e2a
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-NMAP_DEPENDS:=+libpcap +libstdcpp
-NCAT_DEPENDS:=+libpcap
-NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
-NDIFF_DEPENDS:=+python
-
-define Package/nmap/default
-  SUBMENU:=NMAP Suite
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://nmap.org/
-endef
-
-define Package/nmap
-$(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Utility for network exploration or security auditing
-endef
-
-define Package/nmap-ssl
-$(call Package/nmap/default)
-  DEPENDS:=$(NMAP_DEPENDS) +libopenssl
-  VARIANT:=ssl
-  TITLE:=Nmap (with OpenSSL support)
-endef
-
-define Package/ncat
-$(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Much-improved reimplementation of Netcat
-endef
-
-define Package/ncat-ssl
-$(call Package/nmap/default)
-  DEPENDS:=$(NCAT_DEPENDS) +libopenssl
-  VARIANT:=ssl
-  TITLE:=Ncat (with OpenSSL support)
-endef
-
-define Package/nping
-$(call Package/nmap/default)
-  DEPENDS:=$(NPING_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Network packet generation tool / ping utility
-endef
-
-define Package/ndiff
-$(call Package/nmap/default)
-  DEPENDS:=$(NDIFF_DEPENDS)
-  VARIANT:=nossl
-  TITLE:=Utility to compare the results of Nmap scans
-endef
-
-CONFIGURE_ARGS += \
-	--with-libdnet=included \
-	--with-libpcre=included \
-	--with-libpcap="$(STAGING_DIR)/usr" \
-	--without-liblua \
-	--without-zenmap
-
-CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-openssl
-endif
-
-define Package/nmap/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/nmap
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
-endef
-
-define Package/nmap-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/nmap
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
-endef
-
-define Package/ncat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
-endef
-
-define Package/ncat-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/ncat
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
-endef
-
-define Package/ndiff/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
-endef
-
-define Package/nping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
-endef
-
-
-$(eval $(call BuildPackage,nmap))
-$(eval $(call BuildPackage,nmap-ssl))
-$(eval $(call BuildPackage,ncat))
-$(eval $(call BuildPackage,ncat-ssl))
-$(eval $(call BuildPackage,nping))
-$(eval $(call BuildPackage,ndiff))
diff --git a/trunk/package/feeds/packages/nsd/Makefile b/trunk/package/feeds/packages/nsd/Makefile
deleted file mode 100644
index ba1c1993..00000000
--- a/trunk/package/feeds/packages/nsd/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nsd
-PKG_VERSION:=4.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/nsd
-PKG_MD5SUM:=9331dd18478295206775433a0b23e490
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nsd/default
-  TITLE:=NSD Name Server Daemon
-  URL:=http://www.nlnetlabs.nl/projects/nsd/
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-endef
-
-define Package/nsd/default/description
-  NSD is an authoritative only, high performance, simple and open source name
-  server.
-endef
-
-define Package/nsd
-  $(Package/nsd/default)
-  TITLE += (with SSL support)
-  DEPENDS += +libopenssl
-  VARIANT:=ssl
-endef
-
-define Package/nsd/description
-  $(Package/nsd/default/description)
-endef
-
-define Package/nsd-nossl
-  $(Package/nsd/default)
-  TITLE += (without SSL support)
-  VARIANT:=nossl
-endef
-
-define Package/nsd-nossl/description
-  $(Package/nsd/default/description)
-endef
-
-define Package/nsd-checkconf/description
-  $(Package/nsd/default/description)
-endef
-
-define Package/nsd-control
-  $(Package/nsd/default)
-  TITLE += remote control utility
-  DEPENDS += +libopenssl
-endef
-
-define Package/nsd-control/description
-  $(Package/nsd/default/description)
-endef
-
-define Package/nsd-control-setup
-  $(Package/nsd/default)
-  TITLE += SSL keys setup script
-  DEPENDS += +openssl-util
-endef
-
-define Package/nsd-control-setup/description
-  $(Package/nsd/default/description)
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-checking \
-	--with-libevent=no \
-	--with-user="network" \
-
-CONFIGURE_VARS+= \
-	ac_cv_c_va_list_def=no \
-	ac_cv_c_strptime_needs_defs=no \
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += \
-		--with-ssl="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS += \
-		--without-ssl
-endif
-
-define Package/nsd/conffiles
-/etc/nsd/
-endef
-
-define Package/nsd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{nsd,nsd-checkconf} $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/nsd
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nsd/nsd.conf.sample $(1)/etc/nsd/nsd.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/nsd.init $(1)/etc/init.d/nsd
-endef
-
-define Package/nsd-control/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nsd-control $(1)/usr/sbin/
-endef
-
-define Package/nsd-control-setup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nsd-control-setup $(1)/usr/sbin/
-endef
-
-Package/nsd-nossl/install = $(Package/nsd/install)
-Package/nsd-nossl/conffiles = $(Package/nsd/conffiles)
-
-$(eval $(call BuildPackage,nsd))
-$(eval $(call BuildPackage,nsd-nossl))
-$(eval $(call BuildPackage,nsd-control))
-$(eval $(call BuildPackage,nsd-control-setup))
diff --git a/trunk/package/feeds/packages/nsd/files/nsd.init b/trunk/package/feeds/packages/nsd/files/nsd.init
deleted file mode 100644
index 8b1cf1de..00000000
--- a/trunk/package/feeds/packages/nsd/files/nsd.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=60
-USE_PROCD=1
-PROG=/usr/sbin/nsd
-
-start_service() {
-	mkdir -p /var/db/nsd
-	chown network /var/db/nsd
-	chmod 640 /etc/nsd/*.conf 2>/dev/null
-	chgrp network /etc/nsd/*.conf 2>/dev/null
-	procd_open_instance
-	procd_set_param command "$PROG" -d
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/ntfs-3g/Makefile b/trunk/package/feeds/packages/ntfs-3g/Makefile
deleted file mode 100644
index 3d87b7d0..00000000
--- a/trunk/package/feeds/packages/ntfs-3g/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntfs-3g
-PKG_RELEASE:=1
-
-PKG_VERSION:=2014.2.15
-PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.tuxera.com/opensource/
-PKG_MD5SUM:=f11d563816249d730a00498983485f3a
-
-PKG_LICENSE:=GPL-2.0 LGPL-2.0
-PKG_LICENSE_FILES:=COPYING COPYING.LIB
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-# release contains fuseext/int hint
-PKG_RELEASE:=$(PKG_RELEASE)$(if $(CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE),-fuseext,-fuseint)
-
-# define build dir, respect fuseext/int
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntfs-3g/common
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://www.tuxera.com
-  SUBMENU:=Filesystem
-  TITLE:=Stable Read/Write NTFS Driver
-  MAINTAINER:=Bud <wrt_buddhay@gmx.net>
-endef
-
-define Package/ntfs-3g
-  $(call Package/ntfs-3g/common)
-  DEPENDS+= +kmod-fuse +PACKAGE_NTFS-3G_USE_LIBFUSE:libfuse +libpthread
-endef
-
-define Package/ntfs-3g/description
-  Ntfs-3g is a NTFS driver, which can create, remove, rename,
-  move files, directories, hard links, and streams. It can read
-  and write files, including streams and sparse files. It can
-  handle special files like symbolic links, devices, and FIFOs.
-  Moreover it can also read transparently compressed files.
-
-  Contains:
-   - ntfs-3g
-   - ntfs-3g.probe
-   - mount.ntfs-3g (symlink to ntfs-3g)
-
-endef
-
-define Package/ntfs-3g/config
-config PACKAGE_NTFS-3G_USE_LIBFUSE
-	bool "use external FUSE library, selects package libfuse"
-	depends on PACKAGE_ntfs-3g
-	---help---
-	Ntfs-3g by default uses a minimalized lite version of FUSE.
-	If libfuse is part of your filesystem anyway (because of sshfs, owfs
-	etc.) it makes sense to activate this option and save some kilobytes
-	of space.
-
-endef
-
-define Package/ntfs-3g-low
-  $(call Package/ntfs-3g/common)
-  TITLE:=lowntfs-3g (alternative using the fuse low-level interface)
-  DEPENDS+= +ntfs-3g
-endef
-
-define Package/ntfs-3g-low/description
-  Contains:
-   - lowntfs-3g
-   - mount.lowntfs-3g (symlink to lowntfs-3g)
-
-  A driver variant using the fuse low-level interface missing some of the
-  enhanced functionality for streams or the like. You might want to check:
-  http://www.tuxera.com/community/ntfs-3g-manual/
-
-endef
-
-define Package/ntfs-3g-utils
-  $(call Package/ntfs-3g/common)
-  TITLE:=ntfs-3g utilities (ntfs-3g.secaudit, ntfs-3g.usermap)
-  DEPENDS+= +ntfs-3g
-endef
-
-define Package/ntfs-3g-utils/description
-  Additional ntfs-3g utilities. Not included by default for size
-  considerations. All binaries except ntfs-3g, ntfs-3g.probe.
-
-  Currently:
-   - ntfs-3g.secaudit
-   - ntfs-3g.usermap
-
-endef
-
-# TODO: write a proper description
-# new in 2001.4.12
-define Package/ntfsprogs_ntfs-3g
-  $(call Package/ntfs-3g/common)
-  TITLE:=ntfsprogs (ntfs-3g)
-  DEPENDS+= +ntfs-3g +libgcrypt +libuuid
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--with-uuid
-
-# configure/make according selection
-ifdef CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE
-	CONFIGURE_ARGS += --with-fuse=external
-	TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include/fuse $(TARGET_CPPFLAGS)
-else
-	CONFIGURE_ARGS += --with-fuse=internal
-	TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS)
-endif
-
-# enable disable ntfsprogs
-ifneq ($(CONFIG_PACKAGE_ntfsprogs_ntfs-3g)$(SDK)$(DEVELOPER),)
-	CONFIGURE_ARGS += --enable-ntfsprogs
-else
-	CONFIGURE_ARGS += --disable-ntfsprogs
-endif
-
-# redefine prepare to extract to our build dir
-# apply patches
-define Build/Prepare
-	rm -rf $(PKG_BUILD_DIR)/
-	mkdir -p $(PKG_BUILD_DIR)/
-	$(TAR) -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip 1
-	$(Build/Patch)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/ntfs-3g $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{la,a,so*} $(1)/usr/lib/
-endef
-
-define Package/ntfs-3g/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g{,.probe} $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mount.ntfs-3g $(1)/sbin/
-endef
-
-define Package/ntfs-3g/postinst
-#!/bin/sh
-FILE="$${IPKG_INSTROOT}/etc/filesystems"
-ID="ntfs-3g"
-
-if ! [ -f '/etc/filesystems' ]; then
-	echo "Create '$$FILE'."
-	touch "$$FILE"
-fi
-
-if ! grep -q -e '^ntfs-3g$$' "$$FILE"; then
-	echo "Add '$$ID' to known filesystems."
-	echo "$$ID" >> "$$FILE"
-fi
-
-endef
-
-define Package/ntfs-3g-low/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lowntfs-3g $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mount.lowntfs-3g $(1)/sbin/
-endef
-
-define Package/ntfs-3g-low/postinst
-#!/bin/sh
-FILE="$${IPKG_INSTROOT}/etc/filesystems"
-ID="lowntfs-3g"
-
-if ! [ -f '/etc/filesystems' ]; then
-	echo "Create '$$FILE'."
-	touch "$$FILE"
-fi
-
-if ! grep -q -e '^ntfs-3g$$' "$$FILE"; then
-	echo "Add '$$ID' to known filesystems."
-	echo "$$ID" >> "$$FILE"
-fi
-
-endef
-
-define Package/ntfs-3g-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -name ntfs-3g.probe ! -name ntfs-3g -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \;
-endef
-
-define Package/ntfsprogs_ntfs-3g/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.ntfs $(1)/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -regex '.*[^/]*ntfs-3g[^/]*' -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \;
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntfs-3g))
-$(eval $(call BuildPackage,ntfs-3g-low))
-$(eval $(call BuildPackage,ntfs-3g-utils))
-$(eval $(call BuildPackage,ntfsprogs_ntfs-3g))
diff --git a/trunk/package/feeds/packages/ntfs-3g/patches/001-fuseint-fix-path-mounted-on-musl.patch b/trunk/package/feeds/packages/ntfs-3g/patches/001-fuseint-fix-path-mounted-on-musl.patch
deleted file mode 100644
index 577c89bf..00000000
--- a/trunk/package/feeds/packages/ntfs-3g/patches/001-fuseint-fix-path-mounted-on-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: ntfs-3g-2014.2.15-1-fuseint/libfuse-lite/fusermount.c
-===================================================================
---- ntfs-3g-2014.2.15-1-fuseint.orig/libfuse-lite/fusermount.c
-+++ ntfs-3g-2014.2.15-1-fuseint/libfuse-lite/fusermount.c
-@@ -36,6 +36,10 @@
- 
- #define FUSE_DEV_NEW "/dev/fuse"
- 
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED "/proc/mounts"
-+#endif
-+
- #ifndef MS_DIRSYNC
- #define MS_DIRSYNC 128
- #endif
-Index: ntfs-3g-2014.2.15-1-fuseint/libfuse-lite/mount_util.c
-===================================================================
---- ntfs-3g-2014.2.15-1-fuseint.orig/libfuse-lite/mount_util.c
-+++ ntfs-3g-2014.2.15-1-fuseint/libfuse-lite/mount_util.c
-@@ -255,6 +255,10 @@ int fuse_mnt_check_fuseblk(void)
- 
- #else /* __SOLARIS__ */
- 
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED "/proc/mounts"
-+#endif /* _PATH_MOUNTED */
-+
- static int mtab_needs_update(const char *mnt)
- {
- 	int res;
diff --git a/trunk/package/feeds/packages/ntpclient/Makefile b/trunk/package/feeds/packages/ntpclient/Makefile
deleted file mode 100644
index bca4b65f..00000000
--- a/trunk/package/feeds/packages/ntpclient/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntpclient
-PKG_VERSION:=2010_365
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient/
-PKG_MD5SUM:=a64689398f2df8933ee0d8da246e9eaa
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2010
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntpclient
-  SUBMENU:=Time Synchronization
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=NTP (Network Time Protocol) client
-  URL:=http://doolittle.icarus.com/ntpclient/
-  DEPENDS:=+librt
-endef
-
-define Package/ntpclient/description
-	NTP client for setting system time from NTP servers.
-endef
-
-define Package/ntpclient/conffiles
-/etc/config/ntpclient
-endef
-
-MAKE_FLAGS += \
-	all adjtimex
-
-define Package/ntpclient/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/ntpclient.hotplug $(1)/etc/hotplug.d/iface/20-ntpclient
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/ntpclient.config $(1)/etc/config/ntpclient
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpclient $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/adjtimex $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rate.awk $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntpclient))
diff --git a/trunk/package/feeds/packages/ntpclient/files/ntpclient.config b/trunk/package/feeds/packages/ntpclient/files/ntpclient.config
deleted file mode 100644
index 10be8862..00000000
--- a/trunk/package/feeds/packages/ntpclient/files/ntpclient.config
+++ /dev/null
@@ -1,23 +0,0 @@
-config ntpserver
-	option hostname '0.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '1.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '2.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '3.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpdrift
-	option freq     '0'
-
-config ntpclient
-	option interval	600
-	#option count	10
-	#option interface wan
diff --git a/trunk/package/feeds/packages/ntpclient/files/ntpclient.hotplug b/trunk/package/feeds/packages/ntpclient/files/ntpclient.hotplug
deleted file mode 100644
index cdf18eef..00000000
--- a/trunk/package/feeds/packages/ntpclient/files/ntpclient.hotplug
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2014 OpenWrt.org
-
-. /lib/functions.sh
-
-unset SERVER
-unset PORT
-unset INTERVAL
-unset COUNT
-unset INTERFACE_GLOBAL
-
-NTPC=`which ntpclient`
-
-check_server() {
-	local hostname
-	local port
-	local interface
-	[ -n "$SERVER" ] && return
-	config_get hostname $1 hostname
-	config_get port $1 port
-	config_get interface $1 interface
-
-	[ -z "$interface" ] && interface=$INTERFACE_GLOBAL
-
-	[ -n "$interface" ] && {
-		# $INTERFACE is passed from hotplug event
-		[ "$interface" = "$INTERFACE" ] || return
-	}
-
-	[ -z "$hostname" ] && return
-	$NTPC -c 1 -p ${port:-123} -i 2 -h $hostname > /dev/null && { SERVER=$hostname; PORT=${port:-123}; }
-}
-
-set_drift() {
-	config_get freq $1 freq
-	[ -n "$freq" ] && adjtimex -f $freq >/dev/null
-}
-
-start_ntpclient() {
-	config_foreach set_drift ntpdrift
-	config_foreach check_server ntpserver
-	[ -z "$SERVER" ] && exit 0
-	logger starting ntpclient
-	$NTPC ${COUNT:+-c $COUNT} ${INTERVAL:+-i $INTERVAL} -s -l -D -p $PORT -h $SERVER 2> /dev/null
-}
-
-stop_ntpclient() {
-	logger stopping ntpclient
-	killall ntpclient
-}
-
-load_settings() {
-	local interval
-	local count
-	local iface
-	
-	config_get interval $1 interval
-	config_get count $1 count
-	config_get interface $1 interface
-	
-	[ -n "$count" ] && COUNT=$count
-	[ -n "$interval" ] && INTERVAL=$interval
-	[ -n "$interface" ] && INTERFACE_GLOBAL=$interface
-}
-
-config_load ntpclient
-config_foreach load_settings ntpclient
-
-NTP_RUNNING=`ps  | grep $NTPC | grep -v grep`
-
-case "${ACTION:-ifup}" in
-	ifup)
-		[ -z "$NTP_RUNNING" ] && start_ntpclient 
-	;;
-	ifdown)
-		[ -n "$NTP_RUNNING" ] && stop_ntpclient 
-	;;
-esac
diff --git a/trunk/package/feeds/packages/ntpclient/patches/100-daemon.patch b/trunk/package/feeds/packages/ntpclient/patches/100-daemon.patch
deleted file mode 100644
index aa35f963..00000000
--- a/trunk/package/feeds/packages/ntpclient/patches/100-daemon.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ntpclient.c
-+++ b/ntpclient.c
-@@ -611,7 +611,7 @@ int main(int argc, char *argv[]) {
- 	ntpc.cross_check=1;
- 
- 	for (;;) {
--		c = getopt( argc, argv, "c:" DEBUG_OPTION "f:g:h:i:lp:q:" REPLAY_OPTION "st");
-+		c = getopt( argc, argv, "c:" DEBUG_OPTION "f:g:h:i:lp:q:" REPLAY_OPTION "stD");
- 		if (c == EOF) break;
- 		switch (c) {
- 			case 'c':
-@@ -660,6 +660,10 @@ int main(int argc, char *argv[]) {
- 				(ntpc.cross_check)=0;
- 				break;
- 
-+			case 'D':
-+				daemon(0, 0);
-+				break;
-+
- 			default:
- 				usage(argv[0]);
- 				exit(1);
diff --git a/trunk/package/feeds/packages/ntpd/Makefile b/trunk/package/feeds/packages/ntpd/Makefile
deleted file mode 100644
index 46e08f59..00000000
--- a/trunk/package/feeds/packages/ntpd/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntp
-PKG_VERSION:=4.2.8p2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
-PKG_MD5SUM:=fa37049383316322d060ec9061ac23a9
-
-PKG_LICENSE:=Unique
-PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html
-
-PKG_FIXUP:=autoreconf
-PKG_LIBTOOL_PATHS:=. sntp
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntpd/Default
-  SUBMENU:=Time Synchronization
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=ISC ntp
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.ntp.org/
-  DEPENDS:=+libopenssl +libpthread
-endef
-
-define Package/ntpd/Default/description
- The ISC ntp suite is a collection of tools used to synchronize the
- system clock with remote NTP time servers and run/monitor local NTP
- servers.
-endef
-
-define Package/ntpd
-$(call Package/ntpd/Default)
-  TITLE+= server
-  DEPENDS+= +libcap
-  USERID:=ntp=123:ntp=123
-endef
-
-define Package/ntpd/description
-$(call Package/ntpd/Default/description)
- .
- This package contains the ntpd server.
-endef
-
-define Package/ntpdate
-$(call Package/ntpd/Default)
-  TITLE+=date
-endef
-
-define Package/ntpdate/description
-$(call Package/ntpd/Default/description)
- .
- This package contains ntpdate.
-endef
-
-define Package/ntp-utils
-$(call Package/ntpd/Default)
-  TITLE+= utilities
-endef
-
-define Package/ntp-utils/description
-$(call Package/ntpd/Default/description)
- .
- This package contains ntpdc, ntpq and ntptime.
-endef
-
-define Package/ntp-keygen
-$(call Package/ntpd/Default)
-  TITLE+=keygen
-endef
-
-define Package/ntp-keygen/description
-$(call Package/ntpd/Default/description)
- .
- This package contains the ntp-keygen.
-endef
-
-define Package/ntpd/conffiles
-/etc/ntp.conf
-endef
-
-CONFIGURE_VARS += \
-	ac_cv_header_md5_h=no \
-	ac_cv_lib_rt_sched_setscheduler=no \
-	ac_cv_header_dns_sd_h=no
-
-CONFIGURE_ARGS += \
-	--disable-all-clocks \
-	--disable-parse-clocks \
-	--without-ntpsnmpd \
-	--without-lineeditlibs \
-	--enable-NMEA \
-	--enable-LOCAL-CLOCK \
-	--enable-SHM \
-	--enable-linuxcaps \
-	--with-yielding-select=yes \
-	--with-crypto \
-	--with-openssl-incdir="$(STAGING_DIR)/usr/include" \
-	--with-openssl-libdir="$(STAGING_DIR)/usr/lib"
-
-define Package/ntpd/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd/ntpd $(1)/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/ntp.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ntpd.init $(1)/etc/init.d/ntpd
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd
-endef
-
-define Package/ntpd/postinst
-#!/bin/sh
-[ -L "$${IPKG_INSTROOT}/usr/sbin/ntpd" ] && rm -f "$${IPKG_INSTROOT}/usr/sbin/ntpd"
-exit 0
-endef
-
-define Package/ntpd/postrm
-#!/bin/sh
-/bin/busybox ntpd -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/sbin/ntpd
-exit 0
-endef
-
-define Package/ntpdate/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpdate/ntpdate $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ntpdate.init $(1)/etc/init.d/ntpdate
-endef
-
-define Package/ntp-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpdc/ntpdc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpq/ntpq $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/util/ntptime $(1)/usr/sbin/
-endef
-
-define Package/ntp-keygen/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/util/ntp-keygen $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ntpd))
-$(eval $(call BuildPackage,ntpdate))
-$(eval $(call BuildPackage,ntp-utils))
-$(eval $(call BuildPackage,ntp-keygen))
diff --git a/trunk/package/feeds/packages/ntpd/files/ntp.conf b/trunk/package/feeds/packages/ntpd/files/ntp.conf
deleted file mode 100644
index 8bfb8e3d..00000000
--- a/trunk/package/feeds/packages/ntpd/files/ntp.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# use a random selection of 4 public stratum 2 servers
-# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
-
-#restrict default nomodify notrap noquery
-#restrict default noquery
-
-restrict 127.0.0.1
-
-driftfile  /var/lib/ntp/ntp.drift
-
-server 0.openwrt.pool.ntp.org iburst
-server 1.openwrt.pool.ntp.org iburst
-server 2.openwrt.pool.ntp.org iburst
-server 3.openwrt.pool.ntp.org iburst
-
-
-# GPS(NMEA)+PPS
-#server 127.127.20.0 minpoll 4 prefer
-#fudge 127.127.20.0 flag3 1 flag2 0
-
-# SMA PPS
-#server 127.127.28.0 minpoll 4 prefer
-#fudge 127.127.28.0 refid PPS flag3 1
-
-#server 192.168.1.253
-
diff --git a/trunk/package/feeds/packages/ntpd/files/ntpd.hotplug b/trunk/package/feeds/packages/ntpd/files/ntpd.hotplug
deleted file mode 100644
index 992628f6..00000000
--- a/trunk/package/feeds/packages/ntpd/files/ntpd.hotplug
+++ /dev/null
@@ -1,10 +0,0 @@
-NAME=ntpd
-CONFIG=/etc/ntp.conf
-COMMAND=/usr/sbin/$NAME
-
-[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && {
-        [ -x $COMMAND ] && [ -r $CONFIG ] && {
-		killall ntpd
-		/etc/init.d/ntpd start
-        } &
-}
diff --git a/trunk/package/feeds/packages/ntpd/files/ntpd.init b/trunk/package/feeds/packages/ntpd/files/ntpd.init
deleted file mode 100644
index e626e248..00000000
--- a/trunk/package/feeds/packages/ntpd/files/ntpd.init
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=65
-STOP=65
-
-USE_PROCD=1
-
-start_service() {
-#	ln -sf /dev/ttyS0 /dev/gps0
-#	/usr/sbin/setgarmin -d /dev/gps -c /etc/setgarmin.conf
-	mkdir -p /var/lib/ntp
-	chown -R ntp:ntp /var/lib/ntp
-
-	procd_open_instance
-	procd_set_param command /sbin/ntpd -g -u ntp:ntp -p /var/run/ntpd.pid -n
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/ntpd/files/ntpdate.init b/trunk/package/feeds/packages/ntpd/files/ntpdate.init
deleted file mode 100644
index 2f332104..00000000
--- a/trunk/package/feeds/packages/ntpd/files/ntpdate.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
-
-START=60
-
-STEP_SERVERS="0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org"
-TIMEOUT="2" # in seconds
-
-start() {
-	for s in $STEP_SERVERS ; do
-		/usr/sbin/ntpdate -s -b -u -t "$TIMEOUT" "$s" && break
-	done
-}
diff --git a/trunk/package/feeds/packages/ntripcaster/Makefile b/trunk/package/feeds/packages/ntripcaster/Makefile
deleted file mode 100644
index 3941e2fc..00000000
--- a/trunk/package/feeds/packages/ntripcaster/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2011 segal.ubi.pt
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntripcaster
-PKG_VERSION:=0.1.5
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).zip
-PKG_SOURCE_URL:=http://igs.bkg.bund.de/root_ftp/NTRIP/software/
-PKG_MD5SUM:=8c85a6c31d8c5cdf2638fe103207a1fd
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntripcaster
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=NTRIP
-  TITLE:=Standard Ntrip Broadcaster
-  URL:=http://igs.bkg.bund.de/ntrip/download
-  DEPENDS:=+libpthread
-endef
-
-define Package/ntripcaster/description
-  BKG Standard Ntrip Broadcaster
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	unzip $(DL_DIR)/$(PKG_SOURCE) -d $(PKG_BUILD_DIR)
-	mv $(PKG_BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)/* $(PKG_BUILD_DIR)
-	chmod +x $(PKG_BUILD_DIR)/configure
-endef
-
-define Package/ntripcaster/install
-	$(INSTALL_DIR) $(1)/usr/local/ntripcaster/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ntripcaster $(1)/usr/local/ntripcaster/bin/
-	$(INSTALL_DIR) $(1)/usr/local/ntripcaster/conf
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/ntripcaster.conf.dist $(1)/usr/local/ntripcaster/conf/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/sourcetable.dat.dist $(1)/usr/local/ntripcaster/conf/
-endef
-
-$(eval $(call BuildPackage,ntripcaster))
diff --git a/trunk/package/feeds/packages/ntripclient/Makefile b/trunk/package/feeds/packages/ntripclient/Makefile
deleted file mode 100644
index 249f75ba..00000000
--- a/trunk/package/feeds/packages/ntripclient/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2011 segal.ubi.pt
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntripclient
-PKG_VERSION:=1.5.0
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=$(PKG_NAME).zip
-PKG_SOURCE_URL:=http://igs.bkg.bund.de/root_ftp/NTRIP/software/
-PKG_MD5SUM:=4b357fa648d74e4e13c4b5a2a39f5624
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntripclient
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=NTRIP
-  TITLE:=Ntrip Version 2.0 Command Line Client
-  URL:=http://igs.bkg.bund.de/ntrip/download
-endef
-
-define Package/ntripclient/description
-  Ntrip Version 2.0 Command Line Client, reading from Ntrip Version 1.0 or 2.0 Caster
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	unzip $(DL_DIR)/$(PKG_SOURCE) -d $(PKG_BUILD_DIR)
-endef
-
-MAKE_FLAGS += \
-	OPTS="$(TARGET_CFLAGS)"
-
-define Package/ntripclient/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntripclient $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,ntripclient))
diff --git a/trunk/package/feeds/packages/ntripserver/Makefile b/trunk/package/feeds/packages/ntripserver/Makefile
deleted file mode 100644
index 1bb0e873..00000000
--- a/trunk/package/feeds/packages/ntripserver/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2011 segal.ubi.pt
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ntripserver
-PKG_VERSION:=1.5.1
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=$(PKG_NAME).zip
-PKG_SOURCE_URL:=http://igs.bkg.bund.de/root_ftp/NTRIP/software/
-PKG_MD5SUM:=cecff5da0173896df041bd889935fc12
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ntripserver
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=NTRIP
-  TITLE:=Ntrip Version 2.0 Command Line Server
-  URL:=http://igs.bkg.bund.de/ntrip/download
-endef
-
-define Package/ntripserver/description
-  Ntrip Version 2.0 Command Line Server, reading from SISNeT Server, TCP/UDP IP Port, Serial port, or NtripCaster to support an Ntrip Version 1.0 or 2.0 Caster
-endef
-
-MAKE_FLAGS += \
-	OPTS="$(TARGET_CFLAGS)"
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	unzip $(DL_DIR)/$(PKG_SOURCE) -d $(PKG_BUILD_DIR)
-endef
-
-define Package/ntripserver/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntripserver $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,ntripserver))
diff --git a/trunk/package/feeds/packages/nut/Config.in b/trunk/package/feeds/packages/nut/Config.in
deleted file mode 100644
index b37dbca0..00000000
--- a/trunk/package/feeds/packages/nut/Config.in
+++ /dev/null
@@ -1,107 +0,0 @@
-	config NUT_SERVER
-		depends on PACKAGE_nut
-		bool "Include server components (upsd)"
-		help
-			upsd is responsible for serving the data from the drivers to the
-			clients. It connects to each driver and maintains a local cache of the
-			current state. Queries from the clients are served from this cache, so
-			delays are minimal. This program is essential, and must be running at
-			all times to actually make any use out of the drivers and clients.
-		default y
-		
-	config NUT_CLIENTS_UPSC
-		depends on PACKAGE_nut
-		bool "Include command line client (upsc)"
-		help
-			upsc is provided as a quick way to poll the status of a UPS server. It
-			can be used inside shell scripts and other programs that need UPS data
-			but don't want to include the full interface.
-		default y
-		
-	config NUT_CLIENTS_UPSLOG
-		depends on PACKAGE_nut
-		bool "Include logging client (upslog)"
-		help
-			upslog is a daemon that will poll a UPS at periodic intervals, fetch the
-			variables that interest you, format them, and write them to a file.
-		default n
-		
-	config NUT_CLIENTS_UPSCMD
-		depends on PACKAGE_nut
-		bool "Include UPS controller (upscmd)"
-		help
-			upscmd allows you to invoke "instant commands" in your UPS hardware. Not
-			all hardware supports this, so check the list with -l to see if anything
-			will work on your equipment. On hardware that supports it, you can use
-			this program to start and stop battery tests, invoke a front panel test
-			(beep!), turn the load on or off, and more.
-		default n
-		
-	config NUT_CLIENTS_UPSRW
-		depends on PACKAGE_nut
-		bool "Include UPS variable editor (upsrw)"
-		help
-			upsrw allows you to view and change the read/write variables inside your
-			UPS. It sends commands via the upsd to your driver, which configures the
-			hardware for you. The list of variables that allow you to change their
-			values is based on the capabilities of your UPS equipment. Not all
-			models support this feature. Typically, cheaper hardware does not
-			support any of them.
-		default n
-		
-	config NUT_CLIENTS_UPSMON
-		depends on PACKAGE_nut
-		bool "Include monitor and shutdown controller (upsmon)"
-		help
-			upsmon is the client process that is responsible for the most important
-			part of UPS monitoring--shutting down the system when the power goes
-			out. It can call out to other helper programs for notification purposes
-			during power events. upsmon can monitor multiple systems using a single
-			process. Every UPS that is defined in the upsmon.conf configuration file
-			is assigned a power value and a type (slave or master).
-		default y
-		
-	config NUT_CLIENTS_UPSSCHED
-		depends on NUT_CLIENTS_UPSMON
-		bool "Include helper for triggering events from upsmon (upssched)"
-		help
-			upssched was created to allow users to execute programs at times relative
-			to events being monitored by upsmon. The original purpose was to allow
-			for a shutdown to occur after some fixed period on battery, but there are
-			other uses that are possible.
-			You can alternatively write your own script and save some space.
-		default n
-	
-	config NUT_SSL
-		depends on PACKAGE_nut
-		bool "Build with support for OpenSSL"
-		help
-			SSL allows sessions between upsd and clients to be encrypted and can
-			also be used to authenticate servers. This means that stealing port
-			3493 from upsd will no longer net you interesting passwords. SSL is
-			available via OpenSSL on OpenWRT (NSS doesn't seem to work). If you
-			are happy with using passwords to authenticate clients, you can save
-			some space and build NUT without SSL support.
-		default n
-	
-	config NUT_DRIVER_SERIAL
-		depends on PACKAGE_nut
-		bool "Build with support for serial drivers"
-		help
-			If you have a UPS connected via serial, select this.
-		default n
-	
-	config NUT_DRIVER_USB
-		depends on PACKAGE_nut
-		bool "Build with support for USB drivers"
-		help
-			If you have a UPS connected via USB, select this.
-		default y
-	
-	config NUT_DRIVER_SNMP
-		depends on PACKAGE_nut
-		bool "Build with support for SNMP drivers"
-		help
-			If you have a UPS you can connect to via SNMP, select this.
-		default n
-		
diff --git a/trunk/package/feeds/packages/nut/Makefile b/trunk/package/feeds/packages/nut/Makefile
deleted file mode 100644
index d23b7cb5..00000000
--- a/trunk/package/feeds/packages/nut/Makefile
+++ /dev/null
@@ -1,292 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nut
-PKG_VERSION:=2.7.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
-PKG_MD5SUM:=c3568b42e058cfc385b46d25140dced4
-PKG_MAINTAINER:=Martin Rowe <martin.p.rowe@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE-GPL2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/nut-$(PKG_VERSION)
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_NUT_CLIENTS_UPSC \
-	CONFIG_NUT_CLIENTS_UPSCMD \
-	CONFIG_NUT_CLIENTS_UPSLOG \
-	CONFIG_NUT_CLIENTS_UPSMON \
-	CONFIG_NUT_CLIENTS_UPSRW \
-	CONFIG_NUT_CLIENTS_UPSSCHED \
-	CONFIG_NUT_DRIVER_SERIAL \
-	CONFIG_NUT_DRIVER_SNMP \
-	CONFIG_NUT_DRIVER_USB \
-	CONFIG_NUT_SERVER \
-	CONFIG_NUT_SSL \
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nut/Default
-	SECTION:=net
-	CATEGORY:=Network
-	URL:=http://www.networkupstools.org/
-	DEPENDS:=nut
-endef
-
-define Package/nut/description
-Network UPS Tools (NUT) is a client/server monitoring system that
-allows computers to share uninterruptible power supply (UPS) and
-power distribution unit (PDU) hardware. Clients access the hardware
-through the server, and are notified whenever the power status
-changes.
-endef
-
-define Package/nut
-	$(call Package/nut/Default)
-	TITLE:=Network UPS Tools
-	DEPENDS:= \
-		+NUT_DRIVER_SNMP:libnetsnmp \
-		+NUT_DRIVER_USB:libusb-compat \
-		+NUT_SSL:libopenssl
-	MENU:=1
-endef
-
-define Package/nut/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/nut/conffiles
-	/etc/nut/nut.conf
-	$(if $(CONFIG_NUT_CLIENTS_UPSMON),/etc/nut/upsmon.conf)
-	$(if $(CONFIG_NUT_CLIENTS_UPSSCHED),/etc/nut/upssched.conf)
-	$(if $(CONFIG_NUT_SERVER),/etc/nut/ups.conf)
-	$(if $(CONFIG_NUT_SERVER),/etc/nut/upsd.conf)
-	$(if $(CONFIG_NUT_SERVER),/etc/nut/upsd.users)
-endef
-
-define Package/nut/install
-	$(INSTALL_DIR) $(1)/etc/nut
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/nut.conf.sample $(1)/etc/nut/nut.conf
-	$(if $(or $(CONFIG_NUT_CLIENTS_UPSC),\
-		$(CONFIG_NUT_CLIENTS_UPSCMD),\
-		$(CONFIG_NUT_CLIENTS_LOG),\
-		$(CONFIG_NUT_CLIENTS_UPSRW),\
-		$(CONFIG_NUT_CLIENTS_UPSMON),\
-		$(CONFIG_NUT_CLIENTS_UPSSCHED)),$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupsclient.so* $(1)/usr/lib/)
-	$(if $(or $(CONFIG_NUT_SERVER),\
-		$(CONFIG_NUT_CLIENTS_UPSMON)),$(INSTALL_DIR) $(1)/etc/init.d)
-	$(if $(CONFIG_NUT_SERVER),$(INSTALL_DIR) $(1)/lib/nut)
-	$(if $(CONFIG_NUT_SERVER),$(INSTALL_DIR) $(1)/usr/share/nut)
-	$(if $(CONFIG_NUT_SERVER),$(CP) ./files/nut-server.init $(1)/etc/init.d/)
-	$(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsd $(1)/usr/sbin)
-	$(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsdrvctl $(1)/usr/sbin)
-	$(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/share/nut/cmdvartab $(1)/usr/share/nut/)
-	$(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/share/nut/driver.list $(1)/usr/share/nut/)
-	$(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/ups.conf.sample $(1)/etc/nut/ups.conf)
-	$(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.conf.sample $(1)/etc/nut/upsd.conf)
-	$(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.users.sample $(1)/etc/nut/upsd.users)
-	$(if $(CONFIG_NUT_CLIENTS_UPSC),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upsc $(1)/usr/bin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSCMD),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upscmd $(1)/usr/bin/)
-	$(if $(CONFIG_NUT_CLIENTS_LOG),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upslog $(1)/usr/bin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSRW),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upsrw $(1)/usr/bin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSMON),$(CP) ./files/nut-monitor.init $(1)/etc/init.d/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSMON),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSMON),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsmon.conf.sample $(1)/etc/nut/upsmon.conf)
-	$(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upssched-cmd $(1)/usr/bin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upssched $(1)/usr/sbin/)
-	$(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upssched.conf.sample $(1)/etc/nut/upssched.conf)
-endef
-
-# Dealing with all of the drivers is very repetitive, but the previous
-# maintainer had a neat solution which just needed some tweaking.
-define DriverPackage
-        define Package/nut-driver-$(2)
-		$(call Package/nut/Default)
-		TITLE:=$(2) (NUT $(1) driver)
-		$(if $(filter $(1),serial),DEPENDS+= @NUT_DRIVER_SERIAL)
-		$(if $(filter $(1),snmp),DEPENDS+= @NUT_DRIVER_SNMP)
-		$(if $(filter $(1),usb),DEPENDS+= @NUT_DRIVER_USB)
-        endef
-	# Deliberately empty description in order to trigger a build failure.
-	# It should be overridden by the list below, and when updating to a
-	# new version of nut we will need to provide descriptions for any new
-	# drivers.
-        define Package/nut-driver-$(2)/description
-		
-        endef
-        define Package/nut-driver-$(2)/install
-        	$(INSTALL_DIR) $$(1)/lib/nut
-		$(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2) $$(1)/lib/nut/
-		$(if $(filter $(2),clone),$(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2)-outlet $$(1)/lib/nut/)
-        endef
-endef
-define DriverDescription
-        define Package/nut-driver-$(2)/description
-		$(3)
-        endef
-endef
-# These lists are lifted *directly* from drivers/Makefile.am in the nut
-# source tree. This it to make it simpler to keep in sync when updating
-# to a newer version of nut. Do not edit this manually.
-#
-# DO NOT EDIT (except to update with a fresh cut/paste)!
-SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom	\
- bestfortress bestuferrups bestups dummy-ups etapro everups	 \
- gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys	\
- oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino	 \
- safenet skel solis tripplite tripplitesu upscode2 victronups powerpanel \
- blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser	\
- nutdrv_qx
-SNMP_DRIVERLIST = snmp-ups
-USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \
- blazer_usb richcomm_usb riello_usb \
- nutdrv_atcl_usb \
- nutdrv_qx
-# END: DO NOT EDIT!
-SERIAL_DRIVERLIST_IGNORE:=skel clone-outlet nutdrv_qx
-# nutdrv_qx can be either USB or serial. Given most routers have USB
-# instead of serial ports, and not wanting two identical packages with
-# different names that conflict with each other, only the option for the
-# driver with USB bindings is provided. If you really want to save that
-# tiny bit of space and build it without USB support, remove nutdrv_qx
-# from the previous line.
-
-$(foreach d,$(filter-out $(SERIAL_DRIVERLIST_IGNORE),$(SERIAL_DRIVERLIST)),$(eval $(call DriverPackage,serial,$(d))))
-$(foreach d,$(SNMP_DRIVERLIST),$(eval $(call DriverPackage,snmp,$(d))))
-$(foreach d,$(USB_LIBUSB_DRIVERLIST),$(eval $(call DriverPackage,usb,$(d))))
-
-$(eval $(call DriverDescription,serial,al175,\
-	Driver for Eltek UPS models with AL175 alarm module))
-$(eval $(call DriverDescription,serial,bcmxcp,\
-	Driver for UPSes supporting the serial BCM/XCP protocol))
-$(eval $(call DriverDescription,serial,belkin,\
-	Driver for Belkin serial UPS equipment))
-$(eval $(call DriverDescription,serial,belkinunv,\
-	Driver for Belkin "Universal UPS" and compatible))
-$(eval $(call DriverDescription,serial,bestfcom,\
-	Driver for Best Power Fortress/Ferrups))
-$(eval $(call DriverDescription,serial,bestfortress,\
-	Driver for old Best Fortress UPS equipment))
-$(eval $(call DriverDescription,serial,bestuferrups,\
-	Driver for Best Power Micro-Ferrups))
-$(eval $(call DriverDescription,serial,bestups,\
-	Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment))
-$(eval $(call DriverDescription,serial,dummy-ups,\
-	Driver for multi-purpose UPS emulation))
-$(eval $(call DriverDescription,serial,etapro,\
-	Driver for ETA UPS equipment))
-$(eval $(call DriverDescription,serial,everups,\
-	Driver for Ever UPS models))
-$(eval $(call DriverDescription,serial,gamatronic,\
-	Driver for Gamatronic UPS equipment))
-$(eval $(call DriverDescription,serial,genericups,\
-	Driver for contact-closure UPS equipment))
-$(eval $(call DriverDescription,serial,isbmex,\
-	Driver for ISBMEX UPS equipment))
-$(eval $(call DriverDescription,serial,liebert,\
-	Driver for Liebert contact-closure UPS equipment))
-$(eval $(call DriverDescription,serial,liebert-esp2,\
-	Driver for Liebert UPS, using the ESP-II serial protocol))
-$(eval $(call DriverDescription,serial,masterguard,\
-	Driver for Masterguard UPS equipment))
-$(eval $(call DriverDescription,serial,metasys,\
-	Driver for Meta System UPS equipment))
-$(eval $(call DriverDescription,serial,oldmge-shut,\
-	Driver for SHUT Protocol UPS equipment, deprecated, use mge-shut))
-$(eval $(call DriverDescription,serial,mge-utalk,\
-	Driver for MGE UPS SYSTEMS UTalk protocol equipment))
-$(eval $(call DriverDescription,serial,microdowell,\
-	Driver for Microdowell Enterprise UPS series))
-$(eval $(call DriverDescription,serial,mge-shut,\
-	Driver for SHUT Protocol UPS equipment))
-$(eval $(call DriverDescription,serial,oneac,\
-	Driver for Oneac UPS equipment))
-$(eval $(call DriverDescription,serial,optiups,\
-	Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment))
-$(eval $(call DriverDescription,serial,powercom,\
-	Driver for serial Powercom/Trust/Advice UPS equipment))
-$(eval $(call DriverDescription,serial,rhino,\
-	Driver for Brazilian Microsol RHINO UPS equipment))
-$(eval $(call DriverDescription,serial,safenet,\
-	Driver for SafeNet compatible UPS equipment))
-$(eval $(call DriverDescription,serial,solis,\
-	Driver for Brazilian Microsol SOLIS UPS equipment))
-$(eval $(call DriverDescription,serial,tripplite,\
-	Driver for Tripp-Lite SmartPro UPS equipment))
-$(eval $(call DriverDescription,serial,tripplitesu,\
-	Driver for Tripp-Lite SmartOnline (SU) UPS equipment))
-$(eval $(call DriverDescription,serial,upscode2,\
-	Driver for UPScode II compatible UPS equipment))
-$(eval $(call DriverDescription,serial,victronups,\
-	Driver for IMV/Victron UPS unit Match, Match Lite, NetUps))
-$(eval $(call DriverDescription,serial,powerpanel,\
-	Driver for PowerPanel Plus compatible UPS equipment))
-$(eval $(call DriverDescription,serial,blazer_ser,\
-	Driver for Megatec/Q1 protocol serial based UPS equipment))
-$(eval $(call DriverDescription,serial,clone,\
-	UPS driver clone))
-$(eval $(call DriverDescription,serial,ivtscd,\
-	Driver for the IVT Solar Controller Device))
-$(eval $(call DriverDescription,serial,apcsmart,\
-	Driver for American Power Conversion Smart Protocol UPS equipment))
-$(eval $(call DriverDescription,serial,apcsmart-old,\
-	Driver for American Power Conversion Smart Protocol UPS equipment))
-$(eval $(call DriverDescription,serial,apcupsd-ups,\
-	Driver for apcupsd client access))
-$(eval $(call DriverDescription,serial,riello_ser,\
-	Driver for Riello UPS Protocol UPS equipment))
-$(eval $(call DriverDescription,snmp,snmp-ups,\
-	Multi-MIB Driver for SNMP UPS equipment))
-$(eval $(call DriverDescription,usb,usbhid-ups,\
-	Driver for USB/HID UPS equipment))
-$(eval $(call DriverDescription,usb,bcmxcp_usb,\
-	Experimental driver for UPSes supporting the BCM/XCP protocol over USB))
-$(eval $(call DriverDescription,usb,tripplite_usb,\
-	Driver for older Tripp Lite USB UPSes (not PDC HID)))
-$(eval $(call DriverDescription,usb,blazer_usb,\
-	Driver for Megatec/Q1 protocol USB based UPS equipment))
-$(eval $(call DriverDescription,usb,richcomm_usb,\
-	Driver for UPS equipment using Richcomm dry-contact to USB solution))
-$(eval $(call DriverDescription,usb,riello_usb,\
-	Driver for Riello UPS Protocol UPS equipment via USB))
-$(eval $(call DriverDescription,usb,nutdrv_atcl_usb,\
-	Driver for ATCL FOR UPS equipment))
-$(eval $(call DriverDescription,usb,nutdrv_qx,\
-	Driver for Q* protocol serial and USB based UPS equipment))
-
-CONFIGURE_ARGS += \
-	--$(if $(CONFIG_NUT_DRIVER_SERIAL),with,without)-serial \
-	--$(if $(CONFIG_NUT_DRIVER_USB),with,without)-usb \
-	--$(if $(CONFIG_NUT_DRIVER_SNMP),with,without)-snmp \
-	--without-neon \
-	--without-powerman \
-	--without-ipmi \
-	--without-freeipmi \
-	--$(if $(CONFIG_NUT_SSL),with,without)-ssl $(if $(CONFIG_NUT_SSL),--with-openssl) \
-	--without-avahi \
-	--without-libltdl \
-	--with-user=root \
-	--with-group=root \
-	--sysconfdir=/etc/nut \
-	--with-drvpath=/lib/nut \
-	--with-statepath=/var/run \
-	--datadir=/usr/share/nut
-
-$(eval $(call BuildPackage,nut))
-$(foreach d,$(filter-out $(SERIAL_DRIVERLIST_IGNORE),$(SERIAL_DRIVERLIST)),$(eval $(call BuildPackage,nut-driver-$(d))))
-$(foreach d,$(SNMP_DRIVERLIST),$(eval $(call BuildPackage,nut-driver-$(d))))
-$(foreach d,$(USB_LIBUSB_DRIVERLIST),$(eval $(call BuildPackage,nut-driver-$(d))))
diff --git a/trunk/package/feeds/packages/nut/files/nut-monitor.init b/trunk/package/feeds/packages/nut/files/nut-monitor.init
deleted file mode 100755
index e9fdb336..00000000
--- a/trunk/package/feeds/packages/nut/files/nut-monitor.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=60
-USE_PROCD=1
-
-restart() {
-	stop_service
-	start_service
-}
-
-start_service() {
-	upsmon -p
-}
-
-stop_service() {
-	upsmon -c stop
-}
-
-reload_service() {
-	upsmon -c reload
-}
diff --git a/trunk/package/feeds/packages/nut/files/nut-server.init b/trunk/package/feeds/packages/nut/files/nut-server.init
deleted file mode 100755
index f9971be4..00000000
--- a/trunk/package/feeds/packages/nut/files/nut-server.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-USE_PROCD=1
-
-restart() {
-	stop_service
-	start_service
-}
-
-start_service() {
-	upsdrvctl start
-	upsd
-}
-
-stop_service() {
-	upsd -c stop
-	upsdrvctl stop
-}
-
-reload_service() {
-	upsd -c reload
-}
diff --git a/trunk/package/feeds/packages/nut/patches/001-fix-missing-libmath-flags.patch b/trunk/package/feeds/packages/nut/patches/001-fix-missing-libmath-flags.patch
deleted file mode 100644
index 88996be6..00000000
--- a/trunk/package/feeds/packages/nut/patches/001-fix-missing-libmath-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/Makefile.am
-+++ b/drivers/Makefile.am
-@@ -171,7 +171,7 @@ tripplite_usb_SOURCES = tripplite_usb.c
- tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
- 
- bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
--bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
-+bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
- 
- blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c
- blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
---- a/drivers/Makefile.in
-+++ b/drivers/Makefile.in
-@@ -785,7 +785,7 @@ usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LI
- tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c
- tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
- bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
--bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
-+bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
- blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c
- blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
- nutdrv_atcl_usb_SOURCES = nutdrv_atcl_usb.c usb-common.c
diff --git a/trunk/package/feeds/packages/nut/patches/010-ignore_automake_k_bug.patch b/trunk/package/feeds/packages/nut/patches/010-ignore_automake_k_bug.patch
deleted file mode 100644
index 8d3645d0..00000000
--- a/trunk/package/feeds/packages/nut/patches/010-ignore_automake_k_bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -431,12 +431,6 @@ distclean-libtool:
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
- 	@fail= failcom='exit 1'; \
--	for f in x $$MAKEFLAGS; do \
--	  case $$f in \
--	    *=* | --[!k]*);; \
--	    *k*) failcom='fail=yes';; \
--	  esac; \
--	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -456,12 +450,6 @@ $(RECURSIVE_TARGETS):
- 
- $(RECURSIVE_CLEAN_TARGETS):
- 	@fail= failcom='exit 1'; \
--	for f in x $$MAKEFLAGS; do \
--	  case $$f in \
--	    *=* | --[!k]*);; \
--	    *k*) failcom='fail=yes';; \
--	  esac; \
--	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
diff --git a/trunk/package/feeds/packages/ola/Makefile b/trunk/package/feeds/packages/ola/Makefile
deleted file mode 100644
index 0af8176b..00000000
--- a/trunk/package/feeds/packages/ola/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-# Copyright (C) 2015 Christian Beier <dontmind@freeshell.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ola
-PKG_VERSION:=0.9.3
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/OpenLightingProject/ola.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d949ab88ab2c12d4d94b50a0a0df633d634f08fd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=LGPL-2.1+
-
-PKG_FIXUP:=libtool
-PKG_INSTALL:=1
-
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-PKG_BUILD_DEPENDS:=protobuf/host ola/host
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/ola
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Open Lighting Architecture Daemon
-  URL:=https://www.openlighting.org/
-  MAINTAINER:=Christian Beier <dontmind@freeshell.org>
-  DEPENDS:=+protobuf +libusb-1.0 +libuuid +libstdcpp +libpthread +librt +zlib +libncurses +sudo @BROKEN
-endef
-
-define Package/ola/description
-  OLA (Open Lighting Architecture) is a framework that allows applications to 
-  send and receive DMX512, using various hardware devices and 'DMX over IP'
-  protocols. It enables software controllers talk to DMX hardware.
-endef
-
-
-include $(INCLUDE_DIR)/host-build.mk
-
-# When building the host part, disable as much as possible to speed up
-# the configure step and avoid missing host dependencies.
-# Stolen from http://git.buildroot.net/buildroot/commit/?id=66056a5179ef49f2ec10ba5d7fbd1a58863d1350
-define Host/Configure
-   $(call Host/Configure/Default,\
-	--disable-all-plugins \
-	--disable-slp \
-	--disable-osc \
-	--disable-uart \
-	--disable-libusb \
-	--disable-libftdi \
-	--disable-http  \
-	--disable-examples \
-	--disable-unittests \
-	--disable-doxygen-html \
-	--disable-doxygen-doc)
-endef
-
-# only build the ola_protoc thingy
-define Host/Compile
-	cd $(HOST_BUILD_DIR); \
-	    $(MAKE) protoc/ola_protoc
-endef
-
-# only need ola_protoc
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(CP) $(HOST_BUILD_DIR)/protoc/ola_protoc $(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
-
-
-define Build/Configure
-  $(call Build/Configure/Default,\
-	--disable-dependency-tracking \
-	--disable-static \
-	--disable-fatal-warnings \
-	--disable-unittests \
-	--disable-http  \
-	--with-ola-protoc=$(STAGING_DIR_HOST)/bin/ola_protoc)
-endef
-
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ola $(1)/usr/include/
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/olad $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-define Package/ola/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/olad.init $(1)/etc/init.d/olad
-	$(INSTALL_DIR) $(1)/usr/share/ola/pids
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/ola/pids/* $(1)/usr/share/ola/pids
-endef
-
-define Package/ola/postinst
-#!/bin/sh
-
-# make sure the conf dir exists and is writeable by the group olad uses
-mkdir -p /etc/ola
-chgrp nogroup /etc/ola
-chmod 775 $(1)/etc/ola
-
-exit 0
-endef
-
-
-$(eval $(call BuildPackage,ola))
diff --git a/trunk/package/feeds/packages/ola/files/olad.init b/trunk/package/feeds/packages/ola/files/olad.init
deleted file mode 100644
index 9a0e1133..00000000
--- a/trunk/package/feeds/packages/ola/files/olad.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2015 Christian Beier <dontmind@freeshell.org>
-
-USE_PROCD=1
-
-START=90
-
-start_service() {
-    procd_open_instance
-    procd_set_param command sudo -u nobody /usr/bin/olad --syslog --log-level 3 --config-dir /etc/ola
-    procd_set_param respawn
-    procd_close_instance
-}
-
diff --git a/trunk/package/feeds/packages/open-plc-utils/Makefile b/trunk/package/feeds/packages/open-plc-utils/Makefile
deleted file mode 100644
index 1c8ef9d5..00000000
--- a/trunk/package/feeds/packages/open-plc-utils/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=open-plc-utils
-PKG_VERSION:=2015-02-23
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/qca/open-plc-utils.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1f6e7e372b313cf570aa63314037588ed01ec0de
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/open-plc-utils/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Qualcomm Atheros Power Line Communication utilities
-  URL:=https://github.com/qca/open-plc-utils/blob/master/README
-endef
-
-define Package/open-plc-utils
-  $(call Package/open-plc-utils/Default)
-  MENU:=1
-endef
-
-define GenPlugin
-  define Package/$(addprefix open-plc-utils-,$(1))
-    $(call Package/open-plc-utils/Default)
-    DEPENDS:=open-plc-utils
-    TITLE:=Utility $(2) from the Open PLC utilities
-  endef
-
-   define Package/$(addprefix open-plc-utils-,$(1))/description
-     Utility $(2) from the Open PLC utilities package.
-   endef
-endef
-
-OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \
-		     hpavkey hpavkeys rkey mac2pw mac2pwd \
-		     mdioblock mdioblock2 mdiodump mdiogen \
-		     hpav mme \
-		     chknvm chknvm2 nvmsplit nvmmerge \
-		     chkpib chkpib2 setpib getpib modpib pib2xml \
-		     pibcomp pibdump pibruin xml2pib psin psout pskey \
-		     psgraph psnotch pibrump \
-		     int6k int6kboot int6keth int6kf int6khost \
-		     int64host int6kid int6klist int6klog int6kmdio \
-		     int6kmdio2 int6kmod int6kstat int6ktest int6krate \
-		     int6krule int6ktone int6kwait CMEncrypt sada \
-		     coqos_add coqos_info coqos_man coqos_mod coqos_rel \
-		     mdustats ampboot amphost ampID amplist amprate \
-		     ampstat amptest amptool amptone ampwait \
-		     plcboot plchost plcID plclist plcrate plcrule \
-		     plcstat plctest plctool plctone \
-		     plcwait plchostd plcget plcset plcotst plcfwd \
-		     plcdevs plclog plcmdio16 plcmdio32 \
-		     config2cfg sdram \
-		     int6kuart int6kbaud ttysig ptsctl weeder ttysend \
-		     ttyrecv ttycat int6kdetect
-
-$(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call GenPlugin,$(a))))
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-		CROSS="$(TARGET_CROSS)" \
-		ROOTFS="$(PKG_INSTALL_DIR)" \
-		OWNER="$(shell id -u $(shell whoami))" \
-		GROUP="$(shell id -g $(shell whoami))" \
-		all install
-endef
-
-define Package/open-plc-utils/install
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-  	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/$(subst open-plc-utils-,,$(1)) \
-		$$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,open-plc-utils))
-$(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call BuildPlugin,open-plc-utils-$(a))))
diff --git a/trunk/package/feeds/packages/openconnect/Config.in b/trunk/package/feeds/packages/openconnect/Config.in
deleted file mode 100644
index d73bd3a8..00000000
--- a/trunk/package/feeds/packages/openconnect/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# openconnect avanced configuration
-
-menu "Configuration"
-	depends on PACKAGE_openconnect
-
-choice
-	prompt "SSL library"
-	default OPENCONNECT_GNUTLS
-
-config OPENCONNECT_GNUTLS
-	bool "GnuTLS support"
-
-config OPENCONNECT_OPENSSL
-	bool "OpenSSL"
-
-endchoice
-
-config OPENCONNECT_STOKEN
-	bool "stoken support"
-
-endmenu
diff --git a/trunk/package/feeds/packages/openconnect/Makefile b/trunk/package/feeds/packages/openconnect/Makefile
deleted file mode 100644
index 605d6538..00000000
--- a/trunk/package/feeds/packages/openconnect/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openconnect
-PKG_VERSION:=7.05
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
-PKG_MD5SUM:=10cd4f61e8a11cdf793da2b0fd7a6003
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_OPENCONNECT_GNUTLS \
-	CONFIG_OPENCONNECT_OPENSSL \
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openconnect/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/openconnect
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libxml2 +kmod-tun +resolveip +vpnc-scripts +OPENCONNECT_OPENSSL:libopenssl +OPENCONNECT_GNUTLS:libgnutls +OPENCONNECT_STOKEN:libstoken
-  TITLE:=OpenConnect VPN client (Cisco AnyConnect compatible)
-  MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  URL:=http://www.infradead.org/openconnect/
-  SUBMENU:=VPN
-endef
-
-define Package/openconnect/description
-	A VPN client compatible with Cisco's AnyConnect SSL VPN and ocserv.
-
-        OpenConnect is a client that follows the Cisco's AnyConnect SSL VPN protocol,
-        which is supported by IOS 12.4(9)T or later on Cisco SR500, 870, 880, 1800, 
-        2800, 3800, 7200 Series and Cisco 7301 Routers, as well as the OpenConnect
-        VPN server.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-shared \
-	--with-vpnc-script=/lib/netifd/vpnc-script \
-	--without-libpcsclite \
-	--without-stoken
-
-ifeq ($(CONFIG_OPENCONNECT_OPENSSL),y)
-CONFIGURE_ARGS += \
-	--without-gnutls
-endif
-
-ifeq ($(CONFIG_OPENCONNECT_STOKEN),y)
-CONFIGURE_ARGS += \
-	--with-stoken
-endif
-
-define Package/openconnect/install
-	$(INSTALL_DIR) $(1)/etc/openconnect/
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/openconnect.sh $(1)/lib/netifd/proto/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openconnect $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/openconnect-wrapper $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/openconnect.upgrade $(1)/lib/upgrade/keep.d/openconnect
-endef
-
-$(eval $(call BuildPackage,openconnect))
diff --git a/trunk/package/feeds/packages/openconnect/README b/trunk/package/feeds/packages/openconnect/README
deleted file mode 100644
index 7a55da01..00000000
--- a/trunk/package/feeds/packages/openconnect/README
+++ /dev/null
@@ -1,32 +0,0 @@
-The openconnect client expects to be configured using the uci interface.
-
-To setup a VPN connection, add the following to /etc/config/network:
-
-config interface 'MYVPN'
-        option proto 'openconnect'
-        option interface 'wan'
-        option server 'vpn.example.com'
-        option port '4443'
-        option username 'test'
-        option password 'secret'
-        option serverhash 'AE7FF6A0426F0A0CD0A02EB9EC3C5066FAEB0B25'
-        option token_mode 'rsa' # when built with stoken support
-        option token_secret 'secret' # when built with stoken support
-	option defaultroute '0'
-        option authgroup 'DEFAULT'
-
-The additional files are also used:
-/etc/openconnect/user-cert-vpn-MYVPN.pem: The user certificate
-/etc/openconnect/user-key-vpn-MYVPN.pem: The user private key
-/etc/openconnect/ca-vpn-MYVPN.pem: The CA certificate (instead of serverhash)
-
-After these are setup you can initiate the VPN using "ifup MYVPN", and
-deinitialize it using ifdown. You may also use the luci web interface
-(Network -> Interfaces -> MYVPN Connect).
-
-Note that you need to configure the firewall to allow communication between
-the MYVPN interface and lan.
-
-
-There is a luci plugin to allow configuring an openconnect interface from
-the web environment; see the luci-proto-openconnect package.
diff --git a/trunk/package/feeds/packages/openconnect/files/openconnect-wrapper b/trunk/package/feeds/packages/openconnect/files/openconnect-wrapper
deleted file mode 100755
index 082dfba7..00000000
--- a/trunk/package/feeds/packages/openconnect/files/openconnect-wrapper
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# This script wraps openconnect in order to obtain the password
-# file from cmd.
-
-# $1 password file
-# $2... are passed to openconnect
-
-test -z "$1" && exit 1
-
-pwfile=$1
-shift
-
-pidfile=/var/run/ocwrap-$$.pid
-
-cleanup()
-{
-	if ! test -z "$pid";then
-		kill $pid
-		wait $pid
-	fi
-	exit 0
-}
-
-cleanup2()
-{
-	if ! test -z "$pid";then
-		kill -2 $pid
-		wait $pid
-	fi
-	exit 0
-}
-
-trap cleanup2 2
-trap cleanup 1 3 6 15
-
-rm -f "$pidfile"
-/usr/sbin/openconnect $* <$pwfile &
-pid=$!
-
-wait $pid
diff --git a/trunk/package/feeds/packages/openconnect/files/openconnect.sh b/trunk/package/feeds/packages/openconnect/files/openconnect.sh
deleted file mode 100755
index 0e22e1b6..00000000
--- a/trunk/package/feeds/packages/openconnect/files/openconnect.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_openconnect_init_config() {
-	proto_config_add_string "server"
-	proto_config_add_int "port"
-	proto_config_add_string "username"
-	proto_config_add_string "serverhash"
-	proto_config_add_string "authgroup"
-	proto_config_add_string "password"
-	proto_config_add_string "token_mode"
-	proto_config_add_string "token_secret"
-	proto_config_add_string "interface"
-	proto_config_add_string "os"
-	proto_config_add_string "csd_wrapper"
-	no_device=1
-	available=1
-}
-
-proto_openconnect_setup() {
-	local config="$1"
-
-	json_get_vars server port username serverhash authgroup password interface token_mode token_secret os csd_wrapper
-
-	grep -q tun /proc/modules || insmod tun
-
-	logger -t openconnect "initializing..."
-	serv_addr=
-	for ip in $(resolveip -t 10 "$server"); do
-		( proto_add_host_dependency "$config" "$ip" $interface )
-		serv_addr=1
-	done
-	[ -n "$serv_addr" ] || {
-		logger -t openconnect "Could not resolve server address: '$server'"
-		sleep 60
-		proto_setup_failed "$config"
-		exit 1
-	}
-
-	[ -n "$port" ] && port=":$port"
-
-	cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script"
-
-	# migrate to standard config files
-	[ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem"
-	[ -f "/etc/config/openconnect-user-key-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-key-vpn-$config.pem" "/etc/openconnect/user-key-vpn-$config.pem"
-	[ -f "/etc/config/openconnect-ca-vpn-$config.pem" ] && mv "/etc/config/openconnect-ca-vpn-$config.pem" "/etc/openconnect/ca-vpn-$config.pem"
-
-	[ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append cmdline "-c /etc/openconnect/user-cert-vpn-$config.pem"
-	[ -f /etc/openconnect/user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/openconnect/user-key-vpn-$config.pem"
-	[ -f /etc/openconnect/ca-vpn-$config.pem ] && {
-		append cmdline "--cafile /etc/openconnect/ca-vpn-$config.pem"
-		append cmdline "--no-system-trust"
-	}
-	[ -n "$serverhash" ] && {
-		append cmdline " --servercert=$serverhash"
-		append cmdline "--no-system-trust"
-	}
-	[ -n "$authgroup" ] && append cmdline "--authgroup $authgroup"
-	[ -n "$username" ] && append cmdline "-u $username"
-	[ -n "$password" ] && {
-		umask 077
-		mkdir -p /var/etc
-		pwfile="/var/etc/openconnect-$config.passwd"
-		echo "$password" > "$pwfile"
-		append cmdline "--passwd-on-stdin"
-	}
-
-	[ -n "$token_mode" ] && append cmdline "--token-mode=$token_mode"
-	[ -n "$token_secret" ] && append cmdline "--token-secret=$token_secret"
-	[ -n "$os" ] && append cmdline "--os=$os"
-	[ -n "$csd_wrapper" ] && [ -x "$csd_wrapper" ] && append cmdline "--csd-wrapper=$csd_wrapper"
-
-	proto_export INTERFACE="$config"
-	logger -t openconnect "executing 'openconnect $cmdline'"
-
-	if [ -f "$pwfile" ]; then
-		proto_run_command "$config" /usr/sbin/openconnect-wrapper $pwfile $cmdline
-	else
-		proto_run_command "$config" /usr/sbin/openconnect $cmdline
-	fi
-}
-
-proto_openconnect_teardown() {
-	local config="$1"
-
-	pwfile="/var/etc/openconnect-$config.passwd"
-
-	rm -f $pwfile
-	logger -t openconnect "bringing down openconnect"
-	proto_kill_command "$config" 2
-}
-
-add_protocol openconnect
diff --git a/trunk/package/feeds/packages/openconnect/files/openconnect.upgrade b/trunk/package/feeds/packages/openconnect/files/openconnect.upgrade
deleted file mode 100644
index 01bad657..00000000
--- a/trunk/package/feeds/packages/openconnect/files/openconnect.upgrade
+++ /dev/null
@@ -1,9 +0,0 @@
-/etc/openconnect/user-cert-vpn-*.pem
-/etc/openconnect/user-key-vpn-*.pem
-/etc/openconnect/ca-vpn-*.pem
-/etc/openconnect/pre-init.d/
-/etc/openconnect/connect.d/
-/etc/openconnect/post-connect.d/
-/etc/openconnect/disconnect.d/
-/etc/openconnect/post-disconnect.d/
-/etc/openconnect/reconnect.d/
diff --git a/trunk/package/feeds/packages/opencv/Makefile b/trunk/package/feeds/packages/opencv/Makefile
deleted file mode 100644
index bf80fbe9..00000000
--- a/trunk/package/feeds/packages/opencv/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2013-2014 wrtnode.com
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opencv
-PKG_VERSION:=2.4.11
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/$(PKG_VERSION)/
-PKG_MD5SUM:=32f498451bff1817a60e1aabc2939575
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-
-define Package/opencv/Default/description
- OpenCV (Open Source Computer Vision Library) is an open source computer
- vision and machine learning software library. OpenCV was built to provide
- a common infrastructure for computer vision applications and to accelerate
- the use of machine perception in the commercial products. Being a
- BSD-licensed product, OpenCV makes it easy for businesses to utilize
- and modify the code.
-endef
-
-define Package/opencv
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=opencv-2.4.11
-  URL:=http://opencv.org/
-  MAINTAINER:=WRTnode Team <pub@wrtnode.com>
-  DEPENDS:=+libpthread +librt +libstdcpp +zlib +libjpeg
-endef
-
-
-PKG_INSTALL:=1
-
-CMAKE_OPTIONS += -DBUILD_opencv_gpu:BOOL=OFF \
-	-DWITH_1394:BOOL=OFF -DBUILD_opencv_stitching:BOOL=OFF \
-	-DBUILD_opencv_superres:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF \
-	-DBUILD_opencv_highgui:BOOL=OFF \
-	-DBUILD_opencv_videostab:BOOL=OFF \
-	-DWITH_FFMPEG:BOOL=OFF \
-	-DWITH_GSTREAMER:BOOL=OFF \
-	-DWITH_LIBV4L:BOOL=OFF \
-	-DWITH_PNG:BOOL=OFF \
-	-DWITH_TIFF:BOOL=OFF \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/opencv $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/opencv2 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencv* $(1)/usr/lib/
-endef
-
-define Package/opencv/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencv* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,opencv))
diff --git a/trunk/package/feeds/packages/opencv/README.md b/trunk/package/feeds/packages/opencv/README.md
deleted file mode 100644
index a5cdcddf..00000000
--- a/trunk/package/feeds/packages/opencv/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Introduction
-===
-
-#### OpenCV: Open Source Computer Vision Library.OpenCV is based on (open source) issued cross-platform computer vision library, you can run on Linux, Windows and Mac OS operating systems.
-
-#### Resources
-
-* Homepage: <http://opencv.org>
-* Docs: <http://docs.opencv.org>
-* Q&A forum: <http://answers.opencv.org>
-* Issue tracking: <http://code.opencv.org>
-
-#### Contributing
-
-Please read before starting work on a pull request: <http://code.opencv.org/projects/opencv/wiki/How_to_contribute>
-
-Summary of guidelines:
-
-* One pull request per issue;
-* Choose the right base branch;
-* Include tests and documentation;
-* Clean up "oops" commits before submitting;
-* Follow the coding style guide.
diff --git a/trunk/package/feeds/packages/openldap/Makefile b/trunk/package/feeds/packages/openldap/Makefile
deleted file mode 100644
index dcc9d988..00000000
--- a/trunk/package/feeds/packages/openldap/Makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openldap
-PKG_VERSION:=2.4.39
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
-	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-	ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
-PKG_MD5SUM:=b0d5ee4b252c841dec6b332d679cf943
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openldap/Default
-  TITLE:=LDAP implementation
-  URL:=http://www.openldap.org/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-endef
-
-define Package/openldap/Default/description
-	OpenLDAP Software is an open source implementation of the
-	Lightweight Directory Access Protocol (LDAP).
-endef
-
-define Package/libopenldap
-  $(call Package/openldap/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +libsasl2 +libpthread
-  TITLE+= (libraries)
-endef
-
-define Package/libopenldap/description
-	$(call Package/openldap/Default/description)
-	This package contains the shared LDAP client libraries, needed by other programs.
-endef
-
-define Package/libopenldap/conffiles
-/etc/openldap/ldap.conf
-endef
-
-define Package/openldap-utils
-  $(call Package/openldap/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libopenldap
-  TITLE+= (utilities)
-endef
-
-define Package/openldap-utils/description
-	$(call Package/openldap/Default/description)
-	This package contains client programs required to access LDAP servers.
-endef
-
-define Package/openldap-server
-  $(call Package/openldap/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenldap +libuuid
-  TITLE+= (server)
-endef
-
-define Package/openldap-server/description
-	$(call Package/openldap/Default/description)
-	This package contains server programs required to provide LDAP services.
-endef
-
-define Package/openldap-server/conffiles
-/etc/openldap/slapd.conf
-endef
-
-TARGET_CFLAGS += $(FPIC) -lpthread
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-debug \
-	--enable-dynamic \
-	--enable-syslog \
-	--disable-local \
-	--disable-slurpd \
-	--with-cyrus-sasl \
-	--without-fetch \
-	--with-threads \
-	--with-tls \
-	--with-yielding_select="yes" \
-	--without-cyrus-sasl \
-	--without-threads \
-	--enable-null \
-	--disable-bdb \
-	--disable-hdb \
-	--disable-monitor \
-	--disable-relay
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		HOSTCC="$(HOSTCC)" \
-		depend all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libopenldap/install
-	$(INSTALL_DIR) $(1)/etc/openldap
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/
-endef
-
-define Package/openldap-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/
-endef
-
-define Package/openldap-server/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ldap.init $(1)/etc/init.d/ldap
-	$(INSTALL_DIR) $(1)/etc/openldap/schema
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/slapd.conf $(1)/etc/openldap/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	# XXX: OpenLDAP installs slapd into libexecdir, not sbindir:
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/slapd $(1)/usr/sbin/
-	# XXX: switch default backend to ldif, since bdb is disabled
-	$(SED) 's|^\(database\)\([ \t]\+\)bdb|\1\2ldif|g' \
-	    -e 's|^\(index\)|#\1|g' \
-	    $(1)/etc/openldap/slapd.conf
-endef
-
-$(eval $(call BuildPackage,libopenldap))
-$(eval $(call BuildPackage,openldap-utils))
-$(eval $(call BuildPackage,openldap-server))
diff --git a/trunk/package/feeds/packages/openldap/files/ldap.init b/trunk/package/feeds/packages/openldap/files/ldap.init
deleted file mode 100644
index 2209e76b..00000000
--- a/trunk/package/feeds/packages/openldap/files/ldap.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-
-START=60
-
-SERVICE_USE_PID=1
-
-start() {
-	mkdir -m 0755 -p /var/openldap-data
-	service_start /usr/sbin/slapd -h "ldap://localhost/ ldaps:///"
-}
-
-stop() {
-	service_stop /usr/sbin/slapd
-}
-
-reload() {
-	service_reload /usr/sbin/slapd
-}
diff --git a/trunk/package/feeds/packages/openldap/patches/001-automake-compat.patch b/trunk/package/feeds/packages/openldap/patches/001-automake-compat.patch
deleted file mode 100644
index 71cdebee..00000000
--- a/trunk/package/feeds/packages/openldap/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,323 +0,0 @@
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = include libraries clients servers tests doc
---- a/libraries/Makefile.in
-+++ b/libraries/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SUBDIRS= \
- 	liblutil \
- 	liblber \
---- a/libraries/liblber/Makefile.in
-+++ b/libraries/liblber/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = liblber.la
- 
- NT_SRCS = nt_err.c
---- a/libraries/libldap/Makefile.in
-+++ b/libraries/libldap/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libldap.la
- 
- PROGRAMS = apitest dntest ftest ltest urltest
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libldap_r.la
- 
- PROGRAMS = apitest ltest
---- a/libraries/liblunicode/Makefile.in
-+++ b/libraries/liblunicode/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = liblunicode.a
- 
- XXDIR = $(srcdir)/ucdata/
---- a/libraries/liblutil/Makefile.in
-+++ b/libraries/liblutil/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY	= liblutil.a
- PROGRAM = testavl
- 
---- a/libraries/librewrite/Makefile.in
-+++ b/libraries/librewrite/Makefile.in
-@@ -16,6 +16,8 @@
- ## Copyright 2000-2001 Pierangelo Masarati <ando@sys-net.it>
- ##
- 
-+SHELL = @SHELL@
-+
- SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \
- 	session.c subst.c var.c xmap.c \
- 	parse.c rewrite.c
---- a/clients/tools/Makefile.in
-+++ b/clients/tools/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
- 		ldappasswd.c ldapwhoami.c ldapcompare.c \
- 		ldapexop.c ldapurl.c common.c
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
- PROGRAMS=slapd $(SLAPTOOLS)
- XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = overlays.c \
- 	accesslog.c \
- 	auditlog.c \
---- a/tests/progs/Makefile.in
-+++ b/tests/progs/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
- 		slapd-modify slapd-bind slapd-mtread ldif-filter
- 
---- a/servers/slapd/back-bdb/Makefile.in
-+++ b/servers/slapd/back-bdb/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c tools.c config.c \
- 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
- 	extended.c referral.c operational.c \
---- a/servers/slapd/back-dnssrv/Makefile.in
-+++ b/servers/slapd/back-dnssrv/Makefile.in
-@@ -18,6 +18,8 @@
- #  The DNSSRV backend was written by Kurt D. Zeilenga.
- #
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c bind.c search.c config.c referral.c
- OBJS	= init.lo bind.lo search.lo config.lo referral.lo
- 
---- a/servers/slapd/back-hdb/Makefile.in
-+++ b/servers/slapd/back-hdb/Makefile.in
-@@ -15,6 +15,8 @@
- #
- ## Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
- 
-+SHELL = @SHELL@
-+
- XXDIR = $(srcdir)/../back-bdb
- 
- XXSRCS = init.c tools.c config.c \
---- a/servers/slapd/back-ldap/Makefile.in
-+++ b/servers/slapd/back-ldap/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
- 		delete.c modify.c modrdn.c extended.c chain.c \
- 		distproc.c monitor.c pbind.c
---- a/servers/slapd/back-ldif/Makefile.in
-+++ b/servers/slapd/back-ldif/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = ldif.c
- OBJS = ldif.lo
- 
---- a/servers/slapd/back-mdb/Makefile.in
-+++ b/servers/slapd/back-mdb/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c tools.c config.c \
- 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
- 	extended.c operational.c \
---- a/servers/slapd/back-meta/Makefile.in
-+++ b/servers/slapd/back-meta/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
- 		delete.c modify.c modrdn.c suffixmassage.c map.c \
- 		conn.c candidates.c dncache.c
---- a/servers/slapd/back-monitor/Makefile.in
-+++ b/servers/slapd/back-monitor/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.c search.c compare.c modify.c bind.c \
- 	operational.c \
- 	cache.c entry.c \
---- a/servers/slapd/back-ndb/Makefile.in
-+++ b/servers/slapd/back-ndb/Makefile.in
-@@ -17,6 +17,8 @@
- ## This work was initially developed by Howard Chu for inclusion
- ## in OpenLDAP Software. This work was sponsored by MySQL.
- 
-+SHELL = @SHELL@
-+
- SRCS = init.cpp tools.cpp config.cpp ndbio.cpp \
- 	add.cpp bind.cpp compare.cpp delete.cpp modify.cpp modrdn.cpp search.cpp
- 
---- a/servers/slapd/back-null/Makefile.in
-+++ b/servers/slapd/back-null/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS = null.c
- OBJS = null.lo
- 
---- a/servers/slapd/back-passwd/Makefile.in
-+++ b/servers/slapd/back-passwd/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= search.c config.c init.c
- OBJS	= search.lo config.lo init.lo
- 
---- a/servers/slapd/back-perl/Makefile.in
-+++ b/servers/slapd/back-perl/Makefile.in
-@@ -14,6 +14,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c search.c close.c config.c bind.c compare.c \
- 		modify.c add.c modrdn.c delete.c
- OBJS	= init.lo search.lo close.lo config.lo bind.lo compare.lo \
---- a/servers/slapd/back-relay/Makefile.in
-+++ b/servers/slapd/back-relay/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c op.c
- OBJS	= init.lo op.lo
- 
---- a/servers/slapd/back-shell/Makefile.in
-+++ b/servers/slapd/back-shell/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c fork.c search.c bind.c unbind.c add.c \
- 		delete.c modify.c modrdn.c compare.c result.c
- OBJS	= init.lo config.lo fork.lo search.lo bind.lo unbind.lo add.lo \
---- a/servers/slapd/back-sock/Makefile.in
-+++ b/servers/slapd/back-sock/Makefile.in
-@@ -17,6 +17,8 @@
- ## This work was initially developed by Brian Candler for inclusion
- ## in OpenLDAP Software.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c opensock.c search.c bind.c unbind.c add.c \
- 		delete.c modify.c modrdn.c compare.c result.c
- OBJS	= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \
---- a/servers/slapd/back-sql/Makefile.in
-+++ b/servers/slapd/back-sql/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- SRCS	= init.c config.c search.c bind.c compare.c operational.c \
- 		entry-id.c schema-map.c sql-wrap.c modify.c util.c \
- 		add.c delete.c modrdn.c api.c
---- a/servers/slapd/shell-backends/Makefile.in
-+++ b/servers/slapd/shell-backends/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- PROGRAMS = passwd-shell
- 
- SRCS = passwd-shell.c shellutil.c
---- a/servers/slapd/slapi/Makefile.in
-+++ b/servers/slapd/slapi/Makefile.in
-@@ -14,6 +14,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
- 
-+SHELL = @SHELL@
-+
- LIBRARY = libslapi.la
- 
- #all-common: $(LIBRARY) $(PROGRAMS)
diff --git a/trunk/package/feeds/packages/openldap/patches/020-autofs-schema.patch b/trunk/package/feeds/packages/openldap/patches/020-autofs-schema.patch
deleted file mode 100644
index 11c73f55..00000000
--- a/trunk/package/feeds/packages/openldap/patches/020-autofs-schema.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- /dev/null
-+++ b/servers/slapd/schema/autofs.schema
-@@ -0,0 +1,23 @@
-+attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
-+	DESC 'Automount map name'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey'
-+	DESC 'Automount key value'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation'
-+	DESC 'Automount information'
-+	EQUALITY caseExactMatch
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-+
-+objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL
-+	MUST ( automountMapName )
-+	MAY ( description ) )
-+
-+objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL
-+	DESC 'Automount'
-+	MUST ( automountKey $ automountInformation )
-+	MAY description )
diff --git a/trunk/package/feeds/packages/openldap/patches/750-no-strip.patch b/trunk/package/feeds/packages/openldap/patches/750-no-strip.patch
deleted file mode 100644
index a70aacc9..00000000
--- a/trunk/package/feeds/packages/openldap/patches/750-no-strip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/clients/tools/Makefile.in
-+++ b/clients/tools/Makefile.in
-@@ -122,7 +122,7 @@ install-local:	FORCE
- 	-$(MKDIR) $(DESTDIR)$(bindir)
- 	@(								\
- 	    for prg in $(PROGRAMS); do					\
--		$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT)	\
-+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)	\
- 		    $(DESTDIR)$(bindir);				\
- 	    done							\
- 	)
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
-@@ -380,7 +380,7 @@ install-local-srv: install-slapd install
- install-slapd: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libexecdir)
- 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
--	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 \
- 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- 	@for i in $(SUBDIRS); do \
- 	    if test -d $$i && test -f $$i/Makefile ; then \
diff --git a/trunk/package/feeds/packages/opennhrp/Makefile b/trunk/package/feeds/packages/opennhrp/Makefile
deleted file mode 100644
index 449e0a6f..00000000
--- a/trunk/package/feeds/packages/opennhrp/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2009 Jakob Pfeiffer
-# Copyright (C) 2014 Artem Makhutov
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opennhrp
-PKG_VERSION:=0.14.1
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Artem Makhutov <artem@makhutov.org>
-PKG_LICENSE:=MIT License
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/opennhrp
-PKG_MD5SUM:=eb42ddb13e07ceb415b9ebb8eaca28ee
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/opennhrp
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=VPN
-  DEPENDS:=+libcares +ipsec-tools +ip +kmod-gre
-  KCONFIG:=CONFIG_ARPD=y
-  TITLE:=NBMA Next Hop Resolution Protocol
-  URL:=http://opennhrp.sourceforge.net/
-endef
-
-define Package/opennhrp/description
-  OpenNHRP implements NBMA Next Hop Resolution Protocol (as defined in RFC 2332).
-  It makes it possible to create dynamic multipoint VPN Linux router using NHRP,
-  GRE and IPsec. It aims to be Cisco DMVPN compatible.
-endef
-
-define Package/opennhrp/conffiles
-/etc/opennhrp/opennhrp.conf
-endef
-
-define Package/opennhrp/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/opennhrp{,ctl} $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/opennhrp
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp.conf $(1)/etc/opennhrp/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp-script $(1)/etc/opennhrp/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/racoon-ph1down.sh $(1)/etc/opennhrp/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/racoon-ph1dead.sh $(1)/etc/opennhrp/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/opennhrp.init $(1)/etc/init.d/opennhrp
-endef
-
-$(eval $(call BuildPackage,opennhrp))
diff --git a/trunk/package/feeds/packages/opennhrp/files/opennhrp.init b/trunk/package/feeds/packages/opennhrp/files/opennhrp.init
deleted file mode 100644
index 8831287e..00000000
--- a/trunk/package/feeds/packages/opennhrp/files/opennhrp.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2009 Jakob Pfeiffer
-
-START=50
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/sbin/opennhrp -d
-}
-
-stop() {
-	service_stop /usr/sbin/opennhrp
-}
diff --git a/trunk/package/feeds/packages/openobex/Makefile b/trunk/package/feeds/packages/openobex/Makefile
deleted file mode 100644
index f03b96dd..00000000
--- a/trunk/package/feeds/packages/openobex/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openobex
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-Source.tar.gz
-PKG_SOURCE_URL:=@SF/openobex
-PKG_MD5SUM:=3181bfed9cb7db591605391068cb0085
-
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/openobex/Default
-  TITLE:=Open Source impl of the OBject EXchange protocol
-  URL:=https://www.gitorious.org/openobex
-endef
-
-define Package/openobex
-$(call Package/openobex/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= (meta)
-  DEPENDS:=+openobex-apps +libopenobex
-endef
-
-define Package/openobex-apps
-$(call Package/openobex/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= (apps)
-  DEPENDS:=+libopenobex +bluez-libs
-endef
-
-define Package/libopenobex
-$(call Package/openobex/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (library)
-  DEPENDS:=+libusb-1.0
-endef
-
-CMAKE_OPTIONS += \
-	-DBUILD_DOCUMENTATION:BOOL=OFF \
-
-MAKE_FLAGS += \
-	openobex openobex-apps \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/openobex $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopenobex.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/apps/lib/libopenobex-apps-common.a $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/openobex.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/openobex/install
-	:
-endef
-
-define Package/openobex-apps/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-define Package/libopenobex/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopenobex.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,openobex))
-$(eval $(call BuildPackage,openobex-apps))
-$(eval $(call BuildPackage,libopenobex))
diff --git a/trunk/package/feeds/packages/openobex/patches/001-cxx.patch b/trunk/package/feeds/packages/openobex/patches/001-cxx.patch
deleted file mode 100644
index 650458f0..00000000
--- a/trunk/package/feeds/packages/openobex/patches/001-cxx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required ( VERSION 2.8.5 FATAL_ERROR )
- 
--project ( openobex C )
-+project ( openobex C CXX )
- 
- #
- # The project version
diff --git a/trunk/package/feeds/packages/openocd/Makefile b/trunk/package/feeds/packages/openocd/Makefile
deleted file mode 100644
index aadd3e2f..00000000
--- a/trunk/package/feeds/packages/openocd/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openocd
-PKG_VERSION:=v0.8.0-258-gd537cfa
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.code.sf.net/p/openocd/code
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Paul Fertser <fercerpav@gmail.com>
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openocd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=OpenOCD Utility
-  URL:=http://openocd.sf.net/
-  DEPENDS:=+libusb-1.0 +libusb-compat +libftdi1 +hidapi
-endef
-
-define Package/openocd/description
-OpenOCD provides on-chip programming and debugging support with a
-layered architecture of JTAG interface and TAP support including:
-
-- (X)SVF playback to faciliate automated boundary scan and FPGA/CPLD
-  programming;
-- debug target support (e.g. ARM, MIPS): single-stepping,
-  breakpoints/watchpoints, gprof profiling, etc;
-- flash chip drivers (e.g. CFI, NAND, internal flash);
-- embedded TCL interpreter for easy scripting.
-
-Several network interfaces are available for interacting with OpenOCD:
-telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a
-"remote target" for source-level debugging of embedded systems using
-the GNU GDB program (and the others who talk GDB protocol, e.g. IDA
-Pro).
-endef
-
-CONFIGURE_ARGS += \
-	--prefix="/usr" \
-	--disable-werror \
-	--enable-dummy \
-	--enable-sysfsgpio \
-	--enable-usb_blaster_libftdi \
-        --enable-openjtag_ftdi \
-        --enable-presto_libftdi
-
-define Build/Compile
-        +$(MAKE_VARS) \
-        $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
-endef
-
-define Package/openocd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/share/openocd
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openocd $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/openocd/scripts $(1)/usr/share/openocd
-endef
-
-$(eval $(call BuildPackage,openocd))
diff --git a/trunk/package/feeds/packages/opensc/Makefile b/trunk/package/feeds/packages/opensc/Makefile
deleted file mode 100644
index a7b83014..00000000
--- a/trunk/package/feeds/packages/opensc/Makefile
+++ /dev/null
@@ -1,227 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opensc
-PKG_VERSION:=20141126
-PKG_RELEASE:=1
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/OpenSC/OpenSC.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8aadbbd678730dbafb819382da553439887499fd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DEPENDS:=+libpcsclite
-PKG_FIXUP:=libtool
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libopensc
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=OpenSC libraries for smart cards
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  DEPENDS:=+libopenssl +libpthread
-  MENU:=1
-endef
-
-define Package/libopensc/description
-  OpenSC provides a set of libraries and utilities to work with smart cards.
-  Its main focus is on cards that support cryptographic operations, and
-  facilitate their use in security applications such as authentication,
-  mail encryption and digital signatures.
-endef
-
-define Package/libopensc-pkcs11
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=OpenSC - PKCS11 provider
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  DEPENDS:=libopensc
-endef
-
-define Package/libopensc-pkcs11/description
-  OpenSC PKCS#11 provider
-endef
-
-define Package/libpkcs11-spy
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=PKCS11 spying wrapper
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  DEPENDS:=+libopenssl +libpthread
-endef
-
-define Package/libpkcs11-spy/dscription
-  PKCS#11 spying wrapper
-endef
-
-define Package/opensc-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=OpenSC - tools for smart cards
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  DEPENDS:=+libopensc
-  MENU:=1
-endef
-
-define Package/opensc-utils/description
-  OpenSC utilities
-endef
-
-define ToolGen
-define Package/opensc-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))
-  TITLE:=$(firstword $(subst :, ,$(1))) utility from opensc
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=opensc-utils $(wordlist 2,$(words $(subst :, ,$(1))),$(subst :, ,$(1)))
-endef
-endef
-
-define ProfileGen
-define Package/libopensc-profile-$(subst _,-,$(firstword $(subst :, ,$(1))))
-  TITLE:=$(firstword $(subst :, ,$(1))) card profile for opensc
-  URL:=https://github.com/OpenSC/OpenSC/wiki
-  SECTION:=lib
-  CATEGORY:=Libraries
-  DEPENDS:=libopensc
-endef
-endef
-
-TOOLS:= \
-	cardos-tool \
-	cryptoflex-tool \
-	dnie-tool \
-	eidenv \
-	iasecc-tool \
-	netkey-tool \
-	openpgp-tool \
-	opensc-tool \
-	opensc-explorer:+libncurses:+libreadline \
-	piv-tool \
-	pkcs11-tool \
-	pkcs15-crypt \
-	pkcs15-init \
-	pkcs15-tool \
-	sc-hsm-tool \
-	westcos-tool
-
-PROFILES:= \
-	asepcos \
-	authentic \
-	cardos \
-	cyberflex \
-	entersafe \
-	epass2003 \
-	flex \
-	gpk \
-	ias_adele_admin1 \
-	ias_adele_admin2 \
-	ias_adele_common \
-	iasecc_admin_eid \
-	iasecc_generic_oberthur \
-	iasecc_generic_pki \
-	iasecc \
-	incrypto34 \
-	jcop \
-	miocos \
-	muscle \
-	myeid \
-	oberthur \
-	openpgp \
-	pkcs15 \
-	rutoken_ecp \
-	rutoken \
-	sc-hsm \
-	setcos \
-	starcos \
-	westcos
-
-$(foreach file,$(TOOLS),$(eval $(call ToolGen,$(file))))
-$(foreach file,$(PROFILES),$(eval $(call ProfileGen,$(file))))
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopensc.{a,so}* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmm-local.{a,so}* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/opensc-pkcs11.so $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkcs11-spy.so $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkcs11
-	$(LN) ../pkcs11-spy.so $(1)/usr/lib/pkcs11/
-	$(LN) ../opensc-pkcs11.so $(1)/usr/lib/pkcs11/
-	$(INSTALL_DIR) $(1)/usr/share/opensc
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/opensc/* $(1)/usr/share/opensc/
-endef
-
-define Package/libopensc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopensc.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmm-local.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/opensc.conf $(1)/etc/
-endef
-
-define Package/libopensc-pkcs11/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/opensc-pkcs11.so $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkcs11
-	$(LN) ../opensc-pkcs11.so $(1)/usr/lib/pkcs11/
-endef
-
-define Package/libpkcs11-spy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkcs11-spy.so $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkcs11
-	$(LN) ../pkcs11-spy.so $(1)/usr/lib/pkcs11/
-endef
-
-define Package/opensc-card-profiles
-	$(INSTALL_DIR) $(1)/usr/share/opensc
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/opensc/* $(1)/usr/share/opensc/
-endef
-
-define Package/opensc-utils/install
-	true
-endef
-
-define ToolInstall
-define Package/opensc-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/$(firstword $(subst :, ,$(1))) \
-		$$(1)/usr/bin/
-endef
-endef
-
-define ProfileInstall
-define Package/libopensc-profile-$(subst _,-,$(firstword $(subst :, ,$(1))))/install
-	$(INSTALL_DIR) $$(1)/usr/share/opensc
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/share/opensc/$(firstword $(subst :, ,$(1))).profile \
-		$$(1)/usr/share/opensc
-endef
-endef
-
-$(foreach file,$(TOOLS),$(eval $(call ToolInstall,$(file))))
-$(foreach file,$(PROFILES),$(eval $(call ProfileInstall,$(file))))
-
-$(eval $(call BuildPackage,libopensc))
-$(eval $(call BuildPackage,libopensc-pkcs11))
-$(eval $(call BuildPackage,libpkcs11-spy))
-
-$(eval $(call BuildPackage,opensc-utils))
-$(foreach file,$(TOOLS),$(eval $(call BuildPackage,opensc-utils-$(subst _,-,$(firstword $(subst :, ,$(file)))))))
-$(foreach file,$(PROFILES),$(eval $(call BuildPackage,libopensc-profile-$(subst _,-,$(firstword $(subst :, ,$(file)))))))
diff --git a/trunk/package/feeds/packages/opensc/patches/0001-OpenPGP-Detect-and-support-Gnuk-Token.patch b/trunk/package/feeds/packages/opensc/patches/0001-OpenPGP-Detect-and-support-Gnuk-Token.patch
deleted file mode 100644
index 08b2a832..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0001-OpenPGP-Detect-and-support-Gnuk-Token.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From 471b40173b73f213ee72bf05735abf3357658197 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Wed, 20 Feb 2013 11:54:30 +0700
-Subject: [PATCH 01/26] OpenPGP: Detect and support Gnuk Token.
-
-http://www.fsij.org/gnuk/
----
- src/libopensc/card-openpgp.c | 61 ++++++++++++++++++++++++++++++++++----------
- src/libopensc/cards.h        |  1 +
- src/tools/openpgp-tool.c     |  7 ++++-
- 3 files changed, 55 insertions(+), 14 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 6774fe1..c785a55 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -43,6 +43,7 @@
- static struct sc_atr_table pgp_atrs[] = {
- 	{ "3b:fa:13:00:ff:81:31:80:45:00:31:c1:73:c0:01:00:00:90:00:b1", NULL, "OpenPGP card v1.0/1.1", SC_CARD_TYPE_OPENPGP_V1, 0, NULL },
- 	{ "3b:da:18:ff:81:b1:fe:75:1f:03:00:31:c5:73:c0:01:40:00:90:00:0c", NULL, "CryptoStick v1.2 (OpenPGP v2.0)", SC_CARD_TYPE_OPENPGP_V2, 0, NULL },
-+	{ "3b:da:11:ff:81:b1:fe:55:1f:03:00:31:84:73:80:01:80:00:90:00:e4", NULL, "Gnuk v1.0.x (OpenPGP v2.0)", SC_CARD_TYPE_OPENPGP_GNUK, 0, NULL },
- 	{ NULL, NULL, NULL, 0, 0, NULL }
- };
- 
-@@ -307,6 +308,8 @@ pgp_init(sc_card_t *card)
- 	int		r;
- 	struct blob 	*child = NULL;
- 
-+	LOG_FUNC_CALLED(card->ctx);
-+
- 	priv = calloc (1, sizeof *priv);
- 	if (!priv)
- 		return SC_ERROR_OUT_OF_MEMORY;
-@@ -315,11 +318,11 @@ pgp_init(sc_card_t *card)
- 	card->cla = 0x00;
- 
- 	/* set pointer to correct list of card objects */
--	priv->pgp_objects = (card->type == SC_CARD_TYPE_OPENPGP_V2)
-+	priv->pgp_objects = (card->type == SC_CARD_TYPE_OPENPGP_V2 || card->type == SC_CARD_TYPE_OPENPGP_GNUK)
- 				? pgp2_objects : pgp1_objects;
- 
- 	/* set detailed card version */
--	priv->bcd_version = (card->type == SC_CARD_TYPE_OPENPGP_V2)
-+	priv->bcd_version = (card->type == SC_CARD_TYPE_OPENPGP_V2 || card->type == SC_CARD_TYPE_OPENPGP_GNUK)
- 				? OPENPGP_CARD_2_0 : OPENPGP_CARD_1_1;
- 
- 	/* select application "OpenPGP" */
-@@ -428,7 +431,8 @@ pgp_get_card_features(sc_card_t *card)
- 		if ((pgp_get_blob(card, blob73, 0x00c0, &blob) >= 0) &&
- 		    (blob->data != NULL) && (blob->len > 0)) {
- 			/* in v2.0 bit 0x04 in first byte means "algorithm attributes changeable */
--			if ((blob->data[0] & 0x04) && (card->type == SC_CARD_TYPE_OPENPGP_V2))
-+			if ((blob->data[0] & 0x04) &&
-+			    (card->type == SC_CARD_TYPE_OPENPGP_V2 || card->type == SC_CARD_TYPE_OPENPGP_GNUK))
- 				priv->ext_caps |= EXT_CAP_ALG_ATTR_CHANGEABLE;
- 			/* bit 0x08 in first byte means "support for private use DOs" */
- 			if (blob->data[0] & 0x08)
-@@ -445,7 +449,8 @@ pgp_get_card_features(sc_card_t *card)
- 				priv->ext_caps |= EXT_CAP_GET_CHALLENGE;
- 			}
- 			/* in v2.0 bit 0x80 in first byte means "support Secure Messaging" */
--			if ((blob->data[0] & 0x80) && (card->type == SC_CARD_TYPE_OPENPGP_V2))
-+			if ((blob->data[0] & 0x80) &&
-+			    (card->type == SC_CARD_TYPE_OPENPGP_V2 || card->type == SC_CARD_TYPE_OPENPGP_GNUK))
- 				priv->ext_caps |= EXT_CAP_SM;
- 
- 			if ((priv->bcd_version >= OPENPGP_CARD_2_0) && (blob->len >= 10)) {
-@@ -1057,12 +1062,18 @@ static int
- pgp_get_pubkey(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
- {
- 	sc_apdu_t	apdu;
-+	u8 apdu_case = SC_APDU_CASE_4;
- 	u8		idbuf[2];
- 	int		r;
- 
- 	sc_log(card->ctx, "called, tag=%04x\n", tag);
- 
--	sc_format_apdu(card, &apdu, SC_APDU_CASE_4, 0x47, 0x81, 0);
-+	/* With Gnuk token, force to use short APDU */
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+		apdu_case = SC_APDU_CASE_4_SHORT;
-+	}
-+
-+	sc_format_apdu(card, &apdu, apdu_case, 0x47, 0x81, 0);
- 	apdu.lc = 2;
- 	apdu.data = ushort2bebytes(idbuf, tag);
- 	apdu.datalen = 2;
-@@ -1154,6 +1165,7 @@ pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
- 	u8 ins = 0xDA;
- 	u8 p1 = tag >> 8;
- 	u8 p2 = tag & 0xFF;
-+	u8 apdu_case = SC_APDU_CASE_3;
- 	int r;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -1195,13 +1207,17 @@ pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
- 
- 	/* Build APDU */
- 	if (buf != NULL && buf_len > 0) {
--		sc_format_apdu(card, &apdu, SC_APDU_CASE_3, ins, p1, p2);
-+		/* Force short APDU for Gnuk */
-+		if (card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+			apdu_case = SC_APDU_CASE_3_SHORT;
-+		}
-+		sc_format_apdu(card, &apdu, apdu_case, ins, p1, p2);
- 
- 		/* if card/reader does not support extended APDUs, but chaining, then set it */
- 		if (((card->caps & SC_CARD_CAP_APDU_EXT) == 0) && (priv->ext_caps & EXT_CAP_CHAINING))
- 			apdu.flags |= SC_APDU_FLAGS_CHAINING;
- 
--		apdu.data = buf;
-+		apdu.data = (u8 *)buf;
- 		apdu.datalen = buf_len;
- 		apdu.lc = buf_len;
- 	}
-@@ -1328,6 +1344,7 @@ pgp_compute_signature(sc_card_t *card, const u8 *data,
- 	struct pgp_priv_data	*priv = DRVDATA(card);
- 	sc_security_env_t	*env = &priv->sec_env;
- 	sc_apdu_t		apdu;
-+	u8 apdu_case = SC_APDU_CASE_4;
- 	int			r;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -1336,14 +1353,19 @@ pgp_compute_signature(sc_card_t *card, const u8 *data,
- 		LOG_TEST_RET(card->ctx, SC_ERROR_INVALID_ARGUMENTS,
- 				"invalid operation");
- 
-+	/* Force short APDU for Gnuk Token */
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+		apdu_case = SC_APDU_CASE_4_SHORT;
-+	}
-+
- 	switch (env->key_ref[0]) {
- 	case 0x00: /* signature key */
- 		/* PSO SIGNATURE */
--		sc_format_apdu(card, &apdu, SC_APDU_CASE_4, 0x2A, 0x9E, 0x9A);
-+		sc_format_apdu(card, &apdu, apdu_case, 0x2A, 0x9E, 0x9A);
- 		break;
- 	case 0x02: /* authentication key */
- 		/* INTERNAL AUTHENTICATE */
--		sc_format_apdu(card, &apdu, SC_APDU_CASE_4, 0x88, 0, 0);
-+		sc_format_apdu(card, &apdu, apdu_case, 0x88, 0, 0);
- 		break;
- 	case 0x01:
- 	default:
-@@ -1352,7 +1374,7 @@ pgp_compute_signature(sc_card_t *card, const u8 *data,
- 	}
- 
- 	apdu.lc = data_len;
--	apdu.data = data;
-+	apdu.data = (u8 *)data;
- 	apdu.datalen = data_len;
- 	apdu.le = ((outlen >= 256) && !(card->caps & SC_CARD_CAP_APDU_EXT)) ? 256 : outlen;
- 	apdu.resp    = out;
-@@ -1376,6 +1398,7 @@ pgp_decipher(sc_card_t *card, const u8 *in, size_t inlen,
- 	struct pgp_priv_data	*priv = DRVDATA(card);
- 	sc_security_env_t	*env = &priv->sec_env;
- 	sc_apdu_t	apdu;
-+	u8 apdu_case = SC_APDU_CASE_4;
- 	u8		*temp = NULL;
- 	int		r;
- 
-@@ -1400,7 +1423,7 @@ pgp_decipher(sc_card_t *card, const u8 *in, size_t inlen,
- 	case 0x01: /* Decryption key */
- 	case 0x02: /* authentication key */
- 		/* PSO DECIPHER */
--		sc_format_apdu(card, &apdu, SC_APDU_CASE_4, 0x2A, 0x80, 0x86);
-+		sc_format_apdu(card, &apdu, apdu_case, 0x2A, 0x80, 0x86);
- 		break;
- 	case 0x00: /* signature key */
- 	default:
-@@ -1409,8 +1432,13 @@ pgp_decipher(sc_card_t *card, const u8 *in, size_t inlen,
- 				"invalid key reference");
- 	}
- 
-+	/* Gnuk only supports short APDU, so we need to use command chaining */
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+		apdu.flags |= SC_APDU_FLAGS_CHAINING;
-+	}
-+
- 	apdu.lc = inlen;
--	apdu.data = in;
-+	apdu.data = (u8 *)in;
- 	apdu.datalen = inlen;
- 	apdu.le = ((outlen >= 256) && !(card->caps & SC_CARD_CAP_APDU_EXT)) ? 256 : outlen;
- 	apdu.resp = out;
-@@ -1794,6 +1822,11 @@ static int pgp_gen_key(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_in
- 		LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_ARGUMENTS);
- 	}
- 
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && key_info->modulus_len != 2048) {
-+		sc_log(card->ctx, "Gnuk does not support other key length than 2048.");
-+		LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_ARGUMENTS);
-+	}
-+
- 	/* Set attributes for new-generated key */
- 	r = pgp_update_new_algo_attr(card, key_info);
- 	LOG_TEST_RET(card->ctx, r, "Cannot set attributes for new-generated key");
-@@ -1801,7 +1834,9 @@ static int pgp_gen_key(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_in
- 	/* Test whether we will need extended APDU. 1900 is an
- 	 * arbitrary modulus length which for sure fits into a short APDU.
- 	 * This idea is borrowed from GnuPG code.  */
--	if (card->caps & SC_CARD_CAP_APDU_EXT && key_info->modulus_len > 1900) {
-+	if (card->caps & SC_CARD_CAP_APDU_EXT
-+	    && key_info->modulus_len > 1900
-+	    && card->type != SC_CARD_TYPE_OPENPGP_GNUK) {
- 		/* We won't store to apdu variable yet, because it will be reset in
- 		 * sc_format_apdu() */
- 		apdu_le = card->max_recv_size;
-diff --git a/src/libopensc/cards.h b/src/libopensc/cards.h
-index 7be6667..a3f3634 100644
---- a/src/libopensc/cards.h
-+++ b/src/libopensc/cards.h
-@@ -105,6 +105,7 @@ enum {
- 	SC_CARD_TYPE_OPENPGP_BASE = 9000,
- 	SC_CARD_TYPE_OPENPGP_V1,
- 	SC_CARD_TYPE_OPENPGP_V2,
-+	SC_CARD_TYPE_OPENPGP_GNUK,
- 
- 	/* jcop driver */
- 	SC_CARD_TYPE_JCOP_BASE = 10000,
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index f42e6d6..a24a395 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -33,6 +33,7 @@
- #include "libopensc/cards.h"
- #include "libopensc/cardctl.h"
- #include "libopensc/errors.h"
-+#include "libopensc/log.h"
- #include "util.h"
- #include "libopensc/log.h"
- 
-@@ -396,6 +397,8 @@ int do_genkey(sc_card_t *card, u8 key_id, unsigned int key_len)
- 	sc_path_t path;
- 	sc_file_t *file;
- 
-+	LOG_FUNC_CALLED(card->ctx);
-+
- 	if (key_id < 1 || key_id > 3) {
- 		printf("Unknown key ID %d.\n", key_id);
- 		return 1;
-@@ -487,8 +490,10 @@ int main(int argc, char **argv)
- 
- 	/* check card type */
- 	if ((card->type != SC_CARD_TYPE_OPENPGP_V1) &&
--	    (card->type != SC_CARD_TYPE_OPENPGP_V2)) {
-+	    (card->type != SC_CARD_TYPE_OPENPGP_V2) &&
-+	    (card->type != SC_CARD_TYPE_OPENPGP_GNUK)) {
- 		util_error("not an OpenPGP card");
-+		sc_log(card->ctx, "Card type %X", card->type);
- 		exit_status = EXIT_FAILURE;
- 		goto out;
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0002-OpenPGP-Add-Gnuk-in-pkcs15-emulation-layer.patch b/trunk/package/feeds/packages/opensc/patches/0002-OpenPGP-Add-Gnuk-in-pkcs15-emulation-layer.patch
deleted file mode 100644
index c08a6e0a..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0002-OpenPGP-Add-Gnuk-in-pkcs15-emulation-layer.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 00a2c08c9125103ee0bff9af9e7ff42c5cdc14fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Fri, 12 Apr 2013 17:24:00 +0700
-Subject: [PATCH 02/26] OpenPGP: Add Gnuk in pkcs15 emulation layer.
-
----
- src/libopensc/pkcs15-openpgp.c | 6 ++++--
- src/libopensc/pkcs15-syn.c     | 1 +
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
-index 4daaa98..fdf720a 100644
---- a/src/libopensc/pkcs15-openpgp.c
-+++ b/src/libopensc/pkcs15-openpgp.c
-@@ -151,7 +151,8 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
- 	u8		c4data[10];
- 	u8		c5data[70];
- 	int		r, i;
--	const pgp_pin_cfg_t *pin_cfg = (card->type == SC_CARD_TYPE_OPENPGP_V2) ? pin_cfg_v2 : pin_cfg_v1;
-+	const pgp_pin_cfg_t *pin_cfg = (card->type == SC_CARD_TYPE_OPENPGP_V2 || card->type == SC_CARD_TYPE_OPENPGP_GNUK)
-+	                               ? pin_cfg_v2 : pin_cfg_v1;
- 	sc_path_t path;
- 	sc_file_t *file;
- 
-@@ -363,7 +364,8 @@ failed:	sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "Failed to initialize OpenPGP e
- 
- static int openpgp_detect_card(sc_pkcs15_card_t *p15card)
- {
--	if (p15card->card->type == SC_CARD_TYPE_OPENPGP_V1 || p15card->card->type == SC_CARD_TYPE_OPENPGP_V2)
-+	if (p15card->card->type == SC_CARD_TYPE_OPENPGP_V1 || p15card->card->type == SC_CARD_TYPE_OPENPGP_V2
-+	    || p15card->card->type == SC_CARD_TYPE_OPENPGP_GNUK)
- 		return SC_SUCCESS;
- 	else
- 		return SC_ERROR_WRONG_CARD;
-diff --git a/src/libopensc/pkcs15-syn.c b/src/libopensc/pkcs15-syn.c
-index ffbf642..d2c086c 100644
---- a/src/libopensc/pkcs15-syn.c
-+++ b/src/libopensc/pkcs15-syn.c
-@@ -115,6 +115,7 @@ int sc_pkcs15_is_emulation_only(sc_card_t *card)
- 		case SC_CARD_TYPE_GEMSAFEV1_PTEID:
- 		case SC_CARD_TYPE_OPENPGP_V1:
- 		case SC_CARD_TYPE_OPENPGP_V2:
-+		case SC_CARD_TYPE_OPENPGP_GNUK:
- 		case SC_CARD_TYPE_SC_HSM:
- 		case SC_CARD_TYPE_DNIE_BASE:
- 		case SC_CARD_TYPE_DNIE_BLANK:
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0003-OpenPGP-Include-private-DO-to-filesystem-at-driver-i.patch b/trunk/package/feeds/packages/opensc/patches/0003-OpenPGP-Include-private-DO-to-filesystem-at-driver-i.patch
deleted file mode 100644
index 9e96cfef..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0003-OpenPGP-Include-private-DO-to-filesystem-at-driver-i.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2d348b60ab8c22791b56f291600954abd716a791 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Fri, 22 Mar 2013 17:37:16 +0700
-Subject: [PATCH 03/26] OpenPGP: Include private DO to filesystem at driver
- initialization.
-
-In old implementation, the DOs which their access is restricted by
-PIN (like DOs 0101 -> 0104) were excluded from the fake filesystem,
-leading to that we cannot read their data later, even if we verified PIN.
----
- src/libopensc/card-openpgp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index c785a55..1cc3923 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -357,7 +357,7 @@ pgp_init(sc_card_t *card)
- 
- 	/* Populate MF - add matching blobs listed in the pgp_objects table. */
- 	for (info = priv->pgp_objects; (info != NULL) && (info->id > 0); info++) {
--		if (((info->access & READ_MASK) == READ_ALWAYS) &&
-+		if (((info->access & READ_MASK) != READ_NEVER) &&
- 		    (info->get_fn != NULL)) {
- 			child = pgp_new_blob(card, priv->mf, info->id, sc_file_new());
- 
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0004-PKCS15-OpenPGP-Declare-DATA-objects.patch b/trunk/package/feeds/packages/opensc/patches/0004-PKCS15-OpenPGP-Declare-DATA-objects.patch
deleted file mode 100644
index b6408de7..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0004-PKCS15-OpenPGP-Declare-DATA-objects.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From fda9b6dd088e734de372fc85c091f88e8607bc2e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Tue, 26 Feb 2013 17:37:16 +0700
-Subject: [PATCH 04/26] PKCS15-OpenPGP: Declare DATA objects.
-
-Begin to support read/write DATA object for PKCS-OpenPGP binding.
-This object is used by TrueCrypt.
----
- src/libopensc/pkcs15-openpgp.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
-index fdf720a..fea2805 100644
---- a/src/libopensc/pkcs15-openpgp.c
-+++ b/src/libopensc/pkcs15-openpgp.c
-@@ -32,6 +32,7 @@
- #include "log.h"
- 
- int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
-+static int sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *);
- 
- 
- #define	PGP_USER_PIN_FLAGS	(SC_PKCS15_PIN_FLAG_CASE_SENSITIVE \
-@@ -41,6 +42,8 @@ int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
- 				| SC_PKCS15_PIN_FLAG_UNBLOCK_DISABLED \
- 				| SC_PKCS15_PIN_FLAG_SO_PIN)
- 
-+#define PGP_NUM_PRIVDO       4
-+
- typedef struct _pgp_pin_cfg {
- 	const char	*label;
- 	int		reference;
-@@ -355,6 +358,9 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
- 			goto failed;
- 	}
- 
-+	/* PKCS#15 DATA object from OpenPGP private DOs */
-+	r = sc_pkcs15emu_openpgp_add_data(p15card);
-+
- 	return 0;
- 
- failed:	sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "Failed to initialize OpenPGP emulation: %s\n",
-@@ -362,6 +368,35 @@ failed:	sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "Failed to initialize OpenPGP e
- 	return r;
- }
- 
-+static int
-+sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
-+{
-+	sc_context_t *ctx = p15card->card->ctx;
-+	int i, r;
-+
-+	LOG_FUNC_CALLED(ctx);
-+	/* There is 4 private DO from 0101 to 0104 */
-+	for (i = 1; i <= PGP_NUM_PRIVDO; i++) {
-+		sc_pkcs15_data_info_t dat_info;
-+		sc_pkcs15_object_t dat_obj;
-+		char name[8];
-+		char path[9];
-+		memset(&dat_info, 0, sizeof(dat_info));
-+		memset(&dat_obj, 0, sizeof(dat_obj));
-+
-+		sprintf(name, "PrivDO%d", i);
-+		sprintf(path, "3F00010%d", i);
-+
-+		sc_format_path(path, &dat_info.path);
-+		strlcpy(dat_obj.label, name, sizeof(dat_obj.label));
-+		strlcpy(dat_info.app_label, name, sizeof(dat_info.app_label));
-+
-+		sc_log(ctx, "Add %s data object", name);
-+		r = sc_pkcs15emu_add_data_object(p15card, &dat_obj, &dat_info);
-+	}
-+	LOG_FUNC_RETURN(ctx, r);
-+}
-+
- static int openpgp_detect_card(sc_pkcs15_card_t *p15card)
- {
- 	if (p15card->card->type == SC_CARD_TYPE_OPENPGP_V1 || p15card->card->type == SC_CARD_TYPE_OPENPGP_V2
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0005-OpenPGP-Support-erasing-reset-card.patch b/trunk/package/feeds/packages/opensc/patches/0005-OpenPGP-Support-erasing-reset-card.patch
deleted file mode 100644
index 0dc49546..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0005-OpenPGP-Support-erasing-reset-card.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 6d138f0199575516bfaad18cbbafcfa2ee61e58f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Mon, 4 Mar 2013 11:28:08 +0700
-Subject: [PATCH 05/26] OpenPGP: Support erasing (reset) card.
-
-Command: openpgp-tool --erase
----
- src/libopensc/card-openpgp.c | 64 ++++++++++++++++++++++++++++++++++++++++++++
- src/tools/openpgp-tool.c     | 22 ++++++++++++++-
- 2 files changed, 85 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 1cc3923..7349876 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -2195,6 +2195,66 @@ out:
- 
- #endif /* ENABLE_OPENSSL */
- 
-+/**
-+ * Erase card
-+ **/
-+static int pgp_erase_card(sc_card_t *card)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	u8 *apdustring[10] = {
-+		"00:20:00:81:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:81:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:81:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:81:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:83:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:83:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:83:08:40:40:40:40:40:40:40:40",
-+		"00:20:00:83:08:40:40:40:40:40:40:40:40",
-+		"00:e6:00:00",
-+		"00:44:00:00"
-+	};
-+	u8 buf[SC_MAX_APDU_BUFFER_SIZE];
-+	u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-+	sc_apdu_t apdu;
-+	size_t len0;
-+	int commandsnum = 10;
-+	int i, r;
-+
-+	LOG_FUNC_CALLED(ctx);
-+
-+	/* Check card version */
-+	if (card->type != SC_CARD_TYPE_OPENPGP_V2) {
-+		sc_log(ctx, "Card is not OpenPGP v2");
-+		LOG_FUNC_RETURN(ctx, SC_ERROR_NO_CARD_SUPPORT);
-+	}
-+	sc_log(ctx, "Card is OpenPGP v2. Erase card.");
-+
-+	/* Iterate over 10 commands above */
-+	for (i = 0; i < commandsnum; i++) {
-+		/* Convert the string to binary array */
-+		len0 = sizeof(buf);
-+		sc_hex_to_bin(apdustring[i], buf, &len0);
-+		printf("Sending: ");
-+		for (r = 0; r < len0; r++)
-+			printf("%02X ", buf[r]);
-+		printf("\n");
-+
-+		/* Build APDU from binary array */
-+		r = sc_bytes2apdu(card->ctx, buf, len0, &apdu);
-+		if (r) {
-+			sc_log(ctx, "Failed to build APDU");
-+			LOG_FUNC_RETURN(ctx, SC_ERROR_INTERNAL);
-+		}
-+		apdu.resp = rbuf;
-+		apdu.resplen = sizeof(rbuf);
-+
-+		/* Send APDU to card */
-+		r = sc_transmit_apdu(card, &apdu);
-+		LOG_TEST_RET(ctx, r, "Transmiting APDU failed");
-+	}
-+	LOG_FUNC_RETURN(ctx, r);
-+}
-+
- /* ABI: card ctl: perform special card-specific operations */
- static int pgp_card_ctl(sc_card_t *card, unsigned long cmd, void *ptr)
- {
-@@ -2219,6 +2279,10 @@ static int pgp_card_ctl(sc_card_t *card, unsigned long cmd, void *ptr)
- 		LOG_FUNC_RETURN(card->ctx, r);
- 		break;
- #endif /* ENABLE_OPENSSL */
-+	case SC_CARDCTL_ERASE_CARD:
-+		r = pgp_erase_card(card);
-+		LOG_FUNC_RETURN(card->ctx, r);
-+		break;
- 	}
- 
- 	LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index a24a395..de1c9d4 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -78,6 +78,7 @@ static int opt_pin = 0;
- static char *pin = NULL;
- static int opt_dump_do = 0;
- static u8 do_dump_idx;
-+static int opt_erase = 0;
- 
- static const char *app_name = "openpgp-tool";
- 
-@@ -94,6 +95,7 @@ static const struct option options[] = {
- 	{ "help",      no_argument,       NULL, 'h'        },
- 	{ "verbose",   no_argument,       NULL, 'v'        },
- 	{ "version",   no_argument,       NULL, 'V'        },
-+	{ "erase",     no_argument,       NULL, 'E'        },
- 	{ "verify",    required_argument, NULL, OPT_VERIFY },
- 	{ "pin",       required_argument, NULL, OPT_PIN },
- 	{ "do",        required_argument, NULL, 'd' },
-@@ -113,6 +115,7 @@ static const char *option_help[] = {
- /* h */	"Print this help message",
- /* v */	"Verbose operation. Use several times to enable debug output.",
- /* V */	"Show version number",
-+/* E */	"Erase (reset) the card",
- 	"Verify PIN (CHV1, CHV2, CHV3...)",
- 	"PIN string",
- /* d */ "Dump private data object number <arg> (i.e. PRIVATE-DO-<arg>)"
-@@ -232,7 +235,7 @@ static int decode_options(int argc, char **argv)
- {
- 	int c;
- 
--	while ((c = getopt_long(argc, argv,"r:x:CUG:L:hwvVd:", options, (int *) 0)) != EOF) {
-+	while ((c = getopt_long(argc, argv,"r:x:CUG:L:hwvVd:E", options, (int *) 0)) != EOF) {
- 		switch (c) {
- 		case 'r':
- 			opt_reader = optarg;
-@@ -296,6 +299,8 @@ static int decode_options(int argc, char **argv)
- 			do_dump_idx = optarg[0] - '0';
- 			opt_dump_do++;
- 			actions++;
-+		case 'E':
-+			opt_erase++;
- 			break;
- 		default:
- 			util_print_usage_and_die(app_name, options, option_help, NULL);
-@@ -452,6 +457,18 @@ int do_verify(sc_card_t *card, char *type, char *pin)
- 	return r;
- }
- 
-+int do_erase(sc_card_t *card)
-+{
-+	int r;
-+	/* Check card version */
-+	if (card->type != SC_CARD_TYPE_OPENPGP_V2) {
-+		printf("Do not erase card which is not OpenPGP v2\n");
-+	}
-+	printf("Erase card\n");
-+	r = sc_card_ctl(card, SC_CARDCTL_ERASE_CARD, NULL);
-+	return r;
-+}
-+
- int main(int argc, char **argv)
- {
- 	sc_context_t *ctx = NULL;
-@@ -531,6 +548,9 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
-+	if (opt_erase)
-+		exit_status != do_erase(card);
-+
- out:
- 	sc_unlock(card);
- 	sc_disconnect_card(card);
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0006-openpgp-tool-Support-deleting-key-in-Gnuk.patch b/trunk/package/feeds/packages/opensc/patches/0006-openpgp-tool-Support-deleting-key-in-Gnuk.patch
deleted file mode 100644
index 915f6842..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0006-openpgp-tool-Support-deleting-key-in-Gnuk.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 469b6567d9adc4af6f49fa65534162673060454d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Mon, 4 Mar 2013 18:13:03 +0700
-Subject: [PATCH 06/26] openpgp-tool: Support deleting key in Gnuk.
-
----
- src/tools/openpgp-tool.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 142 insertions(+)
-
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index de1c9d4..374819a 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -41,6 +41,7 @@
- #define	OPT_PRETTY	257
- #define	OPT_VERIFY	258
- #define	OPT_PIN	    259
-+#define	OPT_DELKEY  260
- 
- /* define structures */
- struct ef_name_map {
-@@ -79,6 +80,7 @@ static char *pin = NULL;
- static int opt_dump_do = 0;
- static u8 do_dump_idx;
- static int opt_erase = 0;
-+static int opt_delkey = 0;
- 
- static const char *app_name = "openpgp-tool";
- 
-@@ -98,6 +100,7 @@ static const struct option options[] = {
- 	{ "erase",     no_argument,       NULL, 'E'        },
- 	{ "verify",    required_argument, NULL, OPT_VERIFY },
- 	{ "pin",       required_argument, NULL, OPT_PIN },
-+	{ "del-key",   required_argument, NULL, OPT_DELKEY },
- 	{ "do",        required_argument, NULL, 'd' },
- 	{ NULL, 0, NULL, 0 }
- };
-@@ -118,6 +121,7 @@ static const char *option_help[] = {
- /* E */	"Erase (reset) the card",
- 	"Verify PIN (CHV1, CHV2, CHV3...)",
- 	"PIN string",
-+	"Delete key (1, 2, 3 or all)",
- /* d */ "Dump private data object number <arg> (i.e. PRIVATE-DO-<arg>)"
- };
- 
-@@ -302,6 +306,14 @@ static int decode_options(int argc, char **argv)
- 		case 'E':
- 			opt_erase++;
- 			break;
-+		case OPT_DELKEY:
-+			opt_delkey++;
-+			if (strcmp(optarg, "all") != 0)   /* Arg string is not 'all' */
-+				key_id = optarg[0] - '0';
-+			else                              /* Arg string is 'all' */
-+				key_id = 'a';
-+			actions++;
-+			break;
- 		default:
- 			util_print_usage_and_die(app_name, options, option_help, NULL);
- 		}
-@@ -457,6 +469,133 @@ int do_verify(sc_card_t *card, char *type, char *pin)
- 	return r;
- }
- 
-+/**
-+ * Delete key, for Gnuk.
-+ **/
-+int delete_key_gnuk(sc_card_t *card, u8 key_id)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	int r = SC_SUCCESS;
-+	u8 *data = NULL;
-+
-+	/* Delete fingerprint */
-+	sc_log(ctx, "Delete fingerprints");
-+	r |= sc_put_data(card, 0xC6 + key_id, NULL, 0);
-+	/* Delete creation time */
-+	sc_log(ctx, "Delete creation time");
-+	r |= sc_put_data(card, 0xCD + key_id, NULL, 0);
-+
-+	/* Rewrite Extended Header List */
-+	sc_log(ctx, "Rewrite Extended Header List");
-+
-+	if (key_id == 1)
-+		data = "\x4D\x02\xB6";
-+	else if (key_id == 2)
-+		data = "\x4D\x02\xB8";
-+	else if (key_id == 3)
-+		data = "\x4D\x02\xA4";
-+	else
-+		return SC_ERROR_INVALID_ARGUMENTS;
-+
-+	r |= sc_put_data(card, 0x4D, data, strlen(data) + 1);
-+	return r;
-+}
-+
-+/**
-+ * Delete key, for OpenPGP card.
-+ * This function is not complete and is reserved for future version (> 2) of OpenPGP card.
-+ **/
-+int delete_key_openpgp(sc_card_t *card, u8 key_id)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	char *del_fingerprint = "00:DA:00:C6:14:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
-+	char *del_creationtime = "00:DA:00:CD:04:00:00:00:00";
-+	/* We need to replace the 4th byte later */
-+	char *apdustring = NULL;
-+	u8 buf[SC_MAX_APDU_BUFFER_SIZE];
-+	u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-+	sc_apdu_t apdu;
-+	size_t len0;
-+	int i;
-+	int r = SC_SUCCESS;
-+
-+	for (i = 0; i < 2; i++) {
-+		if (i == 0)    /* Reset fingerprint */
-+			apdustring = del_fingerprint;
-+		else           /* Reset creation time */
-+			apdustring = del_creationtime;
-+		/* Convert the string to binary array */
-+		len0 = sizeof(buf);
-+		sc_hex_to_bin(apdustring, buf, &len0);
-+
-+		/* Replace DO tag, subject to key ID */
-+		buf[3] = buf[3] + key_id;
-+
-+		/* Build APDU from binary array */
-+		r = sc_bytes2apdu(card->ctx, buf, len0, &apdu);
-+		if (r) {
-+			sc_log(ctx, "Failed to build APDU");
-+			LOG_FUNC_RETURN(ctx, SC_ERROR_INTERNAL);
-+		}
-+		apdu.resp = rbuf;
-+		apdu.resplen = sizeof(rbuf);
-+
-+		/* Send APDU to card */
-+		r = sc_transmit_apdu(card, &apdu);
-+		LOG_TEST_RET(ctx, r, "Transmiting APDU failed");
-+	}
-+	/* TODO: Rewrite Extended Header List.
-+	 * Not support by OpenGPG v2 yet */
-+	LOG_FUNC_RETURN(ctx, r);
-+}
-+
-+int delete_key(sc_card_t *card, u8 key_id)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	int r;
-+
-+	LOG_FUNC_CALLED(ctx);
-+	/* Check key ID */
-+	if (key_id < 1 || key_id > 3) {
-+		sc_log(ctx, "Invalid key ID %d", key_id);
-+		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
-+	}
-+
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK)
-+		r = delete_key_gnuk(card, key_id);
-+	else
-+		r = delete_key_openpgp(card, key_id);
-+
-+	LOG_FUNC_RETURN(ctx, r);
-+}
-+
-+int do_delete_key(sc_card_t *card, u8 key_id)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	int r = SC_SUCCESS;
-+
-+	/* Currently, only Gnuk supports deleting keys */
-+	if (card->type != SC_CARD_TYPE_OPENPGP_GNUK) {
-+		printf("Only Gnuk supports deleting keys. General OpenPGP doesn't.");
-+		return SC_ERROR_NOT_SUPPORTED;
-+	}
-+
-+	if (key_id < 1 || (key_id > 3 && key_id != 'a')) {
-+		printf("Error: Invalid key id %d", key_id);
-+		return SC_ERROR_INVALID_ARGUMENTS;
-+	}
-+	if (key_id == 1 || key_id == 'a') {
-+		r |= delete_key(card, 1);
-+	}
-+	if (key_id == 2 || key_id == 'a') {
-+		r |= delete_key(card, 2);
-+	}
-+	if (key_id == 3 || key_id == 'a') {
-+		r |= delete_key(card, 3);
-+	}
-+	return r;
-+}
-+
- int do_erase(sc_card_t *card)
- {
- 	int r;
-@@ -548,6 +687,9 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
-+	if (opt_delkey)
-+		exit_status != do_delete_key(card, key_id);
-+
- 	if (opt_erase)
- 		exit_status != do_erase(card);
- 
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0007-OpenPGP-Correct-building-Extended-Header-List-when-i.patch b/trunk/package/feeds/packages/opensc/patches/0007-OpenPGP-Correct-building-Extended-Header-List-when-i.patch
deleted file mode 100644
index 7d804567..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0007-OpenPGP-Correct-building-Extended-Header-List-when-i.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d210faa377bcec63876f84b82540b110ede16e57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Mon, 4 Mar 2013 18:14:51 +0700
-Subject: [PATCH 07/26] OpenPGP: Correct building Extended Header List when
- importing keys.
-
----
- src/libopensc/card-openpgp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 7349876..91c311b 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -1977,7 +1977,7 @@ pgp_build_extended_header_list(sc_card_t *card, sc_cardctl_openpgp_keystore_info
- 	u8 *p = NULL;
- 	u8 *components[] = {key_info->e, key_info->p, key_info->q, key_info->n};
- 	size_t componentlens[] = {key_info->e_len, key_info->p_len, key_info->q_len, key_info->n_len};
--	unsigned int componenttags[] = {0x91, 0x92, 0x93, 0x95};
-+	unsigned int componenttags[] = {0x91, 0x92, 0x93, 0x97};
- 	char *componentnames[] = {
- 		"public exponent",
- 		"prime p",
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0008-OpenPGP-Read-some-empty-DOs-from-Gnuk.patch b/trunk/package/feeds/packages/opensc/patches/0008-OpenPGP-Read-some-empty-DOs-from-Gnuk.patch
deleted file mode 100644
index 17aaf92c..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0008-OpenPGP-Read-some-empty-DOs-from-Gnuk.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From df98874784a77c96a7a1be54412a02a53fdd3a3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Mon, 25 Mar 2013 11:58:38 +0700
-Subject: [PATCH 08/26] OpenPGP: Read some empty DOs from Gnuk.
-
-In Gnuk, some empty DOs are returned as not exist, instead of existing with empty value.
-So, we will consider them exist in driver.
----
- src/libopensc/card-openpgp.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 91c311b..e7b25c0 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -815,6 +815,23 @@ pgp_get_blob(sc_card_t *card, struct blob *blob, unsigned int id,
- 		}
- 	}
- 
-+	/* This part is for "NOT FOUND" cases */
-+
-+	/* Special case:
-+	 * Gnuk does not have default value for children of DO 65 (DOs 5B, 5F2D, 5F35)
-+	 * So, if these blob was not found, we create it. */
-+	if (blob->id == 0x65 && (id == 0x5B || id == 0x5F2D || id == 0x5F35)) {
-+		sc_log(card->ctx, "Create blob %X under %X", id, blob->id);
-+		child = pgp_new_blob(card, blob, id, sc_file_new());
-+		if (child) {
-+			pgp_set_blob(child, NULL, 0);
-+			*ret = child;
-+			return SC_SUCCESS;
-+		}
-+		else
-+			sc_log(card->ctx, "Not enough memory to create blob for DO %X");
-+	}
-+
- 	return SC_ERROR_FILE_NOT_FOUND;
- }
- 
-@@ -1149,6 +1166,14 @@ pgp_get_data(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
- 	LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
- 
- 	r = sc_check_sw(card, apdu.sw1, apdu.sw2);
-+
-+	/* For Gnuk card, if there is no certificate, it returns error instead of empty data.
-+	 * So, for this case, we ignore error and consider success */
-+	if (r == SC_ERROR_DATA_OBJECT_NOT_FOUND && card->type == SC_CARD_TYPE_OPENPGP_GNUK
-+        && (tag == DO_CERT || tag == 0x0101 || tag == 0x0102 || tag == 0x0103 || tag == 0x0104)) {
-+		r = SC_SUCCESS;
-+		apdu.resplen = 0;
-+	}
- 	LOG_TEST_RET(card->ctx, r, "Card returned error");
- 
- 	LOG_FUNC_RETURN(card->ctx, apdu.resplen);
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0009-PKCS15-OpenPGP-Do-not-show-empty-DO-in-pkcs15-emu_in.patch b/trunk/package/feeds/packages/opensc/patches/0009-PKCS15-OpenPGP-Do-not-show-empty-DO-in-pkcs15-emu_in.patch
deleted file mode 100644
index a75a2c2c..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0009-PKCS15-OpenPGP-Do-not-show-empty-DO-in-pkcs15-emu_in.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 42adc35954e18e24f253f710b16d850d1872bce5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Wed, 27 Mar 2013 11:38:42 +0700
-Subject: [PATCH 09/26] PKCS15-OpenPGP: Do not show empty DO in pkcs15
- emu_init.
-
----
- src/libopensc/pkcs15-openpgp.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
-index fea2805..51a2032 100644
---- a/src/libopensc/pkcs15-openpgp.c
-+++ b/src/libopensc/pkcs15-openpgp.c
-@@ -381,16 +381,34 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
- 		sc_pkcs15_object_t dat_obj;
- 		char name[8];
- 		char path[9];
-+		u8 content[254];
- 		memset(&dat_info, 0, sizeof(dat_info));
- 		memset(&dat_obj, 0, sizeof(dat_obj));
- 
- 		sprintf(name, "PrivDO%d", i);
- 		sprintf(path, "3F00010%d", i);
- 
-+		/* Check if the DO can be read.
-+		 * We won't expose pkcs15 DATA object if DO is empty.
-+		 */
-+		r = read_file(p15card->card, path, content, sizeof(content));
-+		if (r <= 0 ) {
-+			sc_log(ctx, "Cannot read DO 010%d or there is no data in it", i);
-+			/* Skip */
-+			continue;
-+		}
- 		sc_format_path(path, &dat_info.path);
- 		strlcpy(dat_obj.label, name, sizeof(dat_obj.label));
- 		strlcpy(dat_info.app_label, name, sizeof(dat_info.app_label));
- 
-+		/* Add DATA object to slot protected by PIN2 (PW1 with Ref 0x82) */
-+		dat_obj.flags = SC_PKCS15_CO_FLAG_PRIVATE | SC_PKCS15_CO_FLAG_MODIFIABLE;
-+		dat_obj.auth_id.len = 1;
-+		if (i == 1 || i == 3)
-+			dat_obj.auth_id.value[0] = 2;
-+		else
-+			dat_obj.auth_id.value[0] = 3;
-+
- 		sc_log(ctx, "Add %s data object", name);
- 		r = sc_pkcs15emu_add_data_object(p15card, &dat_obj, &dat_info);
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0010-PKCS15-OpenPGP-Allow-to-store-data-to-pkcs15-data-ob.patch b/trunk/package/feeds/packages/opensc/patches/0010-PKCS15-OpenPGP-Allow-to-store-data-to-pkcs15-data-ob.patch
deleted file mode 100644
index 7b0f493c..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0010-PKCS15-OpenPGP-Allow-to-store-data-to-pkcs15-data-ob.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f085e6a5f386875b5b071ef3bf115e4d9bb33bdb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Wed, 27 Mar 2013 11:39:33 +0700
-Subject: [PATCH 10/26] PKCS15-OpenPGP: Allow to store data to pkcs15 data
- object.
-
-Only one DO is supported now.
----
- src/libopensc/pkcs15-openpgp.c  |  2 +-
- src/pkcs15init/pkcs15-openpgp.c | 38 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 38 insertions(+), 2 deletions(-)
-
-diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
-index 51a2032..4cc1c39 100644
---- a/src/libopensc/pkcs15-openpgp.c
-+++ b/src/libopensc/pkcs15-openpgp.c
-@@ -393,7 +393,7 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
- 		 */
- 		r = read_file(p15card->card, path, content, sizeof(content));
- 		if (r <= 0 ) {
--			sc_log(ctx, "Cannot read DO 010%d or there is no data in it", i);
-+			sc_log(ctx, "No data get from DO 010%d", i);
- 			/* Skip */
- 			continue;
- 		}
-diff --git a/src/pkcs15init/pkcs15-openpgp.c b/src/pkcs15init/pkcs15-openpgp.c
-index f3a4962..1455580 100755
---- a/src/pkcs15init/pkcs15-openpgp.c
-+++ b/src/pkcs15init/pkcs15-openpgp.c
-@@ -236,13 +236,16 @@ static int openpgp_emu_update_tokeninfo(sc_profile_t *profile, sc_pkcs15_card_t
- }
- 
- static int openpgp_store_data(struct sc_pkcs15_card *p15card, struct sc_profile *profile,
--                              struct sc_pkcs15_object *obj,	struct sc_pkcs15_der *content,
-+                              struct sc_pkcs15_object *obj, struct sc_pkcs15_der *content,
-                               struct sc_path *path)
- {
- 	sc_card_t *card = p15card->card;
-+	sc_context_t *ctx = card->ctx;
- 	sc_file_t *file;
- 	sc_pkcs15_cert_info_t *cinfo;
- 	sc_pkcs15_id_t *cid;
-+	sc_pkcs15_data_info_t *dinfo;
-+	u8 buf[254];
- 	int r;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -282,6 +285,39 @@ static int openpgp_store_data(struct sc_pkcs15_card *p15card, struct sc_profile
- 			                     content->len, 0);
- 		break;
- 
-+	case SC_PKCS15_TYPE_DATA_OBJECT:
-+		dinfo = (sc_pkcs15_data_info_t *) obj->data;
-+		/* dinfo->app_label contains filename */
-+		sc_log(ctx, "===== App label %s", dinfo->app_label);
-+		/* Currently, we only support DO 0101. The reason is that when initializing this
-+		 * pkcs15 emulation, PIN authentication is not applied and we can expose only this DO,
-+		 * which is "read always".
-+		 * If we support other DOs, they will not be exposed, and not helpful to user.
-+		 * I haven't found a way to refresh the list of exposed DOs after verifying PIN yet.
-+		 * http://sourceforge.net/mailarchive/message.php?msg_id=30646373
-+		 **/
-+		sc_log(ctx, "About to write to DO 0101");
-+		sc_format_path("0101", path);
-+		r = sc_select_file(card, path, &file);
-+		LOG_TEST_RET(card->ctx, r, "Cannot select private DO");
-+		r = sc_read_binary(card, 0, buf, sizeof(buf), 0);
-+		if (r < 0) {
-+			sc_log(ctx, "Cannot read DO 0101");
-+			break;
-+		}
-+		if (r > 0) {
-+			sc_log(ctx, "DO 0101 is full.");
-+			r = SC_ERROR_TOO_MANY_OBJECTS;
-+			break;
-+		}
-+		r = sc_pkcs15init_authenticate(profile, p15card, file, SC_AC_OP_UPDATE);
-+		if (r >= 0 && content->len) {
-+			r = sc_update_binary(p15card->card, 0,
-+			                     (const unsigned char *) content->value,
-+			                     content->len, 0);
-+		}
-+		break;
-+
- 	default:
- 		r = SC_ERROR_NOT_IMPLEMENTED;
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0011-OpenPGP-Provide-enough-buffer-to-read-pubkey-from-Gn.patch b/trunk/package/feeds/packages/opensc/patches/0011-OpenPGP-Provide-enough-buffer-to-read-pubkey-from-Gn.patch
deleted file mode 100644
index d133e805..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0011-OpenPGP-Provide-enough-buffer-to-read-pubkey-from-Gn.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 752f8981bed49a98d3592ead3aa50e743318dea8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Fri, 5 Apr 2013 17:18:50 +0700
-Subject: [PATCH 11/26] OpenPGP: Provide enough buffer to read pubkey from
- Gnuk.
-
----
- src/libopensc/card-openpgp.c | 28 +++++++++++++++++++++++-----
- 1 file changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index e7b25c0..1913eca 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -263,7 +263,12 @@ static struct do_info		pgp2_objects[] = {	/* OpenPGP card spec 2.0 */
- 
- /* The DO holding X.509 certificate is constructed but does not contain child DO.
-  * We should notice this when building fake file system later. */
--#define DO_CERT		0x7f21
-+#define DO_CERT                  0x7f21
-+/* Maximum length for response buffer when reading pubkey. This value is calculated with
-+ * 4096-bit key length */
-+#define MAXLEN_RESP_PUBKEY       527
-+/* Gnuk only support 1 key length (2048 bit) */
-+#define MAXLEN_RESP_PUBKEY_GNUK  271
- 
- #define DRVDATA(card)        ((struct pgp_priv_data *) ((card)->drv_data))
- struct pgp_priv_data {
-@@ -731,6 +736,14 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
- 		u8 	buffer[2048];
- 		size_t	buf_len = (card->caps & SC_CARD_CAP_APDU_EXT)
- 				  ? sizeof(buffer) : 256;
-+
-+		/* Buffer length for Gnuk pubkey */
-+		if (card->type == SC_CARD_TYPE_OPENPGP_GNUK &&
-+		    (blob->id == 0xa400 || blob->id == 0xb600 || blob->id == 0xb800
-+		     || blob->id == 0xa401 || blob->id == 0xb601 || blob->id == 0xb801)) {
-+			buf_len = MAXLEN_RESP_PUBKEY_GNUK;
-+		}
-+
- 		int	r = blob->info->get_fn(card, blob->id, buffer, buf_len);
- 
- 		if (r < 0) {	/* an error occurred */
-@@ -1828,6 +1841,7 @@ static int pgp_gen_key(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_in
- 	u8 apdu_case;
- 	u8 *apdu_data;
- 	size_t apdu_le;
-+	size_t resplen = 0;
- 	int r = SC_SUCCESS;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -1868,23 +1882,27 @@ static int pgp_gen_key(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_in
- 		apdu_case = SC_APDU_CASE_4_EXT;
- 	}
- 	else {
--		apdu_le = 256;
- 		apdu_case = SC_APDU_CASE_4_SHORT;
-+		apdu_le = 256;
-+		resplen = MAXLEN_RESP_PUBKEY;
-+	}
-+	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+		resplen = MAXLEN_RESP_PUBKEY_GNUK;
- 	}
- 
- 	/* Prepare APDU */
--	sc_format_apdu(card, &apdu, apdu_case, 0x47, 0x80,  0);
-+	sc_format_apdu(card, &apdu, apdu_case, 0x47, 0x80, 0);
- 	apdu.data = apdu_data;
- 	apdu.datalen = 2;  /* Data = B600 */
- 	apdu.lc = 2;
- 	apdu.le = apdu_le;
- 
- 	/* Buffer to receive response */
--	apdu.resp = calloc(apdu.le, 1);
-+	apdu.resplen = (resplen > 0) ? resplen : apdu_le;
-+	apdu.resp = calloc(apdu.resplen, 1);
- 	if (apdu.resp == NULL) {
- 		LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_ENOUGH_MEMORY);
- 	}
--	apdu.resplen = apdu.le;
- 
- 	/* Send */
- 	sc_log(card->ctx, "Waiting for the card to generate key...");
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0012-OpenPGP-Support-write-certificate-for-Gnuk.patch b/trunk/package/feeds/packages/opensc/patches/0012-OpenPGP-Support-write-certificate-for-Gnuk.patch
deleted file mode 100644
index 3a2526f4..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0012-OpenPGP-Support-write-certificate-for-Gnuk.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 5110ae3ba33d165c43ea5eca8f929a82d81cb3fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Thu, 11 Apr 2013 11:47:51 +0700
-Subject: [PATCH 12/26] OpenPGP: Support write certificate for Gnuk.
-
----
- src/libopensc/card-openpgp.c | 158 +++++++++++++++++++++++++++++++++----------
- 1 file changed, 123 insertions(+), 35 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 1913eca..7cea84f 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -727,6 +727,8 @@ pgp_iterate_blobs(struct blob *blob, int level, void (*func)())
- static int
- pgp_read_blob(sc_card_t *card, struct blob *blob)
- {
-+	struct pgp_priv_data *priv = DRVDATA (card);
-+
- 	if (blob->data != NULL)
- 		return SC_SUCCESS;
- 	if (blob->info == NULL)
-@@ -737,6 +739,11 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
- 		size_t	buf_len = (card->caps & SC_CARD_CAP_APDU_EXT)
- 				  ? sizeof(buffer) : 256;
- 
-+		/* Buffer length for certificate */
-+		if (blob->id == DO_CERT && priv->max_cert_size > 0) {
-+			buf_len = MIN(priv->max_cert_size, sizeof(buffer));
-+		}
-+
- 		/* Buffer length for Gnuk pubkey */
- 		if (card->type == SC_CARD_TYPE_OPENPGP_GNUK &&
- 		    (blob->id == 0xa400 || blob->id == 0xb600 || blob->id == 0xb800
-@@ -1192,49 +1199,75 @@ pgp_get_data(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
- 	LOG_FUNC_RETURN(card->ctx, apdu.resplen);
- }
- 
--/* ABI: PUT DATA */
--static int
--pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
-+
-+/* Internal: Write certificate for Gnuk */
-+static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- {
-+	sc_context_t *ctx = card->ctx;
-+	size_t i = 0;
- 	sc_apdu_t apdu;
-+	u8 *part;
-+	size_t plen;
-+	int r = SC_SUCCESS;
-+
-+	LOG_FUNC_CALLED(ctx);
-+
-+	/* If null data is passed, delete certificate */
-+	if (buf == NULL || length == 0) {
-+		sc_format_apdu(card, &apdu, SC_APDU_CASE_1, 0xD6, 0x85, 0);
-+		r = sc_transmit_apdu(card, &apdu);
-+		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
-+		/* Check response */
-+		r = sc_check_sw(card, apdu.sw1, apdu.sw2);
-+		LOG_FUNC_RETURN(card->ctx, length);
-+	}
-+
-+	/* Ref: gnuk_put_binary_libusb.py and gnuk_token.py in Gnuk source tree */
-+	/* Split data to segments of 256 bytes. Send each segment via command chaining,
-+	 * with particular P1 byte for each segment */
-+	while (i*256 < length) {
-+		part = (u8 *)buf + i*256;
-+		plen = MIN(length - i*256, 256);
-+
-+		sc_log(card->ctx, "Write part %d from offset 0x%X, len %d", i+1, part, plen);
-+
-+		if (i == 0) {
-+			sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xD6, 0x85, 0);
-+		}
-+		else {
-+			sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xD6, i, 0);
-+		}
-+		apdu.flags |= SC_APDU_FLAGS_CHAINING;
-+		apdu.data = part;
-+		apdu.datalen = apdu.lc = plen;
-+
-+		r = sc_transmit_apdu(card, &apdu);
-+		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
-+		/* Check response */
-+		r = sc_check_sw(card, apdu.sw1, apdu.sw2);
-+		LOG_TEST_RET(card->ctx, r, "UPDATE BINARY returned error");
-+
-+		/* To next part */
-+		i++;
-+	}
-+	LOG_FUNC_RETURN(card->ctx, length);
-+}
-+
-+
-+/* Internal: Use PUT DATA command to write */
-+static int
-+pgp_put_data_plain(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
-+{
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *affected_blob = NULL;
--	struct do_info *dinfo = NULL;
-+	sc_context_t *ctx = card->ctx;
-+	sc_apdu_t apdu;
- 	u8 ins = 0xDA;
- 	u8 p1 = tag >> 8;
- 	u8 p2 = tag & 0xFF;
- 	u8 apdu_case = SC_APDU_CASE_3;
- 	int r;
- 
--	LOG_FUNC_CALLED(card->ctx);
--
--	/* Check if the tag is writable */
--	affected_blob = pgp_find_blob(card, tag);
--
--	/* Non-readable DOs have no represented blob, we have to check from pgp_get_info_by_tag */
--	if (affected_blob == NULL)
--		dinfo = pgp_get_info_by_tag(card, tag);
--	else
--		dinfo = affected_blob->info;
--
--	if (dinfo == NULL) {
--		sc_log(card->ctx, "The DO %04X does not exist.", tag);
--		LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_ARGUMENTS);
--	}
--	else if ((dinfo->access & WRITE_MASK) == WRITE_NEVER) {
--		sc_log(card->ctx, "DO %04X is not writable.", tag);
--		LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_ALLOWED);
--	}
--
--	/* Check data size.
--	 * We won't check other DOs than 7F21 (certificate), because their capacity
--	 * is hard-codded and may change in various version of the card. If we check here,
--	 * the driver may be sticked to a limit version number of card.
--	 * 7F21 size is soft-coded, so we can check it. */
--	if (tag == DO_CERT && buf_len > priv->max_cert_size) {
--		sc_log(card->ctx, "Data size %ld exceeds DO size limit %ld.", buf_len, priv->max_cert_size);
--		LOG_FUNC_RETURN(card->ctx, SC_ERROR_WRONG_LENGTH);
--	}
-+	LOG_FUNC_CALLED(ctx);
- 
- 	/* Extended Header list (004D DO) needs a variant of PUT DATA command */
- 	if (tag == 0x004D) {
-@@ -1260,15 +1293,70 @@ pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
- 		apdu.lc = buf_len;
- 	}
- 	else {
-+		/* This case is to empty DO */
- 		sc_format_apdu(card, &apdu, SC_APDU_CASE_1, ins, p1, p2);
- 	}
- 
- 	/* Send APDU to card */
- 	r = sc_transmit_apdu(card, &apdu);
--	LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
-+	LOG_TEST_RET(ctx, r, "APDU transmit failed");
- 	/* Check response */
- 	r = sc_check_sw(card, apdu.sw1, apdu.sw2);
- 
-+	if (r < 0)
-+		LOG_FUNC_RETURN(ctx, r);
-+
-+	LOG_FUNC_RETURN(ctx, buf_len);
-+}
-+
-+/* ABI: PUT DATA */
-+static int
-+pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
-+{
-+	struct pgp_priv_data *priv = DRVDATA(card);
-+	struct blob *affected_blob = NULL;
-+	struct do_info *dinfo = NULL;
-+	int r;
-+
-+	LOG_FUNC_CALLED(card->ctx);
-+
-+	/* Check if the tag is writable */
-+	if (priv->current->id != tag)
-+		affected_blob = pgp_find_blob(card, tag);
-+
-+	/* Non-readable DOs have no represented blob, we have to check from pgp_get_info_by_tag */
-+	if (affected_blob == NULL)
-+		dinfo = pgp_get_info_by_tag(card, tag);
-+	else
-+		dinfo = affected_blob->info;
-+
-+	if (dinfo == NULL) {
-+		sc_log(card->ctx, "The DO %04X does not exist.", tag);
-+		LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_ARGUMENTS);
-+	}
-+	else if ((dinfo->access & WRITE_MASK) == WRITE_NEVER) {
-+		sc_log(card->ctx, "DO %04X is not writable.", tag);
-+		LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_ALLOWED);
-+	}
-+
-+	/* Check data size.
-+	 * We won't check other DOs than 7F21 (certificate), because their capacity
-+	 * is hard-codded and may change in various version of the card. If we check here,
-+	 * the driver may be sticked to a limit version number of card.
-+	 * 7F21 size is soft-coded, so we can check it. */
-+	if (tag == DO_CERT && buf_len > priv->max_cert_size) {
-+		sc_log(card->ctx, "Data size %ld exceeds DO size limit %ld.", buf_len, priv->max_cert_size);
-+		LOG_FUNC_RETURN(card->ctx, SC_ERROR_WRONG_LENGTH);
-+	}
-+
-+	if (tag == DO_CERT && card->type == SC_CARD_TYPE_OPENPGP_GNUK) {
-+		/* Gnuk need a special way to write certificate. */
-+		r = gnuk_write_certificate(card, buf, buf_len);
-+	}
-+	else {
-+		r = pgp_put_data_plain(card, tag, buf, buf_len);
-+	}
-+
- 	/* Instruct more in case of error */
- 	if (r == SC_ERROR_SECURITY_STATUS_NOT_SATISFIED) {
- 		sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Please verify PIN first.");
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0013-pkcs15-openpgp-Change-to-sc_put_data-instead-of-sc_u.patch b/trunk/package/feeds/packages/opensc/patches/0013-pkcs15-openpgp-Change-to-sc_put_data-instead-of-sc_u.patch
deleted file mode 100644
index 48afb373..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0013-pkcs15-openpgp-Change-to-sc_put_data-instead-of-sc_u.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7823e836e8279c8d77786d8f10ffaa83cf50bf1d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Wed, 10 Apr 2013 18:35:58 +0700
-Subject: [PATCH 13/26] pkcs15-openpgp: Change to sc_put_data instead of
- sc_update_binary when writing certificate.
-
----
- src/pkcs15init/pkcs15-openpgp.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/pkcs15init/pkcs15-openpgp.c b/src/pkcs15init/pkcs15-openpgp.c
-index 1455580..be1291e 100755
---- a/src/pkcs15init/pkcs15-openpgp.c
-+++ b/src/pkcs15init/pkcs15-openpgp.c
-@@ -279,10 +279,9 @@ static int openpgp_store_data(struct sc_pkcs15_card *p15card, struct sc_profile
- 		r = sc_select_file(card, path, &file);
- 		LOG_TEST_RET(card->ctx, r, "Cannot select cert file");
- 		r = sc_pkcs15init_authenticate(profile, p15card, file, SC_AC_OP_UPDATE);
-+		sc_log(card->ctx, "Data to write is %d long", content->len);
- 		if (r >= 0 && content->len)
--			r = sc_update_binary(p15card->card, 0,
--			                     (const unsigned char *) content->value,
--			                     content->len, 0);
-+			r = sc_put_data(p15card->card, 0x7F21, (const unsigned char *) content->value, content->len);
- 		break;
- 
- 	case SC_PKCS15_TYPE_DATA_OBJECT:
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0014-OpenPGP-Overcome-the-restriction-of-even-data-length.patch b/trunk/package/feeds/packages/opensc/patches/0014-OpenPGP-Overcome-the-restriction-of-even-data-length.patch
deleted file mode 100644
index 0fa8f2c3..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0014-OpenPGP-Overcome-the-restriction-of-even-data-length.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3ff1f7234abb4c42273adedbe06d9e7f9f3a5f9d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Thu, 11 Apr 2013 16:18:31 +0700
-Subject: [PATCH 14/26] OpenPGP: Overcome the restriction of even data length
- of Gnuk.
-
-When write certificate with odd length to Gnuk, we add zero padding to make it even.
----
- src/libopensc/card-openpgp.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 7cea84f..7a77a71 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -1208,6 +1208,10 @@ static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- 	sc_apdu_t apdu;
- 	u8 *part;
- 	size_t plen;
-+	/* Two round_ variables below are to build APDU data
-+	 * with even length for Gnuk */
-+	u8 roundbuf[256];
-+	size_t roundlen = 0;
- 	int r = SC_SUCCESS;
- 
- 	LOG_FUNC_CALLED(ctx);
-@@ -1238,8 +1242,20 @@ static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- 			sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xD6, i, 0);
- 		}
- 		apdu.flags |= SC_APDU_FLAGS_CHAINING;
--		apdu.data = part;
--		apdu.datalen = apdu.lc = plen;
-+
-+		/* If the last part has odd length, we add zero padding to make it even.
-+		 * Gnuk does not allow data with odd length */
-+		if (plen < 256 && (plen % 2) != 0) {
-+			roundlen = plen + 1;
-+			memset(roundbuf, 0, roundlen);
-+			memcpy(roundbuf, part, plen);
-+			apdu.data = roundbuf;
-+			apdu.datalen = apdu.lc = roundlen;
-+		}
-+		else {
-+			apdu.data = part;
-+			apdu.datalen = apdu.lc = plen;
-+		}
- 
- 		r = sc_transmit_apdu(card, &apdu);
- 		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0015-OpenPGP-Delete-key-as-file-for-Gnuk.patch b/trunk/package/feeds/packages/opensc/patches/0015-OpenPGP-Delete-key-as-file-for-Gnuk.patch
deleted file mode 100644
index 2389cd10..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0015-OpenPGP-Delete-key-as-file-for-Gnuk.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 9af45c4cf052e3a6059a3004082f9ee3d2b3b2bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Fri, 12 Apr 2013 15:33:31 +0700
-Subject: [PATCH 15/26] OpenPGP: Delete key as file, for Gnuk.
-
----
- src/libopensc/card-openpgp.c | 51 +++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 50 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 7a77a71..4d0500d 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -2435,6 +2435,44 @@ static int pgp_card_ctl(sc_card_t *card, unsigned long cmd, void *ptr)
- 	LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
- }
- 
-+
-+/* Internal: Delete key */
-+static int
-+gnuk_delete_key(sc_card_t *card, u8 key_id)
-+{
-+	sc_context_t *ctx = card->ctx;
-+	int r = SC_SUCCESS;
-+	u8 *data = NULL;
-+
-+	LOG_FUNC_CALLED(ctx);
-+
-+	/* Delete fingerprint */
-+	sc_log(ctx, "Delete fingerprints");
-+	r = pgp_put_data(card, 0xC6 + key_id, NULL, 0);
-+	LOG_TEST_RET(ctx, r, "Failed to delete fingerprints");
-+	/* Delete creation time */
-+	sc_log(ctx, "Delete creation time");
-+	r = pgp_put_data(card, 0xCD + key_id, NULL, 0);
-+	LOG_TEST_RET(ctx, r, "Failed to delete creation time");
-+
-+	/* Rewrite Extended Header List */
-+	sc_log(ctx, "Rewrite Extended Header List");
-+
-+	if (key_id == 1)
-+		data = "\x4D\x02\xB6";
-+	else if (key_id == 2)
-+		data = "\x4D\x02\xB8";
-+	else if (key_id == 3)
-+		data = "\x4D\x02\xA4";
-+	else
-+		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
-+
-+	r = pgp_put_data(card, 0x4D, data, strlen(data) + 1);
-+
-+	LOG_FUNC_RETURN(ctx, r);
-+}
-+
-+
- /* ABI: DELETE FILE */
- static int
- pgp_delete_file(sc_card_t *card, const sc_path_t *path)
-@@ -2442,6 +2480,7 @@ pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- 	struct pgp_priv_data *priv = DRVDATA(card);
- 	struct blob *blob;
- 	sc_file_t *file;
-+	u8 key_id;
- 	int r;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -2457,10 +2496,20 @@ pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- 	if (blob == priv->mf)
- 		LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
- 
--	if (file->id == 0xB601 || file->id == 0xB801 || file->id == 0xA401) {
-+	if (card->type != SC_CARD_TYPE_OPENPGP_GNUK &&
-+	    (file->id == 0xB601 || file->id == 0xB801 || file->id == 0xA401)) {
- 		/* These tags are just symbolic. We don't really delete it. */
- 		r = SC_SUCCESS;
- 	}
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB601) {
-+		r = gnuk_delete_key(card, 1);
-+	}
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB801) {
-+		r = gnuk_delete_key(card, 2);
-+	}
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xA401) {
-+		r = gnuk_delete_key(card, 3);
-+	}
- 	else {
- 		/* call pgp_put_data() with zero-sized NULL-buffer to zap the DO contents */
- 		r = pgp_put_data(card, file->id, NULL, 0);
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0016-OpenPGP-Correct-parameter-checking.patch b/trunk/package/feeds/packages/opensc/patches/0016-OpenPGP-Correct-parameter-checking.patch
deleted file mode 100644
index 76c8624e..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0016-OpenPGP-Correct-parameter-checking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ee23d262768e7e54ed0fc554bc0b869c65868ace Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Tue, 16 Apr 2013 10:19:34 +0700
-Subject: [PATCH 16/26] OpenPGP: Correct parameter checking.
-
----
- src/libopensc/card-openpgp.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 4d0500d..beeee83 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -1223,6 +1223,8 @@ static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- 		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
- 		/* Check response */
- 		r = sc_check_sw(card, apdu.sw1, apdu.sw2);
-+		if (r < 0)
-+			LOG_FUNC_RETURN(card->ctx, r);
- 		LOG_FUNC_RETURN(card->ctx, length);
- 	}
- 
-@@ -2446,6 +2448,11 @@ gnuk_delete_key(sc_card_t *card, u8 key_id)
- 
- 	LOG_FUNC_CALLED(ctx);
- 
-+	if (key_id < 1 || key_id > 3) {
-+		sc_log(ctx, "Key ID %d is invalid. Should be 1, 2 or 3.", key_id);
-+		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
-+	}
-+
- 	/* Delete fingerprint */
- 	sc_log(ctx, "Delete fingerprints");
- 	r = pgp_put_data(card, 0xC6 + key_id, NULL, 0);
-@@ -2464,8 +2471,6 @@ gnuk_delete_key(sc_card_t *card, u8 key_id)
- 		data = "\x4D\x02\xB8";
- 	else if (key_id == 3)
- 		data = "\x4D\x02\xA4";
--	else
--		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
- 
- 	r = pgp_put_data(card, 0x4D, data, strlen(data) + 1);
- 
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0017-OpenPGP-Make-code-neater.patch b/trunk/package/feeds/packages/opensc/patches/0017-OpenPGP-Make-code-neater.patch
deleted file mode 100644
index 2bb6fcca..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0017-OpenPGP-Make-code-neater.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f4aec38233010953cea72c367bccc71c3687b2f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Tue, 16 Apr 2013 16:02:17 +0700
-Subject: [PATCH 17/26] OpenPGP: Make code neater
-
----
- src/libopensc/card-openpgp.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index beeee83..ca0d01b 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -1222,10 +1222,7 @@ static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- 		r = sc_transmit_apdu(card, &apdu);
- 		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
- 		/* Check response */
--		r = sc_check_sw(card, apdu.sw1, apdu.sw2);
--		if (r < 0)
--			LOG_FUNC_RETURN(card->ctx, r);
--		LOG_FUNC_RETURN(card->ctx, length);
-+		LOG_TEST_RET(card->ctx, sc_check_sw(card, apdu.sw1, apdu.sw2), "Certificate writing failed");
- 	}
- 
- 	/* Ref: gnuk_put_binary_libusb.py and gnuk_token.py in Gnuk source tree */
-@@ -1262,8 +1259,7 @@ static int gnuk_write_certificate(sc_card_t *card, const u8 *buf, size_t length)
- 		r = sc_transmit_apdu(card, &apdu);
- 		LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
- 		/* Check response */
--		r = sc_check_sw(card, apdu.sw1, apdu.sw2);
--		LOG_TEST_RET(card->ctx, r, "UPDATE BINARY returned error");
-+		LOG_TEST_RET(card->ctx, sc_check_sw(card, apdu.sw1, apdu.sw2), "UPDATE BINARY returned error");
- 
- 		/* To next part */
- 		i++;
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0018-Move-declaration-to-top-of-block.patch b/trunk/package/feeds/packages/opensc/patches/0018-Move-declaration-to-top-of-block.patch
deleted file mode 100644
index 774ed58a..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0018-Move-declaration-to-top-of-block.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c84c84169f7a73eab27f6a9b13b77432baa5c3f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Wed, 8 May 2013 16:51:21 +0700
-Subject: [PATCH 18/26] Move declaration to top of block.
-
----
- src/libopensc/card-openpgp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index ca0d01b..037ef73 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -738,6 +738,7 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
- 		u8 	buffer[2048];
- 		size_t	buf_len = (card->caps & SC_CARD_CAP_APDU_EXT)
- 				  ? sizeof(buffer) : 256;
-+		int r = SC_SUCCESS;
- 
- 		/* Buffer length for certificate */
- 		if (blob->id == DO_CERT && priv->max_cert_size > 0) {
-@@ -751,7 +752,7 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
- 			buf_len = MAXLEN_RESP_PUBKEY_GNUK;
- 		}
- 
--		int	r = blob->info->get_fn(card, blob->id, buffer, buf_len);
-+		r = blob->info->get_fn(card, blob->id, buffer, buf_len);
- 
- 		if (r < 0) {	/* an error occurred */
- 			blob->status = r;
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0019-OpenPGP-Make-indentation-consistent-space-tab.patch b/trunk/package/feeds/packages/opensc/patches/0019-OpenPGP-Make-indentation-consistent-space-tab.patch
deleted file mode 100644
index 3702d61b..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0019-OpenPGP-Make-indentation-consistent-space-tab.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From c6abf7976f64be5191dc80fecdbcb07daab7a2e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 3 Nov 2013 01:45:56 +0800
-Subject: [PATCH 19/26] OpenPGP: Make indentation consistent (space -> tab).
-
----
- src/libopensc/card-openpgp.c | 22 ++++++++---------
- src/tools/openpgp-tool.c     | 56 ++++++++++++++++++++++----------------------
- 2 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 037ef73..ae40940 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -192,12 +192,12 @@ static struct do_info		pgp1_objects[] = {	/* OpenPGP card spec 1.1 */
- 	{ 0x5f35, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  NULL,               sc_put_data },
- 	{ 0x5f50, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  sc_get_data,        sc_put_data },
- 	{ 0x7f49, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, NULL,               NULL        },
--	{ 0xa400, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER,  pgp_get_pubkey,     NULL        },
--	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
--	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER,  pgp_get_pubkey,     NULL        },
--	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
--	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER,  pgp_get_pubkey,     NULL        },
--	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
-+	{ 0xa400, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
- 	{ 0, 0, 0, NULL, NULL },
- };
- 
-@@ -253,11 +253,11 @@ static struct do_info		pgp2_objects[] = {	/* OpenPGP card spec 2.0 */
- 	/* The 0xA401, 0xB601, 0xB801 are just symbolic, it does not represent any real DO.
- 	 * However, their R/W access condition may block the process of importing key in pkcs15init.
- 	 * So we set their accesses condition as WRITE_PIN3 (writable). */
--	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
--	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER,  pgp_get_pubkey,     NULL        },
--	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
--	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER,  pgp_get_pubkey,     NULL        },
--	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3, pgp_get_pubkey_pem, NULL        },
-+	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
- 	{ 0, 0, 0, NULL, NULL },
- };
- 
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index 374819a..a0334ca 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -37,11 +37,11 @@
- #include "util.h"
- #include "libopensc/log.h"
- 
--#define	OPT_RAW		256
--#define	OPT_PRETTY	257
--#define	OPT_VERIFY	258
--#define	OPT_PIN	    259
--#define	OPT_DELKEY  260
-+#define OPT_RAW     256
-+#define OPT_PRETTY  257
-+#define OPT_VERIFY  258
-+#define OPT_PIN     259
-+#define OPT_DELKEY  260
- 
- /* define structures */
- struct ef_name_map {
-@@ -142,10 +142,10 @@ static const struct ef_name_map openpgp_data[] = {
- static void show_version(void)
- {
- 	fprintf(stderr,
--		"openpgp-tool - OpenPGP card utility version " PACKAGE_VERSION "\n"
--		"\n"
--		"Copyright (c) 2012 Peter Marschall <peter@adpm.de>\n"
--		"Licensed under LGPL v2\n");
-+	        "openpgp-tool - OpenPGP card utility version " PACKAGE_VERSION "\n"
-+	        "\n"
-+	        "Copyright (c) 2012 Peter Marschall <peter@adpm.de>\n"
-+	        "Licensed under LGPL v2\n");
- }
- 
- 
-@@ -176,16 +176,16 @@ static char *prettify_language(char *str)
- {
- 	if (str != NULL) {
- 		switch (strlen(str)) {
--			case 8:	memmove(str+7, str+6, 1+strlen(str+6));
-+			case 8: memmove(str+7, str+6, 1+strlen(str+6));
- 				str[6] = ',';
- 				/* fall through */
--			case 6:	memmove(str+5, str+4, 1+strlen(str+4));
-+			case 6: memmove(str+5, str+4, 1+strlen(str+4));
- 				str[4] = ',';
- 				/* fall through */
--			case 4:	memmove(str+3, str+2, 1+strlen(str+2));
-+			case 4: memmove(str+3, str+2, 1+strlen(str+2));
- 				str[2] = ',';
- 				/* fall through */
--			case 2:  return str;
-+			case 2: return str;
- 		}
- 	}
- 	return NULL;
-@@ -197,10 +197,10 @@ static char *prettify_gender(char *str)
- {
- 	if (str != NULL) {
- 		switch (*str) {
--			case '0':  return "unknown";
--			case '1':  return "male";
--			case '2':  return "female";
--			case '9':  return "not applicable";
-+			case '0': return "unknown";
-+			case '1': return "male";
-+			case '2': return "female";
-+			case '9': return "not applicable";
- 		}
- 	}
- 	return NULL;
-@@ -218,7 +218,7 @@ static void display_data(const struct ef_name_map *mapping, char *value)
- 				char *envvar;
- 
- 				envvar = malloc(strlen(mapping->env_name) +
--						strlen(value) + 2);
-+				                strlen(value) + 2);
- 				if (envvar != NULL) {
- 					strcpy(envvar, mapping->env_name);
- 					strcat(envvar, "=");
-@@ -346,20 +346,20 @@ static int do_userinfo(sc_card_t *card)
- 		if (!count)
- 			continue;
- 
--		if (count > (int)sizeof(buf) - 1)   {
-+		if (count > (int)sizeof(buf) - 1) {
- 			fprintf(stderr, "Too small buffer to read the OpenPGP data\n");
- 			return EXIT_FAILURE;
- 		}
--	
--        	r = sc_read_binary(card, 0, buf, count, 0);
--               	if (r < 0) {
-+
-+		r = sc_read_binary(card, 0, buf, count, 0);
-+		if (r < 0) {
- 			fprintf(stderr, "%s: read failed - %s\n", openpgp_data[i].ef, sc_strerror(r));
- 			return EXIT_FAILURE;
--        	}
--               	if (r != count) {
--                        fprintf(stderr, "%s: expecting %d, got only %d bytes\n", openpgp_data[i].ef, count, r);
-+		}
-+		if (r != count) {
-+			fprintf(stderr, "%s: expecting %d, got only %d bytes\n", openpgp_data[i].ef, count, r);
- 			return EXIT_FAILURE;
--        	}
-+		}
- 
- 		buf[count] = '\0';
- 
-@@ -628,7 +628,7 @@ int main(int argc, char **argv)
- 	r = sc_context_create(&ctx, &ctx_param);
- 	if (r) {
- 		util_fatal("failed to establish context: %s\n",
--			sc_strerror(r));
-+		           sc_strerror(r));
- 		return EXIT_FAILURE;
- 	}
- 
-@@ -640,7 +640,7 @@ int main(int argc, char **argv)
- 	r = util_connect_card(ctx, &card, opt_reader, opt_wait, verbose);
- 	if (r) {
- 		util_fatal("failed to connect to card: %s\n",
--			sc_strerror(r));
-+		           sc_strerror(r));
- 		return EXIT_FAILURE;
- 	}
- 
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0020-OpenPGP-Don-t-use-sc_log-in-openpgp-tool.patch b/trunk/package/feeds/packages/opensc/patches/0020-OpenPGP-Don-t-use-sc_log-in-openpgp-tool.patch
deleted file mode 100644
index b73826fa..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0020-OpenPGP-Don-t-use-sc_log-in-openpgp-tool.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 9acf5c1ad7d8a32b472203d3bd8860ea2cbde0e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 3 Nov 2013 02:53:35 +0800
-Subject: [PATCH 20/26] OpenPGP: Don't use sc_log in openpgp-tool.
-
----
- src/tools/openpgp-tool.c | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index a0334ca..505abd9 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -414,8 +414,6 @@ int do_genkey(sc_card_t *card, u8 key_id, unsigned int key_len)
- 	sc_path_t path;
- 	sc_file_t *file;
- 
--	LOG_FUNC_CALLED(card->ctx);
--
- 	if (key_id < 1 || key_id > 3) {
- 		printf("Unknown key ID %d.\n", key_id);
- 		return 1;
-@@ -479,14 +477,14 @@ int delete_key_gnuk(sc_card_t *card, u8 key_id)
- 	u8 *data = NULL;
- 
- 	/* Delete fingerprint */
--	sc_log(ctx, "Delete fingerprints");
-+	fprintf(stdout, "Delete fingerprints");
- 	r |= sc_put_data(card, 0xC6 + key_id, NULL, 0);
- 	/* Delete creation time */
--	sc_log(ctx, "Delete creation time");
-+	fprintf(stdout, "Delete creation time");
- 	r |= sc_put_data(card, 0xCD + key_id, NULL, 0);
- 
- 	/* Rewrite Extended Header List */
--	sc_log(ctx, "Rewrite Extended Header List");
-+	fprintf(stdout, "Rewrite Extended Header List");
- 
- 	if (key_id == 1)
- 		data = "\x4D\x02\xB6";
-@@ -534,15 +532,18 @@ int delete_key_openpgp(sc_card_t *card, u8 key_id)
- 		/* Build APDU from binary array */
- 		r = sc_bytes2apdu(card->ctx, buf, len0, &apdu);
- 		if (r) {
--			sc_log(ctx, "Failed to build APDU");
--			LOG_FUNC_RETURN(ctx, SC_ERROR_INTERNAL);
-+			fprintf(stderr, "Failed to build APDU: %s\n", sc_strerror(r));
-+			return r;
- 		}
- 		apdu.resp = rbuf;
- 		apdu.resplen = sizeof(rbuf);
- 
- 		/* Send APDU to card */
- 		r = sc_transmit_apdu(card, &apdu);
--		LOG_TEST_RET(ctx, r, "Transmiting APDU failed");
-+		if (r) {
-+			fprintf(stderr, "Transmiting APDU failed: %s\n", sc_strerror(r));
-+			return r;
-+		}
- 	}
- 	/* TODO: Rewrite Extended Header List.
- 	 * Not support by OpenGPG v2 yet */
-@@ -557,7 +558,7 @@ int delete_key(sc_card_t *card, u8 key_id)
- 	LOG_FUNC_CALLED(ctx);
- 	/* Check key ID */
- 	if (key_id < 1 || key_id > 3) {
--		sc_log(ctx, "Invalid key ID %d", key_id);
-+		fprintf(stderr, "Invalid key ID %d", key_id);
- 		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
- 	}
- 
-@@ -649,7 +650,7 @@ int main(int argc, char **argv)
- 	    (card->type != SC_CARD_TYPE_OPENPGP_V2) &&
- 	    (card->type != SC_CARD_TYPE_OPENPGP_GNUK)) {
- 		util_error("not an OpenPGP card");
--		sc_log(card->ctx, "Card type %X", card->type);
-+		fprintf(stderr, "Card type %X\n", card->type);
- 		exit_status = EXIT_FAILURE;
- 		goto out;
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0021-OpenPGP-Don-t-reimplement-gnuk_delete_key-in-openpgp.patch b/trunk/package/feeds/packages/opensc/patches/0021-OpenPGP-Don-t-reimplement-gnuk_delete_key-in-openpgp.patch
deleted file mode 100644
index dc8fe849..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0021-OpenPGP-Don-t-reimplement-gnuk_delete_key-in-openpgp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 0fdbf868976172486af210accafbab163452ff78 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 3 Nov 2013 11:26:25 +0800
-Subject: [PATCH 21/26] OpenPGP: Don't reimplement gnuk_delete_key in
- openpgp-tool.
-
----
- src/tools/openpgp-tool.c | 64 ++++++------------------------------------------
- 1 file changed, 8 insertions(+), 56 deletions(-)
-
-diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
-index 505abd9..a7796e7 100644
---- a/src/tools/openpgp-tool.c
-+++ b/src/tools/openpgp-tool.c
-@@ -468,38 +468,6 @@ int do_verify(sc_card_t *card, char *type, char *pin)
- }
- 
- /**
-- * Delete key, for Gnuk.
-- **/
--int delete_key_gnuk(sc_card_t *card, u8 key_id)
--{
--	sc_context_t *ctx = card->ctx;
--	int r = SC_SUCCESS;
--	u8 *data = NULL;
--
--	/* Delete fingerprint */
--	fprintf(stdout, "Delete fingerprints");
--	r |= sc_put_data(card, 0xC6 + key_id, NULL, 0);
--	/* Delete creation time */
--	fprintf(stdout, "Delete creation time");
--	r |= sc_put_data(card, 0xCD + key_id, NULL, 0);
--
--	/* Rewrite Extended Header List */
--	fprintf(stdout, "Rewrite Extended Header List");
--
--	if (key_id == 1)
--		data = "\x4D\x02\xB6";
--	else if (key_id == 2)
--		data = "\x4D\x02\xB8";
--	else if (key_id == 3)
--		data = "\x4D\x02\xA4";
--	else
--		return SC_ERROR_INVALID_ARGUMENTS;
--
--	r |= sc_put_data(card, 0x4D, data, strlen(data) + 1);
--	return r;
--}
--
--/**
-  * Delete key, for OpenPGP card.
-  * This function is not complete and is reserved for future version (> 2) of OpenPGP card.
-  **/
-@@ -547,32 +515,13 @@ int delete_key_openpgp(sc_card_t *card, u8 key_id)
- 	}
- 	/* TODO: Rewrite Extended Header List.
- 	 * Not support by OpenGPG v2 yet */
--	LOG_FUNC_RETURN(ctx, r);
--}
--
--int delete_key(sc_card_t *card, u8 key_id)
--{
--	sc_context_t *ctx = card->ctx;
--	int r;
--
--	LOG_FUNC_CALLED(ctx);
--	/* Check key ID */
--	if (key_id < 1 || key_id > 3) {
--		fprintf(stderr, "Invalid key ID %d", key_id);
--		LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
--	}
--
--	if (card->type == SC_CARD_TYPE_OPENPGP_GNUK)
--		r = delete_key_gnuk(card, key_id);
--	else
--		r = delete_key_openpgp(card, key_id);
--
--	LOG_FUNC_RETURN(ctx, r);
-+	return r;
- }
- 
- int do_delete_key(sc_card_t *card, u8 key_id)
- {
- 	sc_context_t *ctx = card->ctx;
-+	sc_path_t path;
- 	int r = SC_SUCCESS;
- 
- 	/* Currently, only Gnuk supports deleting keys */
-@@ -586,13 +535,16 @@ int do_delete_key(sc_card_t *card, u8 key_id)
- 		return SC_ERROR_INVALID_ARGUMENTS;
- 	}
- 	if (key_id == 1 || key_id == 'a') {
--		r |= delete_key(card, 1);
-+		sc_format_path("B601", &path);
-+		r |= sc_delete_file(card, &path);
- 	}
- 	if (key_id == 2 || key_id == 'a') {
--		r |= delete_key(card, 2);
-+		sc_format_path("B801", &path);
-+		r |= sc_delete_file(card, &path);
- 	}
- 	if (key_id == 3 || key_id == 'a') {
--		r |= delete_key(card, 3);
-+		sc_format_path("A401", &path);
-+		r |= sc_delete_file(card, &path);
- 	}
- 	return r;
- }
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0022-OpenPGP-Use-directly-binary-array-of-APDUs-for-ERASE.patch b/trunk/package/feeds/packages/opensc/patches/0022-OpenPGP-Use-directly-binary-array-of-APDUs-for-ERASE.patch
deleted file mode 100644
index 6297783e..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0022-OpenPGP-Use-directly-binary-array-of-APDUs-for-ERASE.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 0cd2a488d86006bb2740a4e73e7a0d859e1bf33c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 13 Jul 2014 17:37:59 +0800
-Subject: [PATCH 22/26] OpenPGP: Use directly binary array of APDUs for ERASE
- command.
-
-I used a string presentation before and it needed an extra conversion step.
----
- src/libopensc/card-openpgp.c | 47 +++++++++++++++++++++++---------------------
- 1 file changed, 25 insertions(+), 22 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index ae40940..724fe73 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -2347,24 +2347,27 @@ out:
- static int pgp_erase_card(sc_card_t *card)
- {
- 	sc_context_t *ctx = card->ctx;
--	u8 *apdustring[10] = {
--		"00:20:00:81:08:40:40:40:40:40:40:40:40",
--		"00:20:00:81:08:40:40:40:40:40:40:40:40",
--		"00:20:00:81:08:40:40:40:40:40:40:40:40",
--		"00:20:00:81:08:40:40:40:40:40:40:40:40",
--		"00:20:00:83:08:40:40:40:40:40:40:40:40",
--		"00:20:00:83:08:40:40:40:40:40:40:40:40",
--		"00:20:00:83:08:40:40:40:40:40:40:40:40",
--		"00:20:00:83:08:40:40:40:40:40:40:40:40",
--		"00:e6:00:00",
--		"00:44:00:00"
-+	/* Special series of commands to erase OpenPGP card,
-+	 * according to https://www.crypto-stick.com/en/faq
-+	 * (How to reset a Crypto Stick? question).
-+	 * Gnuk is known not to support this feature. */
-+	u8 apdu_binaries[10][13] = {
-+		{0, 0x20, 0, 0x81, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x81, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x81, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x81, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x83, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x83, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x83, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0x20, 0, 0x83, 0x08, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40},
-+		{0, 0xe6, 0, 0},
-+		{0, 0x44, 0, 0}
- 	};
-+	u8 apdu_lens[10] = {13, 13, 13, 13, 13, 13, 13, 13, 4, 4};
- 	u8 buf[SC_MAX_APDU_BUFFER_SIZE];
- 	u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
- 	sc_apdu_t apdu;
--	size_t len0;
--	int commandsnum = 10;
--	int i, r;
-+	int i, l, r;
- 
- 	LOG_FUNC_CALLED(ctx);
- 
-@@ -2376,17 +2379,17 @@ static int pgp_erase_card(sc_card_t *card)
- 	sc_log(ctx, "Card is OpenPGP v2. Erase card.");
- 
- 	/* Iterate over 10 commands above */
--	for (i = 0; i < commandsnum; i++) {
--		/* Convert the string to binary array */
--		len0 = sizeof(buf);
--		sc_hex_to_bin(apdustring[i], buf, &len0);
--		printf("Sending: ");
--		for (r = 0; r < len0; r++)
--			printf("%02X ", buf[r]);
-+	for (i = 0; i < sizeof(apdu_lens); i++) {
-+		/* Length of the binary array of the current command */
-+		l = apdu_lens[i];
-+		/* Print the command to console */
-+		printf("Sending %d: ", i);
-+		for (r = 0; r < l; r++)
-+			printf("%02X ", apdu_binaries[i][r]);
- 		printf("\n");
- 
- 		/* Build APDU from binary array */
--		r = sc_bytes2apdu(card->ctx, buf, len0, &apdu);
-+		r = sc_bytes2apdu(card->ctx, apdu_binaries[i], l, &apdu);
- 		if (r) {
- 			sc_log(ctx, "Failed to build APDU");
- 			LOG_FUNC_RETURN(ctx, SC_ERROR_INTERNAL);
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0023-OpenPGP-Rename-private-blob-type-to-avoid-confusing-.patch b/trunk/package/feeds/packages/opensc/patches/0023-OpenPGP-Rename-private-blob-type-to-avoid-confusing-.patch
deleted file mode 100644
index f859f7cf..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0023-OpenPGP-Rename-private-blob-type-to-avoid-confusing-.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From 6f56ea4cfc52323002d818731a50a31e863b6843 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 13 Jul 2014 19:41:36 +0800
-Subject: [PATCH 23/26] OpenPGP: Rename private "blob" type to avoid confusing
- with variable name.
-
-This name has been used for both data type and variable name of that
-type.
----
- src/libopensc/card-openpgp.c | 96 ++++++++++++++++++++++----------------------
- 1 file changed, 49 insertions(+), 47 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 724fe73..ca3173c 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -111,9 +111,9 @@ enum _card_state {
- 	CARD_STATE_ACTIVATED      = 0x05
- };
- 
--struct blob {
--	struct blob *	next;	/* pointer to next sibling */
--	struct blob *	parent;	/* pointer to parent */
-+typedef struct pgp_blob {
-+	struct pgp_blob *	next;	/* pointer to next sibling */
-+	struct pgp_blob *	parent;	/* pointer to parent */
- 	struct do_info *info;
- 
- 	sc_file_t *	file;
-@@ -122,8 +122,8 @@ struct blob {
- 
- 	unsigned char *	data;
- 	unsigned int	len;
--	struct blob *	files;	/* pointer to 1st child */
--};
-+	struct pgp_blob *	files;	/* pointer to 1st child */
-+} pgp_blob_t;
- 
- struct do_info {
- 	unsigned int	id;		/* ID of the DO in question */
-@@ -141,12 +141,12 @@ struct do_info {
- 
- static int		pgp_get_card_features(sc_card_t *card);
- static int		pgp_finish(sc_card_t *card);
--static void		pgp_iterate_blobs(struct blob *, int, void (*func)());
-+static void		pgp_iterate_blobs(pgp_blob_t *, int, void (*func)());
- 
--static int		pgp_get_blob(sc_card_t *card, struct blob *blob,
--				 unsigned int id, struct blob **ret);
--static struct blob *	pgp_new_blob(sc_card_t *, struct blob *, unsigned int, sc_file_t *);
--static void		pgp_free_blob(struct blob *);
-+static int		pgp_get_blob(sc_card_t *card, pgp_blob_t *blob,
-+				 unsigned int id, pgp_blob_t **ret);
-+static pgp_blob_t *	pgp_new_blob(sc_card_t *, pgp_blob_t *, unsigned int, sc_file_t *);
-+static void		pgp_free_blob(pgp_blob_t *);
- static int		pgp_get_pubkey(sc_card_t *, unsigned int,
- 				u8 *, size_t);
- static int		pgp_get_pubkey_pem(sc_card_t *, unsigned int,
-@@ -272,8 +272,8 @@ static struct do_info		pgp2_objects[] = {	/* OpenPGP card spec 2.0 */
- 
- #define DRVDATA(card)        ((struct pgp_priv_data *) ((card)->drv_data))
- struct pgp_priv_data {
--	struct blob *		mf;
--	struct blob *		current;	/* currently selected file */
-+	pgp_blob_t *		mf;
-+	pgp_blob_t *		current;	/* currently selected file */
- 
- 	enum _version		bcd_version;
- 	struct do_info		*pgp_objects;
-@@ -311,7 +311,7 @@ pgp_init(sc_card_t *card)
- 	sc_file_t	*file = NULL;
- 	struct do_info	*info;
- 	int		r;
--	struct blob 	*child = NULL;
-+	pgp_blob_t 	*child = NULL;
- 
- 	LOG_FUNC_CALLED(card->ctx);
- 
-@@ -389,7 +389,7 @@ pgp_get_card_features(sc_card_t *card)
- 	unsigned char *hist_bytes = card->atr.value;
- 	size_t atr_len = card->atr.len;
- 	size_t i = 0;
--	struct blob *blob, *blob6e, *blob73;
-+	pgp_blob_t *blob, *blob6e, *blob73;
- 
- 	/* parse card capabilities from historical bytes */
- 	while ((i < atr_len) && (hist_bytes[i] != 0x73))
-@@ -526,7 +526,7 @@ pgp_finish(sc_card_t *card)
- 
- /* internal: fill a blob's data */
- static int
--pgp_set_blob(struct blob *blob, const u8 *data, size_t len)
-+pgp_set_blob(pgp_blob_t *blob, const u8 *data, size_t len)
- {
- 	if (blob->data)
- 		free(blob->data);
-@@ -620,16 +620,16 @@ pgp_attach_acl(sc_card_t *card, sc_file_t *file, struct do_info *info)
- }
- 
- /* internal: append a blob to the list of children of a given parent blob */
--static struct blob *
--pgp_new_blob(sc_card_t *card, struct blob *parent, unsigned int file_id,
-+static pgp_blob_t *
-+pgp_new_blob(sc_card_t *card, pgp_blob_t *parent, unsigned int file_id,
- 		sc_file_t *file)
- {
--	struct blob *blob = NULL;
-+	pgp_blob_t *blob = NULL;
- 
- 	if (file == NULL)
- 		return NULL;
- 
--	if ((blob = calloc(1, sizeof(struct blob))) != NULL) {
-+	if ((blob = calloc(1, sizeof(pgp_blob_t))) != NULL) {
- 		struct pgp_priv_data *priv = DRVDATA (card);
- 		struct do_info *info;
- 
-@@ -643,7 +643,7 @@ pgp_new_blob(sc_card_t *card, struct blob *parent, unsigned int file_id,
- 		blob->parent = parent;
- 
- 		if (parent != NULL) {
--			struct blob **p;
-+			pgp_blob_t **p;
- 
- 			/* set file's path = parent's path + file's id */
- 			blob->file->path = parent->file->path;
-@@ -681,11 +681,11 @@ pgp_new_blob(sc_card_t *card, struct blob *parent, unsigned int file_id,
- 
- /* internal: free a blob including its content */
- static void
--pgp_free_blob(struct blob *blob)
-+pgp_free_blob(pgp_blob_t *blob)
- {
- 	if (blob) {
- 		if (blob->parent) {
--			struct blob **p;
-+			pgp_blob_t **p;
- 
- 			/* remove blob from list of parent's children */
- 			for (p = &blob->parent->files; *p != NULL && *p != blob; p = &(*p)->next)
-@@ -705,14 +705,14 @@ pgp_free_blob(struct blob *blob)
- 
- /* internal: iterate through the blob tree, calling a function for each blob */
- static void
--pgp_iterate_blobs(struct blob *blob, int level, void (*func)())
-+pgp_iterate_blobs(pgp_blob_t *blob, int level, void (*func)())
- {
- 	if (blob) {
- 		if (level > 0) {
--			struct blob *child = blob->files;
-+			pgp_blob_t *child = blob->files;
- 
- 			while (child != NULL) {
--				struct blob *next = child->next;
-+				pgp_blob_t *next = child->next;
- 
- 				pgp_iterate_blobs(child, level-1, func);
- 				child = next;
-@@ -725,7 +725,7 @@ pgp_iterate_blobs(struct blob *blob, int level, void (*func)())
- 
- /* internal: read a blob's contents from card */
- static int
--pgp_read_blob(sc_card_t *card, struct blob *blob)
-+pgp_read_blob(sc_card_t *card, pgp_blob_t *blob)
- {
- 	struct pgp_priv_data *priv = DRVDATA (card);
- 
-@@ -772,7 +772,7 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
-  * The OpenPGP card has a TLV encoding according ASN.1 BER-encoding rules.
-  */
- static int
--pgp_enumerate_blob(sc_card_t *card, struct blob *blob)
-+pgp_enumerate_blob(sc_card_t *card, pgp_blob_t *blob)
- {
- 	const u8	*in;
- 	int		r;
-@@ -789,7 +789,7 @@ pgp_enumerate_blob(sc_card_t *card, struct blob *blob)
- 		unsigned int	cla, tag, tmptag;
- 		size_t		len;
- 		const u8	*data = in;
--		struct blob	*new;
-+		pgp_blob_t	*new;
- 
- 		r = sc_asn1_read_tag(&data, blob->len - (in - blob->data),
- 					&cla, &tag, &len);
-@@ -819,10 +819,10 @@ pgp_enumerate_blob(sc_card_t *card, struct blob *blob)
- 
- /* internal: find a blob by ID below a given parent, filling its contents when necessary */
- static int
--pgp_get_blob(sc_card_t *card, struct blob *blob, unsigned int id,
--		struct blob **ret)
-+pgp_get_blob(sc_card_t *card, pgp_blob_t *blob, unsigned int id,
-+		pgp_blob_t **ret)
- {
--	struct blob		*child;
-+	pgp_blob_t		*child;
- 	int			r;
- 
- 	if ((r = pgp_enumerate_blob(card, blob)) < 0)
-@@ -858,10 +858,10 @@ pgp_get_blob(sc_card_t *card, struct blob *blob, unsigned int id,
- 
- /* Internal: search recursively for a blob by ID below a given root */
- static int
--pgp_seek_blob(sc_card_t *card, struct blob *root, unsigned int id,
--		struct blob **ret)
-+pgp_seek_blob(sc_card_t *card, pgp_blob_t *root, unsigned int id,
-+		pgp_blob_t **ret)
- {
--	struct blob	*child;
-+	pgp_blob_t	*child;
- 	int			r;
- 
- 	if ((r = pgp_get_blob(card, root, id, ret)) == 0)
-@@ -883,11 +883,11 @@ pgp_seek_blob(sc_card_t *card, struct blob *root, unsigned int id,
- }
- 
- /* internal: find a blob by tag - pgp_seek_blob with optimizations */
--static struct blob *
-+static pgp_blob_t *
- pgp_find_blob(sc_card_t *card, unsigned int tag)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *blob = NULL;
-+	pgp_blob_t *blob = NULL;
- 	int r;
- 
- 	/* Check if current selected blob is which we want to test*/
-@@ -941,7 +941,7 @@ static int
- pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob	*blob;
-+	pgp_blob_t	*blob;
- 	unsigned int	path_start = 0;
- 	unsigned int	n;
- 	sc_path_t dummy_path;
-@@ -1022,7 +1022,7 @@ static int
- pgp_list_files(sc_card_t *card, u8 *buf, size_t buflen)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob	*blob;
-+	pgp_blob_t	*blob;
- 	unsigned int	k;
- 	int		r;
- 
-@@ -1058,7 +1058,7 @@ pgp_read_binary(sc_card_t *card, unsigned int idx,
- 		u8 *buf, size_t count, unsigned long flags)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob	*blob;
-+	pgp_blob_t	*blob;
- 	int		r;
- 
- 	LOG_FUNC_CALLED(card->ctx);
-@@ -1134,7 +1134,7 @@ static int
- pgp_get_pubkey_pem(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob	*blob, *mod_blob, *exp_blob;
-+	pgp_blob_t	*blob, *mod_blob, *exp_blob;
- 	sc_pkcs15_pubkey_t pubkey;
- 	u8		*data;
- 	size_t		len;
-@@ -1329,7 +1329,7 @@ static int
- pgp_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t buf_len)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *affected_blob = NULL;
-+	pgp_blob_t *affected_blob = NULL;
- 	struct do_info *dinfo = NULL;
- 	int r;
- 
-@@ -1603,7 +1603,7 @@ static int
- pgp_update_new_algo_attr(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_info)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *algo_blob;
-+	pgp_blob_t *algo_blob;
- 	unsigned int old_modulus_len;     /* Measured in bit */
- 	unsigned int old_exponent_len;
- 	const unsigned int tag = 0x00C0 | key_info->keytype;
-@@ -1708,7 +1708,7 @@ pgp_calculate_and_store_fingerprint(sc_card_t *card, time_t ctime,
- 	u8 *p; /* Use this pointer to set fp_buffer content */
- 	size_t pk_packet_len;
- 	unsigned int tag;
--	struct blob *fpseq_blob;
-+	pgp_blob_t *fpseq_blob;
- 	u8 *newdata;
- 	int r;
- 
-@@ -1797,7 +1797,7 @@ pgp_update_pubkey_blob(sc_card_t *card, u8* modulus, size_t modulus_len,
-                        u8* exponent, size_t exponent_len, u8 key_id)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *pk_blob;
-+	pgp_blob_t *pk_blob;
- 	unsigned int blob_id;
- 	sc_pkcs15_pubkey_t pubkey;
- 	u8 *data = NULL;
-@@ -1939,6 +1939,8 @@ static int pgp_update_card_algorithms(sc_card_t *card, sc_cardctl_openpgp_keygen
-  **/
- static int pgp_gen_key(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_info)
- {
-+	struct pgp_priv_data *priv = DRVDATA(card);
-+	pgp_blob_t *algo_blob;
- 	sc_apdu_t apdu;
- 	/* Temporary variables to hold APDU params */
- 	u8 apdu_case;
-@@ -2132,7 +2134,7 @@ pgp_build_extended_header_list(sc_card_t *card, sc_cardctl_openpgp_keystore_info
- 	};
- 	size_t comp_to_add = 3;
- 	size_t req_e_len = 0;     /* The exponent length specified in Algorithm Attributes */
--	struct blob *alat_blob;
-+	pgp_blob_t *alat_blob;
- 	u8 i;
- 	int r;
- 
-@@ -2483,7 +2485,7 @@ static int
- pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *blob;
-+	pgp_blob_t *blob;
- 	sc_file_t *file;
- 	u8 key_id;
- 	int r;
-@@ -2533,7 +2535,7 @@ pgp_update_binary(sc_card_t *card, unsigned int idx,
- 		  const u8 *buf, size_t count, unsigned long flags)
- {
- 	struct pgp_priv_data *priv = DRVDATA(card);
--	struct blob *blob = priv->current;
-+	pgp_blob_t *blob = priv->current;
- 	int r = SC_SUCCESS;
- 
- 	LOG_FUNC_CALLED(card->ctx);
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0024-OpenPGP-Fix-crash-after-accessing-inexistent-file.patch b/trunk/package/feeds/packages/opensc/patches/0024-OpenPGP-Fix-crash-after-accessing-inexistent-file.patch
deleted file mode 100644
index 7d8a0ffc..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0024-OpenPGP-Fix-crash-after-accessing-inexistent-file.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8a87a4ee9107f250254d5c93c6fd62224c400ce7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Mon, 14 Jul 2014 01:30:28 +0800
-Subject: [PATCH 24/26] OpenPGP: Fix crash after accessing inexistent file.
-
----
- src/libopensc/card-openpgp.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index ca3173c..94c69ae 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -973,7 +973,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
- 			 * So we set its size to be the same as max certificate size the card supports. */
- 			(*ret)->size = priv->max_cert_size;
- 		}
--		priv->current = NULL;
- 		LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
- 	}
- 
-@@ -990,7 +989,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
- 		/* This file ID is refered when importing key&certificate via pkcs15init, like above.
- 		 * We pretend to successfully find this inexistent file. */
- 		if (id == 0x4402 || id == 0x5f48) {
--			priv->current = NULL;
- 			if (ret == NULL)
- 				/* No need to return file */
- 				LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
-@@ -1002,7 +1000,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
- 		}
- 
- 		if (r < 0) {	/* failure */
--			priv->current = NULL;
- 			LOG_FUNC_RETURN(card->ctx, r);
- 		}
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0025-Replace-hardcode.patch b/trunk/package/feeds/packages/opensc/patches/0025-Replace-hardcode.patch
deleted file mode 100644
index 0eb750c3..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0025-Replace-hardcode.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From da70a41383e2ab81fbcc89fb1067f5a189e0fb97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
- <ng.hong.quan@gmail.com>
-Date: Sun, 9 Nov 2014 15:58:40 +0700
-Subject: [PATCH 25/26] Replace hardcode.
-
----
- src/libopensc/card-openpgp.c | 72 +++++++++++++++++++++++++-------------------
- 1 file changed, 41 insertions(+), 31 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 94c69ae..1e6e338 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -152,6 +152,24 @@ static int		pgp_get_pubkey(sc_card_t *, unsigned int,
- static int		pgp_get_pubkey_pem(sc_card_t *, unsigned int,
- 				u8 *, size_t);
- 
-+/* The DO holding X.509 certificate is constructed but does not contain child DO.
-+ * We should notice this when building fake file system later. */
-+#define DO_CERT                  0x7f21
-+/* Control Reference Template of private keys. Ref: Section 4.3.3.7 of OpenPGP card v2 spec.
-+ * Here we seen it as DO just for convenient */
-+#define DO_SIGN                  0xb600
-+#define DO_ENCR                  0xb800
-+#define DO_AUTH                  0xa400
-+/* These DO does not exist. They are defined and used just for ease of implementation */
-+#define DO_SIGN_SYM              0xb601
-+#define DO_ENCR_SYM              0xb801
-+#define DO_AUTH_SYM              0xa401
-+/* Maximum length for response buffer when reading pubkey. This value is calculated with
-+ * 4096-bit key length */
-+#define MAXLEN_RESP_PUBKEY       527
-+/* Gnuk only support 1 key length (2048 bit) */
-+#define MAXLEN_RESP_PUBKEY_GNUK  271
-+
- static struct do_info		pgp1_objects[] = {	/* OpenPGP card spec 1.1 */
- 	{ 0x004f, SIMPLE,      READ_ALWAYS | WRITE_NEVER, NULL,               NULL        },
- 	{ 0x005b, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  NULL,               sc_put_data },
-@@ -192,12 +210,12 @@ static struct do_info		pgp1_objects[] = {	/* OpenPGP card spec 1.1 */
- 	{ 0x5f35, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  NULL,               sc_put_data },
- 	{ 0x5f50, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  sc_get_data,        sc_put_data },
- 	{ 0x7f49, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, NULL,               NULL        },
--	{ 0xa400, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
--	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
--	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
--	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
--	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
--	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ DO_AUTH,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
-+	{ DO_AUTH_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
-+	{ DO_SIGN,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
-+	{ DO_SIGN_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
-+	{ DO_ENCR,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
-+	{ DO_ENCR_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
- 	{ 0, 0, 0, NULL, NULL },
- };
- 
-@@ -246,30 +264,21 @@ static struct do_info		pgp2_objects[] = {	/* OpenPGP card spec 2.0 */
- 	{ 0x5f52, SIMPLE,      READ_ALWAYS | WRITE_NEVER, sc_get_data,        NULL        },
- 	/* The 7F21 is constructed DO in spec, but in practice, its content can be retrieved
- 	 * as simple DO (no need to parse TLV). */
--	{ 0x7f21, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  sc_get_data,        sc_put_data },
-+	{ DO_CERT, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  sc_get_data,        sc_put_data },
- 	{ 0x7f48, CONSTRUCTED, READ_NEVER  | WRITE_NEVER, NULL,               NULL        },
- 	{ 0x7f49, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, NULL,               NULL        },
--	{ 0xa400, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
-+	{ DO_AUTH,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
- 	/* The 0xA401, 0xB601, 0xB801 are just symbolic, it does not represent any real DO.
- 	 * However, their R/W access condition may block the process of importing key in pkcs15init.
- 	 * So we set their accesses condition as WRITE_PIN3 (writable). */
--	{ 0xa401, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
--	{ 0xb600, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
--	{ 0xb601, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
--	{ 0xb800, CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL        },
--	{ 0xb801, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL        },
-+	{ DO_AUTH_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
-+	{ DO_SIGN,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
-+	{ DO_SIGN_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
-+	{ DO_ENCR,     CONSTRUCTED, READ_ALWAYS | WRITE_NEVER, pgp_get_pubkey,     NULL   },
-+	{ DO_ENCR_SYM, SIMPLE,      READ_ALWAYS | WRITE_PIN3,  pgp_get_pubkey_pem, NULL   },
- 	{ 0, 0, 0, NULL, NULL },
- };
- 
--/* The DO holding X.509 certificate is constructed but does not contain child DO.
-- * We should notice this when building fake file system later. */
--#define DO_CERT                  0x7f21
--/* Maximum length for response buffer when reading pubkey. This value is calculated with
-- * 4096-bit key length */
--#define MAXLEN_RESP_PUBKEY       527
--/* Gnuk only support 1 key length (2048 bit) */
--#define MAXLEN_RESP_PUBKEY_GNUK  271
--
- #define DRVDATA(card)        ((struct pgp_priv_data *) ((card)->drv_data))
- struct pgp_priv_data {
- 	pgp_blob_t *		mf;
-@@ -747,8 +756,9 @@ pgp_read_blob(sc_card_t *card, pgp_blob_t *blob)
- 
- 		/* Buffer length for Gnuk pubkey */
- 		if (card->type == SC_CARD_TYPE_OPENPGP_GNUK &&
--		    (blob->id == 0xa400 || blob->id == 0xb600 || blob->id == 0xb800
--		     || blob->id == 0xa401 || blob->id == 0xb601 || blob->id == 0xb801)) {
-+		    (blob->id == DO_AUTH || blob->id == DO_SIGN || blob->id == DO_ENCR
-+		     || blob->id == DO_AUTH_SYM || blob->id == DO_SIGN_SYM
-+		     || blob->id == DO_ENCR_SYM)) {
- 			buf_len = MAXLEN_RESP_PUBKEY_GNUK;
- 		}
- 
-@@ -1804,11 +1814,11 @@ pgp_update_pubkey_blob(sc_card_t *card, u8* modulus, size_t modulus_len,
- 	LOG_FUNC_CALLED(card->ctx);
- 
- 	if (key_id == SC_OPENPGP_KEY_SIGN)
--		blob_id = 0xB601;
-+		blob_id = DO_SIGN_SYM;
- 	else if (key_id == SC_OPENPGP_KEY_ENCR)
--		blob_id = 0xB801;
-+		blob_id = DO_ENCR_SYM;
- 	else if (key_id == SC_OPENPGP_KEY_AUTH)
--		blob_id = 0xA401;
-+		blob_id = DO_AUTH_SYM;
- 	else {
- 		sc_log(card->ctx, "Unknown key id %X.", key_id);
- 		LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_ARGUMENTS);
-@@ -2501,17 +2511,17 @@ pgp_delete_file(sc_card_t *card, const sc_path_t *path)
- 		LOG_FUNC_RETURN(card->ctx, SC_ERROR_NOT_SUPPORTED);
- 
- 	if (card->type != SC_CARD_TYPE_OPENPGP_GNUK &&
--	    (file->id == 0xB601 || file->id == 0xB801 || file->id == 0xA401)) {
-+	    (file->id == DO_SIGN_SYM || file->id == DO_ENCR_SYM || file->id == DO_AUTH_SYM)) {
- 		/* These tags are just symbolic. We don't really delete it. */
- 		r = SC_SUCCESS;
- 	}
--	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB601) {
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == DO_SIGN_SYM) {
- 		r = gnuk_delete_key(card, 1);
- 	}
--	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xB801) {
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == DO_ENCR_SYM) {
- 		r = gnuk_delete_key(card, 2);
- 	}
--	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == 0xA401) {
-+	else if (card->type == SC_CARD_TYPE_OPENPGP_GNUK && file->id == DO_AUTH_SYM) {
- 		r = gnuk_delete_key(card, 3);
- 	}
- 	else {
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/opensc/patches/0026-hardcode-defines-for-DO-s.patch b/trunk/package/feeds/packages/opensc/patches/0026-hardcode-defines-for-DO-s.patch
deleted file mode 100644
index d106e868..00000000
--- a/trunk/package/feeds/packages/opensc/patches/0026-hardcode-defines-for-DO-s.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b9dae832db54b206a15bcc12e290cef50f31c3d0 Mon Sep 17 00:00:00 2001
-From: george <ggkitsas@yahoo.com>
-Date: Tue, 11 Nov 2014 16:16:15 +0100
-Subject: [PATCH 26/26] hardcode->defines for DO's
-
----
- src/libopensc/card-openpgp.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
-index 1e6e338..8464914 100644
---- a/src/libopensc/card-openpgp.c
-+++ b/src/libopensc/card-openpgp.c
-@@ -164,6 +164,18 @@ static int		pgp_get_pubkey_pem(sc_card_t *, unsigned int,
- #define DO_SIGN_SYM              0xb601
- #define DO_ENCR_SYM              0xb801
- #define DO_AUTH_SYM              0xa401
-+/* Private DO's */
-+#define DO_PRIV1                 0x0101
-+#define DO_PRIV2                 0x0102
-+#define DO_PRIV3                 0x0103
-+#define DO_PRIV4                 0x0104
-+/* Cardholder information DO's */
-+#define DO_CARDHOLDER            0x65
-+#define DO_NAME                  0x5b
-+#define DO_LANG_PREF             0x5f2d
-+#define DO_SEX                   0x5f35
-+
-+
- /* Maximum length for response buffer when reading pubkey. This value is calculated with
-  * 4096-bit key length */
- #define MAXLEN_RESP_PUBKEY       527
-@@ -851,7 +863,7 @@ pgp_get_blob(sc_card_t *card, pgp_blob_t *blob, unsigned int id,
- 	/* Special case:
- 	 * Gnuk does not have default value for children of DO 65 (DOs 5B, 5F2D, 5F35)
- 	 * So, if these blob was not found, we create it. */
--	if (blob->id == 0x65 && (id == 0x5B || id == 0x5F2D || id == 0x5F35)) {
-+	if (blob->id == DO_CARDHOLDER && (id == DO_NAME || id == DO_LANG_PREF || id == DO_SEX)) {
- 		sc_log(card->ctx, "Create blob %X under %X", id, blob->id);
- 		child = pgp_new_blob(card, blob, id, sc_file_new());
- 		if (child) {
-@@ -1198,7 +1210,7 @@ pgp_get_data(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
- 	/* For Gnuk card, if there is no certificate, it returns error instead of empty data.
- 	 * So, for this case, we ignore error and consider success */
- 	if (r == SC_ERROR_DATA_OBJECT_NOT_FOUND && card->type == SC_CARD_TYPE_OPENPGP_GNUK
--        && (tag == DO_CERT || tag == 0x0101 || tag == 0x0102 || tag == 0x0103 || tag == 0x0104)) {
-+        && (tag == DO_CERT || tag == DO_PRIV1 || tag == DO_PRIV2 || tag == DO_PRIV3 || tag == DO_PRIV4)) {
- 		r = SC_SUCCESS;
- 		apdu.resplen = 0;
- 	}
--- 
-2.1.3
-
diff --git a/trunk/package/feeds/packages/openssh/Makefile b/trunk/package/feeds/packages/openssh/Makefile
deleted file mode 100644
index 279fa0ba..00000000
--- a/trunk/package/feeds/packages/openssh/Makefile
+++ /dev/null
@@ -1,291 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openssh
-PKG_VERSION:=6.8p1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
-		http://ftp.belnet.be/pub/OpenBSD/OpenSSH/portable/
-PKG_MD5SUM:=08f72de6751acfbd0892b5f003922701
-
-PKG_LICENSE:=BSD ISC
-PKG_LICENSE_FILES:=LICENCE
-
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=libopenssl
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openssh/Default
-	SECTION:=net
-	CATEGORY:=Network
-	DEPENDS:=+libopenssl +zlib
-	TITLE:=OpenSSH
-	MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-	URL:=http://www.openssh.com/
-	SUBMENU:=SSH
-	VARIANT:=without-pam
-endef
-
-define Package/openssh-moduli
-	$(call Package/openssh/Default)
-	DEPENDS+= +openssh-keygen
-	TITLE+= moduli file
-endef
-
-define Package/openssh-moduli/description
-OpenSSH server moduli file.
-endef
-
-define Package/openssh-client
-	$(call Package/openssh/Default)
-	TITLE+= client
-endef
-
-define Package/openssh-client/description
-OpenSSH client.
-endef
-
-define Package/openssh-client/conffiles
-/etc/ssh/ssh_config
-endef
-
-define Package/openssh-client-utils
-	$(call Package/openssh/Default)
-	DEPENDS+= +openssh-client +openssh-keygen
-	TITLE+= client utilities
-endef
-
-define Package/openssh-client-utils/description
-OpenSSH client utilities.
-endef
-
-define Package/openssh-keygen
-	$(call Package/openssh/Default)
-	TITLE+= keygen
-endef
-
-define Package/openssh-keygen/description
-OpenSSH keygen.
-endef
-
-define Package/openssh-server
-	$(call Package/openssh/Default)
-	DEPENDS+= +openssh-keygen
-	TITLE+= server
-	USERID:=sshd=22:sshd=22
-endef
-
-define Package/openssh-server/description
-OpenSSH server.
-endef
-
-define Package/openssh-server/conffiles
-/etc/ssh/sshd_config
-endef
-
-define Package/openssh-server-pam
-	$(call Package/openssh/Default)
-	DEPENDS+= +libpthread +openssh-keygen +libpam
-	TITLE+= server (with PAM support)
-	VARIANT:=with-pam
-	USERID:=sshd=22:sshd=22
-endef
-
-define Package/openssh-server-pam/description
-OpenSSH server (with PAM support).
-endef
-
-define Package/openssh-server-pam/conffiles
-/etc/pam.d/sshd
-/etc/security/access-sshd-local.conf
-/etc/ssh/sshd_config
-endef
-
-define Package/openssh-sftp-client
-	$(call Package/openssh/Default)
-	TITLE+= SFTP client
-endef
-
-define Package/openssh-sftp-client/description
-OpenSSH SFTP client.
-endef
-
-define Package/openssh-sftp-server
-	$(call Package/openssh/Default)
-	TITLE+= SFTP server
-	# Strip dependencies to avoid pulling in OpenSSL etc.
-	DEPENDS:=
-endef
-
-define Package/openssh-sftp-server/description
-OpenSSH SFTP server.
-endef
-
-define Package/openssh-sftp-avahi-service
-	$(call Package/openssh/Default)
-	TITLE+= (SFTP Avahi service)
-	DEPENDS:=+openssh-sftp-server +avahi-daemon
-endef
-
-define Package/openssh-sftp-avahi-service/description
- This package contains the service definition for announcing
- SFTP support via mDNS/DNS-SD.
-endef
-
-define Package/openssh-sftp-avahi-service/conffiles
-/etc/avahi/services/sftp-ssh.service
-endef
-
-CONFIGURE_ARGS+= \
-	$(DISABLE_NLS) \
-	--sysconfdir=/etc/ssh \
-	--with-privsep-user=sshd \
-	--with-privsep-path=/var/empty \
-	--enable-shared \
-	--disable-static \
-	--disable-debug \
-	--disable-strip \
-	--disable-etc-default-login \
-	--disable-lastlog \
-	--disable-utmp \
-	--disable-utmpx \
-	--disable-wtmp \
-	--disable-wtmpx \
-	--without-bsd-auth \
-	--without-kerberos5 \
-	--without-x
-
-ifeq ($(BUILD_VARIANT),with-pam)
-CONFIGURE_ARGS += \
-	--with-pam
-else
-CONFIGURE_ARGS += \
-	--without-pam
-endif
-
-ifeq ($(CONFIG_OPENSSL_ENGINE),y)
-CONFIGURE_ARGS+= \
-	--with-ssl-engine
-endif
-
-ifneq ($(CONFIG_SSP_SUPPORT),y)
-CONFIGURE_ARGS += \
-	--without-stackprotect
-endif
-
-CONFIGURE_VARS += LD="$(TARGET_CC)"
-
-ifeq ($(BUILD_VARIANT),with-pam)
-TARGET_LDFLAGS += -lpthread
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LIBS="" \
-		sftp-server
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		STRIP_OPT="" \
-		all install
-endef
-
-define Package/openssh-client/preinst
-#!/bin/sh
-if [ -L $${IPKG_INSTROOT}/usr/bin/ssh ] && [ -L $${IPKG_INSTROOT}/usr/bin/scp ]; then
-	rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
-fi
-exit 0
-endef
-
-define Package/openssh-client/postrm
-#!/bin/sh
-rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
-if [ -x $${IPKG_INSTROOT}/usr/sbin/dropbear ] ; then
-	ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/ssh;
-	ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp;
-fi
-exit 0
-endef
-
-define Package/openssh-moduli/install
-	$(INSTALL_DIR) $(1)/etc/ssh
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/moduli $(1)/etc/ssh/
-endef
-
-define Package/openssh-client/install
-	$(INSTALL_DIR) $(1)/etc/ssh
-	chmod 0700 $(1)/etc/ssh
-	$(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/
-endef
-
-define Package/openssh-client-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(foreach bin,add agent keyscan keysign,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/
-endef
-
-define Package/openssh-keygen/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
-endef
-
-define Package/openssh-server/install
-	$(INSTALL_DIR) $(1)/etc/ssh
-	chmod 0700 $(1)/etc/ssh
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
-endef
-
-define Package/openssh-server-pam/install
-	$(call Package/openssh-server/install,$(1))
-	sed -i 's,#PasswordAuthentication yes,PasswordAuthentication no,g' $(1)/etc/ssh/sshd_config
-	sed -i 's,#UsePAM no,UsePAM yes,g' $(1)/etc/ssh/sshd_config
-	$(INSTALL_DIR) $(1)/etc/pam.d
-	$(INSTALL_DATA) ./files/sshd.pam $(1)/etc/pam.d/sshd
-	$(INSTALL_DIR) $(1)/etc/security
-	$(INSTALL_DATA) ./files/sshd.pam-access $(1)/etc/security/access-sshd-local.conf
-endef
-
-define Package/openssh-sftp-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
-endef
-
-define Package/openssh-sftp-server/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec
-	ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server
-endef
-
-define Package/openssh-sftp-avahi-service/install
-	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DATA) ./files/sftp-ssh.service $(1)/etc/avahi/services/
-endef
-
-$(eval $(call BuildPackage,openssh-client))
-$(eval $(call BuildPackage,openssh-moduli))
-$(eval $(call BuildPackage,openssh-client-utils))
-$(eval $(call BuildPackage,openssh-keygen))
-$(eval $(call BuildPackage,openssh-server))
-$(eval $(call BuildPackage,openssh-server-pam))
-$(eval $(call BuildPackage,openssh-sftp-client))
-$(eval $(call BuildPackage,openssh-sftp-server))
-$(eval $(call BuildPackage,openssh-sftp-avahi-service))
diff --git a/trunk/package/feeds/packages/openssh/files/sftp-ssh.service b/trunk/package/feeds/packages/openssh/files/sftp-ssh.service
deleted file mode 100644
index 17e09274..00000000
--- a/trunk/package/feeds/packages/openssh/files/sftp-ssh.service
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
-  <service>
-   <type>_sftp-ssh._tcp</type>
-   <port>22</port>
-  </service>
-</service-group>
diff --git a/trunk/package/feeds/packages/openssh/files/sshd.init b/trunk/package/feeds/packages/openssh/files/sshd.init
deleted file mode 100644
index c5a54e00..00000000
--- a/trunk/package/feeds/packages/openssh/files/sshd.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=50
-STOP=50
-
-USE_PROCD=1
-PROG=/usr/sbin/sshd
-
-start_service() {
-	for type in rsa dsa; do {
-		# check for keys
-		key=/etc/ssh/ssh_host_${type}_key
-		[ ! -f $key ] && {
-			# generate missing keys
-			[ -x /usr/bin/ssh-keygen ] && {
-				/usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&-
-			}
-		}
-	}; done
-	mkdir -m 0700 -p /var/empty
-
-	procd_open_instance
-	procd_set_param command $PROG -D
-	procd_close_instance
-}
-
-shutdown() {
-	local pid
-	local pids
-	local pid_mine
-
-	stop
-
-	# kill active clients
-	pid_mine="$$"
-	pids="$(pidof sshd)"
-	for pid in $pids; do
-		[ "$pid" = "$pid_mine" ] && continue
-		[ -e "/proc/$pid/stat" ] && kill $pid
-	done
-}
diff --git a/trunk/package/feeds/packages/openssh/files/sshd.pam b/trunk/package/feeds/packages/openssh/files/sshd.pam
deleted file mode 100644
index 387ff2e0..00000000
--- a/trunk/package/feeds/packages/openssh/files/sshd.pam
+++ /dev/null
@@ -1,41 +0,0 @@
-# PAM configuration for the Secure Shell service
-
-# Read environment variables from /etc/environment and
-# /etc/security/pam_env.conf.
-auth       required     pam_env.so
-
-# Skip Google Authenticator if logging in from the local network.
-# auth [success=1 default=ignore] pam_access.so accessfile=/etc/security/access-sshd-local.conf
-# Google Authenticator 2-step verification.
-# auth       requisite    pam_google_authenticator.so
-
-# Standard Un*x authentication.
-auth       include      common-auth
-
-# Disallow non-root logins when /etc/nologin exists.
-account    required     pam_nologin.so
-
-# Uncomment and edit /etc/security/access.conf if you need to set complex
-# access limits that are hard to express in sshd_config.
-# account    required     pam_access.so
-
-# Standard Un*x authorization.
-account    include      common-account
-
-# Standard Un*x session setup and teardown.
-session    include      common-session
-
-# Print the message of the day upon successful login.
-session    optional     pam_motd.so
-
-# Print the status of the user's mailbox upon successful login.
-session    optional     pam_mail.so standard noenv
-
-# Set up user limits from /etc/security/limits.conf.
-session    required     pam_limits.so
-
-# Set up SELinux capabilities (need modified pam)
-# session    required     pam_selinux.so multiple
-
-# Standard Un*x password updating.
-password   include      common-password
diff --git a/trunk/package/feeds/packages/openssh/files/sshd.pam-access b/trunk/package/feeds/packages/openssh/files/sshd.pam-access
deleted file mode 100644
index 425ff119..00000000
--- a/trunk/package/feeds/packages/openssh/files/sshd.pam-access
+++ /dev/null
@@ -1,4 +0,0 @@
-# Skip Google Authenticator for local network
-#+ : ALL : 192.168.1.0/24
-+ : ALL : LOCAL
-- : ALL : ALL
diff --git a/trunk/package/feeds/packages/openssh/patches/100-no_cast_fix.patch b/trunk/package/feeds/packages/openssh/patches/100-no_cast_fix.patch
deleted file mode 100644
index 5a4ecb12..00000000
--- a/trunk/package/feeds/packages/openssh/patches/100-no_cast_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cipher.c
-+++ b/cipher.c
-@@ -88,8 +88,10 @@ static const struct sshcipher ciphers[]
- 	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
- 	{ "blowfish-cbc",
- 			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
-+#ifndef OPENSSL_NO_CAST
- 	{ "cast128-cbc",
- 			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
-+#endif
- 	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
- 	{ "arcfour128",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
- 	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
diff --git a/trunk/package/feeds/packages/openssh/patches/130-implicit_memset_decl_fix.patch b/trunk/package/feeds/packages/openssh/patches/130-implicit_memset_decl_fix.patch
deleted file mode 100644
index 7d46d20d..00000000
--- a/trunk/package/feeds/packages/openssh/patches/130-implicit_memset_decl_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/includes.h
-+++ b/includes.h
-@@ -60,6 +60,9 @@
- /*
-  *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively
-  */
-+#ifdef HAVE_STRING_H
-+# include <string.h>
-+#endif
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
diff --git a/trunk/package/feeds/packages/openssh/patches/140-pam_uclibc_pthreads_fix.patch b/trunk/package/feeds/packages/openssh/patches/140-pam_uclibc_pthreads_fix.patch
deleted file mode 100644
index 1319b524..00000000
--- a/trunk/package/feeds/packages/openssh/patches/140-pam_uclibc_pthreads_fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/auth-pam.c
-+++ b/auth-pam.c
-@@ -159,7 +159,7 @@ sshpam_sigchld_handler(int sig)
- 	}
- 	if (WIFSIGNALED(sshpam_thread_status) &&
- 	    WTERMSIG(sshpam_thread_status) == SIGTERM)
--		return;	/* terminated by pthread_cancel */
-+		return;	/* terminated by pthread2_cancel */
- 	if (!WIFEXITED(sshpam_thread_status))
- 		sigdie("PAM: authentication thread exited unexpectedly");
- 	if (WEXITSTATUS(sshpam_thread_status) != 0)
-@@ -168,14 +168,14 @@ sshpam_sigchld_handler(int sig)
- 
- /* ARGSUSED */
- static void
--pthread_exit(void *value)
-+pthread2_exit(void *value)
- {
- 	_exit(0);
- }
- 
- /* ARGSUSED */
- static int
--pthread_create(sp_pthread_t *thread, const void *attr,
-+pthread2_create(sp_pthread_t *thread, const void *attr,
-     void *(*thread_start)(void *), void *arg)
- {
- 	pid_t pid;
-@@ -201,7 +201,7 @@ pthread_create(sp_pthread_t *thread, con
- }
- 
- static int
--pthread_cancel(sp_pthread_t thread)
-+pthread2_cancel(sp_pthread_t thread)
- {
- 	signal(SIGCHLD, sshpam_oldsig);
- 	return (kill(thread, SIGTERM));
-@@ -209,7 +209,7 @@ pthread_cancel(sp_pthread_t thread)
- 
- /* ARGSUSED */
- static int
--pthread_join(sp_pthread_t thread, void **value)
-+pthread2_join(sp_pthread_t thread, void **value)
- {
- 	int status;
- 
-@@ -510,7 +510,7 @@ sshpam_thread(void *ctxtp)
- 	/* XXX - can't do much about an error here */
- 	ssh_msg_send(ctxt->pam_csock, sshpam_err, &buffer);
- 	buffer_free(&buffer);
--	pthread_exit(NULL);
-+	pthread2_exit(NULL);
- 
-  auth_fail:
- 	buffer_put_cstring(&buffer,
-@@ -521,7 +521,7 @@ sshpam_thread(void *ctxtp)
- 	else
- 		ssh_msg_send(ctxt->pam_csock, PAM_AUTH_ERR, &buffer);
- 	buffer_free(&buffer);
--	pthread_exit(NULL);
-+	pthread2_exit(NULL);
- 
- 	return (NULL); /* Avoid warning for non-pthread case */
- }
-@@ -533,8 +533,8 @@ sshpam_thread_cleanup(void)
- 
- 	debug3("PAM: %s entering", __func__);
- 	if (ctxt != NULL && ctxt->pam_thread != 0) {
--		pthread_cancel(ctxt->pam_thread);
--		pthread_join(ctxt->pam_thread, NULL);
-+		pthread2_cancel(ctxt->pam_thread);
-+		pthread2_join(ctxt->pam_thread, NULL);
- 		close(ctxt->pam_psock);
- 		close(ctxt->pam_csock);
- 		memset(ctxt, 0, sizeof(*ctxt));
-@@ -698,7 +698,7 @@ sshpam_init_ctx(Authctxt *authctxt)
- 	}
- 	ctxt->pam_psock = socks[0];
- 	ctxt->pam_csock = socks[1];
--	if (pthread_create(&ctxt->pam_thread, NULL, sshpam_thread, ctxt) == -1) {
-+	if (pthread2_create(&ctxt->pam_thread, NULL, sshpam_thread, ctxt) == -1) {
- 		error("PAM: failed to start authentication thread: %s",
- 		    strerror(errno));
- 		close(socks[0]);
diff --git a/trunk/package/feeds/packages/openssh/patches/200-dscp-qos.patch b/trunk/package/feeds/packages/openssh/patches/200-dscp-qos.patch
deleted file mode 100644
index 827a6689..00000000
--- a/trunk/package/feeds/packages/openssh/patches/200-dscp-qos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ssh_config
-+++ b/ssh_config
-@@ -46,3 +46,6 @@
- #   VisualHostKey no
- #   ProxyCommand ssh -q -W %h:%p gateway.example.com
- #   RekeyLimit 1G 1h
-+
-+# enable DSCP QoS values (per RFC-4594)
-+#IPQoS AF21 AF11
---- a/sshd_config
-+++ b/sshd_config
-@@ -122,6 +122,9 @@ UsePrivilegeSeparation sandbox		# Defaul
- # no default banner path
- #Banner none
- 
-+# enable DSCP QoS values (per RFC-4594)
-+#IPQoS AF21 AF11
-+
- # override default of no subsystems
- Subsystem	sftp	/usr/libexec/sftp-server
- 
diff --git a/trunk/package/feeds/packages/opentracker/Makefile b/trunk/package/feeds/packages/opentracker/Makefile
deleted file mode 100644
index 9fafaf2e..00000000
--- a/trunk/package/feeds/packages/opentracker/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opentracker
-PKG_VERSION:=20141007
-PKG_RELEASE:=1
-PKG_REV:=6c60309745ced3c121a2c5c7d80ed85a573b848e
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=Beerware
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://erdgeist.org/opentracker
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=git
-PKG_BUILD_DEPENDS:=libowfat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/opentracker/Default
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=opentracker
-  URL:=http://erdgeist.org/arts/software/opentracker/
-  DEPENDS:=+zlib +libpthread
-endef
-
-define Package/opentracker
-$(call Package/opentracker/Default)
-  VARIANT:=ipv4
-endef
-
-define Package/opentracker6
-$(call Package/opentracker/Default)
-  TITLE+= (IPv6 build)
-  VARIANT:=ipv6
-endef
-
-
-define Package/opentracker-default/description
- opentracker - An open and free bittorrent tracker
-
- opentracker is an open and free bittorrent tracker project.
- It aims for minimal resource usage and is intended to run at your wlan router.
- Currently it is deployed as an open and free tracker instance.
- Read our free and open tracker blog and announce your torrents there
- (but do not hesitate to setup your own free trackers!).
-endef
-
-define Package/opentracker/description
- $(call Package/opentracker-default/description)
-
- This package contains the IPv4-build of opentracker.
-
-endef
-
-define Package/opentracker6/description
- $(call Package/opentracker-default/description)
-
- This package contains the IPv6-build of opentracker.
-
-endef
-
-
-MAKE_FLAGS += PREFIX="$(STAGING_DIR)/usr"
-
-ifeq ($(BUILD_VARIANT),ipv6)
-  MAKE_FLAGS += FEATURES="-DWANT_V6"
-endif
-
-define Package/opentracker/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/opentracker $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/opentracker.conf.sample $(1)/etc/opentracker.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/opentracker.init $(1)/etc/init.d/opentracker
-endef
-
-define Package/opentracker6/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/opentracker $(1)/usr/bin/opentracker6
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/opentracker.conf.sample $(1)/etc/opentracker6.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/opentracker6.init $(1)/etc/init.d/opentracker6
-endef
-
-$(eval $(call BuildPackage,opentracker))
-$(eval $(call BuildPackage,opentracker6))
diff --git a/trunk/package/feeds/packages/opentracker/files/opentracker.init b/trunk/package/feeds/packages/opentracker/files/opentracker.init
deleted file mode 100755
index 91fb386e..00000000
--- a/trunk/package/feeds/packages/opentracker/files/opentracker.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=10
-STOP=15
-
-NAME="opentracker"
-PROG="/usr/bin/opentracker"
-OPTIONS="-f /etc/opentracker.conf"
-USE_PROCD=1
-
-start_service()
-{
-	procd_open_instance
-	procd_set_param command $PROG $OPTIONS
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/opentracker/files/opentracker6.init b/trunk/package/feeds/packages/opentracker/files/opentracker6.init
deleted file mode 100755
index 02417f3e..00000000
--- a/trunk/package/feeds/packages/opentracker/files/opentracker6.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=10
-STOP=15
-
-NAME="opentracker6"
-PROG="/usr/bin/opentracker6"
-OPTIONS="-f /etc/opentracker6.conf"
-USE_PROCD=1
-
-start_service()
-{
-	procd_open_instance
-	procd_set_param command $PROG $OPTIONS
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/opentracker/patches/100-makefile.patch b/trunk/package/feeds/packages/opentracker/patches/100-makefile.patch
deleted file mode 100644
index bbaf8d99..00000000
--- a/trunk/package/feeds/packages/opentracker/patches/100-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -9,13 +9,13 @@ CC?=gcc
- 
- # BSD flavour
- # PREFIX?=/usr/local
--# LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
--# LIBOWFAT_LIBRARY=$(PREFIX)/lib
-+LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
-+LIBOWFAT_LIBRARY=$(PREFIX)/lib
- 
- # Debug flavour
--PREFIX?=..
--LIBOWFAT_HEADERS=$(PREFIX)/libowfat
--LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
-+# PREFIX?=..
-+# LIBOWFAT_HEADERS=$(PREFIX)/libowfat
-+# LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
- 
- BINDIR?=$(PREFIX)/bin
- 
-@@ -66,7 +66,7 @@ CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $
- 
- $(BINARY): $(OBJECTS) $(HEADERS)
- 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
--	strip $@
-+	$(STRIP) $@
- $(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
- 	$(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
- proxy: $(OBJECTS_proxy) $(HEADERS)
diff --git a/trunk/package/feeds/packages/openvswitch/Makefile b/trunk/package/feeds/packages/openvswitch/Makefile
deleted file mode 100644
index 3fb6ca89..00000000
--- a/trunk/package/feeds/packages/openvswitch/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-# 
-# Copyright (C) 2013 Julius Schulz-Zander <julius@net.t-labs.tu-berlin.de>
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openvswitch
-
-PKG_RELEASE:=2
-PKG_VERSION:=2.3.1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_USE_MIPS16:=0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/openvswitch/ovs
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0dfed4ba9c8a16a1f316d709b7831a4e139472d4
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-$(call include_mk, python-package.mk)
-
-PKG_FIXUP=libtool
-
-define Package/openvswitch/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://openvswitch.org/
-  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-endef
-
-define Package/openvswitch/Default/description
-  Open vSwitch is a production quality, multilayer, software-based, Ethernet
-  virtual switch. It is designed to enable massive network automation through
-  programmatic extension, while still supporting standard management interfaces
-  and protocols (e.g. NetFlow, sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In
-  addition, it is designed to support distribution across multiple physical
-  servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus
-  1000V.
-endef
-
-define Package/openvswitch
-  $(call Package/openvswitch/Default)
-  TITLE:=Open vSwitch Userspace Package
-  DEPENDS:=+libpcap +libopenssl +librt +libatomic +kmod-openvswitch \
-           @(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
-endef
-
-define Package/openvswitch/description
-  Provides the main userspace components required for Open vSwitch to function.
-endef
-
-define Package/openvswitch-python
-  $(call Package/openvswitch/Default)
-  TITLE:=Open vSwitch Python Support
-  DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch +python
-endef
-
-define Package/openvswitch-python/description
-  Provides bindings and libraries for using Python to manipulate/work with Open vSwitch.
-endef
-
-define Package/openvswitch-ipsec
-  $(call Package/openvswitch/Default)
-  TITLE:=Open vSwitch Userspace Package
-  DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch-python
-endef
-
-define Package/openvswitch-ipsec/description
-  The ovs-monitor-ipsec script provides support for encrypting GRE tunnels with 
-  IPsec.
-endef
-
-define Package/openvswitch-benchmark
-  $(call Package/openvswitch/Default)
-  TITLE:=Open vSwitch Userspace Package
-  DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch
-endef
-
-define Package/openvswitch-benchmark/description
-  Utility for running OpenVSwitch benchmarking
-endef
-
-define KernelPackage/openvswitch
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  TITLE:=Open vSwitch Kernel Package
-  KCONFIG:=CONFIG_BRIDGE
-  DEPENDS:=+kmod-stp +kmod-ipv6 +kmod-gre +kmod-lib-crc32c +kmod-vxlan \
-           @(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
-  FILES:= \
-	$(PKG_BUILD_DIR)/datapath/linux/openvswitch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,21,openvswitch)
-endef
-
-define KernelPackage/openvswitch/description
-  This package contains the Open vSwitch kernel moodule and bridge compat
-  module. Furthermore, it supports OpenFlow.
-endef
-
-CONFIGURE_ARGS += --with-linux=$(LINUX_DIR) --with-rundir=/var/run
-CONFIGURE_ARGS += --enable-ndebug
-CONFIGURE_ARGS += --disable-ssl
-CONFIGURE_ARGS += --enable-shared
-
-TARGET_CFLAGS += -flto
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		autoreconf -v --install --force || exit 1 \
-	);
-	$(call Build/Configure/Default,$(CONFIGURE_ARGS))
-endef
-
-KCFLAGS=
-ifeq ($(CONFIG_GCC_VERSION_4_9),y)
-KCFLAGS:=-Wno-error=date-time
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="-I$(PKG_BUILD_DIR)/lib $(TARGET_CFLAGS) -std=gnu99" \
-		LDFLAGS="-L$(PKG_BUILD_DIR)/lib $(TARGET_LDFLAGS)" \
-		LDFLAGS_MODULES="$(TARGET_LDFLAGS) -L$(PKG_BUILD_DIR)/lib" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)/usr" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/datapath/linux" \
-		PATH="$(TARGET_PATH)" \
-		EXTRA_CFLAGS="$(KCFLAGS)" \
-		KCC="$(KERNEL_CC)"
-endef
-
-define Package/openvswitch/install
-	$(INSTALL_DIR) $(1)/etc/openvswitch
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/openvswitch.init $(1)/etc/init.d/openvswitch
-
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libsflow-$(PKG_VERSION).so  $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libopenvswitch-$(PKG_VERSION).so  $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/ofproto/.libs/libofproto-$(PKG_VERSION).so  $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/ovsdb/.libs/libovsdb-$(PKG_VERSION).so  $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-appctl $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-ofctl $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-client $(1)/usr/bin/
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-dpctl $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-vsctl $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-tool $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vswitchd/.libs/ovs-vswitchd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-server $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/usr/share/openvswitch/
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/
-endef
-
-define Package/openvswitch-python/install
-	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
-	$(CP) $(PKG_BUILD_DIR)/python/ovs/ $(1)/usr/lib/python$(PYTHON_VERSION)/
-endef
-
-define Package/openvswitch-ipsec/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/debian/ovs-monitor-ipsec $(1)/usr/sbin/
-endef
-
-define Package/openvswitch-benchmark/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/
-endef
-
-define Package/openvswitch/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true
-endef
-
-$(eval $(call BuildPackage,openvswitch))
-$(eval $(call BuildPackage,openvswitch-python))
-$(eval $(call BuildPackage,openvswitch-ipsec))
-$(eval $(call BuildPackage,openvswitch-benchmark))
-$(eval $(call KernelPackage,openvswitch))
-
diff --git a/trunk/package/feeds/packages/openvswitch/files/etc/init.d/openvswitch.init b/trunk/package/feeds/packages/openvswitch/files/etc/init.d/openvswitch.init
deleted file mode 100644
index ffe879a0..00000000
--- a/trunk/package/feeds/packages/openvswitch/files/etc/init.d/openvswitch.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013 Julius Schulz-Zander <julius@net.t-labs.tu-berlin.de>
-# Copyright (C) 2014 OpenWrt.org
-
-START=15
-USE_PROCD=1
-
-start_service() {
-	[ -x /var/run/openvswitch ] || mkdir -p /var/run/openvswitch
-	[ -e /etc/openvswitch/conf.db ] || {
-		/usr/bin/ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema
-	}
-
-	# ovsdb-server
-	procd_open_instance
-	procd_set_param command /usr/sbin/ovsdb-server
-	procd_append_param command --remote=punix:/var/run/db.sock
-	procd_append_param command --remote=db:Open_vSwitch,Open_vSwitch,manager_options
-	procd_append_param command --pidfile=/var/run/ovsdb-server.pid
-	procd_set_param respawn
-	procd_append_param respawn 3600
-	procd_append_param respawn 5
-	procd_append_param respawn -1
-	procd_set_param nice
-	procd_append_param nice -10
-	procd_close_instance
-
-	# ovs-vswitchd
-	procd_open_instance
-	procd_set_param command /usr/sbin/ovs-vswitchd
-	procd_append_param command --pidfile=/var/run/ovs-vswitchd.pid
-	procd_set_param respawn
-	procd_append_param respawn 3600
-	procd_append_param respawn 5
-	procd_append_param respawn -1
-	procd_set_param nice
-	procd_append_param nice -10
-	procd_close_instance
-
-}
-
diff --git a/trunk/package/feeds/packages/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/trunk/package/feeds/packages/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
deleted file mode 100644
index 1e79f3ae..00000000
--- a/trunk/package/feeds/packages/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b9284f535e93c337ab21f330753e60e1038f9a27 Mon Sep 17 00:00:00 2001
-From: Helmut Schaa <helmut.schaa@googlemail.com>
-Date: Wed, 8 Jan 2014 13:48:49 +0100
-Subject: [PATCH 2/2] netdev-linux: Let interface flag survive internal port
- setup
-
-Due to a race condition when bringing up an internal port on Linux
-some interface flags (e.g. IFF_MULTICAST) are falsely reset. This
-happens because netlink events may be processed after the according
-netdev has been brought up (which sets interface flags).
-
-Fix this by reading the interface flags just before updating them
-if they have not been updated by from the kernel yet.
-
-Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
----
- lib/netdev-linux.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
-index 9eaac33..423e72e 100644
---- a/lib/netdev-linux.c
-+++ b/lib/netdev-linux.c
-@@ -2569,7 +2569,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off,
-     unsigned int old_flags, new_flags;
-     int error = 0;
- 
--    old_flags = netdev->ifi_flags;
-+    if (!(netdev->cache_valid & VALID_DRVINFO)) {
-+        /* Most likely the debvice flags are not in sync yet, fetch them now */
-+        get_flags(&netdev->up, &old_flags);
-+    } else {
-+        old_flags = netdev->ifi_flags;
-+    }
-+
-     *old_flagsp = iff_to_nd_flags(old_flags);
-     new_flags = (old_flags & ~nd_to_iff_flags(off)) | nd_to_iff_flags(on);
-     if (new_flags != old_flags) {
--- 
-1.8.1.4
-
diff --git a/trunk/package/feeds/packages/openvswitch/patches/0002-netdev-linux-Use-unsigned-int-for-ifi_flags.patch b/trunk/package/feeds/packages/openvswitch/patches/0002-netdev-linux-Use-unsigned-int-for-ifi_flags.patch
deleted file mode 100644
index 19c77479..00000000
--- a/trunk/package/feeds/packages/openvswitch/patches/0002-netdev-linux-Use-unsigned-int-for-ifi_flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 12edcd800d924f69630768eeece842373dee5bb0 Mon Sep 17 00:00:00 2001
-From: Helmut Schaa <helmut.schaa@googlemail.com>
-Date: Wed, 8 Jan 2014 13:48:33 +0100
-Subject: [PATCH 1/2] netdev-linux: Use unsigned int for ifi_flags
-
-ifi_flags is unsigned, the local equivalents should do the same.
-
-Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
----
- lib/netdev-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
-index 9bdbbdf..9eaac33 100644
---- a/lib/netdev-linux.c
-+++ b/lib/netdev-linux.c
-@@ -2566,7 +2566,7 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off,
-              enum netdev_flags on, enum netdev_flags *old_flagsp)
-     OVS_REQUIRES(netdev->mutex)
- {
--    int old_flags, new_flags;
-+    unsigned int old_flags, new_flags;
-     int error = 0;
- 
-     old_flags = netdev->ifi_flags;
--- 
-1.8.1.4
-
diff --git a/trunk/package/feeds/packages/openvswitch/patches/0003-lib-util.h-Disable-ovs_assert-when-build-with-NDEBUG.patch b/trunk/package/feeds/packages/openvswitch/patches/0003-lib-util.h-Disable-ovs_assert-when-build-with-NDEBUG.patch
deleted file mode 100644
index 2aade29e..00000000
--- a/trunk/package/feeds/packages/openvswitch/patches/0003-lib-util.h-Disable-ovs_assert-when-build-with-NDEBUG.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 34b51e26555d05c00b2320f943a645added5dae4 Mon Sep 17 00:00:00 2001
-From: Helmut Schaa <helmut.schaa@googlemail.com>
-Date: Mon, 9 Dec 2013 14:15:11 +0100
-Subject: [PATCH 5/6] lib/util.h: Disable ovs_assert when build with NDEBUG
-
-Reduces binary size. Use a static inline function instead of
-a macro to not get "unused variable" warning everywhere.
-
-Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
----
- lib/util.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/util.h b/lib/util.h
-index 5c23962..9e5866d 100644
---- a/lib/util.h
-+++ b/lib/util.h
-@@ -69,10 +69,15 @@
-  *   - Writes the failure message to the log.
-  *
-  *   - Not affected by NDEBUG. */
-+#ifndef NDEBUG
- #define ovs_assert(CONDITION)                                           \
-     if (!OVS_LIKELY(CONDITION)) {                                       \
-         ovs_assert_failure(SOURCE_LOCATOR, __func__, #CONDITION);       \
-     }
-+#else
-+static inline void ovs_assert(bool cond OVS_UNUSED) {}
-+#endif
-+
- void ovs_assert_failure(const char *, const char *, const char *) NO_RETURN;
- 
- /* Casts 'pointer' to 'type' and issues a compiler warning if the cast changes
--- 
-1.8.1.4
-
diff --git a/trunk/package/feeds/packages/openvswitch/patches/0004-datapath-Use-ccflags-y-instead-of-deprecated-EXTRA_C.patch b/trunk/package/feeds/packages/openvswitch/patches/0004-datapath-Use-ccflags-y-instead-of-deprecated-EXTRA_C.patch
deleted file mode 100644
index 95891a1a..00000000
--- a/trunk/package/feeds/packages/openvswitch/patches/0004-datapath-Use-ccflags-y-instead-of-deprecated-EXTRA_C.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 36fd4f214f9ba74aaf0e5fb3e4ba271b946a1550 Mon Sep 17 00:00:00 2001
-From: Thomas Graf <tgraf@noironetworks.com>
-Date: Wed, 26 Nov 2014 15:52:31 +0100
-Subject: [PATCH] datapath: Use ccflags-y instead of deprecated EXTRA_CFLAGS
-
-This allows users to pass in additional compiler flags through the
-environment variable EXTRA_CFLAGS, e.g.
-
-   make EXTRA_CFLAGS=-Wno-error=foo V=1
-
-Reported-by: Alexandru Ardelean <ardeleanalex@gmail.com>
-Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
-Acked-by: Pravin B Shelar <pshelar@nicira.com>
----
- datapath/linux/Kbuild.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/datapath/linux/Kbuild.in b/datapath/linux/Kbuild.in
-index 6f6f65f..cb98c11 100644
---- a/datapath/linux/Kbuild.in
-+++ b/datapath/linux/Kbuild.in
-@@ -7,11 +7,11 @@ export VERSION = @VERSION@
- include $(srcdir)/../Modules.mk
- include $(srcdir)/Modules.mk
- 
--EXTRA_CFLAGS := -DVERSION=\"$(VERSION)\"
--EXTRA_CFLAGS += -I$(srcdir)/..
--EXTRA_CFLAGS += -I$(builddir)/..
--EXTRA_CFLAGS += -g
--EXTRA_CFLAGS += -include $(builddir)/kcompat.h
-+ccflags-y := -DVERSION=\"$(VERSION)\"
-+ccflags-y += -I$(srcdir)/..
-+ccflags-y += -I$(builddir)/..
-+ccflags-y += -g
-+ccflags-y += -include $(builddir)/kcompat.h
- 
- # These include directories have to go before -I$(KSRC)/include.
- # NOSTDINC_FLAGS just happens to be a variable that goes in the
--- 
-2.1.2
-
diff --git a/trunk/package/feeds/packages/opus-tools/Makefile b/trunk/package/feeds/packages/opus-tools/Makefile
deleted file mode 100644
index e53b8432..00000000
--- a/trunk/package/feeds/packages/opus-tools/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opus-tools
-PKG_VERSION:=0.1.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
-PKG_MD5SUM:=20682e4d8d1ae9ec5af3cf43e808b8cb
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/opus-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libogg +libopus
-  TITLE:=OPUS Codec tools
-  URL:=http://opus-codec.org/
-endef
-
-define Package/opus-tools/description
- This package provides command-line utilities to encode, inspect, and decode 
- .opus files.
-endef
-
-CONFIGURE_ARGS += \
-	--without-flac \
-
-define Package/opus-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/opus{dec,enc,info} $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,opus-tools))
diff --git a/trunk/package/feeds/packages/opus/Makefile b/trunk/package/feeds/packages/opus/Makefile
deleted file mode 100644
index dbcb4dd9..00000000
--- a/trunk/package/feeds/packages/opus/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opus
-PKG_VERSION:=1.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
-PKG_MD5SUM:=c5a8cf7c0b066759542bc4ca46817ac6
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libopus
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=OPUS Codec
-  URL:=http://opus-codec.org/
-endef
-
-define Package/libopus/description
- Opus is a totally open, royalty-free, highly versatile audio codec. Opus is 
- unmatched for interactive speech and music transmission over the Internet, but 
- is also intended for storage and streaming applications.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/opus $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopus.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/opus.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libopus/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopus.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libopus))
diff --git a/trunk/package/feeds/packages/owfs/Makefile b/trunk/package/feeds/packages/owfs/Makefile
deleted file mode 100644
index bec087f8..00000000
--- a/trunk/package/feeds/packages/owfs/Makefile
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=owfs
-PKG_VERSION:=2.9p5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=b5c20998e8ffc6fa3974daef99c02402
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=GPL-2.0
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-#
-# templates
-#
-
-define Package/$(PKG_NAME)/Default
-  TITLE:=OWFS (1-Wire File System)
-  URL:=http://owfs.sourceforge.net/
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-endef
-
-define Package/$(PKG_NAME)/Default/description
-  OWFS is a suite of programs that designed to make the 1-wire bus and its
-  devices easily accessible. The underlying priciple is to create a virtual
-  filesystem, with the unique ID being the directory, and the individual
-  properties of the device are represented as simple files that can be read
-  and written.
-
-  Details of the individual slave or master design are hidden behind a
-  consistent interface. The goal is to provide an easy set of tools for a
-  software designer to create monitoring or control applications. There are
-  some performance enhancements in the implementation, including data caching,
-  parallel access to bus masters, and aggregation of device communication.
-  Still the fundemental goal has been ease of use, flexibility and correctness
-  rather than speed.
-endef
-
-define Package/owfs/Server
-  $(call Package/owfs/Default)
-  DEPENDS:=+libow +libpthread
-endef
-
-define Package/owfs/Library
-  $(call Package/owfs/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-endef
-
-define Package/owfs/Utility
-  $(call Package/owfs/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libow
-endef
-
-#
-# shared libraries
-#
-
-define Package/libow
-  $(call Package/owfs/Library)
-  DEPENDS:=+libusb-compat +libpthread
-  TITLE:=OWFS - common shared library
-endef
-
-define Package/libow/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS library.
-endef
-
-define Package/libow-capi
-  $(call Package/owfs/Library)
-  DEPENDS:=+libow
-  TITLE:=OWFS - C-API library
-endef
-
-define Package/libow-capi/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS C-API library.
-endef
-
-#
-# utilities
-#
-
-define Package/owshell
-  $(call Package/owfs/Utility)
-  TITLE:=OWFS - shell utilities
-  DEPENDS+= +USE_UCLIBC:librpc
-endef
-
-define Package/owshell/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS shell utilities.
-endef
-
-define Package/owfs
-  $(call Package/owfs/Utility)
-  # libfuse depends on kmod-fuse, no need to declare dependency
-  DEPENDS+= +libfuse +fuse-utils
-  TITLE:=OWFS - fuse file system
-endef
-
-define Package/owfs/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS fuse filesystem.
-endef
-
-#
-# network daemons
-#
-
-define Package/owhttpd
-  $(call Package/owfs/Server)
-  TITLE:=OWFS - http server
-endef
-
-define Package/owhttpd/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS http server.
-endef
-
-define Package/owftpd
-  $(call Package/owfs/Server)
-  TITLE:=OWFS - ftp server
-endef
-
-define Package/owftpd/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS ftp server.
-endef
-
-define Package/owserver
-  $(call Package/owfs/Server)
-  TITLE:=OWFS - network server
-endef
-
-define Package/owserver/description
-  $(call Package/$(PKG_NAME)/Default/description)
-
-  This package contains the OWFS network server.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-owftpd \
-	--enable-owserver \
-	--enable-owhttpd \
-	--enable-owfs \
-	--with-fuseinclude="$(STAGING_DIR)/usr/include" \
-	--with-fuselib="$(STAGING_DIR)/usr/lib" \
-	--enable-shared \
-	--enable-zero \
-	--disable-parport \
-	--disable-ownet \
-	--disable-owpython \
-	--disable-owphp \
-	--disable-owtcl \
-	--disable-swig \
-
-CONFIGURE_VARS += \
-	LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(TOOLCHAIN_DIR)/usr/lib" \
-	lt_cv_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-	lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-	shrext_cmds=".so" \
-
-MAKE_FLAGS += \
-	CC="$(TARGET_CC)" \
-	HOST_CPU="$(PKGARCH)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/ow{capi,fs_config}.h $(STAGING_DIR)/usr/include/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libow{,capi}*.so* $(STAGING_DIR)/usr/lib/
-endef
-
-define Package/owfs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owfs $(1)/usr/bin/
-endef
-
-define Package/owshell/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owget $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owread $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owwrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owdir $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owpresent $(1)/usr/bin/
-endef
-
-
-define Package/owserver/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owserver $(1)/usr/bin/
-endef
-
-define Package/owhttpd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owhttpd $(1)/usr/bin/
-endef
-
-define Package/owftpd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owftpd $(1)/usr/bin/
-endef
-
-
-define Package/libow/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/
-endef
-
-define Package/libow-capi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,owfs))
-$(eval $(call BuildPackage,owshell))
-
-$(eval $(call BuildPackage,owserver))
-$(eval $(call BuildPackage,owhttpd))
-$(eval $(call BuildPackage,owftpd))
-
-$(eval $(call BuildPackage,libow))
-$(eval $(call BuildPackage,libow-capi))
diff --git a/trunk/package/feeds/packages/p11-kit/Makefile b/trunk/package/feeds/packages/p11-kit/Makefile
deleted file mode 100644
index 853287aa..00000000
--- a/trunk/package/feeds/packages/p11-kit/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=p11-kit
-PKG_VERSION:=0.20.7
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=6648cad01a3080b685b8b3bf7372c91a
-PKG_SOURCE_URL:=http://p11-glue.freedesktop.org/releases/
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/p11-kit
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A library that provides a way to load and enumerate PKCS11 modules.
-  URL:=http://p11-glue.freedesktop.org/p11-kit.html
-  DEPENDS:=+libtasn1 +libpthread
-endef
-
-define Package/p11-kit/description
-  Provides a way to load and enumerate PKCS11 modules. Provides a
-  standard configuration setup for installing PKCS11 modules in such a
-  way that they are discoverable.
-endef
-
-CONFIGURE_ARGS+= \
-	--without-libffi
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/p11-kit-1/p11-kit/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/p11-kit-1/p11-kit/* $(1)/usr/include/p11-kit-1/p11-kit/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11-kit.so $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11-kit.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/p11-kit-1.pc $(1)/usr/lib/pkgconfig/p11-kit-1.pc
-endef
-
-define Package/p11-kit/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11-kit.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/p11-kit/modules/
-ifneq ($(CONFIG_PACKAGE_libopensc),)
-	$(CP) ./files/opensc.module $(1)/etc/p11-kit/modules/
-endif
-endef
-
-$(eval $(call BuildPackage,p11-kit))
diff --git a/trunk/package/feeds/packages/p11-kit/files/opensc.module b/trunk/package/feeds/packages/p11-kit/files/opensc.module
deleted file mode 100644
index 5f59814e..00000000
--- a/trunk/package/feeds/packages/p11-kit/files/opensc.module
+++ /dev/null
@@ -1 +0,0 @@
-module: /usr/lib/opensc-pkcs11.so
diff --git a/trunk/package/feeds/packages/p910nd/Makefile b/trunk/package/feeds/packages/p910nd/Makefile
deleted file mode 100644
index d07ee1ac..00000000
--- a/trunk/package/feeds/packages/p910nd/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=p910nd
-PKG_VERSION:=0.97
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/p910nd
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-PKG_MD5SUM:=69461a6c54dca0b13ecad5b83864b43e
-PKG_MAINTAINER:=Philipp Kerling <pkerling@casix.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/p910nd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Printing
-  TITLE:=A small non-spooling printer server
-  URL:=http://p910nd.sourceforge.net
-endef
-
-define Package/p910nd/conffiles
-/etc/config/p910nd
-endef
-
-define Package/p910nd/description
- p910nd is a small daemon that copies any data received on
- the port it is listening on to the corresponding printer
- port. It is primarily intended for diskless Linux hosts
- running as printer drivers but there is no reason why it
- could not be used on diskful hosts. Port 9100 is copied
- to /dev/lp0, 9101 to /dev/lp1 and 9102 to /dev/lp2. The
- default is port 9100 to /dev/lp0.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -DLOCKFILE_DIR=\"\\\"/tmp\"\\\""
-
-define Package/p910nd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/p910nd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/p910nd.config $(1)/etc/config/p910nd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/p910nd.init $(1)/etc/init.d/p910nd
-endef
-
-$(eval $(call BuildPackage,p910nd))
diff --git a/trunk/package/feeds/packages/p910nd/files/p910nd.config b/trunk/package/feeds/packages/p910nd/files/p910nd.config
deleted file mode 100644
index d5090359..00000000
--- a/trunk/package/feeds/packages/p910nd/files/p910nd.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config p910nd
-	option device        /dev/usb/lp0
-	option port          0
-	option bidirectional 1
-	option enabled       0
diff --git a/trunk/package/feeds/packages/p910nd/files/p910nd.init b/trunk/package/feeds/packages/p910nd/files/p910nd.init
deleted file mode 100644
index 8757551b..00000000
--- a/trunk/package/feeds/packages/p910nd/files/p910nd.init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-START=50
-
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get_bool _val "$section" "$option" '0'
-	[ "$_val" -gt 0 ] && append args "$3"
-}
-
-append_string() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get _val "$section" "$option"
-	[ -n "$_val" ] && append args "$3$_val"
-}
-
-start_service() {
-	local section="$1"
-	args=""
-
-	append_bool "$section" bidirectional "-b"
-	append_string "$section" device "-f "
-	append_string "$section" bind "-i "
-	append_string "$section" port ""
-	config_get_bool "enabled" "$section" "enabled" '1'
-	[ "$enabled" -gt 0 ] && /usr/sbin/p910nd $args
-}
-
-stop_service() {
-	local section="$1"
-	config_get port "$section" port
-
-	PID_F=/var/run/p910${port}d.pid
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-
-start() {
-	config_load "p910nd"
-	config_foreach start_service p910nd
-}
-
-stop() {
-	config_load "p910nd"
-	config_foreach stop_service p910nd
-}
diff --git a/trunk/package/feeds/packages/patch/Makefile b/trunk/package/feeds/packages/patch/Makefile
deleted file mode 100644
index d705a30a..00000000
--- a/trunk/package/feeds/packages/patch/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=patch
-PKG_VERSION:=2.7.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/patch
-PKG_MD5SUM:=e3da7940431633fb65a01b91d3b7a27a
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/patch
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=patch
-  URL:=http://www.gnu.org/
-  MAINTAINER:=Russell Senior <russell@personaltelco.net>
-endef
-
-define Package/patch/description
-  The Patch package contains a program for modifying or creating files
-  by applying a "patch" file typically created by the diff program.
-endef
-
-CONFIGURE_ARGS+= --disable-xattr
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/patch/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/patch $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,patch))
diff --git a/trunk/package/feeds/packages/pciutils/Makefile b/trunk/package/feeds/packages/pciutils/Makefile
deleted file mode 100644
index e9879f60..00000000
--- a/trunk/package/feeds/packages/pciutils/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pciutils
-PKG_VERSION:=3.3.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
-PKG_MD5SUM:=86d5462e5cfc2a4341a2b91ce3ed0f09
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_USE_MIPS16:=0
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pciutils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Linux PCI Utilities
-  URL:=http://mj.ucw.cz/pciutils.shtml
-  DEPENDS:=+libkmod +zlib
-endef
-
-define Package/pciutils/description
- contains collection of programs for inspecting and manipulating configuration
- of PCI devices
-endef
-
-define Package/pciutils/postinst
-#!/bin/sh
-[ -z "$${IPKG_INSTROOT}" ] || \
-(cd $${PKG_ROOT}/usr/share; $${PKG_ROOT}/usr/sbin/update-pciids; rm pci.ids.gz.old)
-exit 0
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-	PREFIX="/usr" \
-	HOST="$(GNU_TARGET_NAME)" \
-	ZLIB="yes" \
-
-ifneq ($(CONFIG_USE_GLIBC),)
-TARGET_LDFLAGS += -lresolv
-endif
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libpci.a $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include/pci
-	$(CP) $(foreach i,pci.h config.h header.h types.h, \
-		$(PKG_BUILD_DIR)/lib/$(i)) $(1)/usr/include/pci
-endef
-
-define Package/pciutils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{lspci,setpci,update-pciids} $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pci.ids.gz $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,pciutils))
diff --git a/trunk/package/feeds/packages/pciutils/patches/100-remove-no-timestamping.patch b/trunk/package/feeds/packages/pciutils/patches/100-remove-no-timestamping.patch
deleted file mode 100644
index 93bc85fa..00000000
--- a/trunk/package/feeds/packages/pciutils/patches/100-remove-no-timestamping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/update-pciids.sh
-+++ b/update-pciids.sh
-@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then
- 	DL="curl -o $DEST.new $SRC"
-     ${quiet} && DL="$DL -s -S"
- elif which wget >/dev/null 2>&1 ; then
--	DL="wget --no-timestamping -O $DEST.new $SRC"
-+	DL="wget -O $DEST.new $SRC"
- 	${quiet} && DL="$DL -q"
- elif which lynx >/dev/null 2>&1 ; then
- 	DL="eval lynx -source $SRC >$DEST.new"
diff --git a/trunk/package/feeds/packages/pciutils/patches/101-no-strip.patch b/trunk/package/feeds/packages/pciutils/patches/101-no-strip.patch
deleted file mode 100644
index 610a7553..00000000
--- a/trunk/package/feeds/packages/pciutils/patches/101-no-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -111,7 +111,7 @@ distclean: clean
- install: all
- # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
--	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
- 	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
- 	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
- 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/trunk/package/feeds/packages/pciutils/patches/102-compressed-ids.patch b/trunk/package/feeds/packages/pciutils/patches/102-compressed-ids.patch
deleted file mode 100644
index 9b319384..00000000
--- a/trunk/package/feeds/packages/pciutils/patches/102-compressed-ids.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/update-pciids.sh
-+++ b/update-pciids.sh
-@@ -6,9 +6,8 @@ set -e
- SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
- DEST=pci.ids
- PCI_COMPRESSED_IDS=
--GREP=grep
- 
--# if pci.ids is read-only (because the filesystem is read-only),
-+# if pci.ids.gz is read-only (because the filesystem is read-only),
- # then just skip this whole process.
- if ! touch ${DEST} >/dev/null 2>&1 ; then
- 	${quiet} || echo "${DEST} is read-only, exiting." 1>&2
-@@ -18,7 +17,7 @@ fi
- if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
- 	DECOMP="cat"
- 	SRC="$SRC.gz"
--	GREP=zgrep
-+	DEST="$DEST.gz"
- elif which bzip2 >/dev/null 2>&1 ; then
- 	DECOMP="bzip2 -d"
- 	SRC="$SRC.bz2"
-@@ -53,7 +52,7 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; th
- 	exit 1
- fi
- 
--if ! $GREP >/dev/null "^C " $DEST.neww ; then
-+if ! zcat $DEST.neww | grep >/dev/null "^C " ; then
- 	echo >&2 "update-pciids: missing class info, probably truncated file"
- 	exit 1
- fi
diff --git a/trunk/package/feeds/packages/pciutils/patches/103-relative-path-ids.patch b/trunk/package/feeds/packages/pciutils/patches/103-relative-path-ids.patch
deleted file mode 100644
index c6d69068..00000000
--- a/trunk/package/feeds/packages/pciutils/patches/103-relative-path-ids.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -88,7 +88,7 @@ lspci: LDLIBS+=$(LIBKMOD_LIBS)
- ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS)
- 
- update-pciids: update-pciids.sh
--	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
-+	sed <$< >$@ "s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
- 	chmod +x $@
- 
- # The example of use of libpci
diff --git a/trunk/package/feeds/packages/pciutils/patches/104-resolv.patch b/trunk/package/feeds/packages/pciutils/patches/104-resolv.patch
deleted file mode 100644
index c38d1cfc..00000000
--- a/trunk/package/feeds/packages/pciutils/patches/104-resolv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/configure
-+++ b/lib/configure
-@@ -57,7 +57,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t
- echo >$m 'WITH_LIBS='
- 
- echo_n "Looking for access methods..."
--LIBRESOLV=-lresolv
-+LIBRESOLV=
- LIBEXT=so
- 
- case $sys in
diff --git a/trunk/package/feeds/packages/pcre/Makefile b/trunk/package/feeds/packages/pcre/Makefile
deleted file mode 100644
index 007af93d..00000000
--- a/trunk/package/feeds/packages/pcre/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pcre
-PKG_VERSION:=8.36
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=b767bc9af0c20bc9c1fe403b0d41ad97
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENCE
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libpcre/default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://www.pcre.org/
-endef
-
-define Package/libpcre
-  $(call Package/libpcre/default)
-  TITLE:=A Perl Compatible Regular Expression library
-endef
-
-define Package/libpcre16
-  $(call Package/libpcre/default)
-  TITLE:=A Perl Compatible Regular Expression library (16bit support)
-endef
-
-define Package/libpcrecpp
-  $(call Package/libpcre/default)
-  TITLE:=C++ wrapper for Perl Compatible Regular Expression library
-  DEPENDS:=+libpcre +libstdcpp
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-utf8 \
-	--enable-unicode-properties \
-	--enable-pcre16 \
-
-ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
-  CONFIGURE_ARGS+= --enable-cpp
-else
-  CONFIGURE_ARGS+= --disable-cpp
-endif
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(2)/bin
-	$(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libpcre/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
-endef
-
-define Package/libpcre16/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre16.so* $(1)/usr/lib/
-endef
-
-define Package/libpcrecpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libpcre))
-$(eval $(call BuildPackage,libpcre16))
-$(eval $(call BuildPackage,libpcrecpp))
diff --git a/trunk/package/feeds/packages/pcsc-lite/Makefile b/trunk/package/feeds/packages/pcsc-lite/Makefile
deleted file mode 100644
index f5387f03..00000000
--- a/trunk/package/feeds/packages/pcsc-lite/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pcsc-lite
-PKG_VERSION:=1.8.13
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4126
-PKG_MD5SUM:=4dcd22d20a6df8810fac5480cc320b6d
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pcsc-lite/Default
-  TITLE:=Middleware to access a smart card using SCard API (PC/SC).
-  URL:=http://pcsclite.alioth.debian.org/
-endef
-
-define Package/pcsc-lite/Default/description
-  The purpose of PC/SC Lite is to provide a Windows(R) SCard
-  interface in a very small form factor for communicating to
-  smart cards and smart cards readers.
-endef
-
-define Package/libpcsclite
-  $(call Package/pcsc-lite/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (library)
-  DEPENDS:=+libusb-1.0 +libpthread +librt
-endef
-
-define Package/libpcsclite/description
-  $(call Package/pcsc-lite/Default/description)
-  .
-  This package contains the PC/SC shared library.
-endef
-
-define Package/pcscd
-  $(call Package/pcsc-lite/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= (daemon)
-  DEPENDS:=+libpcsclite
-endef
-
-define Package/pcscd/description
-  $(call Package/pcsc-lite/Default/description)
-  .
-  This package contains the PC/SC daemon.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += -lpthread
-
-CONFIGURE_ARGS += \
-	--disable-libudev \
-	--enable-libusb \
-	--enable-static \
-	--enable-usbdropdir=/usr/lib/pcsc/drivers
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/PCSC
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/PCSC/* $(1)/usr/include/PCSC/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcsclite.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcsclite.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libpcsclite/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcsclite.so.* $(1)/usr/lib/
-endef
-
-define Package/pcscd/conffiles
-/etc/reader.conf.d/reader.conf
-endef
-
-define Package/pcscd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pcscd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/pcscd.init $(1)/etc/init.d/pcscd
-	$(INSTALL_DIR) $(1)/etc/reader.conf.d
-endef
-
-$(eval $(call BuildPackage,libpcsclite))
-$(eval $(call BuildPackage,pcscd))
diff --git a/trunk/package/feeds/packages/pcsc-lite/files/pcscd.init b/trunk/package/feeds/packages/pcsc-lite/files/pcscd.init
deleted file mode 100644
index 9a7a9057..00000000
--- a/trunk/package/feeds/packages/pcsc-lite/files/pcscd.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
-
-START=50
-
-SERVICE_PID_FILE=/var/run/pcscd/pcscd.pid
-
-start() {
-	service_start /usr/sbin/pcscd
-}
-
-stop() {
-	service_stop /usr/sbin/pcscd
-}
diff --git a/trunk/package/feeds/packages/pen/Makefile b/trunk/package/feeds/packages/pen/Makefile
deleted file mode 100644
index 77b7b7a2..00000000
--- a/trunk/package/feeds/packages/pen/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pen
-PKG_VERSION:=0.27.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://siag.nu/pub/pen/
-PKG_MD5SUM:=a83bbbe3aec24d8d53f5e87efb433b25
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pen
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl
-  TITLE:=Simple TCP load balancer
-  URL:=http://morestuff.siag.nu/category/pen/
-endef
-
-define Package/pen/description
-	This is pen, a load balancer for "simple" TCP based protocols
-	such as HTTP or SMTP. It allows several servers to appear as
-	one to the outside and automatically detects servers that are
-	down and distributes clients among the available servers.
-	This gives high availability and scalable performance.
-endef
-
-CONFIGURE_ARGS += \
-		--with-poll \
-		--with-ssl="$(STAGING_DIR)/usr" \
-		--without-geoip \
-
-define Package/pen/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mergelogs $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/pen $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/penctl $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/penlog $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/penlogd $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/penctl.cgi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/penstats $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,pen))
diff --git a/trunk/package/feeds/packages/perl-compress-bzip2/Makefile b/trunk/package/feeds/packages/perl-compress-bzip2/Makefile
deleted file mode 100644
index 0671cd97..00000000
--- a/trunk/package/feeds/packages/perl-compress-bzip2/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014, 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-compress-bzip2
-PKG_VERSION:=2.22
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN/
-PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=0d01b86c3efa74e29bb975aea46b666f
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-compress-bzip2
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl interface to bzip2 compression library
-  URL:=http://search.cpan.org/dist/Compress-Bzip2/
-  DEPENDS:=perl +libbz2
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,BUILD_BZLIB=0)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-compress-bzip2/install
-	$(call perlmod/Install,$(1),Compress auto/Compress)
-endef
-
-
-$(eval $(call BuildPackage,perl-compress-bzip2))
diff --git a/trunk/package/feeds/packages/perl-dbi/Makefile b/trunk/package/feeds/packages/perl-dbi/Makefile
deleted file mode 100644
index 26335912..00000000
--- a/trunk/package/feeds/packages/perl-dbi/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2014, 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-dbi
-PKG_VERSION:=1.633
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TI/TIMB/
-PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=b4fe13b9a51c1446c5f3cf93e69a2044
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/DBI-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-include ../perl/perlmod.mk
-
-define Package/perl-dbi
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Database independent interface for Perl
-  URL:=http://search.cpan.org/dist/DBI/
-  DEPENDS:=perl +perlbase-essential
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Host/Configure
-	$(call perlmod/host/Configure,,)
-endef
-
-define Host/Compile
-	$(call perlmod/host/Compile,,)
-endef
-
-define Host/Install
-	$(call perlmod/host/Install,$(1),)
-endef
-
-define Package/perl-dbi/install
-	$(call perlmod/Install,$(1),DB* auto/DBI,DBI/W32ODBC.pm auto/DBI/*.h)
-endef
-
-
-$(eval $(call BuildPackage,perl-dbi))
-$(eval $(call HostBuild))
diff --git a/trunk/package/feeds/packages/perl-html-parser/Makefile b/trunk/package/feeds/packages/perl-html-parser/Makefile
deleted file mode 100644
index 6baa88d8..00000000
--- a/trunk/package/feeds/packages/perl-html-parser/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-parser
-PKG_VERSION:=3.71
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
-PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9128a45893097dfa3bf03301b19c5efe
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-parser
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=A collection of modules that parse HTML text documents
-  URL:=http://search.cpan.org/dist/HTML-Parser/
-  DEPENDS:=perl +perl-html-tagset +perl-uri
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-parser/install
-	$(call perlmod/Install,$(1),HTML auto/HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-parser))
diff --git a/trunk/package/feeds/packages/perl-html-tagset/Makefile b/trunk/package/feeds/packages/perl-html-tagset/Makefile
deleted file mode 100644
index fbec409c..00000000
--- a/trunk/package/feeds/packages/perl-html-tagset/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-tagset
-PKG_VERSION:=3.20
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/
-PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-tagset
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Data tables pertaining to HTML
-  URL:=http://search.cpan.org/dist/HTML-Tagset/
-  DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-tagset/install
-	$(call perlmod/Install,$(1),HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-tagset))
diff --git a/trunk/package/feeds/packages/perl-html-tree/Makefile b/trunk/package/feeds/packages/perl-html-tree/Makefile
deleted file mode 100644
index 614aff7f..00000000
--- a/trunk/package/feeds/packages/perl-html-tree/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-html-tree
-PKG_VERSION:=3.23
-PKG_RELEASE:=2
-PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETEK/
-PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-html-tree
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=represent and create HTML syntax trees
-  URL:=http://search.cpan.org/dist/HTML-Tree/
-  DEPENDS:=perl +perl-html-parser +perl-html-tagset
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-html-tree/install
-	$(call perlmod/Install,$(1),HTML)
-endef
-
-
-$(eval $(call BuildPackage,perl-html-tree))
diff --git a/trunk/package/feeds/packages/perl-lockfile-simple/Makefile b/trunk/package/feeds/packages/perl-lockfile-simple/Makefile
deleted file mode 100644
index e65d4a57..00000000
--- a/trunk/package/feeds/packages/perl-lockfile-simple/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-lockfile-simple
-PKG_VERSION:=0.208
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SC/SCHWIGON/lockfile-simple/
-PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=4421283b4f32549e5299963734170044
-
-PKG_LICENSE:=GPL-2.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-lockfile-simple
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Simple advisory file locking
-  URL:=http://search.cpan.org/dist/LockFile-Simple/
-  DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-lockfile-simple/install
-	$(call perlmod/Install,$(1),LockFile auto/LockFile)
-endef
-
-
-$(eval $(call BuildPackage,perl-lockfile-simple))
diff --git a/trunk/package/feeds/packages/perl-net-telnet/Makefile b/trunk/package/feeds/packages/perl-net-telnet/Makefile
deleted file mode 100644
index d229cd81..00000000
--- a/trunk/package/feeds/packages/perl-net-telnet/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-net-telnet
-PKG_VERSION:=3.04
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/J/JR/JROGERS/
-PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=d2514080116c1b0fa5f96295c84538e3
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-net-telnet
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Telnet client
-  URL:=http://search.cpan.org/dist/Net-Telnet/
-  DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-net-telnet/install
-	$(call perlmod/Install,$(1),Net auto/Net)
-endef
-
-
-$(eval $(call BuildPackage,perl-net-telnet))
diff --git a/trunk/package/feeds/packages/perl-test-harness/Makefile b/trunk/package/feeds/packages/perl-test-harness/Makefile
deleted file mode 100644
index 9a0f0a53..00000000
--- a/trunk/package/feeds/packages/perl-test-harness/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014, 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-test-harness
-PKG_VERSION:=3.35
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/L/LE/LEONT/
-PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=2a6010bca2ad78e094d629eea6afd7d9
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Harness-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-test-harness
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl Test Harness
-  URL:=http://search.cpan.org/dist/Test-Harness/
-  DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-test-harness/install
-	$(call perlmod/Install,$(1),App auto/Test TAP Test)
-endef
-
-
-$(eval $(call BuildPackage,perl-test-harness))
diff --git a/trunk/package/feeds/packages/perl-uri/Makefile b/trunk/package/feeds/packages/perl-uri/Makefile
deleted file mode 100644
index 28164fd7..00000000
--- a/trunk/package/feeds/packages/perl-uri/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-uri
-PKG_VERSION:=1.67
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
-PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=d0ef53b6c63bcc02ba55f405c30741e3
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-uri
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Manipulates and accesses URI strings
-  URL:=http://search.cpan.org/dist/URI/
-  DEPENDS:=perl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-uri/install
-	$(call perlmod/Install,$(1),URI URI.pm)
-endef
-
-
-$(eval $(call BuildPackage,perl-uri))
diff --git a/trunk/package/feeds/packages/perl-www-curl/Makefile b/trunk/package/feeds/packages/perl-www-curl/Makefile
deleted file mode 100644
index 8bc3bfda..00000000
--- a/trunk/package/feeds/packages/perl-www-curl/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-www-curl
-PKG_VERSION:=4.17
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/
-PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=997ac81cd6b03b30b36f7cd930474845
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Curl-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www-curl
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl bindings to libcurl
-  URL:=http://search.cpan.org/dist/WWW-Curl/
-  DEPENDS:=perl +libcurl
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www-curl/install
-	$(call perlmod/Install,$(1),WWW/Curl WWW/Curl.pm auto/WWW/Curl)
-endef
-
-
-$(eval $(call BuildPackage,perl-www-curl))
diff --git a/trunk/package/feeds/packages/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch b/trunk/package/feeds/packages/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
deleted file mode 100644
index 568b65c2..00000000
--- a/trunk/package/feeds/packages/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -12,31 +12,31 @@ no_index		directory => 'template';
- repository		'http://github.com/szbalint/WWW--Curl';
- # This is a hack. If you have libcurl installed, just specify curl.h below
- # and comment out this line.
--if ($^O ne 'MSWin32') {
--    if (!$ENV{CURL_CONFIG}) {
--	    requires_external_bin	'curl-config';
--    }
--} else {
--	print	"Sorry, no automated install is available on Windows,\n".
--		"please see the README.Win32 file on instructions for a manual install.\n";
--	exit(0);
--}
--
--my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
--
--my $vernum = `${curl_config} --vernum`; chomp $vernum;
--my $version = `${curl_config} --version`; chomp $version; 
--
--my $minimum_ver = hex("070a08");
--
--if ($vernum && hex($vernum) <= $minimum_ver) {
--	print	"Your currently installed libcurl version - $version - is too old.\n".
--		"This module doesn't seek compatibility with versions older than 7.10.8\n".
--		"Proceed manually if you know what you're doing.\n";
--	exit(0);
--}
--
--print "The version is $version\n";
-+#if ($^O ne 'MSWin32') {
-+#    if (!$ENV{CURL_CONFIG}) {
-+#	    requires_external_bin	'curl-config';
-+#    }
-+#} else {
-+#	print	"Sorry, no automated install is available on Windows,\n".
-+#		"please see the README.Win32 file on instructions for a manual install.\n";
-+#	exit(0);
-+#}
-+#
-+#my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
-+#
-+#my $vernum = `${curl_config} --vernum`; chomp $vernum;
-+#my $version = `${curl_config} --version`; chomp $version; 
-+#
-+#my $minimum_ver = hex("070a08");
-+#
-+#if ($vernum && hex($vernum) <= $minimum_ver) {
-+#	print	"Your currently installed libcurl version - $version - is too old.\n".
-+#		"This module doesn't seek compatibility with versions older than 7.10.8\n".
-+#		"Proceed manually if you know what you're doing.\n";
-+#	exit(0);
-+#}
-+#
-+#print "The version is $version\n";
- 
- my @includes = qw();
- my ($cflags,$lflags, $ldflags) = ('','','');
-@@ -58,10 +58,10 @@ if ($^O ne 'MSWin32') {
- # Get curl to tell us where it is, if we can.
- #
- 
--if ($^O ne 'MSWin32') {
--	$cflags = `${curl_config} --cflags`;
--	$lflags = `${curl_config} --libs`;
--}
-+#if ($^O ne 'MSWin32') {
-+#	$cflags = `${curl_config} --cflags`;
-+#	$lflags = `${curl_config} --libs`;
-+#}
- 
- # can't find link flags, make some guesses
- if (!defined($lflags)) {
diff --git a/trunk/package/feeds/packages/perl-www-curl/patches/200-fix_default_lflags.patch b/trunk/package/feeds/packages/perl-www-curl/patches/200-fix_default_lflags.patch
deleted file mode 100644
index f51eaf58..00000000
--- a/trunk/package/feeds/packages/perl-www-curl/patches/200-fix_default_lflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -39,7 +39,7 @@ repository		'http://github.com/szbalint/
- #print "The version is $version\n";
- 
- my @includes = qw();
--my ($cflags,$lflags, $ldflags) = ('','','');
-+my ($cflags,$lflags, $ldflags) = ('','-lcurl','');
- 
- # You may need to specify where to find curl.h on your platform
- # These are guesses only, in case curl-config is not telling us.
diff --git a/trunk/package/feeds/packages/perl-www-mechanize/Makefile b/trunk/package/feeds/packages/perl-www-mechanize/Makefile
deleted file mode 100644
index 576424cd..00000000
--- a/trunk/package/feeds/packages/perl-www-mechanize/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2010-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-www-mechanize
-PKG_VERSION:=1.74
-PKG_RELEASE:=1
-
-PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
-PKG_MD5SUM:=8ec615225037ac66a2d37f4e9693ef86
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Mechanize-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www-mechanize
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Perl WWW Mechanize
-  URL:=http://search.cpan.org/dist/WWW-Mechanize/
-  DEPENDS:=perl +perl-www
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www-mechanize/install
-	$(call perlmod/Install,$(1),WWW/Mechanize WWW/Mechanize.pm)
-endef
-
-
-$(eval $(call BuildPackage,perl-www-mechanize))
diff --git a/trunk/package/feeds/packages/perl-www/Makefile b/trunk/package/feeds/packages/perl-www/Makefile
deleted file mode 100644
index fadc1c02..00000000
--- a/trunk/package/feeds/packages/perl-www/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl-www
-PKG_VERSION:=5.837
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
-PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9bbf1bce482b0bac98bb4f04253c03d0
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
-
-define Package/perl-www
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=WWW client/server library for Perl (aka LWP)
-  URL:=http://search.cpan.org/dist/libwww-perl/
-  DEPENDS:=perl +perl-html-parser +perl-html-tagset +perl-uri
-endef
-
-define Build/Configure
-	$(call perlmod/Configure,-n,)
-endef
-
-define Build/Compile
-	$(call perlmod/Compile,,)
-endef
-
-define Package/perl-www/install
-	$(call perlmod/Install,$(1),File HTML HTTP LWP LWP.pm Net WWW)
-endef
-
-
-$(eval $(call BuildPackage,perl-www))
diff --git a/trunk/package/feeds/packages/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch b/trunk/package/feeds/packages/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
deleted file mode 100644
index 9166e891..00000000
--- a/trunk/package/feeds/packages/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 3b266f17ccd5613a9c42d1e04118e94ca6467489
-Author: Gisle Aas <gisle@aas.no>
-Date:   Sun Jan 16 12:56:30 2011 +0100
-
-    Call IO::Socket::SSL's verify_hostname when available
-
---- a/lib/LWP/Protocol/https.pm
-+++ b/lib/LWP/Protocol/https.pm
-@@ -14,6 +14,15 @@ sub socket_type
- sub _check_sock
- {
-     my($self, $req, $sock) = @_;
-+    if ($sock->can("verify_hostname")) {
-+	if (!$sock->verify_hostname($req->uri->host, "www")) {
-+	    my $subject = $sock->peer_certificate("subject");
-+	    die "SSL-peer fails verification [subject=$subject]\n";
-+	}
-+	else {
-+	    $req->{ssl_sock_verified}++;
-+	}
-+    }
-     my $check = $req->header("If-SSL-Cert-Subject");
-     if (defined $check) {
- 	my $cert = $sock->get_peer_certificate ||
-@@ -36,9 +45,14 @@ sub _get_sock_info
- 	$res->header("Client-SSL-Cert-Subject" => $cert->subject_name);
- 	$res->header("Client-SSL-Cert-Issuer" => $cert->issuer_name);
-     }
--    if(! eval { $sock->get_peer_verify }) {
--       $res->header("Client-SSL-Warning" => "Peer certificate not verified");
-+    if (!$res->request->{ssl_sock_verified}) {
-+	if(! eval { $sock->get_peer_verify }) {
-+	    my $msg = "Peer certificate not verified";
-+	    $msg .= " [$@]" if $@;
-+	    $res->header("Client-SSL-Warning" => $msg);
-+	}
-     }
-+    $res->header("Client-SSL-Socket-Class" => $Net::HTTPS::SSL_SOCKET_CLASS);
- }
- 
- #-----------------------------------------------------------
diff --git a/trunk/package/feeds/packages/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch b/trunk/package/feeds/packages/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
deleted file mode 100644
index 465010e2..00000000
--- a/trunk/package/feeds/packages/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-commit 62dd58188d8f8987d24bd84951813a54a8bf5987
-Author: Gisle Aas <gisle@aas.no>
-Date:   Mon Jan 24 23:19:59 2011 +0100
-
-    Default to verifying hostnames when using SSL
-
---- a/lib/LWP/Protocol/https.pm
-+++ b/lib/LWP/Protocol/https.pm
-@@ -11,18 +11,30 @@ sub socket_type
-     return "https";
- }
- 
--sub _check_sock
-+sub _extra_sock_opts
- {
--    my($self, $req, $sock) = @_;
--    if ($sock->can("verify_hostname")) {
--	if (!$sock->verify_hostname($req->uri->host, "www")) {
--	    my $subject = $sock->peer_certificate("subject");
--	    die "SSL-peer fails verification [subject=$subject]\n";
--	}
--	else {
--	    $req->{ssl_sock_verified}++;
-+    my $self = shift;
-+    my %ssl_opts = %{$self->{ua}{ssl_opts} || {}};
-+    unless (exists $ssl_opts{SSL_verify_mode}) {
-+	$ssl_opts{SSL_verify_mode} = 1;
-+    }
-+    if (delete $ssl_opts{verify_hostname}) {
-+	$ssl_opts{SSL_verify_mode} ||= 1;
-+	$ssl_opts{SSL_verifycn_scheme} = 'www';
-+    }
-+    if ($ssl_opts{SSL_verify_mode}) {
-+	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-+	    require Mozilla::CA;
-+	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
- 	}
-     }
-+    $self->{ssl_opts} = \%ssl_opts;
-+    return (%ssl_opts, $self->SUPER::_extra_sock_opts);
-+}
-+
-+sub _check_sock
-+{
-+    my($self, $req, $sock) = @_;
-     my $check = $req->header("If-SSL-Cert-Subject");
-     if (defined $check) {
- 	my $cert = $sock->get_peer_certificate ||
-@@ -45,12 +57,11 @@ sub _get_sock_info
- 	$res->header("Client-SSL-Cert-Subject" => $cert->subject_name);
- 	$res->header("Client-SSL-Cert-Issuer" => $cert->issuer_name);
-     }
--    if (!$res->request->{ssl_sock_verified}) {
--	if(! eval { $sock->get_peer_verify }) {
--	    my $msg = "Peer certificate not verified";
--	    $msg .= " [$@]" if $@;
--	    $res->header("Client-SSL-Warning" => $msg);
--	}
-+    if (!$self->{ssl_opts}{SSL_verify_mode}) {
-+	$res->push_header("Client-SSL-Warning" => "Peer certificate not verified");
-+    }
-+    elsif (!$self->{ssl_opts}{SSL_verifycn_scheme}) {
-+	$res->push_header("Client-SSL-Warning" => "Peer hostname match with certificate not verified");
-     }
-     $res->header("Client-SSL-Socket-Class" => $Net::HTTPS::SSL_SOCKET_CLASS);
- }
---- a/lib/LWP/UserAgent.pm
-+++ b/lib/LWP/UserAgent.pm
-@@ -41,6 +41,7 @@ sub new
-     my $timeout = delete $cnf{timeout};
-     $timeout = 3*60 unless defined $timeout;
-     my $local_address = delete $cnf{local_address};
-+    my $ssl_opts = delete $cnf{ssl_opts};
-     my $use_eval = delete $cnf{use_eval};
-     $use_eval = 1 unless defined $use_eval;
-     my $parse_head = delete $cnf{parse_head};
-@@ -83,6 +84,7 @@ sub new
- 		      def_headers  => $def_headers,
- 		      timeout      => $timeout,
- 		      local_address => $local_address,
-+		      ssl_opts     => { $ssl_opts ? %$ssl_opts  : (verify_hostname => 1) },
- 		      use_eval     => $use_eval,
-                       show_progress=> $show_progress,
- 		      max_size     => $max_size,
-@@ -582,6 +584,20 @@ sub max_size     { shift->_elem('max_siz
- sub max_redirect { shift->_elem('max_redirect', @_); }
- sub show_progress{ shift->_elem('show_progress', @_); }
- 
-+sub ssl_opts {
-+    my $self = shift;
-+    if (@_ == 1) {
-+	my $k = shift;
-+	return $self->{ssl_opts}{$k};
-+    }
-+    if (@_) {
-+	%{$self->{ssl_opts}} = (%{$self->{ssl_opts}}, @_);
-+    }
-+    else {
-+	return keys %{$self->{ssl_opts}};
-+    }
-+}
-+
- sub parse_head {
-     my $self = shift;
-     if (@_) {
-@@ -1040,6 +1056,7 @@ The following options correspond to attr
-    cookie_jar              undef
-    default_headers         HTTP::Headers->new
-    local_address           undef
-+   ssl_opts		   { verify_hostname => 1 }
-    max_size                undef
-    max_redirect            7
-    parse_head              1
diff --git a/trunk/package/feeds/packages/perl/Config.in b/trunk/package/feeds/packages/perl/Config.in
deleted file mode 100644
index f4c4f887..00000000
--- a/trunk/package/feeds/packages/perl/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_perl
-
-config PERL_THREADS
-    bool "Enable threading support"
-    default y if (mips || mipsel || i386 || i686 || x86_64 || armeb || arm) && (USE_UCLIBC || USE_GLIBC)
-    default n
-
-config PERL_TESTS
-	bool "Include perl tests"
-	default n
-	help
-		Include test suites for all perl packages.
-		
-		This will increase the size of perl and related packages
-		considerably.
-		Test support is still in development. Some tests will fail,
-		others are just missing completely.
-
-endmenu
diff --git a/trunk/package/feeds/packages/perl/Makefile b/trunk/package/feeds/packages/perl/Makefile
deleted file mode 100644
index abd327f6..00000000
--- a/trunk/package/feeds/packages/perl/Makefile
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=perl
-PKG_VERSION:=5.20.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
-		http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz \
-		ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
-		http://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
-		ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \
-		http://ftp5.gwdg.de/pub/languages/perl/CPAN/src/ \
-		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 \
-		http://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=81b17b9a4e5ee18e54efe906c9bf544d
-
-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-PKG_LICENSE_FILES:=Copying Artistic README
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
-
-# Build settings
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=perl/host
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-
-# Variables used during configuration/build
-HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
-ifneq ($(CONFIG_USE_GLIBC),)
-	EXTRA_LIBS:=bsd
-	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
-endif
-
-# Filter -g3, it will break Compress-Raw-Zlib
-TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))
-TARGET_CPPFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CPPFLAGS))
-
-# Handle threading
-ifdef CONFIG_PERL_THREADS
-	PERL_CONFIG_SUFFIX:=-mt
-
-	# uclibc doesn't provide crypt_r(). Enable crypt() usage for glibc builds only
-	ifdef CONFIG_USE_GLIBC
-		CRYPT_R_PROTO:=REENTRANT_PROTO_B_CCS
-		CRYPT:=define
-	else
-		CRYPT_R_PROTO:=0
-		CRYPT:=undef
-	endif
-endif
-
-# A list of disabled tests
-# ExtUtils tests are disabled for now as we don't support building
-# native extensions on the target machine at the moment
-PERL_DISABLEDTESTS:=cpan/ExtUtils-Constant cpan/ExtUtils-MakeMaker
-# We're on Linux, so don't even package them
-PERL_DISABLEDTESTS+=cpan/Win32API-File cpan/Win32 ext/VMS-DCLsym ext/VMS-Filespec ext/VMS-Stdio ext/Win32CORE
-# NDBM and ODBM not supported
-PERL_DISABLEDTESTS+=ext/NDBM_File ext/ODBM_File
-
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-include perlmod.mk
-
-define Package/perl
-  SUBMENU:=Perl
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=The Perl intepreter
-  URL:=http://www.perl.com/
-  DEPENDS:=+USE_GLIBC:libbsd +PERL_THREADS:libpthread
-endef
-
-define Package/perl/description
-  Perl is a stable, cross platform programming language.
-  It is used for mission critical projects in the public and private sectors
-  and is widely used to program web applications of all needs.
-endef
-
-define Package/perl/config
-	source "$(SOURCE)/Config.in"
-endef
-
-# Static host perl
-define Host/Configure
-	( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Duserelocatableinc -Dprefix=$(HOST_PERL_PREFIX) )
-endef
-
-define Host/Install
-	( cd $(HOST_BUILD_DIR); ./miniperl installperl )
-	$(INSTALL_DIR) $(HOST_PERL_PREFIX)/bin/
-	$(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_PREFIX)/bin/
-	
-	# Link any possibly installed static extension in
-	$(MAKE) -C $(HOST_BUILD_DIR)/relink clean || true
-	( cd $(HOST_BUILD_DIR)/relink && $(HOST_PERL_PREFIX)/bin/perl Makefile.PL )
-	$(call perlmod/host/relink,$(HOST_BUILD_DIR)/relink)
-endef
-
-# Target perl
-define Build/Configure
-	sed \
-		-e 's!%%CC%%!$(TARGET_CC)!g' \
-		-e 's!%%CFLAGS%%!$(TARGET_CFLAGS_PERL) $(TARGET_CPPFLAGS_PERL)!g' \
-		-e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
-		-e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
-		-e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
-		-e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
-		-e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
-		-e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
-		-e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \
-		-e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \
-		-e 's!%%IPV6%%!$(if $($(CONFIG_IPV6)),define,undef)!g' \
-		-e 's!%%HOSTMINIPERL%%!$(HOST_PERL_PREFIX)/bin/perl!g' \
-		-e 's!%%CRYPT_R_PROTO%%!$(CRYPT_R_PROTO)!g' \
-		-e 's!%%CRYPT%%!$(CRYPT)!g' \
-		-e 's!%%HOSTGENERATE%%!$(HOST_PERL_PREFIX)/bin/generate_uudmap!g' \
-		files/config.sh-$(patsubst i386,i486,$(ARCH))$(PERL_CONFIG_SUFFIX).in \
-		> $(PKG_BUILD_DIR)/config.sh
-	(cd $(PKG_BUILD_DIR) && ./Configure -S)
-	install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20 $(1)/usr/lib/perl5/
-endef
-
-define Package/perl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin
-	ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl
-	
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/CORE
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20/CORE/libperl.so $(1)/usr/lib/perl5/5.20/CORE/
-endef
-
-
-$(eval $(call RequireCommand,rsync, \
-	$(PKG_NAME) requires rsync installed on the host-system. \
-))
-
-$(eval $(call BuildPackage,perl))
-$(eval $(call HostBuild))
-
--include perlbase.mk
-
-# A helper package that includes all sort of supplementary files for tests
-define Package/perl-tests-common
-$(call Package/perlbase-template)
-TITLE:=Common test support files
-DEPENDS:=@PERL_TESTS
-endef
-
-define Package/perl-tests-common/install
-	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)
-	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/Porting
-	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/regen
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/XS
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/auto/XS
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/unicore
-	
-	$(CP) $(PKG_BUILD_DIR)/t $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/Porting $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/regen $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/MANIFEST $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/TestInit.pm $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/vutil.c $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/vxs.inc $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/lib/XS $(1)/usr/lib/perl5/5.20/
-	$(CP) $(PKG_BUILD_DIR)/lib/auto/XS $(1)/usr/lib/perl5/5.20/auto
-	$(CP) $(PKG_BUILD_DIR)/lib/vmsish.pm $(1)/usr/lib/perl5/5.20/
-	$(CP) $(PKG_BUILD_DIR)/lib/unicore/TestProp.pl $(1)/usr/lib/perl5/5.20/unicore
-	$(CP) files/perl-run_tests.sh $(1)/$(PERL_TESTSDIR)/run_tests.sh
-	sed -e 's!%%PERL_DISABLEDTESTS%%!$(PERL_DISABLEDTESTS)!' -i $(1)/$(PERL_TESTSDIR)/run_tests.sh
-	$(CP) $(PKG_BUILD_DIR)/config_h.SH $(1)/$(PERL_TESTSDIR)
-	$(CP) $(PKG_BUILD_DIR)/perl.h $(1)/$(PERL_TESTSDIR)
-endef
-
-$(eval $(call BuildPackage,perl-tests-common))
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-arm-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-arm-mt.in
deleted file mode 100644
index 635b05e9..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-arm-mt.in
+++ /dev/null
@@ -1,1163 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:18:17 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='arm-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__ARM_ARCH_3__=1'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:18:17 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='arm-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='arm-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-arm.in b/trunk/package/feeds/packages/perl/files/config.sh-arm.in
deleted file mode 100644
index 9382b653..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-arm.in
+++ /dev/null
@@ -1,1162 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:18:17 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='arm-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__ARM_ARCH_3__=1'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:18:17 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='arm-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='arm-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-armeb-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-armeb-mt.in
deleted file mode 100644
index 6dad0eb1..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-armeb-mt.in
+++ /dev/null
@@ -1,1163 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:39:05 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-
-
-ar='ar'
-archname64=''
-archname='armeb-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__ARM_ARCH_3__=1'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:39:05 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='armeb-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-subversion='0'
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='armeb-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-armeb.in b/trunk/package/feeds/packages/perl/files/config.sh-armeb.in
deleted file mode 100644
index b6e828b6..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-armeb.in
+++ /dev/null
@@ -1,1162 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:39:05 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-
-
-ar='ar'
-archname64=''
-archname='armeb-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__ARM_ARCH_3__=1'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:39:05 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='armeb-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-subversion='0'
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='armeb-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-avr32-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-avr32-mt.in
deleted file mode 100644
index 7336b666..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-avr32-mt.in
+++ /dev/null
@@ -1,1165 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:39:05 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='avr32-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:39:05 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-# Matteo Croce, Mon, 21 Apr 2008 03:19:30 +0200
-# Fixes perl: can't resolve symbol 'gcvt'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='avr32-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='avr32-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='undef'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-avr32.in b/trunk/package/feeds/packages/perl/files/config.sh-avr32.in
deleted file mode 100644
index 2ec7588e..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-avr32.in
+++ /dev/null
@@ -1,1164 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:39:05 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='avr32-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:39:05 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-# Matteo Croce, Mon, 21 Apr 2008 03:19:30 +0200
-# Fixes perl: can't resolve symbol 'gcvt'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='avr32-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='avr32-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='undef'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-i486-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-i486-mt.in
deleted file mode 100644
index 89583b65..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-i486-mt.in
+++ /dev/null
@@ -1,1149 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Sat Apr 19 15:51:11 MDT 2008
-# Configured by     : root
-# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='i386-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Sat Apr 19 15:51:11 MDT 2008'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 i386=1 __i386=1 __i386__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='define'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='12'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='i386-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.25'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"LE"'
-sPRIFUldbl='"LF"'
-sPRIGUldbl='"LG"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"Le"'
-sPRIfldbl='"Lf"'
-sPRIgldbl='"Lg"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"Lf"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='i386-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-i486.in b/trunk/package/feeds/packages/perl/files/config.sh-i486.in
deleted file mode 100644
index 9d91dff7..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-i486.in
+++ /dev/null
@@ -1,1148 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Sat Apr 19 15:51:11 MDT 2008
-# Configured by     : root
-# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='i386-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Sat Apr 19 15:51:11 MDT 2008'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 i386=1 __i386=1 __i386__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='define'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='20'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='12'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='i386-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.25'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"LE"'
-sPRIFUldbl='"LF"'
-sPRIGUldbl='"LG"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"Le"'
-sPRIfldbl='"Lf"'
-sPRIgldbl='"Lg"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"Lf"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='i386-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mips-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-mips-mt.in
deleted file mode 100644
index 8564c233..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mips-mt.in
+++ /dev/null
@@ -1,1163 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='mips-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mips-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM 111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mips-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mips.in b/trunk/package/feeds/packages/perl/files/config.sh-mips.in
deleted file mode 100644
index 1a752e74..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mips.in
+++ /dev/null
@@ -1,1162 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='mips-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mips-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM 111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mips-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mips64-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-mips64-mt.in
deleted file mode 100644
index 26d908a7..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mips64-mt.in
+++ /dev/null
@@ -1,1163 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='mips64-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='87654321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols=''
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='undef'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='undef'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='define'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"u"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='int'
-i64size='8'
-i64type='long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='8'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='16'
-longlongsize='8'
-longsize='8'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mips64-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips64 unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='char *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='53'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='8'
-quadkind='2'
-quadtype='long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"lX"'
-sPRId64='"ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"li"'
-sPRIo64='"lo"'
-sPRIu64='"lu"'
-sPRIx64='"lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='64'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM 111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='8'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mips64-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned int'
-u64size='8'
-u64type='unsigned long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"u"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long'
-use5005threads='undef'
-use64bitall='define'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='8'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='67768036191676799'
-sGMTIME_min='-62167219200'
-sLOCALTIME_max='67768036191673199'
-sLOCALTIME_min='-62167222408'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mips64.in b/trunk/package/feeds/packages/perl/files/config.sh-mips64.in
deleted file mode 100644
index baab56fd..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mips64.in
+++ /dev/null
@@ -1,1162 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='mips64-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='87654321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols=''
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='undef'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='undef'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='define'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"u"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='int'
-i64size='8'
-i64type='long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='8'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='16'
-longlongsize='8'
-longsize='8'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mips64-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips64 unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='char *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='53'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='8'
-quadkind='2'
-quadtype='long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"lX"'
-sPRId64='"ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"li"'
-sPRIo64='"lo"'
-sPRIu64='"lu"'
-sPRIx64='"lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='64'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM 111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='8'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mips64-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned int'
-u64size='8'
-u64type='unsigned long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"u"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long'
-use5005threads='undef'
-use64bitall='define'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='8'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='67768036191676799'
-sGMTIME_min='-62167219200'
-sLOCALTIME_max='67768036191673199'
-sLOCALTIME_min='-62167222408'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mipsel-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-mipsel-mt.in
deleted file mode 100644
index d09586a8..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mipsel-mt.in
+++ /dev/null
@@ -1,1149 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='mipsel-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mipsel-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mipsel-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-mipsel.in b/trunk/package/feeds/packages/perl/files/config.sh-mipsel.in
deleted file mode 100644
index 43c61a69..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-mipsel.in
+++ /dev/null
@@ -1,1148 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Thu Jan 25 03:12:45 MST 2007
-# Configured by     : root
-# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='mipsel-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@merope.dev.null'
-cf_time='Thu Jan 25 03:12:45 MST 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='define'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='long'
-i64size='8'
-i64type='long long'
-i8size='1'
-i8type='char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='mipsel-linux-uclibc'
-mydomain='.dev.null'
-myhostname='merope'
-myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
-n='-n'
-need_va_copy='undef'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.4.30'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@merope.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='128'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
-sig_size='131'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='mipsel-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-powerpc-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-powerpc-mt.in
deleted file mode 100644
index 564f27bc..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-powerpc-mt.in
+++ /dev/null
@@ -1,1163 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:26:18 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='powerpc-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 system=linux system=posix system=unix'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:26:18 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols='linux=1 unix=1'
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='powerpc-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='powerpc-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-powerpc.in b/trunk/package/feeds/packages/perl/files/config.sh-powerpc.in
deleted file mode 100644
index 8906ad68..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-powerpc.in
+++ /dev/null
@@ -1,1162 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Fri Jul 20 04:26:18 MDT 2007
-# Configured by     : root
-# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-
-
-ar='ar'
-archname64=''
-archname='powerpc-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='4321'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 system=linux system=posix system=unix'
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Fri Jul 20 04:26:18 MDT 2007'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols='linux=1 unix=1'
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='undef'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='define'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='define'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='undef'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='24'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"lu"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='signed short'
-i32size='4'
-i32type='signed long'
-i64size='8'
-i64type='signed long long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-
-installscript='/usr/bin'
-
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='4'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='8'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='powerpc-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='const void *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='32'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.22'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-
-
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='4'
-quadkind='3'
-quadtype='long long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"E"'
-sPRIFUldbl='"F"'
-sPRIGUldbl='"G"'
-sPRIXU64='"LX"'
-sPRId64='"Ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"Li"'
-sPRIo64='"Lo"'
-sPRIu64='"Lu"'
-sPRIx64='"Lx"'
-sSCNfldbl='"f"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='4'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='powerpc-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned long'
-u64size='8'
-u64type='unsigned long long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"lu"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long long'
-use5005threads='undef'
-use64bitall='undef'
-use64bitint='undef'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='4'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-
-
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='2147483647'
-sGMTIME_min='-2147483648'
-sLOCALTIME_max='2147483647'
-sLOCALTIME_min='-2147483648'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-x86_64-mt.in b/trunk/package/feeds/packages/perl/files/config.sh-x86_64-mt.in
deleted file mode 100644
index 3c6ab7b1..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-x86_64-mt.in
+++ /dev/null
@@ -1,1149 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Sat Apr 19 15:51:11 MDT 2008
-# Configured by     : root
-# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='x86_64-linux-uclibc'
-archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='12345678'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Sat Apr 19 15:51:11 MDT 2008'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE %%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _LP64=1 __FLT_EVAL_METHOD__=0 __FXSR__=1 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __LONG_MAX__=9223372036854775807L __LP64__=1 __MMX__=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __SIZEOF_INT128__=16 __SIZEOF_LONG_DOUBLE__=16 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SIZE_T__=8 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __SSE2_MATH__=1 __SSE2__=1 __SSE_MATH__=1 __SSE__=1 __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __amd64=1 __amd64__=1 __code_model_small__=1 __k8=1 __k8__=1 __x86_64=1 __x86_64__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='%%CRYPT_R_PROTO%%'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='define'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='%%CRYPT%%'
-d_crypt_r='%%CRYPT%%'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='define'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='define'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='define'
-d_getgrgid_r='define'
-d_getgrnam_r='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='define'
-d_gethostbyname_r='define'
-d_gethostent_r='define'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='define'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='define'
-d_getnetbyname_r='define'
-d_getnetent_r='define'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='define'
-d_getprotobynumber_r='define'
-d_getprotoent_r='define'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='define'
-d_gettimeod='define'
-d_gmtime_r='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='define'
-d_localtime_r_needs_tzset='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='define'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='undef'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='define'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='undef'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='define'
-d_pthread_attr_setscope='define'
-d_pthread_yield='define'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='define'
-d_readdir64_r='define'
-d_readdir='define'
-d_readdir_r='define'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='define'
-d_srandom_r='define'
-d_sresgproto='define'
-d_sresuproto='define'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='define'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='define'
-d_truncate='define'
-d_ttyname_r='define'
-d_tzname='define'
-d_u32align='define'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='16'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gidformat='"u"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='int'
-i64size='8'
-i64type='long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='%%CRYPT%%'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='8'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
-locincpth=' '
-loclibpth=' '
-longdblsize='16'
-longlongsize='8'
-longsize='8'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='x86_64-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 x86_64 unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='char *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='53'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.25'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lpthread -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='8'
-quadkind='2'
-quadtype='long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"LE"'
-sPRIFUldbl='"LF"'
-sPRIGUldbl='"LG"'
-sPRIXU64='"lX"'
-sPRId64='"ld"'
-sPRIeldbl='"Le"'
-sPRIfldbl='"Lf"'
-sPRIgldbl='"Lg"'
-sPRIi64='"li"'
-sPRIo64='"lo"'
-sPRIu64='"lu"'
-sPRIx64='"lx"'
-sSCNfldbl='"Lf"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='64'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='8'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='x86_64-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned int'
-u64size='8'
-u64type='unsigned long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"u"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long'
-use5005threads='undef'
-use64bitall='define'
-use64bitint='define'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='define'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='define'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='8'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der -Dusethreads'
-config_argc=2
-config_arg1='-der'
-config_arg2='-Dusethreads'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='67768036191676799'
-sGMTIME_min='-62167219200'
-sLOCALTIME_max='67768036191673199'
-sLOCALTIME_min='-62167222408'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/config.sh-x86_64.in b/trunk/package/feeds/packages/perl/files/config.sh-x86_64.in
deleted file mode 100644
index f528c541..00000000
--- a/trunk/package/feeds/packages/perl/files/config.sh-x86_64.in
+++ /dev/null
@@ -1,1148 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: Sat Apr 19 15:51:11 MDT 2008
-# Configured by     : root
-# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-Mcc='Mcc'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='8'
-ansi2knr=''
-aphostname='/bin/hostname'
-api_revision='5'
-api_subversion='0'
-ar='ar'
-archname64=''
-archname='x86_64-linux-uclibc'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison='bison'
-byacc='byacc'
-byteorder='12345678'
-c=''
-castflags='0'
-cat='cat'
-cc='%%CC%%'
-cccdlflags='-fPIC'
-ccflags='%%CFLAGS%%'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='gcc'
-ccsymbols=''
-ccversion=''
-cf_by='root'
-cf_email='root@maia.dev.null'
-cf_time='Sat Apr 19 15:51:11 MDT 2008'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags='%%CFLAGS%%'
-cpplast='-'
-cppminus='-'
-cpprun='%%CPP%%'
-cppstdin='%%CPP%%'
-cppsymbols='__ELF__=1 _LP64=1 __FLT_EVAL_METHOD__=0 __FXSR__=1 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __LONG_MAX__=9223372036854775807L __LP64__=1 __MMX__=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __SIZEOF_INT128__=16 __SIZEOF_LONG_DOUBLE__=16 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SIZE_T__=8 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __SSE2_MATH__=1 __SSE2__=1 __SSE_MATH__=1 __SSE__=1 __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __amd64=1 __amd64__=1 __code_model_small__=1 __k8=1 __k8__=1 __x86_64=1 __x86_64__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_format='define'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='define'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='undef'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='undef'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime='define'
-d_dir_dd_fd='undef'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='undef'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='undef'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='define'
-d_flockproto='define'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='undef'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='undef'
-d_frexpl='undef'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef'
-d_gethostbyname_r='undef'
-d_gethostent_r='undef'
-d_gethostprotos='define'
-d_getitimer='define'
-d_getlogin='define'
-d_getlogin_r='undef'
-d_getmnt='undef'
-d_getmntent='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetbyaddr_r='undef'
-d_getnetbyname_r='undef'
-d_getnetent_r='undef'
-d_getnetprotos='define'
-d_getpagsz='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotobyname_r='undef'
-d_getprotobynumber_r='undef'
-d_getprotoent_r='undef'
-d_getprotoprotos='define'
-d_getprpwnam='undef'
-d_getpwent='define'
-d_getpwent_r='undef'
-d_getpwnam_r='undef'
-d_getpwuid_r='undef'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservbyname_r='undef'
-d_getservbyport_r='undef'
-d_getservent_r='undef'
-d_getservprotos='define'
-d_getspnam='define'
-d_getspnam_r='undef'
-d_gettimeod='define'
-d_gmtime_r='undef'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_hasmntopt='define'
-d_htonl='define'
-d_ilogbl='undef'
-d_inc_version_list='undef'
-d_index='undef'
-d_inetaton='define'
-d_int64_t='define'
-d_isascii='define'
-d_isfinite='undef'
-d_isinf='define'
-d_isnan='define'
-d_isnanl='undef'
-d_killpg='define'
-d_lchown='define'
-d_ldbl_dig='define'
-d_libm_lib_version='define'
-d_link='define'
-d_localtime_r='undef'
-d_localtime_r_needs_tzset='undef'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lseekproto='define'
-d_lstat='define'
-d_madvise='define'
-d_malloc_good_size='undef'
-d_malloc_size='undef'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memchr='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkdtemp='define'
-d_mkfifo='define'
-d_mkstemp='define'
-d_mkstemps='undef'
-d_mktime='define'
-d_mmap='define'
-d_modfl='undef'
-d_modfl_pow32_bug='undef'
-d_modflproto='define'
-d_mprotect='define'
-d_msg='define'
-d_msg_ctrunc='define'
-d_msg_dontroute='define'
-d_msg_oob='define'
-d_msg_peek='define'
-d_msg_proxy='define'
-d_msgctl='define'
-d_msgget='define'
-d_msghdr_s='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_msync='define'
-d_munmap='define'
-d_mymalloc='undef'
-d_nice='define'
-d_nl_langinfo='define'
-d_nv_preserves_uv='undef'
-d_nv_zero_is_allbits_zero='define'
-d_off64_t='undef'
-d_old_pthread_create_joinable='undef'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_perl_otherlibdirs='undef'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_printf_format_null='undef'
-d_procselfexe='define'
-d_pseudofork='undef'
-d_pthread_atfork='undef'
-d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
-d_pwage='undef'
-d_pwchange='undef'
-d_pwclass='undef'
-d_pwcomment='undef'
-d_pwexpire='undef'
-d_pwgecos='define'
-d_pwpasswd='define'
-d_pwquota='undef'
-d_qgcvt='undef'
-d_quad='define'
-d_random_r='undef'
-d_readdir64_r='undef'
-d_readdir='define'
-d_readdir_r='undef'
-d_readlink='define'
-d_readv='define'
-d_recvmsg='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='undef'
-d_safemcpy='undef'
-d_sanemcmp='define'
-d_sbrkproto='define'
-d_scalbnl='undef'
-d_sched_yield='define'
-d_scm_rights='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_sendmsg='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrent_r='undef'
-d_setgrps='define'
-d_sethent='define'
-d_sethostent_r='undef'
-d_setitimer='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setlocale_r='undef'
-d_setnent='define'
-d_setnetent_r='undef'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setproctitle='undef'
-d_setprotoent_r='undef'
-d_setpwent='define'
-d_setpwent_r='undef'
-d_setregid='define'
-d_setresgid='define'
-d_setresuid='define'
-d_setreuid='define'
-d_setrgid='undef'
-d_setruid='undef'
-d_setsent='define'
-d_setservent_r='undef'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_signbit='undef'
-d_sigprocmask='define'
-d_sigsetjmp='define'
-d_sitearch='define'
-d_snprintf='define'
-d_sockatmark='undef'
-d_sockatmarkproto='undef'
-d_socket='define'
-d_socklen_t='define'
-d_sockpair='define'
-d_socks5_init='undef'
-d_sprintf_returns_strlen='define'
-d_sqrtl='undef'
-d_srand48_r='undef'
-d_srandom_r='undef'
-d_sresgproto='undef'
-d_sresuproto='undef'
-d_statblks='define'
-d_statfs_f_flags='undef'
-d_statfs_s='define'
-d_statvfs='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='undef'
-d_stdio_stream_array='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strerror_r='undef'
-d_strftime='define'
-d_strlcat='define'
-d_strlcpy='define'
-d_strtod='define'
-d_strtol='define'
-d_strtold='define'
-d_strtoll='define'
-d_strtoq='define'
-d_strtoul='define'
-d_strtoull='define'
-d_strtouq='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_syscallproto='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='undef'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_telldirproto='define'
-d_time='define'
-d_times='define'
-d_tm_tm_gmtoff='define'
-d_tm_tm_zone='define'
-d_tmpnam_r='undef'
-d_truncate='define'
-d_ttyname_r='undef'
-d_tzname='define'
-d_u32align='define'
-d_ualarm='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='undef'
-d_unordered='undef'
-d_unsetenv='define'
-d_usleep='define'
-d_usleepproto='define'
-d_ustat='define'
-d_vendorarch='undef'
-d_vendorbin='undef'
-d_vendorlib='undef'
-d_vendorscript='undef'
-d_vfork='undef'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_vsnprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_writev='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-db_version_major=''
-db_version_minor=''
-db_version_patch=''
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-drand01='drand48()'
-drand48_r_proto='0'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-endgrent_r_proto='0'
-endhostent_r_proto='0'
-endnetent_r_proto='0'
-endprotoent_r_proto='0'
-endpwent_r_proto='0'
-endservent_r_proto='0'
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
-extras=''
-fflushNULL='define'
-fflushall='undef'
-find=''
-firstmakefile='makefile'
-flex=''
-fpossize='16'
-fpostype='fpos_t'
-freetype='void'
-from=':'
-full_ar='%%AR%%'
-full_csh='csh'
-full_sed='sed'
-gccansipedantic=''
-gccosandvers=''
-gccversion='3.4.3'
-getgrent_r_proto='0'
-getgrgid_r_proto='0'
-getgrnam_r_proto='0'
-gethostbyaddr_r_proto='0'
-gethostbyname_r_proto='0'
-gethostent_r_proto='0'
-getlogin_r_proto='0'
-getnetbyaddr_r_proto='0'
-getnetbyname_r_proto='0'
-getnetent_r_proto='0'
-getprotobyname_r_proto='0'
-getprotobynumber_r_proto='0'
-getprotoent_r_proto='0'
-getpwent_r_proto='0'
-getpwnam_r_proto='0'
-getpwuid_r_proto='0'
-getservbyname_r_proto='0'
-getservbyport_r_proto='0'
-getservent_r_proto='0'
-getspnam_r_proto='0'
-gidformat='"u"'
-gidsign='1'
-gidsize='4'
-gidtype='gid_t'
-glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
-gmake='gmake'
-gmtime_r_proto='0'
-gnulibc_version=''
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-html1dir=' '
-html1direxp=''
-html3dir=' '
-html3direxp=''
-i16size='2'
-i16type='short'
-i32size='4'
-i32type='int'
-i64size='8'
-i64type='long'
-i8size='1'
-i8type='signed char'
-i_arpainet='define'
-i_bsdioctl=''
-i_crypt='define'
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_fp='undef'
-i_fp_class='undef'
-i_gdbm='define'
-i_grp='define'
-i_ieeefp='undef'
-i_inttypes='define'
-i_langinfo='define'
-i_libutil='undef'
-i_limits='define'
-i_locale='define'
-i_machcthr='undef'
-i_malloc='define'
-i_math='define'
-i_memory='undef'
-i_mntent='define'
-i_ndbm='undef'
-i_netdb='define'
-i_neterrno='undef'
-i_netinettcp='define'
-i_niin='define'
-i_poll='define'
-i_prot='undef'
-i_pthread='define'
-i_pwd='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_shadow='define'
-i_socks='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sunmath='undef'
-i_sysaccess='undef'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='undef'
-i_sysin='undef'
-i_sysioctl='define'
-i_syslog='define'
-i_sysmman='define'
-i_sysmode='undef'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_syssecrt='undef'
-i_sysselct='define'
-i_syssockio='undef'
-i_sysstat='define'
-i_sysstatfs='define'
-i_sysstatvfs='define'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysuio='define'
-i_sysun='define'
-i_sysutsname='define'
-i_sysvfs='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='define'
-i_unistd='define'
-i_ustat='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs='y'
-inc_version_list=' '
-inc_version_list_init='0'
-incpath=''
-inews=''
-installbin='/usr/bin'
-initialinstalllocation='/usr/bin'
-installhtml1dir=''
-installhtml3dir=''
-installman1dir=''
-installman3dir=''
-installprefix='/usr'
-installprefixexp='/usr'
-installscript='/usr/bin'
-installsitebin='/usr/bin'
-installsitehtml1dir=''
-installsitehtml3dir=''
-installsiteman1dir=''
-installsiteman3dir=''
-installsitescript='/usr/bin'
-installstyle='lib/perl5'
-installusrbinperl='define'
-installvendorarch=''
-installvendorbin=''
-installvendorhtml1dir=''
-installvendorhtml3dir=''
-installvendorlib=''
-installvendorman1dir=''
-installvendorman3dir=''
-installvendorscript=''
-intsize='4'
-issymlink='test -h'
-ivdformat='"ld"'
-ivsize='8'
-ivtype='long'
-known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
-ksh=''
-ld='%%LD%%'
-lddlflags='-shared %%LDFLAGS%%'
-ldflags='%%EXTRA_PERLLIBDIRS%%'
-ldflags_uselargefiles=''
-ldlibpthname='LD_LIBRARY_PATH'
-less='less'
-lib_ext='.a'
-libc=''
-libperl='libperl.so'
-libpth='%%LIBDIRS%%'
-libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
-libsdirs='%%LIBDIRS%%'
-libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
-#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-libspath='%%LIBDIRS%%'
-libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
-libswanted_uselargefiles=''
-line=''
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-localtime_r_proto='0'
-locincpth=' '
-loclibpth=' '
-longdblsize='16'
-longlongsize='8'
-longsize='8'
-lp=''
-lpr=''
-ls='ls'
-lseeksize='8'
-lseektype='off_t'
-mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir=' '
-man1direxp=''
-man1ext='0'
-man3dir=' '
-man3direxp=''
-man3ext='0'
-mips_type=''
-mistrustnm=''
-mkdir='mkdir'
-mmaptype='void *'
-modetype='mode_t'
-more='more'
-multiarch='undef'
-mv=''
-myarchname='x86_64-linux-uclibc'
-mydomain='.dev.null'
-myhostname='maia'
-myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 x86_64 unknown unknown gnulinux '
-n='-n'
-need_va_copy='define'
-netdb_hlen_type='size_t'
-netdb_host_type='char *'
-netdb_name_type='const char *'
-netdb_net_type='in_addr_t'
-nm='nm'
-nm_opt=''
-nm_so_opt='--dynamic'
-nroff='nroff'
-nvEUformat='"E"'
-nvFUformat='"F"'
-nvGUformat='"G"'
-nv_preserves_uv_bits='53'
-nveformat='"e"'
-nvfformat='"f"'
-nvgformat='"g"'
-nvsize='8'
-nvtype='double'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-old_pthread_create_joinable=''
-optimize='-O2'
-orderlib='false'
-osname='linux'
-osvers='2.6.25'
-otherlibdirs=' '
-package='perl5'
-pager='/usr/bin/less'
-passcat='cat /etc/passwd'
-path_sep=':'
-perl5=''
-perl=''
-perl_patchlevel=''
-perladmin='root@maia.dev.null'
-perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-procselfexe='"/proc/self/exe"'
-prototype='define'
-ptrsize='8'
-quadkind='2'
-quadtype='long'
-randbits='48'
-randfunc='drand48'
-random_r_proto='0'
-randseedtype='long'
-ranlib=':'
-rd_nodata='-1'
-readdir64_r_proto='0'
-readdir_r_proto='0'
-revision='5'
-rm='rm'
-rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
-rmail=''
-run=''
-runnm='false'
-sPRIEUldbl='"LE"'
-sPRIFUldbl='"LF"'
-sPRIGUldbl='"LG"'
-sPRIXU64='"lX"'
-sPRId64='"ld"'
-sPRIeldbl='"Le"'
-sPRIfldbl='"Lf"'
-sPRIgldbl='"Lg"'
-sPRIi64='"li"'
-sPRIo64='"lo"'
-sPRIu64='"lu"'
-sPRIx64='"lx"'
-sSCNfldbl='"Lf"'
-sched_yield='sched_yield()'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-seedfunc='srand48'
-selectminbits='64'
-selecttype='fd_set *'
-sendmail=''
-setgrent_r_proto='0'
-sethostent_r_proto='0'
-setlocale_r_proto='0'
-setnetent_r_proto='0'
-setprotoent_r_proto='0'
-setpwent_r_proto='0'
-setservent_r_proto='0'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='void *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_count='64'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
-sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
-sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
-sig_size='68'
-signal_t='void'
-sitearch=''
-sitearchexp=''
-sitebin='/usr/bin'
-sitebinexp='/usr/bin'
-sitehtml1dir=''
-sitehtml1direxp=''
-sitehtml3dir=''
-sitehtml3direxp=''
-sitelib=''
-#sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp=''
-siteman1dir=''
-siteman1direxp=''
-siteman3dir=''
-siteman3direxp=''
-siteprefix='/usr'
-siteprefixexp='/usr'
-sitescript='/usr/bin'
-sitescriptexp='/usr/bin'
-sizesize='8'
-sizetype='size_t'
-sleep=''
-smail=''
-so='so'
-sockethdr=''
-socketlib=''
-socksizetype='socklen_t'
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-srand48_r_proto='0'
-srandom_r_proto='0'
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array=''
-strerror_r_proto='0'
-#strings='/usr/include/string.h'
-submit=''
-sysman='/usr/share/man/man1'
-tail=''
-tar=''
-targetarch='x86_64-linux-uclibc'
-tbl=''
-tee=''
-test='test'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-timetype='time_t'
-tmpnam_r_proto='0'
-to=':'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-ttyname_r_proto='0'
-u16size='2'
-u16type='unsigned short'
-u32size='4'
-u32type='unsigned int'
-u64size='8'
-u64type='unsigned long'
-u8size='1'
-u8type='unsigned char'
-uidformat='"u"'
-uidsign='1'
-uidsize='4'
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-uquadtype='unsigned long'
-use5005threads='undef'
-use64bitall='define'
-use64bitint='define'
-usecrosscompile='define'
-usedl='define'
-usefaststdio='undef'
-useithreads='undef'
-uselargefiles='define'
-uselongdouble='undef'
-usemallocwrap='define'
-usemorebits='undef'
-usemultiplicity='undef'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='define'
-useposix='true'
-usereentrant='undef'
-userelocatableinc='undef'
-usesfio='false'
-useshrplib='true'
-usesitecustomize='undef'
-usesocks='undef'
-usethreads='undef'
-usevendorprefix='undef'
-usevfork='false'
-usrinc='%%INCDIRS%%'
-uuname=''
-uvXUformat='"lX"'
-uvoformat='"lo"'
-uvsize='8'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
-vendorarch=''
-vendorarchexp=''
-vendorbin=''
-vendorbinexp=''
-vendorhtml1dir=' '
-vendorhtml1direxp=''
-vendorhtml3dir=' '
-vendorhtml3direxp=''
-vendorlib=''
-vendorlib_stem=''
-vendorlibexp=''
-vendorman1dir=' '
-vendorman1direxp=''
-vendorman3dir=' '
-vendorman3direxp=''
-vendorprefix=''
-vendorprefixexp=''
-vendorscript=''
-vendorscriptexp=''
-versiononly='undef'
-vi=''
-voidflags='15'
-xlibpth='/usr/lib/386 /lib/386'
-yacc='yacc'
-yaccflags=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='./Configure'
-config_args='-der'
-config_argc=1
-config_arg1='-der'
-PERL_REVISION=5
-PERL_API_REVISION=5
-PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
-# Fix problem with HiRes timer.
-d_nanosleep='define'
-d_clock_gettime='define'
-d_clock_getres='define'
-d_clock_nanosleep='define'
-d_clock='define'
-
-# New symbols for perl 5.20.0
-bin_ELF='define'
-bootstrap_charset='undef'
-charbits='8'
-charsize='1'
-d_asctime64='undef'
-d_attribute_deprecated='define'
-d_ctime64='undef'
-d_difftime64='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getnameinfo='define'
-d_gmtime64='undef'
-d_inetntop='define'
-d_inetpton='define'
-d_ip_mreq='define'
-d_ip_mreq_source='define'
-d_ipv6_mreq='%%IPV6%%'
-d_ipv6_mreq_source='undef'
-d_isblank='define'
-d_libname_unique='undef'
-d_localtime64='undef'
-d_mktime64='undef'
-d_ndbm='undef'
-d_ndbm_h_uses_prototypes='undef'
-d_prctl='define'
-d_prctl_set_name='define'
-d_sin6_scope_id='%%IPV6%%'
-d_sockaddr_in6='%%IPV6%%'
-d_sockaddr_sa_len='undef'
-d_static_inline='define'
-d_timegm='define'
-dtrace=''
-extern_C='extern'
-hostosname=''
-i_assert='define'
-i_gdbm_ndbm='undef'
-i_gdbmndbm='undef'
-i_mallocmalloc='undef'
-i_stdbool='define'
-i_syspoll='define'
-#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
-ld_can_script='define'
-#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-perl_static_inline='static __inline__'
-sGMTIME_max='67768036191676799'
-sGMTIME_min='-62167219200'
-sLOCALTIME_max='67768036191673199'
-sLOCALTIME_min='-62167222408'
-#sitelib_stem='/usr/local/lib/perl5/site_perl'
-st_ino_sign='1'
-st_ino_size='8'
-#strings='/usr/include/string.h'
-sysroot=''
-targetdir=''
-targetenv=''
-targethost=''
-targetmkdir=''
-targetport=''
-targetsh='/bin/sh'
-#timeincl='/usr/include/sys/time.h /usr/include/time.h '
-usedevel='undef'
-usedtrace='undef'
-usekernprocpathname='undef'
-usensgetexecutablepath='undef'
-useversionedarchname='undef'
-vaproto='define'
-libdb_needs_pthread='N'
-
-# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
-# change again for new versions, so they're included here for
-# future reference
-api_version='20'
-# Always set this to the base version, not the patched one!
-api_versionstring='5.20.0'
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
-installarchlib='/usr/lib/perl5/5.20'
-installprivlib='/usr/lib/perl5/5.20'
-installsitearch='/usr/lib/perl5/5.20'
-installsitelib='/usr/lib/perl5/5.20'
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
-privlib='/usr/lib/perl5/5.20'
-privlibexp='/usr/lib/perl5/5.20'
-archlib='/usr/lib/perl5/5.20'
-archlibexp='/usr/lib/perl5/5.20'
-version='5.20.2'
-version_patchlevel_string='version 20 subversion 2'
-PERL_VERSION=20
-PERL_API_VERSION=20
-PERL_SUBVERSION=2
-patchlevel='20'
-ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
-subversion='2'
-
-# Make perl use these tools instead of the target binaries during build
-hostgenerate='%%HOSTGENERATE%%'
-hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/feeds/packages/perl/files/perl-run_tests.sh b/trunk/package/feeds/packages/perl/files/perl-run_tests.sh
deleted file mode 100755
index af6a39c9..00000000
--- a/trunk/package/feeds/packages/perl/files/perl-run_tests.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-PERL_TESTSDIR="/usr/share/perl/perl-tests"
-PERL_LIBDIR="/usr/lib/perl5/5.20/"
-PERL_DISABLEDTESTS="%%PERL_DISABLEDTESTS%%"
-
-if [ ! -f "$PERL_TESTSDIR/__prepared" ]; then
-	ln -s "$PERL_LIBDIR" "$PERL_TESTSDIR/lib"
-	ln -s /usr/bin/perl "$PERL_TESTSDIR/perl"
-	ln -s /usr/bin/perl "$PERL_TESTSDIR/t/perl"
-	touch "$PERL_TESTSDIR/__prepared"
-	
-	for i in $PERL_DISABLEDTESTS; do
-		echo "Disabling $i tests"
-		sed 's!^'$i'.*$!!' -i $PERL_TESTSDIR/MANIFEST
-	done
-	
-	cat $PERL_TESTSDIR/MANIFEST | grep -v '^$' > $PERL_TESTSDIR/MANIFEST_NEW
-	rm $PERL_TESTSDIR/MANIFEST
-	mv $PERL_TESTSDIR/MANIFEST_NEW $PERL_TESTSDIR/MANIFEST
-fi
-
-cd "$PERL_TESTSDIR/t"
-./perl TEST
diff --git a/trunk/package/feeds/packages/perl/patches/101-fix-cross-compile-endianness-detection.patch b/trunk/package/feeds/packages/perl/patches/101-fix-cross-compile-endianness-detection.patch
deleted file mode 100644
index e187941e..00000000
--- a/trunk/package/feeds/packages/perl/patches/101-fix-cross-compile-endianness-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/config_h.SH
-+++ b/config_h.SH
-@@ -52,6 +52,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
- #ifndef _config_h_
- #define _config_h_
- 
-+#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-+#  include <endian.h>
-+#  if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
-+#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+#      define __LITTLE_ENDIAN__
-+#    elif (__BYTE_ORDER == __BIG_ENDIAN)
-+#      define __BIG_ENDIAN__
-+#    else
-+#      error Unknown endianness
-+#    endif
-+#  endif
-+#endif
-+
- /* LOC_SED:
-  *	This symbol holds the complete pathname to the sed program.
-  */
diff --git a/trunk/package/feeds/packages/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch b/trunk/package/feeds/packages/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
deleted file mode 100644
index 761f8b92..00000000
--- a/trunk/package/feeds/packages/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/hints/linux.sh
-+++ b/hints/linux.sh
-@@ -204,6 +204,24 @@ case "$libc" in
-     ;;
- esac
- 
-+# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
-+# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
-+# where to look.  We don't want gcc's own libraries, however, so we
-+# filter those out.
-+# This could be conditional on Unbuntu, but other distributions may
-+# follow suit, and this scheme seems to work even on rather old gcc's.
-+# This unconditionally uses gcc because even if the user is using another
-+# compiler, we still need to find the math library and friends, and I don't
-+# know how other compilers will cope with that situation.
-+# Still, as an escape hatch, allow Configure command line overrides to
-+# plibpth to bypass this check.
-+case "$plibpth" in
-+'') plibpth=`gcc -print-search-dirs | grep libraries |
-+	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc'`
-+    plibpth="$plibpth"  # Collapse all entries on one line
-+    ;;
-+esac
-+
- # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
- # for this test.
- cat >try.c <<'EOM'
diff --git a/trunk/package/feeds/packages/perl/patches/300-always_use_miniperl.patch b/trunk/package/feeds/packages/perl/patches/300-always_use_miniperl.patch
deleted file mode 100644
index f8f8a65d..00000000
--- a/trunk/package/feeds/packages/perl/patches/300-always_use_miniperl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -315,22 +315,11 @@ MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE
- 
- !GROK!THIS!
- 
--case "$usecrosscompile$perl" in
--define?*)
--	$spitshell >>$Makefile <<!GROK!THIS!
--# Macros to invoke a copy of our fully operational perl during the build.
--PERL_EXE = perl\$(EXE_EXT)
--RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
--!GROK!THIS!
--	;;
--*)
--	$spitshell >>$Makefile <<!GROK!THIS!
-+$spitshell >>$Makefile <<!GROK!THIS!
- # Macros to invoke a copy of our fully operational perl during the build.
- PERL_EXE = perl\$(EXE_EXT)
--RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib
-+RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib
- !GROK!THIS!
--	;;
--esac
- 
- $spitshell >>$Makefile <<!GROK!THIS!
- # Macros to run our tests
diff --git a/trunk/package/feeds/packages/perl/patches/400-add_microperl_caretx_dependency.patch b/trunk/package/feeds/packages/perl/patches/400-add_microperl_caretx_dependency.patch
deleted file mode 100644
index 1c25fea4..00000000
--- a/trunk/package/feeds/packages/perl/patches/400-add_microperl_caretx_dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.micro
-+++ b/Makefile.micro
-@@ -22,7 +22,8 @@ O = uav$(_O) udeb$(_O) udoio$(_O) udoop$
- 	uregcomp$(_O) uregexec$(_O) urun$(_O) \
- 	uscope$(_O) usv$(_O) utaint$(_O) utoke$(_O) \
- 	unumeric$(_O) ulocale$(_O) umathoms$(_O) \
--	uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O)
-+	uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O) \
-+	ucaretx$(_O)
- 
- microperl:	$(O)
- 	$(LD) -o $@ $(O) $(LDFLAGS) $(LIBS)
-@@ -178,6 +179,9 @@ uutil$(_O):	$(HE) util.c
- uperlapi$(_O):	$(HE) perlapi.c perlapi.h
- 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
- 
-+ucaretx$(_O): $(HE) caretx.c
-+	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) caretx.c
-+
- uuudmap.h umg_data.h: ubitcount.h
- 
- ubitcount.h: ugenerate_uudmap$(_X)
diff --git a/trunk/package/feeds/packages/perl/patches/500-add-relink-hack.patch b/trunk/package/feeds/packages/perl/patches/500-add-relink-hack.patch
deleted file mode 100644
index fd3d3861..00000000
--- a/trunk/package/feeds/packages/perl/patches/500-add-relink-hack.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- /dev/null
-+++ b/relink/Makefile.PL
-@@ -0,0 +1,3 @@
-+use ExtUtils::MakeMaker;
-+
-+WriteMakefile(NAME => "relink");
diff --git a/trunk/package/feeds/packages/perl/perlbase.mk b/trunk/package/feeds/packages/perl/perlbase.mk
deleted file mode 100644
index e5dd88a8..00000000
--- a/trunk/package/feeds/packages/perl/perlbase.mk
+++ /dev/null
@@ -1,1539 +0,0 @@
-define Package/perlbase-template
-SUBMENU:=Perl
-SECTION:=lang
-CATEGORY:=Languages
-URL:=http://www.cpan.org/
-DEPENDS:=perl
-endef
-
-define Package/perlbase-anydbm-file
-$(call Package/perlbase-template)
-TITLE:=AnyDBM_File perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-anydbm-file/install
-$(call perlmod/Install,$(1),AnyDBM_File.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-anydbm-file))
-
-
-define Package/perlbase-app
-$(call Package/perlbase-template)
-TITLE:=app perl module
-DEPENDS+=+perlbase-autouse +perlbase-base +perlbase-config +perlbase-cpan +perlbase-essential +perlbase-file +perlbase-getopt +perlbase-if +perlbase-tap +perlbase-text
-endef
-
-define Package/perlbase-app/install
-$(call perlmod/Install,$(1),App,)
-endef
-
-$(eval $(call BuildPackage,perlbase-app))
-
-
-define Package/perlbase-archive
-$(call Package/perlbase-template)
-TITLE:=Archive perl module
-DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file +perlbase-io
-endef
-
-define Package/perlbase-archive/install
-$(call perlmod/Install,$(1),Archive,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Archive-Tar/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-archive))
-
-
-define Package/perlbase-arybase
-$(call Package/perlbase-template)
-TITLE:=arybase perl module
-endef
-
-define Package/perlbase-arybase/install
-$(call perlmod/Install,$(1),arybase.pm auto/arybase,)
-$(call perlmod/InstallBaseTests,$(1),ext/arybase/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-arybase))
-
-
-define Package/perlbase-attribute
-$(call Package/perlbase-template)
-TITLE:=Attribute perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-attribute/install
-$(call perlmod/Install,$(1),Attribute,)
-$(call perlmod/InstallBaseTests,$(1),dist/Attribute-Handlers/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-attribute))
-
-
-define Package/perlbase-attributes
-$(call Package/perlbase-template)
-TITLE:=attributes perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-attributes/install
-$(call perlmod/Install,$(1),attributes.pm auto/attributes,)
-endef
-
-$(eval $(call BuildPackage,perlbase-attributes))
-
-
-define Package/perlbase-autodie
-$(call Package/perlbase-template)
-TITLE:=autodie perl module
-DEPENDS+=+perlbase-base +perlbase-essential +perlbase-fatal +perlbase-if
-endef
-
-define Package/perlbase-autodie/install
-$(call perlmod/Install,$(1),autodie autodie.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/autodie/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-autodie))
-
-
-define Package/perlbase-autoloader
-$(call Package/perlbase-template)
-TITLE:=AutoLoader perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-autoloader/install
-$(call perlmod/Install,$(1),AutoLoader.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/AutoLoader/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-autoloader))
-
-
-define Package/perlbase-autosplit
-$(call Package/perlbase-template)
-TITLE:=AutoSplit perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-file
-endef
-
-define Package/perlbase-autosplit/install
-$(call perlmod/Install/NoStrip,$(1),AutoSplit.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-autosplit))
-
-
-define Package/perlbase-autouse
-$(call Package/perlbase-template)
-TITLE:=autouse perl module
-endef
-
-define Package/perlbase-autouse/install
-$(call perlmod/Install,$(1),autouse.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/autouse/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-autouse))
-
-
-define Package/perlbase-b
-$(call Package/perlbase-template)
-TITLE:=B perl module
-DEPENDS+=+perlbase-config +perlbase-essential
-endef
-
-define Package/perlbase-b/install
-$(call perlmod/Install,$(1),B B.pm auto/B,)
-$(call perlmod/InstallBaseTests,$(1),cpan/B-Debug/t ext/B/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-b))
-
-
-define Package/perlbase-base
-$(call Package/perlbase-template)
-TITLE:=base perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-base/install
-$(call perlmod/Install,$(1),base.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/base/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-base))
-
-
-define Package/perlbase-benchmark
-$(call Package/perlbase-template)
-TITLE:=Benchmark perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-benchmark/install
-$(call perlmod/Install,$(1),Benchmark.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-benchmark))
-
-
-define Package/perlbase-bigint
-$(call Package/perlbase-template)
-TITLE:=bigint perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-bigint/install
-$(call perlmod/Install,$(1),bigint.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-bigint))
-
-
-define Package/perlbase-bignum
-$(call Package/perlbase-template)
-TITLE:=bignum perl module
-DEPENDS+=+perlbase-bigint +perlbase-essential
-endef
-
-define Package/perlbase-bignum/install
-$(call perlmod/Install,$(1),bignum.pm bigrat.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/bignum/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-bignum))
-
-
-define Package/perlbase-blib
-$(call Package/perlbase-template)
-TITLE:=blib perl module
-DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file
-endef
-
-define Package/perlbase-blib/install
-$(call perlmod/Install,$(1),blib.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-blib))
-
-
-define Package/perlbase-bytes
-$(call Package/perlbase-template)
-TITLE:=bytes perl module
-endef
-
-define Package/perlbase-bytes/install
-$(call perlmod/Install,$(1),bytes.pm bytes_heavy.pl,)
-endef
-
-$(eval $(call BuildPackage,perlbase-bytes))
-
-
-define Package/perlbase-cgi
-$(call Package/perlbase-template)
-TITLE:=CGI perl module
-DEPENDS+=+perlbase-base +perlbase-essential +perlbase-file +perlbase-if
-endef
-
-define Package/perlbase-cgi/install
-$(call perlmod/Install,$(1),CGI CGI.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/CGI/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-cgi))
-
-
-define Package/perlbase-charnames
-$(call Package/perlbase-template)
-TITLE:=charnames perl module
-DEPENDS+=+perlbase-bytes +perlbase-essential +perlbase-file +perlbase-re +perlbase-unicore
-endef
-
-define Package/perlbase-charnames/install
-$(call perlmod/Install,$(1),_charnames.pm charnames.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-charnames))
-
-
-define Package/perlbase-class
-$(call Package/perlbase-template)
-TITLE:=Class perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-class/install
-$(call perlmod/Install,$(1),Class,)
-endef
-
-$(eval $(call BuildPackage,perlbase-class))
-
-
-define Package/perlbase-compress
-$(call Package/perlbase-template)
-TITLE:=Compress perl module
-DEPENDS+=+perlbase-bytes +perlbase-essential +perlbase-io +perlbase-scalar
-endef
-
-define Package/perlbase-compress/install
-$(call perlmod/Install,$(1),Compress auto/Compress,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Compress-Raw-Bzip2/t cpan/Compress-Raw-Zlib/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-compress))
-
-
-define Package/perlbase-config
-$(call Package/perlbase-template)
-TITLE:=Config perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-config/install
-$(call perlmod/Install,$(1),Config Config.pm Config_git.pl Config_heavy.pl,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Config-Perl-V/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-config))
-
-
-define Package/perlbase-cpan
-$(call Package/perlbase-template)
-TITLE:=CPAN perl module
-DEPENDS+=+perlbase-b +perlbase-config +perlbase-cwd +perlbase-dirhandle +perlbase-essential +perlbase-extutils +perlbase-fcntl +perlbase-file +perlbase-filehandle +perlbase-http-tiny +perlbase-list +perlbase-net +perlbase-safe +perlbase-scalar +perlbase-sys +perlbase-text +perlbase-version
-endef
-
-define Package/perlbase-cpan/install
-$(call perlmod/Install,$(1),CPAN CPAN.pm Parse/CPAN/Meta.pm,CPAN/FirstTime.pm)
-$(call perlmod/Install/NoStrip,$(1),CPAN/FirstTime.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/CPAN-Meta-Requirements/t cpan/CPAN-Meta-YAML/t cpan/CPAN-Meta/t cpan/CPAN/t cpan/Parse-CPAN-Meta/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-cpan))
-
-
-define Package/perlbase-cwd
-$(call Package/perlbase-template)
-TITLE:=Cwd perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-cwd/install
-$(call perlmod/Install,$(1),Cwd.pm auto/Cwd,)
-endef
-
-$(eval $(call BuildPackage,perlbase-cwd))
-
-
-define Package/perlbase-data
-$(call Package/perlbase-template)
-TITLE:=Data perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-data/install
-$(call perlmod/Install,$(1),Data auto/Data,)
-$(call perlmod/InstallBaseTests,$(1),dist/Data-Dumper/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-data))
-
-
-define Package/perlbase-db
-$(call Package/perlbase-template)
-TITLE:=DB perl module
-DEPENDS+=+libdb47 +perlbase-essential
-endef
-
-define Package/perlbase-db/install
-$(call perlmod/Install,$(1),DB.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-db))
-
-
-define Package/perlbase-db-file
-$(call Package/perlbase-template)
-TITLE:=DB_File perl module
-DEPENDS+=+libdb47 +perlbase-essential
-endef
-
-define Package/perlbase-db-file/install
-$(call perlmod/Install,$(1),DB_File.pm auto/DB_File,)
-$(call perlmod/InstallBaseTests,$(1),cpan/DB_File/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-db-file))
-
-
-define Package/perlbase-dbm-filter
-$(call Package/perlbase-template)
-TITLE:=DBM_Filter perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-dbm-filter/install
-$(call perlmod/Install,$(1),DBM_Filter DBM_Filter.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-dbm-filter))
-
-
-define Package/perlbase-devel
-$(call Package/perlbase-template)
-TITLE:=Devel perl module
-DEPENDS+=+perlbase-essential +perlbase-file
-endef
-
-define Package/perlbase-devel/install
-$(call perlmod/Install,$(1),Devel auto/Devel,Devel/PPPort.pm)
-$(call perlmod/Install/NoStrip,$(1),Devel/PPPort.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Devel-PPPort/t dist/Devel-SelfStubber/t ext/Devel-Peek/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-devel))
-
-
-define Package/perlbase-diagnostics
-$(call Package/perlbase-template)
-TITLE:=diagnostics perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-text
-endef
-
-define Package/perlbase-diagnostics/install
-$(call perlmod/Install,$(1),diagnostics.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-diagnostics))
-
-
-define Package/perlbase-digest
-$(call Package/perlbase-template)
-TITLE:=Digest perl module
-DEPENDS+=+perlbase-essential +perlbase-fcntl +perlbase-integer
-endef
-
-define Package/perlbase-digest/install
-$(call perlmod/Install,$(1),Digest Digest.pm auto/Digest,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Digest-MD5/MD5.xs cpan/Digest-MD5/t cpan/Digest-SHA/t cpan/Digest/t)
-	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/cpan/Digest-SHA/src
-endef
-
-$(eval $(call BuildPackage,perlbase-digest))
-
-
-define Package/perlbase-dirhandle
-$(call Package/perlbase-template)
-TITLE:=DirHandle perl module
-DEPENDS+=+perlbase-essential +perlbase-symbol
-endef
-
-define Package/perlbase-dirhandle/install
-$(call perlmod/Install,$(1),DirHandle.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-dirhandle))
-
-
-define Package/perlbase-dumpvalue
-$(call Package/perlbase-template)
-TITLE:=Dumpvalue perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-dumpvalue/install
-$(call perlmod/Install,$(1),Dumpvalue.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/Dumpvalue/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-dumpvalue))
-
-
-define Package/perlbase-dumpvar
-$(call Package/perlbase-template)
-TITLE:=dumpvar perl module
-endef
-
-define Package/perlbase-dumpvar/install
-$(call perlmod/Install,$(1),dumpvar.pl,)
-endef
-
-$(eval $(call BuildPackage,perlbase-dumpvar))
-
-
-define Package/perlbase-dynaloader
-$(call Package/perlbase-template)
-TITLE:=DynaLoader perl module
-DEPENDS+=+perlbase-config
-endef
-
-define Package/perlbase-dynaloader/install
-$(call perlmod/Install,$(1),DynaLoader.pm,)
-$(call perlmod/InstallBaseTests,$(1),ext/DynaLoader/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-dynaloader))
-
-
-define Package/perlbase-encode
-$(call Package/perlbase-template)
-TITLE:=Encode perl module
-DEPENDS+=+perlbase-essential +perlbase-mime +perlbase-utf8 +perlbase-xsloader
-endef
-
-define Package/perlbase-encode/install
-$(call perlmod/Install,$(1),Encode Encode.pm auto/Encode,Encode/PerlIO.pod Encode/Supported.pod)
-$(call perlmod/InstallBaseTests,$(1),cpan/Encode/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-encode))
-
-
-define Package/perlbase-encoding
-$(call Package/perlbase-template)
-TITLE:=encoding perl module
-DEPENDS+=+perlbase-encode +perlbase-essential
-endef
-
-define Package/perlbase-encoding/install
-$(call perlmod/Install,$(1),encoding encoding.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/encoding-warnings/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-encoding))
-
-
-define Package/perlbase-english
-$(call Package/perlbase-template)
-TITLE:=English perl module
-endef
-
-define Package/perlbase-english/install
-$(call perlmod/Install,$(1),English.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-english))
-
-
-define Package/perlbase-env
-$(call Package/perlbase-template)
-TITLE:=Env perl module
-DEPENDS+=+perlbase-config +perlbase-tie
-endef
-
-define Package/perlbase-env/install
-$(call perlmod/Install,$(1),Env.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/Env/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-env))
-
-
-define Package/perlbase-errno
-$(call Package/perlbase-template)
-TITLE:=Errno perl module
-DEPENDS+=+perlbase-config +perlbase-essential
-endef
-
-define Package/perlbase-errno/install
-$(call perlmod/Install,$(1),Errno.pm,)
-$(call perlmod/InstallBaseTests,$(1),ext/Errno/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-errno))
-
-
-define Package/perlbase-essential
-$(call Package/perlbase-template)
-TITLE:=essential perl module
-endef
-
-define Package/perlbase-essential/install
-$(call perlmod/Install,$(1),Carp Carp.pm Exporter Exporter.pm constant.pm deprecate.pm lib.pm locale.pm overload.pm overloading.pm parent.pm strict.pm subs.pm vars.pm warnings warnings.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/parent/t dist/Carp/t dist/Exporter/t dist/constant/t dist/lib/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-essential))
-
-
-define Package/perlbase-experimental
-$(call Package/perlbase-template)
-TITLE:=experimental perl module
-DEPENDS+=+perlbase-essential +perlbase-feature
-endef
-
-define Package/perlbase-experimental/install
-$(call perlmod/Install,$(1),experimental.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/experimental/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-experimental))
-
-
-define Package/perlbase-extutils
-$(call Package/perlbase-template)
-TITLE:=ExtUtils perl module
-DEPENDS+=+perlbase-autosplit +perlbase-config +perlbase-cwd +perlbase-dirhandle +perlbase-essential +perlbase-file +perlbase-io +perlbase-ipc +perlbase-ostype +perlbase-symbol +perlbase-text
-endef
-
-define Package/perlbase-extutils/install
-$(call perlmod/Install,$(1),ExtUtils,ExtUtils/MakeMaker/FAQ.pod ExtUtils/MakeMaker/Tutorial.pod ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm)
-$(call perlmod/Install/NoStrip,$(1),ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/ExtUtils-Constant/t cpan/ExtUtils-MakeMaker/t dist/ExtUtils-CBuilder/t dist/ExtUtils-Command/t dist/ExtUtils-Install/t dist/ExtUtils-Manifest/t dist/ExtUtils-ParseXS/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-extutils))
-
-
-define Package/perlbase-fatal
-$(call Package/perlbase-template)
-TITLE:=Fatal perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-scalar +perlbase-tie
-endef
-
-define Package/perlbase-fatal/install
-$(call perlmod/Install,$(1),Fatal.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-fatal))
-
-
-define Package/perlbase-fcntl
-$(call Package/perlbase-template)
-TITLE:=Fcntl perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-fcntl/install
-$(call perlmod/Install,$(1),Fcntl.pm auto/Fcntl,)
-$(call perlmod/InstallBaseTests,$(1),ext/Fcntl/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-fcntl))
-
-
-define Package/perlbase-feature
-$(call Package/perlbase-template)
-TITLE:=feature perl module
-endef
-
-define Package/perlbase-feature/install
-$(call perlmod/Install,$(1),feature.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-feature))
-
-
-define Package/perlbase-fields
-$(call Package/perlbase-template)
-TITLE:=fields perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-fields/install
-$(call perlmod/Install,$(1),fields.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-fields))
-
-
-define Package/perlbase-file
-$(call Package/perlbase-template)
-TITLE:=File perl module
-DEPENDS+=+perlbase-class +perlbase-config +perlbase-cwd +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-filehandle +perlbase-io +perlbase-locale +perlbase-params +perlbase-scalar
-endef
-
-define Package/perlbase-file/install
-$(call perlmod/Install,$(1),File auto/File,File/Find.pm)
-$(call perlmod/Install/NoStrip,$(1),File/Find.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/File-Fetch/t cpan/File-Path/t cpan/File-Temp/t dist/PathTools/t ext/File-DosGlob/t ext/File-Find/t ext/File-Glob/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-file))
-
-
-define Package/perlbase-filecache
-$(call Package/perlbase-template)
-TITLE:=FileCache perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-filecache/install
-$(call perlmod/Install,$(1),FileCache.pm,)
-$(call perlmod/InstallBaseTests,$(1),ext/FileCache/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-filecache))
-
-
-define Package/perlbase-filehandle
-$(call Package/perlbase-template)
-TITLE:=FileHandle perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-filehandle/install
-$(call perlmod/Install,$(1),FileHandle.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-filehandle))
-
-
-define Package/perlbase-filetest
-$(call Package/perlbase-template)
-TITLE:=filetest perl module
-endef
-
-define Package/perlbase-filetest/install
-$(call perlmod/Install,$(1),filetest.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-filetest))
-
-
-define Package/perlbase-filter
-$(call Package/perlbase-template)
-TITLE:=Filter perl module
-DEPENDS+=+perlbase-essential +perlbase-text
-endef
-
-define Package/perlbase-filter/install
-$(call perlmod/Install,$(1),Filter auto/Filter,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Filter-Util-Call/filter-util.pl cpan/Filter-Util-Call/t dist/Filter-Simple/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-filter))
-
-
-define Package/perlbase-findbin
-$(call Package/perlbase-template)
-TITLE:=FindBin perl module
-DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file
-endef
-
-define Package/perlbase-findbin/install
-$(call perlmod/Install,$(1),FindBin.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-findbin))
-
-
-define Package/perlbase-gdbm-file
-$(call Package/perlbase-template)
-TITLE:=GDBM_File perl module
-DEPENDS+=+libgdbm +perlbase-essential
-endef
-
-define Package/perlbase-gdbm-file/install
-$(call perlmod/Install,$(1),GDBM_File.pm auto/GDBM_File,)
-$(call perlmod/InstallBaseTests,$(1),ext/GDBM_File/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-gdbm-file))
-
-
-define Package/perlbase-getopt
-$(call Package/perlbase-template)
-TITLE:=Getopt perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-getopt/install
-$(call perlmod/Install,$(1),Getopt,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Getopt-Long/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-getopt))
-
-
-define Package/perlbase-hash
-$(call Package/perlbase-template)
-TITLE:=Hash perl module
-DEPENDS+=+perlbase-essential +perlbase-scalar
-endef
-
-define Package/perlbase-hash/install
-$(call perlmod/Install,$(1),Hash auto/Hash,)
-$(call perlmod/InstallBaseTests,$(1),ext/Hash-Util-FieldHash/t ext/Hash-Util/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-hash))
-
-
-define Package/perlbase-http-tiny
-$(call Package/perlbase-template)
-TITLE:=http-tiny perl module
-DEPENDS+=+perlbase-errno +perlbase-essential +perlbase-io
-endef
-
-define Package/perlbase-http-tiny/install
-$(call perlmod/Install,$(1),HTTP/Tiny.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/HTTP-Tiny/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-http-tiny))
-
-
-define Package/perlbase-i18n
-$(call Package/perlbase-template)
-TITLE:=I18N perl module
-DEPENDS+=+perlbase-essential +perlbase-posix
-endef
-
-define Package/perlbase-i18n/install
-$(call perlmod/Install,$(1),I18N auto/I18N,I18N/LangTags/List.pm)
-$(call perlmod/InstallBaseTests,$(1),dist/I18N-Collate/t dist/I18N-LangTags/t ext/I18N-Langinfo/t)
-$(call perlmod/Install/NoStrip,$(1),I18N/LangTags/List.pm)
-endef
-
-$(eval $(call BuildPackage,perlbase-i18n))
-
-
-define Package/perlbase-if
-$(call Package/perlbase-template)
-TITLE:=if perl module
-endef
-
-define Package/perlbase-if/install
-$(call perlmod/Install,$(1),if.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/if/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-if))
-
-
-define Package/perlbase-integer
-$(call Package/perlbase-template)
-TITLE:=integer perl module
-endef
-
-define Package/perlbase-integer/install
-$(call perlmod/Install,$(1),integer.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-integer))
-
-
-define Package/perlbase-io
-$(call Package/perlbase-template)
-TITLE:=IO perl module
-DEPENDS+=+perlbase-base +perlbase-bytes +perlbase-config +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-list +perlbase-posix +perlbase-scalar +perlbase-selectsaver +perlbase-socket +perlbase-symbol +perlbase-tie +perlbase-xsloader
-endef
-
-define Package/perlbase-io/install
-$(call perlmod/Install,$(1),IO IO.pm auto/IO,)
-$(call perlmod/InstallBaseTests,$(1),cpan/IO-Compress/t cpan/IO-Socket-IP/t cpan/IO-Zlib/t dist/IO/Makefile.PL dist/IO/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-io))
-
-
-define Package/perlbase-ipc
-$(call Package/perlbase-template)
-TITLE:=IPC perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-file +perlbase-locale +perlbase-params +perlbase-symbol +perlbase-text
-endef
-
-define Package/perlbase-ipc/install
-$(call perlmod/Install,$(1),IPC auto/IPC,)
-$(call perlmod/InstallBaseTests,$(1),cpan/IPC-Cmd/t cpan/IPC-SysV/t ext/IPC-Open3/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-ipc))
-
-
-define Package/perlbase-json-pp
-$(call Package/perlbase-template)
-TITLE:=json-pp perl module
-DEPENDS+=+perlbase-b +perlbase-base +perlbase-essential
-endef
-
-define Package/perlbase-json-pp/install
-$(call perlmod/Install,$(1),JSON/PP JSON/PP.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/JSON-PP/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-json-pp))
-
-
-define Package/perlbase-less
-$(call Package/perlbase-template)
-TITLE:=less perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-less/install
-$(call perlmod/Install,$(1),less.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-less))
-
-
-define Package/perlbase-list
-$(call Package/perlbase-template)
-TITLE:=List perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-list/install
-$(call perlmod/Install,$(1),List auto/List,)
-endef
-
-$(eval $(call BuildPackage,perlbase-list))
-
-
-define Package/perlbase-locale
-$(call Package/perlbase-template)
-TITLE:=Locale perl module
-DEPENDS+=+perlbase-essential +perlbase-i18n +perlbase-integer +perlbase-utf8
-endef
-
-define Package/perlbase-locale/install
-$(call perlmod/Install,$(1),Locale,Locale/Constants.pod Locale/Country.pod Locale/Currency.pod Locale/Language.pod Locale/Maketext.pod Locale/Maketext/TPJ13.pod Locale/Script.pod)
-$(call perlmod/InstallBaseTests,$(1),cpan/Locale-Codes/t cpan/Locale-Maketext-Simple/t dist/Locale-Maketext/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-locale))
-
-
-define Package/perlbase-math
-$(call Package/perlbase-template)
-TITLE:=Math perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-scalar
-endef
-
-define Package/perlbase-math/install
-$(call perlmod/Install,$(1),Math auto/Math,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Math-Complex/t dist/Math-BigInt-FastCalc/t dist/Math-BigInt/t dist/Math-BigRat/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-math))
-
-
-define Package/perlbase-memoize
-$(call Package/perlbase-template)
-TITLE:=Memoize perl module
-DEPENDS+=+perlbase-config +perlbase-essential +perlbase-storable
-endef
-
-define Package/perlbase-memoize/install
-$(call perlmod/Install,$(1),Memoize Memoize.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Memoize/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-memoize))
-
-
-define Package/perlbase-mime
-$(call Package/perlbase-template)
-TITLE:=MIME perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-mime/install
-$(call perlmod/Install,$(1),MIME auto/MIME,)
-$(call perlmod/InstallBaseTests,$(1),cpan/MIME-Base64/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-mime))
-
-
-define Package/perlbase-module
-$(call Package/perlbase-template)
-TITLE:=Module perl module
-DEPENDS+=+perlbase-config +perlbase-cwd +perlbase-data +perlbase-essential +perlbase-extutils +perlbase-file +perlbase-filehandle +perlbase-if +perlbase-io +perlbase-locale +perlbase-ostype +perlbase-params +perlbase-text +perlbase-version
-endef
-
-define Package/perlbase-module/install
-$(call perlmod/Install,$(1),Module,Module/Build Module/Build.pm Module/Build/API.pod Module/Build/Authoring.pod)
-$(call perlmod/Install/NoStrip,$(1),Module/Build Module/Build.pm,Module/Build/API.pod Module/Build/Authoring.pod)
-$(call perlmod/InstallBaseTests,$(1),cpan/Module-Build/lib cpan/Module-Build/t cpan/Module-Load-Conditional/t cpan/Module-Load/t cpan/Module-Loaded/t cpan/Module-Metadata/lib cpan/Module-Metadata/t dist/Module-CoreList/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-module))
-
-
-define Package/perlbase-mro
-$(call Package/perlbase-template)
-TITLE:=mro perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-mro/install
-$(call perlmod/Install,$(1),auto/mro mro.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-mro))
-
-
-define Package/perlbase-net
-$(call Package/perlbase-template)
-TITLE:=Net perl module
-DEPENDS+=+perlbase-class +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-filehandle +perlbase-io +perlbase-posix +perlbase-socket +perlbase-symbol +perlbase-time
-endef
-
-define Package/perlbase-net/install
-$(call perlmod/Install,$(1),Net,Net/libnetFAQ.pod)
-$(call perlmod/InstallBaseTests,$(1),cpan/libnet/t dist/Net-Ping/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-net))
-
-
-define Package/perlbase-next
-$(call Package/perlbase-template)
-TITLE:=NEXT perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-next/install
-$(call perlmod/Install,$(1),NEXT.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/NEXT/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-next))
-
-
-define Package/perlbase-o
-$(call Package/perlbase-template)
-TITLE:=O perl module
-DEPENDS+=+perlbase-b +perlbase-essential
-endef
-
-define Package/perlbase-o/install
-$(call perlmod/Install,$(1),O.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-o))
-
-
-define Package/perlbase-opcode
-$(call Package/perlbase-template)
-TITLE:=Opcode perl module
-DEPENDS+=+perlbase-essential +perlbase-xsloader
-endef
-
-define Package/perlbase-opcode/install
-$(call perlmod/Install,$(1),auto/Opcode,)
-$(call perlmod/Install/NoStrip,$(1),Opcode.pm,)
-$(call perlmod/InstallBaseTests,$(1),ext/Opcode/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-opcode))
-
-
-define Package/perlbase-open
-$(call Package/perlbase-template)
-TITLE:=open perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-open/install
-$(call perlmod/Install,$(1),open.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-open))
-
-
-define Package/perlbase-ops
-$(call Package/perlbase-template)
-TITLE:=ops perl module
-DEPENDS+=+perlbase-opcode
-endef
-
-define Package/perlbase-ops/install
-$(call perlmod/Install,$(1),ops.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-ops))
-
-
-define Package/perlbase-ostype
-$(call Package/perlbase-template)
-TITLE:=OSType perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-ostype/install
-$(call perlmod/Install,$(1),Perl/OSType.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Perl-OSType/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-ostype))
-
-
-define Package/perlbase-package
-$(call Package/perlbase-template)
-TITLE:=Package perl module
-DEPENDS+=+perlbase-essential +perlbase-if
-endef
-
-define Package/perlbase-package/install
-$(call perlmod/Install,$(1),Package,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Package-Constants/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-package))
-
-
-define Package/perlbase-params
-$(call Package/perlbase-template)
-TITLE:=Params perl module
-DEPENDS+=+perlbase-essential +perlbase-locale
-endef
-
-define Package/perlbase-params/install
-$(call perlmod/Install,$(1),Params,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Params-Check/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-params))
-
-
-define Package/perlbase-perl5db
-$(call Package/perlbase-template)
-TITLE:=perl5db perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-perl5db/install
-$(call perlmod/Install,$(1),perl5db.pl,)
-endef
-
-$(eval $(call BuildPackage,perlbase-perl5db))
-
-
-define Package/perlbase-perlio
-$(call Package/perlbase-template)
-TITLE:=PerlIO perl module
-DEPENDS+=+perlbase-essential +perlbase-mime +perlbase-xsloader
-endef
-
-define Package/perlbase-perlio/install
-$(call perlmod/Install,$(1),PerlIO PerlIO.pm auto/PerlIO,)
-$(call perlmod/InstallBaseTests,$(1),cpan/PerlIO-via-QuotedPrint/t ext/PerlIO-encoding/t ext/PerlIO-scalar/t ext/PerlIO-via/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-perlio))
-
-
-define Package/perlbase-pod
-$(call Package/perlbase-template)
-TITLE:=Pod perl module
-DEPENDS+=+perlbase-config +perlbase-cwd +perlbase-encode +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-getopt +perlbase-integer +perlbase-posix +perlbase-symbol +perlbase-term +perlbase-text
-endef
-
-define Package/perlbase-pod/install
-$(call perlmod/Install,$(1),Pod,Pod/Usage.pm)
-$(call perlmod/Install/NoStrip,$(1),Pod/Usage.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Pod-Checker/t cpan/Pod-Escapes/t cpan/Pod-Parser/lib cpan/Pod-Parser/scripts cpan/Pod-Parser/t cpan/Pod-Perldoc/t cpan/Pod-Simple/t cpan/Pod-Usage/scripts cpan/Pod-Usage/t cpan/podlators/t ext/Pod-Functions/Functions.pm ext/Pod-Functions/t ext/Pod-Html/t)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/pod2man $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/pod2text $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,perlbase-pod))
-
-
-define Package/perlbase-posix
-$(call Package/perlbase-template)
-TITLE:=POSIX perl module
-DEPENDS+=+perlbase-essential +perlbase-fcntl
-endef
-
-define Package/perlbase-posix/install
-$(call perlmod/Install,$(1),POSIX.pm auto/POSIX,)
-$(call perlmod/InstallBaseTests,$(1),ext/POSIX/Makefile.PL ext/POSIX/POSIX.xs ext/POSIX/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-posix))
-
-
-define Package/perlbase-re
-$(call Package/perlbase-template)
-TITLE:=re perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-re/install
-$(call perlmod/Install,$(1),auto/re re.pm,)
-$(call perlmod/InstallBaseTests,$(1),ext/re/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-re))
-
-
-define Package/perlbase-safe
-$(call Package/perlbase-template)
-TITLE:=Safe perl module
-DEPENDS+=+perlbase-b +perlbase-essential +perlbase-opcode +perlbase-scalar
-endef
-
-define Package/perlbase-safe/install
-$(call perlmod/Install,$(1),Safe.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/Safe/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-safe))
-
-
-define Package/perlbase-scalar
-$(call Package/perlbase-template)
-TITLE:=Scalar perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-scalar/install
-$(call perlmod/Install,$(1),Scalar,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Scalar-List-Utils/t)
-	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/cpan/Scalar-List-Utils/blib
-endef
-
-$(eval $(call BuildPackage,perlbase-scalar))
-
-
-define Package/perlbase-sdbm-file
-$(call Package/perlbase-template)
-TITLE:=SDBM_File perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-sdbm-file/install
-$(call perlmod/Install,$(1),SDBM_File.pm auto/SDBM_File,)
-$(call perlmod/InstallBaseTests,$(1),ext/SDBM_File/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-sdbm-file))
-
-
-define Package/perlbase-search
-$(call Package/perlbase-template)
-TITLE:=Search perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-search/install
-$(call perlmod/Install,$(1),Search,)
-$(call perlmod/InstallBaseTests,$(1),dist/Search-Dict/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-search))
-
-
-define Package/perlbase-selectsaver
-$(call Package/perlbase-template)
-TITLE:=SelectSaver perl module
-DEPENDS+=+perlbase-essential +perlbase-symbol
-endef
-
-define Package/perlbase-selectsaver/install
-$(call perlmod/Install,$(1),SelectSaver.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-selectsaver))
-
-
-define Package/perlbase-selfloader
-$(call Package/perlbase-template)
-TITLE:=SelfLoader perl module
-DEPENDS+=+perlbase-essential +perlbase-io
-endef
-
-define Package/perlbase-selfloader/install
-$(call perlmod/Install,$(1),SelfLoader.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/SelfLoader/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-selfloader))
-
-
-define Package/perlbase-sigtrap
-$(call Package/perlbase-template)
-TITLE:=sigtrap perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-sigtrap/install
-$(call perlmod/Install,$(1),sigtrap.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-sigtrap))
-
-
-define Package/perlbase-socket
-$(call Package/perlbase-template)
-TITLE:=Socket perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-socket/install
-$(call perlmod/Install,$(1),Socket.pm auto/Socket,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Socket/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-socket))
-
-
-define Package/perlbase-sort
-$(call Package/perlbase-template)
-TITLE:=sort perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-sort/install
-$(call perlmod/Install,$(1),sort.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-sort))
-
-
-define Package/perlbase-storable
-$(call Package/perlbase-template)
-TITLE:=Storable perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-storable/install
-$(call perlmod/Install,$(1),Storable.pm auto/Storable,)
-$(call perlmod/InstallBaseTests,$(1),dist/Storable/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-storable))
-
-
-define Package/perlbase-symbol
-$(call Package/perlbase-template)
-TITLE:=Symbol perl module
-endef
-
-define Package/perlbase-symbol/install
-$(call perlmod/Install,$(1),Symbol.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-symbol))
-
-
-define Package/perlbase-sys
-$(call Package/perlbase-template)
-TITLE:=Sys perl module
-DEPENDS+=+perlbase-essential +perlbase-file +perlbase-posix +perlbase-socket
-endef
-
-define Package/perlbase-sys/install
-$(call perlmod/Install,$(1),Sys auto/Sys,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Sys-Syslog/t ext/Sys-Hostname/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-sys))
-
-
-define Package/perlbase-tap
-$(call Package/perlbase-template)
-TITLE:=TAP perl module
-DEPENDS+=+perlbase-base +perlbase-benchmark +perlbase-config +perlbase-essential +perlbase-file +perlbase-io +perlbase-posix +perlbase-text
-endef
-
-define Package/perlbase-tap/install
-$(call perlmod/Install,$(1),TAP,)
-endef
-
-$(eval $(call BuildPackage,perlbase-tap))
-
-
-define Package/perlbase-term
-$(call Package/perlbase-template)
-TITLE:=Term perl module
-DEPENDS+=+perlbase-essential
-endef
-
-define Package/perlbase-term/install
-$(call perlmod/Install,$(1),Term,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Term-ANSIColor/t cpan/Term-Cap/test.pl dist/Term-Complete/t dist/Term-ReadLine/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-term))
-
-
-define Package/perlbase-test
-$(call Package/perlbase-template)
-TITLE:=Test perl module
-DEPENDS+=+perlbase-base +perlbase-config +perlbase-essential +perlbase-symbol +perlbase-tap +perlbase-text
-endef
-
-define Package/perlbase-test/install
-$(call perlmod/Install,$(1),Test Test.pm,Test/Builder.pm Test/Harness/TAP.pod Test/More.pm Test/Tutorial.pod)
-$(call perlmod/Install/NoStrip,$(1),Test/Builder.pm Test/More.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Test-Harness/t cpan/Test-Simple/t cpan/Test/t)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prove $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,perlbase-test))
-
-
-define Package/perlbase-text
-$(call Package/perlbase-template)
-TITLE:=Text perl module
-DEPENDS+=+perlbase-essential +perlbase-selfloader
-endef
-
-define Package/perlbase-text/install
-$(call perlmod/Install,$(1),Text,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Text-Balanced/t cpan/Text-ParseWords/t cpan/Text-Tabs/t dist/Text-Abbrev/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-text))
-
-
-define Package/perlbase-thread
-$(call Package/perlbase-template)
-TITLE:=Thread perl module
-DEPENDS+=+perlbase-essential +perlbase-scalar +perlbase-threads
-endef
-
-define Package/perlbase-thread/install
-$(call perlmod/Install,$(1),Thread Thread.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/Thread-Queue/t dist/Thread-Semaphore/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-thread))
-
-
-define Package/perlbase-threads
-$(call Package/perlbase-template)
-TITLE:=threads perl module
-DEPENDS+=+perlbase-essential +perlbase-scalar
-endef
-
-define Package/perlbase-threads/install
-$(call perlmod/Install,$(1),auto/threads threads threads.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/threads-shared/t dist/threads/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-threads))
-
-
-define Package/perlbase-tie
-$(call Package/perlbase-template)
-TITLE:=Tie perl module
-DEPENDS+=+perlbase-essential +perlbase-fcntl +perlbase-posix
-endef
-
-define Package/perlbase-tie/install
-$(call perlmod/Install,$(1),Tie auto/Tie,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Tie-RefHash/t dist/Tie-File/t ext/Tie-Hash-NamedCapture/t ext/Tie-Memoize/lib/Tie/Memoize.pm ext/Tie-Memoize/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-tie))
-
-
-define Package/perlbase-time
-$(call Package/perlbase-template)
-TITLE:=Time perl module
-DEPENDS+=+perlbase-class +perlbase-config +perlbase-essential
-endef
-
-define Package/perlbase-time/install
-$(call perlmod/Install,$(1),Time auto/Time,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Time-HiRes/t cpan/Time-Local/t cpan/Time-Piece/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-time))
-
-
-define Package/perlbase-unicode
-$(call Package/perlbase-template)
-TITLE:=Unicode perl module
-DEPENDS+=+perlbase-base +perlbase-charnames +perlbase-essential +perlbase-file
-endef
-
-define Package/perlbase-unicode/install
-$(call perlmod/Install,$(1),Unicode auto/Unicode,)
-$(call perlmod/InstallBaseTests,$(1),cpan/Unicode-Collate/t cpan/Unicode-Normalize/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-unicode))
-
-
-define Package/perlbase-unicore
-$(call Package/perlbase-template)
-TITLE:=unicore perl module
-endef
-
-define Package/perlbase-unicore/install
-$(call perlmod/Install,$(1),unicore,)
-endef
-
-$(eval $(call BuildPackage,perlbase-unicore))
-
-
-define Package/perlbase-universal
-$(call Package/perlbase-template)
-TITLE:=UNIVERSAL perl module
-endef
-
-define Package/perlbase-universal/install
-$(call perlmod/Install,$(1),UNIVERSAL.pm,)
-endef
-
-$(eval $(call BuildPackage,perlbase-universal))
-
-
-define Package/perlbase-user
-$(call Package/perlbase-template)
-TITLE:=User perl module
-DEPENDS+=+perlbase-class +perlbase-config +perlbase-essential
-endef
-
-define Package/perlbase-user/install
-$(call perlmod/Install,$(1),User,)
-endef
-
-$(eval $(call BuildPackage,perlbase-user))
-
-
-define Package/perlbase-utf8
-$(call Package/perlbase-template)
-TITLE:=utf8 perl module
-DEPENDS+=+perlbase-essential +perlbase-re
-endef
-
-define Package/perlbase-utf8/install
-$(call perlmod/Install,$(1),utf8.pm utf8_heavy.pl,)
-endef
-
-$(eval $(call BuildPackage,perlbase-utf8))
-
-
-define Package/perlbase-version
-$(call Package/perlbase-template)
-TITLE:=version perl module
-DEPENDS+=+perlbase-config +perlbase-essential
-endef
-
-define Package/perlbase-version/install
-$(call perlmod/Install,$(1),version version.pm,)
-$(call perlmod/InstallBaseTests,$(1),cpan/version/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-version))
-
-
-define Package/perlbase-xsloader
-$(call Package/perlbase-template)
-TITLE:=XSLoader perl module
-endef
-
-define Package/perlbase-xsloader/install
-$(call perlmod/Install,$(1),XSLoader.pm,)
-$(call perlmod/InstallBaseTests,$(1),dist/XSLoader/t ext/XS-APItest/t ext/XS-Typemap/t)
-endef
-
-$(eval $(call BuildPackage,perlbase-xsloader))
-
-
-# Generated Mon Oct 13 10:06:15 2014
diff --git a/trunk/package/feeds/packages/perl/perlmod.mk b/trunk/package/feeds/packages/perl/perlmod.mk
deleted file mode 100644
index 5b6ba165..00000000
--- a/trunk/package/feeds/packages/perl/perlmod.mk
+++ /dev/null
@@ -1,160 +0,0 @@
-# This makefile simplifies perl module builds.
-#
-
-# Build environment
-HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
-ifneq ($(CONFIG_USE_GLIBC),)
-	EXTRA_LIBS:=bsd
-	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
-endif
-PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0
-
-MOD_CFLAGS_PERL:=$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
-ifdef CONFIG_PERL_THREADS
-	MOD_CFLAGS_PERL+= -D_REENTRANT -D_GNU_SOURCE
-endif
-
-# Module install prefix
-PERL_SITELIB:=/usr/lib/perl5/5.20
-PERL_TESTSDIR:=/usr/share/perl/perl-tests
-PERLBASE_TESTSDIR:=/usr/share/perl/perlbase-tests
-PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
-
-define perlmod/host/relink
-	rm -f $(1)/Makefile.aperl
-	$(MAKE) -C $(1) perl
-	$(CP) $(1)/perl $(PERL_CMD)
-	$(CP) $(1)/perl $(STAGING_DIR_HOST)/usr/bin/perl
-endef
-
-define perlmod/host/Configure
-	(cd $(HOST_BUILD_DIR); \
-	PERL_MM_USE_DEFAULT=1 \
-	$(2) \
-	$(PERL_CMD) Makefile.PL \
-		$(1) \
-	);
-endef
-
-define perlmod/host/Compile
-	$(2) \
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		$(1) \
-		install
-endef
-
-define perlmod/host/Install
-	$(2) \
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		$(1) \
-		install
-	$(call perlmod/host/relink,$(HOST_BUILD_DIR))
-endef
-
-define perlmod/Configure
-	(cd $(PKG_BUILD_DIR); \
-	PERL_MM_USE_DEFAULT=1 \
-	$(2) \
-	$(PERL_CMD) Makefile.PL \
-		$(1) \
-		AR=ar \
-		CC=$(GNU_TARGET_NAME)-gcc \
-		CCFLAGS="$(MOD_CFLAGS_PERL)" \
-		CCCDLFLAGS=-fPIC \
-		CCDLFLAGS=-Wl,-E \
-		DLEXT=so \
-		DLSRC=dl_dlopen.xs \
-		EXE_EXT=" " \
-		FULL_AR=$(GNU_TARGET_NAME)-ar \
-		LD=$(GNU_TARGET_NAME)-gcc \
-		LDDLFLAGS="-shared $(TARGET_LDFLAGS)"  \
-		LDFLAGS="$(EXTRA_LIBDIRS:%=-L%) $(EXTRA_LIBS:%=-l%) " \
-		LIBC=" " \
-		LIB_EXT=.a \
-		OBJ_EXT=.o \
-		OSNAME=linux \
-		OSVERS=2.4.30 \
-		RANLIB=: \
-		SITELIBEXP=" " \
-		SITEARCHEXP=" " \
-		SO=so  \
-		VENDORARCHEXP=" " \
-		VENDORLIBEXP=" " \
-		SITEPREFIX=/usr \
-		INSTALLPRIVLIB=$(PERL_SITELIB) \
-		INSTALLSITELIB=$(PERL_SITELIB) \
-		INSTALLVENDORLIB=" " \
-		INSTALLARCHLIB=$(PERL_SITELIB) \
-		INSTALLSITEARCH=$(PERL_SITELIB) \
-		INSTALLVENDORARCH=" " \
-		INSTALLBIN=/usr/bin \
-		INSTALLSITEBIN=/usr/bin \
-		INSTALLVENDORBIN=" " \
-		INSTALLSCRIPT=/usr/bin \
-		INSTALLSITESCRIPT=/usr/bin \
-		INSTALLVENDORSCRIPT=" " \
-		INSTALLMAN1DIR=/usr/man/man1 \
-		INSTALLSITEMAN1DIR=/usr/man/man1 \
-		INSTALLVENDORMAN1DIR=" " \
-		INSTALLMAN3DIR=/usr/man/man3 \
-		INSTALLSITEMAN3DIR=/usr/man/man3 \
-		INSTALLVENDORMAN3DIR=" " \
-		LINKTYPE=dynamic \
-		DESTDIR=$(PKG_INSTALL_DIR) \
-	);
-	sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/5.20/CORE/!' -i $(PKG_BUILD_DIR)/Makefile
-endef
-
-define perlmod/Compile
-	PERL5LIB=$(PERL_LIB) \
-	$(2) \
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(1) \
-		install
-endef
-
-define perlmod/Install/NoStrip
-	$(INSTALL_DIR) $(strip $(1))$(PERL_SITELIB)
-	(cd $(PKG_INSTALL_DIR)$(PERL_SITELIB) && \
-	rsync --relative -rlHp --itemize-changes \
-		--exclude=\*.pod \
-		--exclude=.packlist \
-		$(addprefix --exclude=/,$(strip $(3))) \
-		--prune-empty-dirs \
-		$(strip $(2)) $(strip $(1))$(PERL_SITELIB))
-
-	chmod -R u+w $(strip $(1))$(PERL_SITELIB)
-endef
-
-
-define perlmod/Install
-	$(call perlmod/Install/NoStrip,$(1),$(2),$(3))
-
-	@echo "---> Stripping modules in: $(strip $(1))$(PERL_SITELIB)"
-	find $(strip $(1))$(PERL_SITELIB) -name \*.pm -or -name \*.pl | \
-	xargs -r sed -i \
-		-e '/^=\(head\|pod\|item\|over\|back\|encoding\|begin\|end\|for\)/,/^=cut/d' \
-		-e '/^=\(head\|pod\|item\|over\|back\|encoding\|begin\|end\|for\)/,$$$$d' \
-		-e '/^#$$$$/d' \
-		-e '/^#[^!"'"'"']/d'
-endef
-
-# You probably don't want to use this directly. Look at perlmod/InstallTests
-define perlmod/_InstallTests
-	$(INSTALL_DIR) $(strip $(1))
-	(cd $(PKG_BUILD_DIR)/$(2) && \
-	rsync --relative -rlHp --itemize-changes \
-		--exclude=.packlist \
-		--prune-empty-dirs \
-		$(strip $(3)) $(strip $(1)))
-
-	chmod -R u+w $(strip $(1))
-endef
-
-define perlmod/InstallBaseTests
-	$(if $(CONFIG_PERL_TESTS),$(call perlmod/_InstallTests,$(1)$(PERL_TESTSDIR),,$(2)))
-endef
-
-define perlmod/InstallTests
-	$(if $(CONFIG_PERL_TESTS),$(call perlmod/_InstallTests,$(1)$(PERL_TESTSDIR),$(2),$(3)))
-endef
diff --git a/trunk/package/feeds/packages/php5/Makefile b/trunk/package/feeds/packages/php5/Makefile
deleted file mode 100644
index 1092b5cd..00000000
--- a/trunk/package/feeds/packages/php5/Makefile
+++ /dev/null
@@ -1,563 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=php
-PKG_VERSION:=5.6.7
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=PHPv3.01
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_MD5SUM:=2e4b0534d4b8aa9aabedeef12e7c0aa8
-
-PKG_FIXUP:=libtool autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-PHP5_MODULES = \
-	calendar ctype curl \
-	fileinfo \
-	dom \
-	exif \
-	ftp \
-	gettext gd gmp \
-	hash \
-	iconv \
-	json \
-	ldap \
-	mbstring mcrypt mysql mysqli \
-	openssl \
-	pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \
-	session shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm \
-	tokenizer \
-	xml xmlreader xmlwriter zip \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \
-	CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML CONFIG_PHP5_SYSTEMTZDATA
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/php5/Default
-  SUBMENU:=PHP
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=PHP5 Hypertext preprocessor
-  URL:=http://www.php.net/
-  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-  DEPENDS:=php5
-endef
-
-define Package/php5/Default/description
-  PHP is a widely-used general-purpose scripting language that is especially
-  suited for Web development and can be embedded into HTML.
-endef
-
-define Package/php5/config
-	config PHP5_FILTER
-		bool "PHP5 Filter support"
-		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
-
-	config PHP5_LIBXML
-		bool "PHP5 LIBXML support"
-		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
-
-	config PHP5_SYSTEMTZDATA
-		bool "Use system timezone data instead of php's built-in database"
-		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
-		select PACKAGE_zoneinfo-core
-		default y
-		help
-			Enabling this feature automatically selects the zoneinfo-core package
-			which contains data for UTC timezone. To use other timezones you have
-			to install the corresponding zoneinfo-... package(s).
-endef
-
-define Package/php5
-  $(call Package/php5/Default)
-
-  DEPENDS:=+libpcre +zlib \
-           +PHP5_LIBXML:libxml2
-endef
-
-define Package/php5/description
-  $(call Package/php5/Default/description)
-  This package contains only the PHP config file. You must actually choose
-  your PHP flavour (cli, cgi or fastcgi).
-endef
-
-define Package/php5-cli
-  $(call Package/php5/Default)
-  TITLE+= (CLI)
-endef
-
-define Package/php5-cli/description
-  $(call Package/php5/Default/description)
-  This package contains the CLI version of the PHP5 interpreter.
-endef
-
-define Package/php5-cgi
-  $(call Package/php5/Default)
-  TITLE+= (CGI & FastCGI)
-endef
-
-define Package/php5-cgi/description
-  $(call Package/php5/Default/description)
-  This package contains the CGI version of the PHP5 interpreter.
-endef
-
-define Package/php5-fastcgi
-  $(call Package/php5/Default)
-  DEPENDS+= +php5-cgi
-  TITLE:=FastCGI startup script
-endef
-
-define Package/php5-fastcgi/description
-  As FastCGI support is now a core feature the php5-fastcgi package now depends
-  on the php5-cgi package, containing just the startup script.
-endef
-
-define Package/php5-fpm
-  $(call Package/php5/Default)
-  DEPENDS+= +php5-cgi
-  TITLE+= (FPM)
-endef
-
-define Package/php5-fpm/description
-  $(call Package/php5/Default/description)
-  This package contains the FastCGI Process Manager of the PHP5 interpreter.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-cli \
-	--enable-cgi \
-	--enable-fpm \
-	--enable-shared \
-	--disable-static \
-	--disable-rpath \
-	--disable-debug \
-	--without-pear \
-	\
-	--with-config-file-path=/etc \
-	--with-config-file-scan-dir=/etc/php5 \
-	--disable-short-tags \
-	\
-	--with-zlib="$(STAGING_DIR)/usr" \
-	  --with-zlib-dir="$(STAGING_DIR)/usr" \
-	--with-pcre-regex="$(STAGING_DIR)/usr" \
-	--disable-phar
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),)
-  CONFIGURE_ARGS+= --enable-calendar=shared
-else
-  CONFIGURE_ARGS+= --disable-calendar
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),)
-  CONFIGURE_ARGS+= --enable-ctype=shared
-else
-  CONFIGURE_ARGS+= --disable-ctype
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),)
-  CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-curl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),)
-  CONFIGURE_ARGS+= --enable-fileinfo=shared
-else
-  CONFIGURE_ARGS+= --disable-fileinfo
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gettext),)
-  CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full"
-else
-  CONFIGURE_ARGS+= --without-gettext
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),)
-  CONFIGURE_ARGS+= --enable-dom=shared
-else
-  CONFIGURE_ARGS+= --disable-dom
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),)
-  CONFIGURE_ARGS+= --enable-exif=shared
-else
-  CONFIGURE_ARGS+= --disable-exif
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),)
-  CONFIGURE_ARGS+= --enable-ftp=shared
-else
-  CONFIGURE_ARGS+= --disable-ftp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),)
-  CONFIGURE_ARGS+= \
-	--with-gd=shared \
-	--without-freetype-dir \
-	--with-jpeg-dir="$(STAGING_DIR)/usr" \
-	--with-png-dir="$(STAGING_DIR)/usr" \
-	--without-xpm-dir \
-	--without-t1lib \
-	--enable-gd-native-ttf \
-	--disable-gd-jis-conv
-else
-  CONFIGURE_ARGS+= --without-gd
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),)
-  CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-gmp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),)
-  CONFIGURE_ARGS+= --enable-hash=shared
-else
-  CONFIGURE_ARGS+= --disable-hash
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),)
-  CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
-else
-  CONFIGURE_ARGS+= --without-iconv
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-json),)
-  CONFIGURE_ARGS+= --enable-json=shared
-else
-  CONFIGURE_ARGS+= --disable-json
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),)
-  CONFIGURE_ARGS+= \
-	--with-ldap=shared,"$(STAGING_DIR)/usr" \
-	--with-ldap-sasl="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-ldap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),)
-  CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex
-else
-  CONFIGURE_ARGS+= --disable-mbstring
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),)
-  CONFIGURE_ARGS+=  --with-mcrypt=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-mcrypt
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),)
-  CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysqli),)
-  CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config"
-else
-  CONFIGURE_ARGS+= --without-mysqli
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),)
-  CONFIGURE_ARGS+= \
-	--with-openssl=shared,"$(STAGING_DIR)/usr" \
-	--with-kerberos=no \
-	--with-openssl-dir="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-openssl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),)
-  CONFIGURE_ARGS+= --enable-pcntl=shared
-else
-  CONFIGURE_ARGS+= --disable-pcntl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),)
-  CONFIGURE_ARGS+= --enable-pdo=shared
-  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-mysql),)
-    CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr"
-  else
-    CONFIGURE_ARGS+= --without-pdo-mysql
-  endif
-  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-pgsql),)
-    CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr"
-  else
-    CONFIGURE_ARGS+= --without-pdo-pgsql
-  endif
-  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),)
-    CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr"
-  else
-    CONFIGURE_ARGS+= --without-pdo-sqlite
-  endif
-else
-  CONFIGURE_ARGS+= --disable-pdo
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),)
-  CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-pgsql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),)
-  CONFIGURE_ARGS+= --enable-session=shared
-else
-  CONFIGURE_ARGS+= --disable-session
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-shmop),)
-  CONFIGURE_ARGS+= --enable-shmop=shared
-else
-  CONFIGURE_ARGS+= --disable-shmop
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),)
-  CONFIGURE_ARGS+= --enable-simplexml=shared
-else
-  CONFIGURE_ARGS+= --disable-simplexml
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),)
-  CONFIGURE_ARGS+= --enable-soap=shared
-else
-  CONFIGURE_ARGS+= --disable-soap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),)
-  CONFIGURE_ARGS+= --enable-sockets=shared
-else
-  CONFIGURE_ARGS+= --disable-sockets
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),)
-  CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-sqlite3
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),)
-  CONFIGURE_ARGS+= --enable-sysvmsg=shared
-else
-  CONFIGURE_ARGS+= --disable-sysvmsg
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),)
-  CONFIGURE_ARGS+= --enable-sysvsem=shared
-else
-  CONFIGURE_ARGS+= --disable-sysvsem
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),)
-  CONFIGURE_ARGS+= --enable-sysvshm=shared
-else
-  CONFIGURE_ARGS+= --disable-sysvshm
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),)
-  CONFIGURE_ARGS+= --enable-tokenizer=shared
-else
-  CONFIGURE_ARGS+= --disable-tokenizer
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),)
-  CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
-  ifneq ($(CONFIG_PHP5_LIBXML),)
-    CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
-  else
-    CONFIGURE_ARGS+= --with-libexpat-dir="$(STAGING_DIR)/usr"
-  endif
-else
-  CONFIGURE_ARGS+= --disable-xml
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),)
-  CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --disable-xmlreader
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),)
-  CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --disable-xmlwriter
-endif
-
-ifneq ($(CONFIG_PACKAGE_php5-mod-zip),)
-  CONFIGURE_ARGS+= --enable-zip=shared
-else
-  CONFIGURE_ARGS+= --disable-zip
-endif
-
-ifneq ($(SDK)$(CONFIG_PHP5_FILTER),)
-  CONFIGURE_ARGS+= --enable-filter
-else
-  CONFIGURE_ARGS+= --disable-filter
-endif
-
-ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),)
-  CONFIGURE_ARGS+= --enable-libxml
-  CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
-else
-  CONFIGURE_ARGS+= --disable-libxml
-endif
-
-ifneq ($(CONFIG_PHP5_SYSTEMTZDATA),)
-  CONFIGURE_ARGS+= --with-system-tzdata
-else
-  CONFIGURE_ARGS+= --without-system-tzdata
-endif
-
-CONFIGURE_VARS+= \
-	ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \
-	php_cv_cc_rpath="no" \
-	iconv_impl_name="gnu_libiconv" \
-	ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \
-
-define Package/php5/conffiles
-/etc/php.ini
-endef
-
-define Package/php5/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/php.ini $(1)/etc/
-endef
-
-define Package/php5-cli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/sapi/cli/php $(1)/usr/bin/php-cli
-endef
-
-define Package/php5-cgi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(1)/usr/bin/php-cgi
-	ln -sf php-cgi $(1)/usr/bin/php-fcgi
-endef
-
-define Package/php5-fastcgi/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/php5-fastcgi.config $(1)/etc/config/php5-fastcgi
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/php5-fastcgi.init $(1)/etc/init.d/php5-fastcgi
-endef
-
-define Package/php5-fpm/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sapi/fpm/php-fpm $(1)/usr/bin/php-fpm
-
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/php5-fpm.conf $(1)/etc/php5-fpm.conf
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/php5-fpm.config $(1)/etc/config/php5-fpm
-
-	$(INSTALL_DIR) $(1)/etc/php5-fpm.d
-	$(INSTALL_DATA) ./files/php5-fpm-www.conf $(1)/etc/php5-fpm.d/www.conf
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/php5-fpm.init $(1)/etc/init.d/php5-fpm
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	( cd $(PKG_BUILD_DIR); touch configure.in; ./buildconf --force )
-endef
-
-define Build/InstallDev
-	mkdir -p $(PKG_BUILD_DIR)/staging/usr/bin
-	make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging
-	rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php
-	$(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR_HOST)
-	sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
-	sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
-	sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR_HOST)/usr\"#" $(STAGING_DIR_HOST)/usr/bin/php-config
-endef
-
-define BuildModule
-
-  define Package/php5-mod-$(1)
-    $(call Package/php5/Default)
-
-    ifneq ($(3),)
-      DEPENDS+=$(3)
-    endif
-
-    TITLE:=$(2) shared module
-  endef
-
-  define Package/php5-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/php
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
-	$(INSTALL_DIR) $$(1)/etc/php5
-	echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
-  endef
-
-  $$(eval $$(call BuildPackage,php5-mod-$(1)))
-
-endef
-
-$(eval $(call BuildPackage,php5))
-$(eval $(call BuildPackage,php5-cgi))
-$(eval $(call BuildPackage,php5-cli))
-$(eval $(call BuildPackage,php5-fastcgi))
-$(eval $(call BuildPackage,php5-fpm))
-
-#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS]))
-$(eval $(call BuildModule,calendar,Calendar))
-$(eval $(call BuildModule,ctype,Ctype))
-$(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl))
-$(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2))
-$(eval $(call BuildModule,exif,EXIF))
-$(eval $(call BuildModule,fileinfo,Fileinfo))
-$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl))
-$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng))
-$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full))
-$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp))
-$(eval $(call BuildModule,hash,Hash))
-$(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS)))
-$(eval $(call BuildModule,json,JSON))
-$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2))
-$(eval $(call BuildModule,mbstring,MBString))
-$(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl))
-$(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient))
-$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php5-mod-mysqli:libmysqlclient))
-$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl))
-$(eval $(call BuildModule,pcntl,PCNTL))
-$(eval $(call BuildModule,pdo,PHP Data Objects))
-$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-mysql:libmysqlclient))
-$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-pgsql:libpq))
-$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php5-mod-pdo +PACKAGE_php5-mod-pdo-sqlite:libsqlite3 +PACKAGE_php5-mod-pdo-sqlite:librt))
-$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php5-mod-pgsql:libpq))
-$(eval $(call BuildModule,session,Session))
-$(eval $(call BuildModule,shmop,Shared Memory))
-$(eval $(call BuildModule,simplexml,SimpleXML,+@PHP5_LIBXML +PACKAGE_php5-mod-simplexml:libxml2))
-$(eval $(call BuildModule,soap,SOAP,+@PHP5_LIBXML +PACKAGE_php5-mod-soap:libxml2))
-$(eval $(call BuildModule,sockets,Sockets))
-$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3))
-$(eval $(call BuildModule,sysvmsg,System V messages))
-$(eval $(call BuildModule,sysvsem,System V shared memory))
-$(eval $(call BuildModule,sysvshm,System V semaphore))
-$(eval $(call BuildModule,tokenizer,Tokenizer))
-$(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat))
-$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlreader:libxml2))
-$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2))
-$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib))
diff --git a/trunk/package/feeds/packages/php5/files/php.ini b/trunk/package/feeds/packages/php5/files/php.ini
deleted file mode 100644
index 6fe2a310..00000000
--- a/trunk/package/feeds/packages/php5/files/php.ini
+++ /dev/null
@@ -1,311 +0,0 @@
-[PHP]
-
-zend.ze1_compatibility_mode = Off
-
-; Language Options
-
-engine = On
-;short_open_tag = Off
-precision    =  12
-y2k_compliance = On
-output_buffering = Off
-;output_handler =
-zlib.output_compression = Off
-;zlib.output_compression_level = -1
-;zlib.output_handler =
-implicit_flush = Off
-unserialize_callback_func =
-serialize_precision = 100
-
-;open_basedir =
-disable_functions =
-disable_classes =
-
-; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; <span style="color: ???????"> would work.
-;highlight.string  = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html    = #000000
-
-;ignore_user_abort = On
-;realpath_cache_size = 16k
-;realpath_cache_ttl = 120
-
-; Miscellaneous
-
-expose_php = On
-
-; Resource Limits
-
-max_execution_time = 30	; Maximum execution time of each script, in seconds.
-max_input_time = 60	; Maximum amount of time each script may spend parsing request data.
-;max_input_nesting_level = 64
-memory_limit = 8M	; Maximum amount of memory a script may consume.
-
-; Error handling and logging
-
-; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 6.0.0)
-; E_ERROR           - fatal run-time errors
-; E_RECOVERABLE_ERROR  - almost fatal run-time errors
-; E_WARNING         - run-time warnings (non-fatal errors)
-; E_PARSE           - compile-time parse errors
-; E_NOTICE          - run-time notices (these are warnings which often result
-;                     from a bug in your code, but it's possible that it was
-;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it's automatically initialized to an
-;                     empty string)
-; E_STRICT			- run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
-; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-;                     initial startup
-; E_COMPILE_ERROR   - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR      - user-generated error message
-; E_USER_WARNING    - user-generated warning message
-; E_USER_NOTICE     - user-generated notice message
-; E_DEPRECATED      - warn about code that will not work in future versions
-;                     of PHP
-; E_USER_DEPRECATED - user-generated deprecation warnings
-;
-; Common Values:
-;   E_ALL & ~E_NOTICE  (Show all errors, except for notices and coding standards warnings.)
-;   E_ALL & ~E_NOTICE | E_STRICT  (Show all errors, except for notices)
-;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
-;   E_ALL | E_STRICT  (Show all errors, warnings and notices including coding standards.)
-; Default Value: E_ALL & ~E_NOTICE
-error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
-
-display_errors = On
-display_startup_errors = Off
-log_errors = Off
-log_errors_max_len = 1024
-ignore_repeated_errors = Off
-ignore_repeated_source = Off
-report_memleaks = On
-;report_zend_debug = 0
-track_errors = Off
-;html_errors = Off
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-;error_prepend_string = "<font color=#ff0000>"
-;error_append_string = "</font>"
-; Log errors to specified file.
-;error_log = /var/log/php_errors.log
-; Log errors to syslog.
-;error_log = syslog
-
-; Data Handling
-
-;arg_separator.output = "&amp;"
-;arg_separator.input = ";&"
-variables_order = "EGPCS"
-request_order = "GP"
-register_globals = Off
-register_long_arrays = Off
-register_argc_argv = On
-auto_globals_jit = On
-post_max_size = 8M
-;magic_quotes_gpc = Off
-magic_quotes_runtime = Off
-magic_quotes_sybase = Off
-auto_prepend_file =
-auto_append_file =
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-;always_populate_raw_post_data = On
-
-; Paths and Directories
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-doc_root = "/www"
-user_dir =
-extension_dir = "/usr/lib/php"
-enable_dl = On
-;cgi.force_redirect = 1
-;cgi.nph = 1
-;cgi.redirect_status_env = ;
-cgi.fix_pathinfo=1
-;fastcgi.impersonate = 1;
-;fastcgi.logging = 0
-;cgi.rfc2616_headers = 0
-
-; File Uploads
-
-file_uploads = On
-upload_tmp_dir = "/tmp"
-upload_max_filesize = 2M
-max_file_uploads = 20
-
-; Fopen wrappers
-
-allow_url_fopen = On
-allow_url_include = Off
-;from="john@doe.com"
-;user_agent="PHP"
-default_socket_timeout = 60
-;auto_detect_line_endings = Off
-
-; Dynamic Extensions
-
-;extension=ctype.so
-;extension=curl.so
-;extension=dom.so
-;extension=exif.so
-;extension=ftp.so
-;extension=gd.so
-;extension=gmp.so
-;extension=hash.so
-;extension=iconv.so
-;extension=json.so
-;extension=ldap.so
-;extension=mbstring.so
-;extension=mcrypt.so
-;extension=mysql.so
-;extension=openssl.so
-;extension=pcre.so
-;extension=pdo.so
-;extension=pdo-mysql.so
-;extension=pdo-pgsql.so
-;extension=pdo_sqlite.so
-;extension=pgsql.so
-;extension=session.so
-;extension=soap.so
-;extension=sockets.so
-;extension=sqlite.so
-;extension=sqlite3.so
-;extension=tokenizer.so
-;extension=xml.so
-;extension=xmlreader.so
-;extension=xmlwriter.so
-
-; Module Settings
-
-[APC]
-apc.enabled = 1
-apc.shm_segments = 1	;The number of shared memory segments to allocate for the compiler cache.
-apc.shm_size = 4M	;The size of each shared memory segment.
-
-[Date]
-;date.timezone =
-;date.default_latitude = 31.7667
-;date.default_longitude = 35.2333
-;date.sunrise_zenith = 90.583333
-;date.sunset_zenith = 90.583333
-
-[filter]
-;filter.default = unsafe_raw
-;filter.default_flags =
-
-[iconv]
-;iconv.input_encoding = ISO-8859-1
-;iconv.internal_encoding = ISO-8859-1
-;iconv.output_encoding = ISO-8859-1
-
-[sqlite]
-;sqlite.assoc_case = 0
-
-[sqlite3]
-;sqlite3.extension_dir =
-
-[Pdo_mysql]
-pdo_mysql.cache_size = 2000
-pdo_mysql.default_socket=
-
-[MySQL]
-mysql.allow_local_infile = On
-mysql.allow_persistent = On
-mysql.cache_size = 2000
-mysql.max_persistent = -1
-mysql.max_links = -1
-mysql.default_port =
-mysql.default_socket =
-mysql.default_host =
-mysql.default_user =
-mysql.default_password =
-mysql.connect_timeout = 60
-mysql.trace_mode = Off
-
-[PostgresSQL]
-pgsql.allow_persistent = On
-pgsql.auto_reset_persistent = Off
-pgsql.max_persistent = -1
-pgsql.max_links = -1
-pgsql.ignore_notice = 0
-pgsql.log_notice = 0
-
-[Session]
-session.save_handler = files
-session.save_path = "/tmp"
-session.use_cookies = 1
-;session.cookie_secure =
-session.use_only_cookies = 1
-session.name = PHPSESSID
-session.auto_start = 0
-session.cookie_lifetime = 0
-session.cookie_path = /
-session.cookie_domain =
-session.cookie_httponly =
-session.serialize_handler = php
-session.gc_probability = 1
-session.gc_divisor     = 100
-session.gc_maxlifetime = 1440
-session.bug_compat_42 = On
-session.bug_compat_warn = On
-session.referer_check =
-session.entropy_length = 0
-;session.entropy_file = /dev/urandom
-session.entropy_file =
-;session.entropy_length = 16
-session.cache_limiter = nocache
-session.cache_expire = 180
-session.use_trans_sid = 0
-session.hash_function = 0
-session.hash_bits_per_character = 4
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset="
-
-[mbstring]
-;mbstring.language = Japanese
-;mbstring.internal_encoding = EUC-JP
-;mbstring.http_input = auto
-;mbstring.http_output = SJIS
-;mbstring.encoding_translation = Off
-;mbstring.detect_order = auto
-;mbstring.substitute_character = none;
-;mbstring.func_overload = 0
-;mbstring.strict_detection = Off
-;mbstring.http_output_conv_mimetype=
-;mbstring.script_encoding=
-
-[gd]
-;gd.jpeg_ignore_warning = 0
-
-[exif]
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel    = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel    = JIS
-
-[soap]
-soap.wsdl_cache_enabled=1
-soap.wsdl_cache_dir="/tmp"
-soap.wsdl_cache_ttl=86400
-soap.wsdl_cache_limit = 5
-
-[sysvshm]
-;sysvshm.init_mem = 10000
-
-[ldap]
-ldap.max_links = -1
-
-[mcrypt]
-;mcrypt.algorithms_dir=
-;mcrypt.modes_dir=
diff --git a/trunk/package/feeds/packages/php5/files/php5-fastcgi.config b/trunk/package/feeds/packages/php5/files/php5-fastcgi.config
deleted file mode 100644
index 039d3bbc..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fastcgi.config
+++ /dev/null
@@ -1,3 +0,0 @@
-config php5-fastcgi
-	option enabled 1
-	option port '1026'
diff --git a/trunk/package/feeds/packages/php5/files/php5-fastcgi.init b/trunk/package/feeds/packages/php5/files/php5-fastcgi.init
deleted file mode 100644
index 0c452ad2..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fastcgi.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
-
-START=50
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-start_instance() {
-	local section="$1"
-	local enabled
-	local port
-
-	config_get_bool enabled "$section" 'enabled' 0
-	config_get port "$section" 'port' 1026
-
-	[ $enabled -gt 0 ] || return 1
-
-	PHP_FCGI_CHILDREN='' \
-	service_start /usr/bin/php-fcgi -b $port
-}
-
-start() {
-	config_load 'php5-fastcgi'
-	config_foreach start_instance 'php5-fastcgi'
-}
-
-stop() {
-	service_stop /usr/bin/php-fcgi
-}
diff --git a/trunk/package/feeds/packages/php5/files/php5-fpm-www.conf b/trunk/package/feeds/packages/php5/files/php5-fpm-www.conf
deleted file mode 100644
index 4776bbae..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fpm-www.conf
+++ /dev/null
@@ -1,392 +0,0 @@
-; Start a new pool named 'www'.
-; the variable $pool can we used in any directive and will be replaced by the
-; pool name ('www' here)
-[www]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-;       will be used.
-user = nobody
-;group =
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
-;                            a specific port;
-;   'port'                 - to listen on a TCP socket to all addresses on a
-;                            specific port;
-;   '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /var/run/php5-fpm.sock
-
-; Set listen(2) backlog.
-; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 128
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions. 
-; Default Values: user and group are set as the running user
-;                 mode is set to 0666
-;listen.owner = www-data
-;listen.group = www-data
-;listen.mode = 0666
-
-; List of ipv4 addresses of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-;       - The pool processes will inherit the master process priority
-;         unless it specified otherwise
-; Default Value: no set
-; priority = -19
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-;   static  - a fixed number (pm.max_children) of child processes;
-;   dynamic - the number of child processes are set dynamically based on the
-;             following directives. With this process management, there will be
-;             always at least 1 children.
-;             pm.max_children      - the maximum number of children that can
-;                                    be alive at the same time.
-;             pm.start_servers     - the number of children created on startup.
-;             pm.min_spare_servers - the minimum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is less than this
-;                                    number then some children will be created.
-;             pm.max_spare_servers - the maximum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is greater than this
-;                                    number then some children will be killed.
-;  ondemand - no children are created at startup. Children will be forked when
-;             new requests will connect. The following parameter are used:
-;             pm.max_children           - the maximum number of children that
-;                                         can be alive at the same time.
-;             pm.process_idle_timeout   - The number of seconds after which
-;                                         an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following informations:
-;   pool                 - the name of the pool;
-;   process manager      - static, dynamic or ondemand;
-;   start time           - the date and time FPM has started;
-;   start since          - number of seconds since FPM has started;
-;   accepted conn        - the number of request accepted by the pool;
-;   listen queue         - the number of request in the queue of pending
-;                          connections (see backlog in listen(2));
-;   max listen queue     - the maximum number of requests in the queue
-;                          of pending connections since FPM has started;
-;   listen queue len     - the size of the socket queue of pending connections;
-;   idle processes       - the number of idle processes;
-;   active processes     - the number of active processes;
-;   total processes      - the number of idle + active processes;
-;   max active processes - the maximum number of active processes since FPM
-;                          has started;
-;   max children reached - number of times, the process limit has been reached,
-;                          when pm tries to start more children (works only for
-;                          pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-;   pool:                 www
-;   process manager:      static
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          62636
-;   accepted conn:        190460
-;   listen queue:         0
-;   max listen queue:     1
-;   listen queue len:     42
-;   idle processes:       4
-;   active processes:     11
-;   total processes:      15
-;   max active processes: 12
-;   max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-;   http://www.foo.bar/status
-;   http://www.foo.bar/status?json
-;   http://www.foo.bar/status?html
-;   http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example: 
-;   http://www.foo.bar/status?full
-;   http://www.foo.bar/status?json&full
-;   http://www.foo.bar/status?html&full
-;   http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-;   pid                  - the PID of the process;
-;   state                - the state of the process (Idle, Running, ...);
-;   start time           - the date and time the process has started;
-;   start since          - the number of seconds since the process has started;
-;   requests             - the number of requests the process has served;
-;   request duration     - the duration in µs of the requests;
-;   request method       - the request method (GET, POST, ...);
-;   request URI          - the request URI with the query string;
-;   content length       - the content length of the request (only with POST);
-;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
-;   script               - the main script called (or '-' if not set);
-;   last request cpu     - the %cpu the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because CPU calculation is done when the request
-;                          processing has terminated;
-;   last request memory  - the max amount of memory the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because memory calculation is done when the request
-;                          processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-;   ************************
-;   pid:                  31330
-;   state:                Running
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          63087
-;   requests:             12808
-;   request duration:     1250261
-;   request method:       GET
-;   request URI:          /test_mem.php?N=10000
-;   content length:       0
-;   user:                 -
-;   script:               /home/fat/web/docs/php/test_mem.php
-;   last request cpu:     0.00
-;   last request memory:  0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: ${prefix}/share/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set 
-;pm.status_path = /status
-
-; The ping URI to call the monitoring page of FPM. If this value is not set, no
-; URI will be recognized as a ping page. This could be used to test from outside
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-;  %%: the '%' character
-;  %C: %CPU used by the request
-;      it can accept the following format:
-;      - %{user}C for user CPU only
-;      - %{system}C for system CPU only
-;      - %{total}C  for user + system CPU (default)
-;  %d: time taken to serve the request
-;      it can accept the following format:
-;      - %{seconds}d (default)
-;      - %{miliseconds}d
-;      - %{mili}d
-;      - %{microseconds}d
-;      - %{micro}d
-;  %e: an environment variable (same as $_ENV or $_SERVER)
-;      it must be associated with embraces to specify the name of the env
-;      variable. Some exemples:
-;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-;  %f: script filename
-;  %l: content-length of the request (for POST request only)
-;  %m: request method
-;  %M: peak of memory allocated by PHP
-;      it can accept the following format:
-;      - %{bytes}M (default)
-;      - %{kilobytes}M
-;      - %{kilo}M
-;      - %{megabytes}M
-;      - %{mega}M
-;  %n: pool name
-;  %o: ouput header
-;      it must be associated with embraces to specify the name of the header:
-;      - %{Content-Type}o
-;      - %{X-Powered-By}o
-;      - %{Transfert-Encoding}o
-;      - ....
-;  %p: PID of the child that serviced the request
-;  %P: PID of the parent of the child that serviced the request
-;  %q: the query string 
-;  %Q: the '?' character if query string exists
-;  %r: the request URI (without the query string, see %q and %Q)
-;  %R: remote IP address
-;  %s: status (response code)
-;  %t: server time the request was received
-;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
-;  %T: time the log has been written (the request has finished)
-;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
-;  %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_terminate_timeout = 0
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-;       possible. However, all PHP paths will be relative to the chroot
-;       (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-chdir = /
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environement, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; exectute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-;   php_value/php_flag             - you can set classic ini defines which can
-;                                    be overwritten from PHP call 'ini_set'. 
-;   php_admin_value/php_admin_flag - these directives won't be overwritten by
-;                                     PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-;                specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
diff --git a/trunk/package/feeds/packages/php5/files/php5-fpm.conf b/trunk/package/feeds/packages/php5/files/php5-fpm.conf
deleted file mode 100644
index 00c8e4f5..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fpm.conf
+++ /dev/null
@@ -1,121 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;
-; FPM Configuration ;
-;;;;;;;;;;;;;;;;;;;;;
-
-; All relative paths in this configuration file are relative to PHP's install
-; prefix (/usr). This prefix can be dynamically changed by using the
-; '-p' argument from the command line.
-
-; Include one or more files. If glob(3) exists, it is used to include a bunch of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-; Relative path can also be used. They will be prefixed by:
-;  - the global prefix if it's been set (-p argument)
-;  - /usr otherwise
-;include=/etc/php5/fpm/*.conf
-
-;;;;;;;;;;;;;;;;;;
-; Global Options ;
-;;;;;;;;;;;;;;;;;;
-
-[global]
-; Pid file
-; Note: the default prefix is /var
-; Default Value: none
-pid = /var/run/php5-fpm.pid
-
-; Error log file
-; If it's set to "syslog", log is sent to syslogd instead of being written
-; in a local file.
-; Note: the default prefix is /var
-; Default Value: log/php-fpm.log
-error_log = /var/log/php5-fpm.log
-
-; syslog_facility is used to specify what type of program is logging the
-; message. This lets syslogd specify that messages from different facilities
-; will be handled differently.
-; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
-; Default Value: daemon
-;syslog.facility = daemon
-
-; syslog_ident is prepended to every message. If you have multiple FPM
-; instances running on the same server, you can change the default value
-; which must suit common needs.
-; Default Value: php-fpm
-;syslog.ident = php-fpm
-
-; Log level
-; Possible Values: alert, error, warning, notice, debug
-; Default Value: notice
-;log_level = notice
-
-; If this number of child processes exit with SIGSEGV or SIGBUS within the time
-; interval set by emergency_restart_interval then FPM will restart. A value
-; of '0' means 'Off'.
-; Default Value: 0
-;emergency_restart_threshold = 0
-
-; Interval of time used by emergency_restart_interval to determine when 
-; a graceful restart will be initiated.  This can be useful to work around
-; accidental corruptions in an accelerator's shared memory.
-; Available Units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-;emergency_restart_interval = 0
-
-; Time limit for child processes to wait for a reaction on signals from master.
-; Available units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-;process_control_timeout = 0
-
-; The maximum number of processes FPM will fork. This has been design to control
-; the global number of processes when using dynamic PM within a lot of pools.
-; Use it with caution.
-; Note: A value of 0 indicates no limit
-; Default Value: 0
-; process.max = 128
-
-; Specify the nice(2) priority to apply to the master process (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-;       - The pool process will inherit the master process priority
-;         unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
-; Default Value: yes
-;daemonize = yes
-
-; Set open file descriptor rlimit for the master process.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit for the master process.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Specify the event mechanism FPM will use. The following is available:
-; - select     (any POSIX os)
-; - poll       (any POSIX os)
-; - epoll      (linux >= 2.5.44)
-; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
-; - /dev/poll  (Solaris >= 7)
-; - port       (Solaris >= 10)
-; Default Value: not set (auto detection)
-; events.mechanism = epoll
-
-;;;;;;;;;;;;;;;;;;;;
-; Pool Definitions ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Multiple pools of child processes may be started with different listening
-; ports and different management options.  The name of the pool will be
-; used in logs and stats. There is no limitation on the number of pools which
-; FPM can handle. Your system will tell you anyway :)
-
-; To configure the pools it is recommended to have one .conf file per
-; pool in the following directory:
-include=/etc/php5-fpm.d/*.conf
diff --git a/trunk/package/feeds/packages/php5/files/php5-fpm.config b/trunk/package/feeds/packages/php5/files/php5-fpm.config
deleted file mode 100644
index 4f40c925..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fpm.config
+++ /dev/null
@@ -1,2 +0,0 @@
-config php5-fpm
-	option enabled 1
diff --git a/trunk/package/feeds/packages/php5/files/php5-fpm.init b/trunk/package/feeds/packages/php5/files/php5-fpm.init
deleted file mode 100644
index aa5397a5..00000000
--- a/trunk/package/feeds/packages/php5/files/php5-fpm.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=50
-
-PROG=/usr/bin/php-fpm
-CONFIG=/etc/php5-fpm.conf
-
-SERVICE_PID_FILE=/var/run/php5-fpm.pid
-
-start_instance() {
-	local section="$1"
-	local enabled
-
-	config_get_bool enabled "$section" 'enabled' 0
-
-	[ $enabled -gt 0 ] || return 1
-
-	service_start $PROG -y $CONFIG -g $SERVICE_PID_FILE
-}
-
-start() {
-	config_load 'php5-fpm'
-	config_foreach start_instance 'php5-fpm'
-}
-
-stop() {
-	service_stop $PROG
-}
diff --git a/trunk/package/feeds/packages/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/trunk/package/feeds/packages/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
deleted file mode 100644
index 3e81dd6b..00000000
--- a/trunk/package/feeds/packages/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ext/standard/php_crypt_r.c
-+++ b/ext/standard/php_crypt_r.c
-@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void)
- 		InterlockedIncrement(&initialized);
- #elif defined(HAVE_SYNC_FETCH_AND_ADD)
- 		__sync_fetch_and_add(&initialized, 1);
-+#elif (defined(__GNUC__) && (__GNUC__ == 3))
-+		initialized = 1;
- #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
- 		membar_producer();
- 		atomic_add_int(&initialized, 1);
diff --git a/trunk/package/feeds/packages/php5/patches/102-debian_patches_use_embedded_timezonedb.patch b/trunk/package/feeds/packages/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
deleted file mode 100644
index 438274aa..00000000
--- a/trunk/package/feeds/packages/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-
-Add support for use of the system timezone database, rather
-than embedding a copy.  Discussed upstream but was not desired.
-
-History:
-r9: fix another compile error without --with-system-tzdata configured
-r8: fix compile error without --with-system-tzdata configured
-r7: improve check for valid timezone id to exclude directories
-r6: fix fd leak in r5, fix country code/BC flag use in 
-    timezone_identifiers_list() using system db,
-    fix use of PECL timezonedb to override system db,
-r5: reverts addition of "System/Localtime" fake tzname.
-    updated for 5.3.0, parses zone.tab to pick up mapping between
-    timezone name, country code and long/lat coords
-r4: added "System/Localtime" tzname which uses /etc/localtime
-r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
-r2: add filesystem trawl to set up name alias index
-r1: initial revision
-
---- a/ext/date/lib/parse_tz.c
-+++ b/ext/date/lib/parse_tz.c
-@@ -20,6 +20,16 @@
- 
- #include "timelib.h"
- 
-+#ifdef HAVE_SYSTEM_TZDATA
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include "php_scandir.h"
-+#endif
-+
- #include <stdio.h>
- 
- #ifdef HAVE_LOCALE_H
-@@ -31,7 +41,12 @@
- #else
- #include <strings.h>
- #endif
-+
-+#ifndef HAVE_SYSTEM_TZDATA
- #include "timezonedb.h"
-+#endif
-+
-+#include <ctype.h>
- 
- #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
- # if defined(__LITTLE_ENDIAN__)
-@@ -51,9 +66,14 @@
- 
- static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
- {
--	/* skip ID */
--	*tzf += 4;
--	
-+        if (memcmp(tzf, "TZif", 4) == 0) {
-+                *tzf += 20;
-+                return;
-+        }
-+        
-+        /* skip ID */
-+        *tzf += 4;
-+                
- 	/* read BC flag */
- 	tz->bc = (**tzf == '\1');
- 	*tzf += 1;
-@@ -256,7 +276,397 @@ void timelib_dump_tzinfo(timelib_tzinfo
- 	}
- }
- 
--static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
-+#ifdef HAVE_SYSTEM_TZDATA
-+
-+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
-+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
-+#else
-+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
-+#endif
-+
-+/* System timezone database pointer. */
-+static const timelib_tzdb *timezonedb_system = NULL;
-+
-+/* Hash table entry for the cache of the zone.tab mapping table. */
-+struct location_info {
-+        char code[2];
-+        double latitude, longitude;
-+        char name[64];
-+        char *comment;
-+        struct location_info *next;
-+};
-+
-+/* Cache of zone.tab. */
-+static struct location_info **system_location_table;
-+
-+/* Size of the zone.tab hash table; a random-ish prime big enough to
-+ * prevent too many collisions. */
-+#define LOCINFO_HASH_SIZE (1021)
-+
-+static uint32_t tz_hash(const char *str)
-+{
-+    const unsigned char *p = (const unsigned char *)str;
-+    uint32_t hash = 5381;
-+    int c;
-+    
-+    while ((c = *p++) != '\0') {
-+        hash = (hash << 5) ^ hash ^ c;
-+    }
-+    
-+    return hash % LOCINFO_HASH_SIZE;
-+}
-+
-+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
-+ * parsed string on success, or NULL on parse error.  On success,
-+ * writes the parsed number to *result. */
-+static char *parse_iso6709(char *p, double *result)
-+{
-+    double v, sign;
-+    char *pend;
-+    size_t len;
-+
-+    if (*p == '+')
-+        sign = 1.0;
-+    else if (*p == '-')
-+        sign = -1.0;
-+    else
-+        return NULL;
-+
-+    p++;
-+    for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
-+        ;;
-+
-+    /* Annoying encoding used by zone.tab has no decimal point, so use
-+     * the length to determine the format:
-+     * 
-+     * 4 = DDMM
-+     * 5 = DDDMM
-+     * 6 = DDMMSS
-+     * 7 = DDDMMSS
-+     */
-+    len = pend - p;
-+    if (len < 4 || len > 7) {
-+        return NULL;
-+    }
-+
-+    /* p => [D]DD */
-+    v = (p[0] - '0') * 10.0 + (p[1] - '0');
-+    p += 2;
-+    if (len == 5 || len == 7)
-+        v = v * 10.0 + (*p++ - '0');
-+    /* p => MM[SS] */
-+    v += (10.0 * (p[0] - '0')
-+          + p[1] - '0') / 60.0;
-+    p += 2;
-+    /* p => [SS] */
-+    if (len > 5) {
-+        v += (10.0 * (p[0] - '0')
-+              + p[1] - '0') / 3600.0;
-+        p += 2;
-+    }
-+
-+    /* Round to five decimal place, not because it's a good idea,
-+     * but, because the builtin data uses rounded data, so, match
-+     * that. */
-+    *result = round(v * sign * 100000.0) / 100000.0;
-+
-+    return p;
-+}
-+
-+/* This function parses the zone.tab file to build up the mapping of
-+ * timezone to country code and geographic location, and returns a
-+ * hash table.  The hash table is indexed by the function:
-+ *
-+ *   tz_hash(timezone-name)
-+ */
-+static struct location_info **create_location_table(void)
-+{
-+    struct location_info **li, *i;
-+    char zone_tab[PATH_MAX];
-+    char line[512];
-+    FILE *fp;
-+
-+    strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
-+
-+    fp = fopen(zone_tab, "r");
-+    if (!fp) {
-+        return NULL;
-+    }
-+
-+    li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
-+
-+    while (fgets(line, sizeof line, fp)) {
-+        char *p = line, *code, *name, *comment;
-+        uint32_t hash;
-+        double latitude, longitude;
-+
-+        while (isspace(*p))
-+            p++;
-+
-+        if (*p == '#' || *p == '\0' || *p == '\n')
-+            continue;
-+        
-+        if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
-+            continue;
-+        
-+        /* code => AA */
-+        code = p;
-+        p[2] = 0;
-+        p += 3;
-+
-+        /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
-+        p = parse_iso6709(p, &latitude);
-+        if (!p) {
-+            continue;
-+        }
-+        p = parse_iso6709(p, &longitude);
-+        if (!p) {
-+            continue;
-+        }
-+
-+        if (!p || *p != '\t') {
-+            continue;
-+        }
-+
-+        /* name = string */
-+        name = ++p;
-+        while (*p != '\t' && *p && *p != '\n')
-+            p++;
-+
-+        *p++ = '\0';
-+
-+        /* comment = string */
-+        comment = p;
-+        while (*p != '\t' && *p && *p != '\n')
-+            p++;
-+
-+        if (*p == '\n' || *p == '\t')
-+            *p = '\0';
-+        
-+        hash = tz_hash(name);
-+        i = malloc(sizeof *i);
-+        memcpy(i->code, code, 2);
-+        strncpy(i->name, name, sizeof i->name);
-+        i->comment = strdup(comment);
-+        i->longitude = longitude;
-+        i->latitude = latitude;
-+        i->next = li[hash];
-+        li[hash] = i;
-+        /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
-+    }
-+
-+    fclose(fp);
-+
-+    return li;
-+}
-+
-+/* Return location info from hash table, using given timezone name.
-+ * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li, 
-+                                           const char *name)
-+{
-+    uint32_t hash = tz_hash(name);
-+    const struct location_info *l;
-+
-+    if (!li) {
-+        return NULL;
-+    }
-+
-+    for (l = li[hash]; l; l = l->next) {
-+        if (strcasecmp(l->name, name) == 0)
-+            return l;
-+    }
-+
-+    return NULL;
-+}    
-+
-+/* Filter out some non-tzdata files and the posix/right databases, if
-+ * present. */
-+static int index_filter(const struct dirent *ent)
-+{
-+	return strcmp(ent->d_name, ".") != 0
-+		&& strcmp(ent->d_name, "..") != 0
-+		&& strcmp(ent->d_name, "posix") != 0
-+		&& strcmp(ent->d_name, "posixrules") != 0
-+		&& strcmp(ent->d_name, "right") != 0
-+		&& strstr(ent->d_name, ".tab") == NULL;
-+}
-+
-+static int sysdbcmp(const void *first, const void *second)
-+{
-+        const timelib_tzdb_index_entry *alpha = first, *beta = second;
-+
-+        return strcmp(alpha->id, beta->id);
-+}
-+
-+
-+/* Create the zone identifier index by trawling the filesystem. */
-+static void create_zone_index(timelib_tzdb *db)
-+{
-+	size_t dirstack_size,  dirstack_top;
-+	size_t index_size, index_next;
-+	timelib_tzdb_index_entry *db_index;
-+	char **dirstack;
-+
-+	/* LIFO stack to hold directory entries to scan; each slot is a
-+	 * directory name relative to the zoneinfo prefix. */
-+	dirstack_size = 32;
-+	dirstack = malloc(dirstack_size * sizeof *dirstack);
-+	dirstack_top = 1;
-+	dirstack[0] = strdup("");
-+	
-+	/* Index array. */
-+	index_size = 64;
-+	db_index = malloc(index_size * sizeof *db_index);
-+	index_next = 0;
-+
-+	do {
-+		struct dirent **ents;
-+		char name[PATH_MAX], *top;
-+		int count;
-+
-+		/* Pop the top stack entry, and iterate through its contents. */
-+		top = dirstack[--dirstack_top];
-+		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
-+
-+		count = php_scandir(name, &ents, index_filter, php_alphasort);
-+
-+		while (count > 0) {
-+			struct stat st;
-+			const char *leaf = ents[count - 1]->d_name;
-+
-+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
-+				 top, leaf);
-+			
-+			if (strlen(name) && stat(name, &st) == 0) {
-+				/* Name, relative to the zoneinfo prefix. */
-+				const char *root = top;
-+
-+				if (root[0] == '/') root++;
-+
-+				snprintf(name, sizeof name, "%s%s%s", root, 
-+					 *root ? "/": "", leaf);
-+
-+				if (S_ISDIR(st.st_mode)) {
-+					if (dirstack_top == dirstack_size) {
-+						dirstack_size *= 2;
-+						dirstack = realloc(dirstack, 
-+								   dirstack_size * sizeof *dirstack);
-+					}
-+					dirstack[dirstack_top++] = strdup(name);
-+				}
-+				else {
-+					if (index_next == index_size) {
-+						index_size *= 2;
-+						db_index = realloc(db_index,
-+								   index_size * sizeof *db_index);
-+					}
-+
-+					db_index[index_next++].id = strdup(name);
-+				}
-+			}
-+
-+			free(ents[--count]);
-+		}
-+		
-+		if (count != -1) free(ents);
-+		free(top);
-+	} while (dirstack_top);
-+
-+        qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
-+
-+	db->index = db_index;
-+	db->index_size = index_next;
-+
-+	free(dirstack);
-+}
-+
-+#define FAKE_HEADER "1234\0??\1??"
-+#define FAKE_UTC_POS (7 - 4)
-+
-+/* Create a fake data segment for database 'sysdb'. */
-+static void fake_data_segment(timelib_tzdb *sysdb,
-+                              struct location_info **info)
-+{
-+        size_t n;
-+        char *data, *p;
-+        
-+        data = malloc(3 * sysdb->index_size + 7);
-+
-+        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
-+
-+        for (n = 0; n < sysdb->index_size; n++) {
-+                const struct location_info *li;
-+                timelib_tzdb_index_entry *ent;
-+
-+                ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
-+
-+                /* Lookup the timezone name in the hash table. */
-+                if (strcmp(ent->id, "UTC") == 0) {
-+                        ent->pos = FAKE_UTC_POS;
-+                        continue;
-+                }
-+
-+                li = find_zone_info(info, ent->id);
-+                if (li) {
-+                        /* If found, append the BC byte and the
-+                         * country code; set the position for this
-+                         * section of timezone data.  */
-+                        ent->pos = (p - data) - 4;
-+                        *p++ = '\1';
-+                        *p++ = li->code[0];
-+                        *p++ = li->code[1];
-+                }
-+                else {
-+                        /* If not found, the timezone data can
-+                         * point at the header. */
-+                        ent->pos = 0;
-+                }
-+        }
-+        
-+        sysdb->data = (unsigned char *)data;
-+}
-+
-+/* Returns true if the passed-in stat structure describes a
-+ * probably-valid timezone file. */
-+static int is_valid_tzfile(const struct stat *st)
-+{
-+	return S_ISREG(st->st_mode) && st->st_size > 20;
-+}
-+
-+/* Return the mmap()ed tzfile if found, else NULL.  On success, the
-+ * length of the mapped data is placed in *length. */
-+static char *map_tzfile(const char *timezone, size_t *length)
-+{
-+	char fname[PATH_MAX];
-+	struct stat st;
-+	char *p;
-+	int fd;
-+	
-+	if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+		return NULL;
-+	}
-+
-+	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
-+	
-+	fd = open(fname, O_RDONLY);
-+	if (fd == -1) {
-+		return NULL;
-+	} else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st)) {
-+		close(fd);
-+		return NULL;
-+	}
-+
-+	*length = st.st_size;
-+	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+	close(fd);
-+	
-+	return p != MAP_FAILED ? p : NULL;
-+}
-+
-+#endif
-+
-+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
- {
- 	int left = 0, right = tzdb->index_size - 1;
- #ifdef HAVE_SETLOCALE
-@@ -295,36 +705,128 @@ static int seek_to_tz_position(const uns
- 	return 0;
- }
- 
-+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, 
-+			       char **map, size_t *maplen,
-+			       const timelib_tzdb *tzdb)
-+{
-+#ifdef HAVE_SYSTEM_TZDATA
-+	if (tzdb == timezonedb_system) {
-+		char *orig;
-+
-+		orig = map_tzfile(timezone, maplen);
-+		if (orig == NULL) {
-+			return 0;
-+		}
-+		
-+		(*tzf) = (unsigned char *)orig ;
-+		*map = orig;
-+                
-+                return 1;
-+	}
-+	else
-+#endif
-+	{
-+		return inmem_seek_to_tz_position(tzf, timezone, tzdb);
-+	}
-+}
-+
- const timelib_tzdb *timelib_builtin_db(void)
- {
-+#ifdef HAVE_SYSTEM_TZDATA
-+	if (timezonedb_system == NULL) {
-+		timelib_tzdb *tmp = malloc(sizeof *tmp);
-+
-+		tmp->version = "0.system";
-+		tmp->data = NULL;
-+		create_zone_index(tmp);
-+		system_location_table = create_location_table();
-+                fake_data_segment(tmp, system_location_table);
-+		timezonedb_system = tmp;
-+	}
-+
-+			
-+	return timezonedb_system;
-+#else
- 	return &timezonedb_builtin;
-+#endif
- }
- 
- const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
- {
-+#ifdef HAVE_SYSTEM_TZDATA
-+	*count = timezonedb_system->index_size;
-+	return timezonedb_system->index;
-+#else
- 	*count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin);
- 	return timezonedb_idx_builtin;
-+#endif
- }
- 
- int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
- {
- 	const unsigned char *tzf;
--	return (seek_to_tz_position(&tzf, timezone, tzdb));
-+
-+#ifdef HAVE_SYSTEM_TZDATA
-+        if (tzdb == timezonedb_system) {
-+            char fname[PATH_MAX];
-+            struct stat st;
-+
-+            if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+		return 0;
-+            }
-+            
-+            snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
-+            
-+            return stat(fname, &st) == 0 && is_valid_tzfile(&st);
-+        }
-+#endif
-+
-+	return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
- }
- 
- timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
- {
- 	const unsigned char *tzf;
-+	char *memmap = NULL;
-+	size_t maplen;
- 	timelib_tzinfo *tmp;
- 
--	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
-+	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
- 		tmp = timelib_tzinfo_ctor(timezone);
- 
- 		read_preamble(&tzf, tmp);
- 		read_header(&tzf, tmp);
- 		read_transistions(&tzf, tmp);
- 		read_types(&tzf, tmp);
--		read_location(&tzf, tmp);
-+
-+#ifdef HAVE_SYSTEM_TZDATA
-+		if (memmap) {
-+			const struct location_info *li;
-+
-+			/* TZif-style - grok the location info from the system database,
-+			 * if possible. */
-+
-+			if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
-+				tmp->location.comments = strdup(li->comment);
-+                                strncpy(tmp->location.country_code, li->code, 2);
-+				tmp->location.longitude = li->longitude;
-+				tmp->location.latitude = li->latitude;
-+				tmp->bc = 1;
-+			}
-+			else {
-+				strcpy(tmp->location.country_code, "??");
-+				tmp->bc = 0;
-+				tmp->location.comments = strdup("");
-+			}
-+
-+			/* Now done with the mmap segment - discard it. */
-+			munmap(memmap, maplen);
-+		} else
-+#endif
-+		{
-+			/* PHP-style - use the embedded info. */
-+			read_location(&tzf, tmp);
-+		}
- 	} else {
- 		tmp = NULL;
- 	}
---- a/ext/date/lib/timelib.m4
-+++ b/ext/date/lib/timelib.m4
-@@ -78,3 +78,17 @@ stdlib.h
- 
- dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll strftime)
-+
-+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
-+[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
-+no, no)
-+
-+if test "$PHP_SYSTEM_TZDATA" != "no"; then
-+   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
-+
-+   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
-+      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
-+                         [Define for location of system timezone data])
-+   fi
-+fi
-+
diff --git a/trunk/package/feeds/packages/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/trunk/package/feeds/packages/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
deleted file mode 100644
index ae8d1827..00000000
--- a/trunk/package/feeds/packages/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Sean Finney <seanius@debian.org>
-Forwarded: no (upstream doesn't want it)
-Description: Silence warnings about using the default system timezone info
- In vanilla upstream php, this is considered an error (i.e. the user must
- set the timezone explicitly), though with our use of the system timezonedb
- patch, we actually feel quite comfortable using the default timezone info.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
---- a/ext/date/tests/date_default_timezone_set-1.phpt
-+++ b/ext/date/tests/date_default_timezone_set-1.phpt
-@@ -22,9 +22,6 @@ date.timezone=
- 	echo date(DATE_ISO8601, $date4), "\n";
- ?>
- --EXPECTF--
--Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 3
--
--Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 4
- America/Indiana/Knox
- 2005-01-12T03:00:00-0500
- 2005-07-12T03:00:00-0500
diff --git a/trunk/package/feeds/packages/php5/patches/800-gd-iconv.patch b/trunk/package/feeds/packages/php5/patches/800-gd-iconv.patch
deleted file mode 100644
index 1418c276..00000000
--- a/trunk/package/feeds/packages/php5/patches/800-gd-iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/ext/gd/libgd/gdkanji.c
-+++ b/ext/gd/libgd/gdkanji.c
-@@ -9,6 +9,11 @@
- #include "gdhelpers.h"
- 
- #include <stdarg.h>
-+
-+/* force usage of internal conversation routine */
-+#undef HAVE_ICONV_H
-+#undef HAVE_ICONV
-+
- #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV)
- #include <iconv.h>
- #ifdef HAVE_ERRNO_H
diff --git a/trunk/package/feeds/packages/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/trunk/package/feeds/packages/php5/patches/950-Fix-dl-cross-compiling-issue.patch
deleted file mode 100644
index 02b1f644..00000000
--- a/trunk/package/feeds/packages/php5/patches/950-Fix-dl-cross-compiling-issue.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -u --recursive php-5.6.6-vanilla/configure.in php-5.6.6/configure.in
---- php-5.6.6-vanilla/configure.in	2015-02-26 22:10:51.865487530 -0500
-+++ php-5.6.6/configure.in	2015-02-26 22:29:59.043102135 -0500
-@@ -453,7 +453,10 @@
- PHP_CHECK_FUNC(gethostbyaddr, nsl)
- PHP_CHECK_FUNC(yp_get_default_domain, nsl)
- 
--PHP_CHECK_FUNC(dlopen, dl)
-+PHP_ADD_LIBRARY(dl)
-+PHP_DEF_HAVE(dlopen)
-+PHP_DEF_HAVE(libdl)
-+ac_cv_func_dlopen=yes
- if test "$ac_cv_func_dlopen" = "yes"; then
-   AC_DEFINE(HAVE_LIBDL, 1, [ ])
- fi
-diff -u --recursive php-5.6.6-vanilla/ext/fileinfo/config.m4 php-5.6.6/ext/fileinfo/config.m4
---- php-5.6.6-vanilla/ext/fileinfo/config.m4	2015-02-26 22:10:51.639487135 -0500
-+++ php-5.6.6/ext/fileinfo/config.m4	2015-02-26 22:22:47.645609128 -0500
-@@ -46,6 +46,10 @@
-     AC_MSG_RESULT(no)
-     AC_MSG_NOTICE(using libmagic strcasestr implementation)
-     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
-+  ],[
-+    dnl cross-compiling; assume not present
-+    AC_MSG_NOTICE(using libmagic strcasestr implementation)
-+    libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
-   ])
- 
-   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
-diff -u --recursive php-5.6.6-vanilla/ext/opcache/config.m4 php-5.6.6/ext/opcache/config.m4
---- php-5.6.6-vanilla/ext/opcache/config.m4	2015-02-26 22:10:51.790487399 -0500
-+++ php-5.6.6/ext/opcache/config.m4	2015-02-26 22:34:19.240414394 -0500
-@@ -341,7 +341,14 @@
- 	flock_type=linux
-     AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
-     AC_MSG_RESULT("yes")
--], AC_MSG_RESULT("no") )
-+], [
-+    AC_MSG_RESULT("no")
-+], [
-+    dnl cross-compiling; assume Linux
-+	flock_type=linux
-+    AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
-+    AC_MSG_RESULT("yes")
-+])
- 
- AC_MSG_CHECKING("whether flock struct is BSD ordered")
- AC_TRY_RUN([
-@@ -357,7 +364,12 @@
- 	flock_type=bsd
-     AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) 
-     AC_MSG_RESULT("yes")
--], AC_MSG_RESULT("no") )
-+], [
-+    AC_MSG_RESULT("no")
-+], [
-+    dnl cross-compiling; assume Linux
-+    AC_MSG_RESULT("no")
-+])
- 
- if test "$flock_type" == "unknown"; then
- 	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
diff --git a/trunk/package/feeds/packages/php5/pecl.mk b/trunk/package/feeds/packages/php5/pecl.mk
deleted file mode 100644
index e1b98196..00000000
--- a/trunk/package/feeds/packages/php5/pecl.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/php5-pecl/Default
-  SUBMENU:=PHP
-  SECTION:=lang
-  CATEGORY:=Languages
-  URL:=http://pecl.php.net/
-  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-  DEPENDS:=php5
-endef
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize )
-	$(Build/Configure/Default)
-endef
-
-CONFIGURE_ARGS+= \
-	--with-php-config=$(STAGING_DIR_HOST)/usr/bin/php-config
-
-define PECLPackage
-
-  define Package/php5-pecl-$(1)
-    $(call Package/php5-pecl/Default)
-    TITLE:=$(2)
-
-    ifneq ($(3),)
-      DEPENDS+=$(3)
-    endif
-  endef
-
-  define Package/php5-pecl-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/php
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
-	$(INSTALL_DIR) $$(1)/etc/php5
-    ifeq ($(4),zend)
-	echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
-    else
-	echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
-    endif
-  endef
-
-endef
diff --git a/trunk/package/feeds/packages/pianod/Makefile b/trunk/package/feeds/packages/pianod/Makefile
deleted file mode 100644
index 0c668945..00000000
--- a/trunk/package/feeds/packages/pianod/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pianod
-PKG_VERSION:=173
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://deviousfish.com/Downloads/pianod/
-PKG_MD5SUM:=be0cec19ea6df1c4bc6c1cac8e253445
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=MIT VARIOUS
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pianod
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libao +libfaad2 +libmad +libpolarssl +libjson-c +libgcrypt +libpthread
-  TITLE:=Pandora radio daemon
-  USERID:=pianod=88:pianod=88
-  URL:=http://deviousfish.com/pianod/
-endef
-
-define Package/pianod/description
-  pianod is a Pandora music player client with line-oriented and Websocket control interfaces.
-  A simple protocol makes for easy clients, mix scripting, integration with a
-  home automation system, use as multiple-user music system for home or office.
-  Documentation and configuration information can be found at:
-      http://deviousfish.com/pianod/
-endef
-
-define Package/pianod-client
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+pianod
-  TITLE:=Pandora radio daemon WebUI
-  URL:=http://deviousfish.com/pianod/
-endef
-
-define Package/pianod-client/description
-  Web client UI and remote player viewer for pianod
-  Examples --- (Note: The viewer.* files need not be on the pianod host)
-  Main interface: http://pianod-host:4446/pianod
-  Remote viewer: file:///<path>/viewer.html?server=pianod-host:4446  --or--
-                 http://pianod-host:4446/pianod/viewer.html?server=pianod-host:4446
-endef
-
-CONFIGURE_ARGS+= --with-polarssl
-
-PIANOD_CLIENT:=pianod-client-compiled-51.tar.gz
-
-define Download/pianod-client
-  URL:=$(PKG_SOURCE_URL)
-  FILE:=$(PIANOD_CLIENT)
-  MD5SUM:=abbdee5627bcee6a00c8304da8b4e2e7
-endef
-
-define Package/pianod/conffiles
-/etc/pianod/startscript
-/etc/pianod/users
-endef
-
-define Build/Prepare
-    $(call Build/Prepare/Default)
-    ifneq ($(CONFIG_PACKAGE_pianod-client),)
-	$(eval $(call Download,pianod-client))
-	mkdir -p $(PKG_BUILD_DIR)/pianod-client
-	$(TAR) -xf $(DL_DIR)/$(PIANOD_CLIENT) --strip=1 -C $(PKG_BUILD_DIR)/pianod-client
-    endif
-endef
-
-define Package/pianod-client/Configure
-endef
-
-define Package/pianod-client/Compile
-endef
-
-define Package/pianod/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pianod $(1)/usr/bin/
-# These scripts need ksh (install mksh and link)
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/piano $(1)/usr/bin/
-#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/runmix $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/pianod
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/startscript-example $(1)/etc/pianod/startscript
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/pianod.init $(1)/etc/init.d/pianod
-endef
-
-define Package/pianod-client/install
-	$(INSTALL_DIR) $(1)/www/pianod
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/pianod-client/*.{html,js,gif,jpeg,css} $(1)/www/pianod/
-endef
-
-$(eval $(call BuildPackage,pianod))
-$(eval $(call BuildPackage,pianod-client))
diff --git a/trunk/package/feeds/packages/pianod/files/pianod.init b/trunk/package/feeds/packages/pianod/files/pianod.init
deleted file mode 100644
index b232944e..00000000
--- a/trunk/package/feeds/packages/pianod/files/pianod.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-NAME=pianod
-START=95
-
-USE_PROCD=1
-
-PD_USER=$NAME
-PD_STARTSCRIPT=/etc/$NAME/startscript
-PD_PASSWDFILE=/etc/$NAME/users
-PD_WEBUI=/www/$NAME
-
-start_service() {
-	# Take group ownership of audio devices
-	chown root:$NAME /dev/snd/* /dev/mixer /dev/dsp
-	chmod 664 /dev/snd/* /dev/mixer /dev/dsp
-
-	procd_open_instance
-
-	procd_set_param command "/usr/bin/$NAME"
-
-	procd_append_param command -n $PD_USER
-	procd_append_param command -i "$PD_STARTSCRIPT"
-	procd_append_param command -u "$PD_PASSWDFILE"
-	[ -d "$PD_WEBUI" ] && procd_append_param command -c "$PD_WEBUI"
-	# No HTTPS support without certificates
-	procd_append_param command -s 0
-
-	procd_close_instance
-}
-
-# Wait for service to exit and release sockets
-reload_service() {
-	stop
-	sleep 2
-	start
-}
-
-restart() {
-	reload_service
-}
diff --git a/trunk/package/feeds/packages/pianod/patches/005-Fix_IPV6_socket_handling.patch b/trunk/package/feeds/packages/pianod/patches/005-Fix_IPV6_socket_handling.patch
deleted file mode 100644
index 883495a1..00000000
--- a/trunk/package/feeds/packages/pianod/patches/005-Fix_IPV6_socket_handling.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/src/libwaitress/waitress.c
-+++ b/src/libwaitress/waitress.c
-@@ -805,34 +805,37 @@ static WaitressReturn_t WaitressConnect
- 			int pollres;
- 
- 			/* we need shorter timeouts for connect() */
--			fcntl (sock, F_SETFL, O_NONBLOCK);
-+			pollres = fcntl (sock, F_SETFL, O_NONBLOCK);
-+			assert (pollres != -1);
- 
--			/* increase socket receive buffer */
--			const int sockopt = 256*1024;
--			setsockopt (sock, SOL_SOCKET, SO_RCVBUF, &sockopt,
--					sizeof (sockopt));
--
--			/* non-blocking connect will return immediately */
--			connect (sock, gacurr->ai_addr, gacurr->ai_addrlen);
--
--			pollres = WaitressPollLoop (sock, POLLOUT, waith->timeout);
--			if (pollres == 0) {
--				ret = WAITRESS_RET_TIMEOUT;
--			} else if (pollres == -1) {
--				ret = WAITRESS_RET_ERR;
--			} else {
--				/* check connect () return value */
--				socklen_t pollresSize = sizeof (pollres);
--				getsockopt (sock, SOL_SOCKET, SO_ERROR, &pollres,
--						&pollresSize);
--				if (pollres != 0) {
--					ret = WAITRESS_RET_CONNECT_REFUSED;
-+			if (connect (sock, gacurr->ai_addr, gacurr->ai_addrlen) != -1) {
-+				/* working */
-+				waith->request.sockfd = sock;
-+				break;
-+			} else if (errno == EINPROGRESS) {
-+				/* wait for connect to succeed */
-+				pollres = WaitressPollLoop (sock, POLLOUT, waith->timeout);
-+				if (pollres == 0) {
-+					ret = WAITRESS_RET_TIMEOUT;
-+				} else if (pollres == -1) {
-+					ret = WAITRESS_RET_ERR;
- 				} else {
--					/* this one is working */
--					waith->request.sockfd = sock;
--					break;
-+					/* check connect () return value */
-+					socklen_t pollresSize = sizeof (pollres);
-+					getsockopt (sock, SOL_SOCKET, SO_ERROR, &pollres,
-+							&pollresSize);
-+					if (pollres != 0) {
-+						ret = WAITRESS_RET_CONNECT_REFUSED;
-+					} else {
-+						/* this one is working */
-+						waith->request.sockfd = sock;
-+						break;
-+					}
- 				}
-+			} else {
-+				ret = WAITRESS_RET_ERR;
- 			}
-+
- 			close (sock);
- 		}
- 	}
---- a/src/libfootball/fb_service.c
-+++ b/src/libfootball/fb_service.c
-@@ -111,6 +111,8 @@ static bool fb_setup_socket (FB_SERVICE
- 		service->socket [which] = 0;
- 	} else {
-         fb_perror ("socket");
-+        // Element must be zero (not -1)
-+        service->socket [which] = 0;
- 	};
- 	return false;
- }
diff --git a/trunk/package/feeds/packages/pianod/patches/010-Configure_add_SSL_options.patch b/trunk/package/feeds/packages/pianod/patches/010-Configure_add_SSL_options.patch
deleted file mode 100644
index 2c267796..00000000
--- a/trunk/package/feeds/packages/pianod/patches/010-Configure_add_SSL_options.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,8 +31,6 @@ AC_CHECK_LIB([pthread], [pthread_create]
- # with it, but don't consider it an error.
- # PKG_CHECK_MODULES only validates that pkg-config returns stuff; it doesn't
- # validate that these are correct, so check lib to make sure they're right.
--PKG_CHECK_MODULES([gnutls], [gnutls],,
--	[AC_MSG_WARN([No pkg-config for libgnutls])])
- PKG_CHECK_MODULES([ao], [ao],,
- 	[AC_MSG_WARN([No pkg-config for libao])])
- PKG_CHECK_MODULES([mad], [mad],,
-@@ -42,12 +40,28 @@ PKG_CHECK_MODULES([json], [json-c],,
- 		[PKG_CHECK_MODULES([json], [json0],,
- 			[AC_MSG_WARN([No pkg-config for json-c (aka libjson0, libjson)])])])])
- 
-+
- # Network communication stuff:
- AC_CHECK_LIB([gcrypt], [gcry_cipher_open],,
- 	[AC_MSG_ERROR([Cannot find required library: libgcrypt],1)])
--AC_CHECK_LIB([gnutls], [gnutls_record_recv],,
-+# Check for SSL option
-+AC_ARG_WITH(polarssl, [  --with-polarssl	Build waitress with PolarSSL (default GNUTLS)], [
-+  AC_MSG_RESULT(>>Using PolarSSL)
-+  HAS_POLARSSL=1
-+  AC_DEFINE([USE_POLARSSL], 1, [Build for PolarSSL])
-+  PKG_CHECK_MODULES([polarssl], [polarssl],,
-+		[AC_MSG_WARN([No pkg-config for libpolarssl])])
-+  AC_CHECK_LIB([polarssl], [ssl_set_session],,
-+		[AC_MSG_ERROR([Cannot find required library: libpolarssl (aka polarssl)],1)])] )
-+AM_CONDITIONAL([USE_POLARSSL],[test "x$HAS_POLARSSL" = "x1"])
-+
-+if test "x$HAS_POLARSSL" != x1 ; then
-+  PKG_CHECK_MODULES([gnutls], [gnutls],,
-+	[AC_MSG_WARN([No pkg-config for libgnutls])])
-+  AC_CHECK_LIB([gnutls], [gnutls_record_recv],,
- 	[AC_MSG_ERROR([Cannot find required library: libgnutls (aka gnutls)],1)])
--AC_CHECK_FUNCS(gnutls_transport_set_int2 gnutls_sec_param_to_pk_bits)
-+  AC_CHECK_FUNCS(gnutls_transport_set_int2 gnutls_sec_param_to_pk_bits)
-+fi
- 
- # Bloody json library may be linked via -ljson, or -ljson-c depending on
- # the platform.  Try both.
diff --git a/trunk/package/feeds/packages/pianod/patches/020-Use_package_config_h_for_all_modules.patch b/trunk/package/feeds/packages/pianod/patches/020-Use_package_config_h_for_all_modules.patch
deleted file mode 100644
index 228710b0..00000000
--- a/trunk/package/feeds/packages/pianod/patches/020-Use_package_config_h_for_all_modules.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/src/libpiano/config.h
-+++ /dev/null
-@@ -1 +0,0 @@
--#define PACKAGE "libpiano"
---- a/src/libwaitress/config.h
-+++ /dev/null
-@@ -1 +0,0 @@
--#define PACKAGE "libwaitress"
---- a/src/libpiano/piano.h
-+++ b/src/libpiano/piano.h
-@@ -39,6 +39,8 @@ THE SOFTWARE.
-  * http://pan-do-ra-api.wikia.com
-  */
- 
-+#define LIBPIANO_NAME "libpiano"
-+
- #define PIANO_RPC_HOST "tuner.pandora.com"
- #define PIANO_RPC_PATH "/services/json/?"
- 
---- a/src/libwaitress/waitress.c
-+++ b/src/libwaitress/waitress.c
-@@ -918,14 +918,14 @@ static WaitressReturn_t WaitressSendRequ
- 	if (WaitressProxyEnabled (waith) && !waith->url.tls) {
- 		snprintf (buf, WAITRESS_BUFFER_SIZE,
- 			"%s http://%s:%s/%s HTTP/" WAITRESS_HTTP_VERSION "\r\n"
--			"Host: %s\r\nUser-Agent: " PACKAGE "\r\nConnection: Close\r\n",
-+			"Host: %s\r\nUser-Agent: " LIBWAITRESS_NAME "\r\nConnection: Close\r\n",
- 			(waith->method == WAITRESS_METHOD_GET ? "GET" : "POST"),
- 			waith->url.host,
- 			WaitressDefaultPort (&waith->url), path, waith->url.host);
- 	} else {
- 		snprintf (buf, WAITRESS_BUFFER_SIZE,
- 			"%s /%s HTTP/" WAITRESS_HTTP_VERSION "\r\n"
--			"Host: %s\r\nUser-Agent: " PACKAGE "\r\nConnection: Close\r\n",
-+			"Host: %s\r\nUser-Agent: " LIBWAITRESS_NAME "\r\nConnection: Close\r\n",
- 			(waith->method == WAITRESS_METHOD_GET ? "GET" : "POST"),
- 			path, waith->url.host);
- 	}
---- a/src/libwaitress/waitress.h
-+++ b/src/libwaitress/waitress.h
-@@ -29,6 +29,8 @@ THE SOFTWARE.
- #include <stdbool.h>
- #include <gnutls/gnutls.h>
- 
-+#define LIBWAITRESS_NAME "libwaitress"
-+
- #define WAITRESS_BUFFER_SIZE 10*1024
- 
- typedef enum {
---- a/src/libpiano/request.c
-+++ b/src/libpiano/request.c
-@@ -40,6 +40,7 @@ THE SOFTWARE.
- #include <stdio.h>
- #include <string.h>
- /* needed for urlencode */
-+#include <config.h>
- #include <waitress.h>
- 
- #include "piano.h"
diff --git a/trunk/package/feeds/packages/pianod/patches/030-Waitress_add_polarssl_variant.patch b/trunk/package/feeds/packages/pianod/patches/030-Waitress_add_polarssl_variant.patch
deleted file mode 100644
index b2a65764..00000000
--- a/trunk/package/feeds/packages/pianod/patches/030-Waitress_add_polarssl_variant.patch
+++ /dev/null
@@ -1,333 +0,0 @@
---- a/src/libwaitress/waitress.h
-+++ b/src/libwaitress/waitress.h
-@@ -27,7 +27,12 @@ THE SOFTWARE.
- #include <stdlib.h>
- #include <unistd.h>
- #include <stdbool.h>
-+
-+#if defined(USE_POLARSSL)
-+typedef struct _polarssl_ctx polarssl_ctx;
-+#else
- #include <gnutls/gnutls.h>
-+#endif
- 
- #define LIBWAITRESS_NAME "libwaitress"
- 
-@@ -102,8 +107,9 @@ typedef struct {
- 	WaitressUrl_t url;
- 	WaitressUrl_t proxy;
- 
-+#if !defined(USE_POLARSSL)
- 	gnutls_certificate_credentials_t tlsCred;
--
-+#endif
- 	/* per-request data */
- 	struct {
- 		int sockfd;
-@@ -121,7 +127,11 @@ typedef struct {
- 		WaitressReturn_t (*read) (void *, char *, const size_t, size_t *);
- 		WaitressReturn_t (*write) (void *, const char *, const size_t);
- 
-+#if defined(USE_POLARSSL)
-+		polarssl_ctx* sslCtx;
-+#else
- 		gnutls_session_t tlsSession;
-+#endif
- 	} request;
- } WaitressHandle_t;
- 
---- a/src/pianod.c
-+++ b/src/pianod.c
-@@ -531,8 +531,11 @@ static bool initialize_libraries (APPSTA
- 	gcry_check_version (NULL);
- 	gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
- 	gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-+
-+#if !defined(USE_POLARSSL)
- 	int crystatus = gnutls_global_init ();
- 	if (crystatus == GNUTLS_E_SUCCESS) {
-+#endif
- 		PianoReturn_t status = PianoInit (&app->ph, app->settings.partnerUser, app->settings.partnerPassword,
- 										  app->settings.device, app->settings.inkey, app->settings.outkey);
- 		if (status == PIANO_RET_OK) {
-@@ -545,11 +548,13 @@ static bool initialize_libraries (APPSTA
- 		} else {
- 			flog (LOG_ERROR, "initialize_libraries: PianoInit: %s", PianoErrorToStr (status));
- 		}
-+#if !defined(USE_POLARSSL)
- 		gnutls_global_deinit ();
- 	} else {
- 		flog (LOG_ERROR, "initialize_libraries: gnutls_global_init: %s", gcry_strerror (crystatus));
- 
- 	}
-+#endif
- 	return false;
- }
- 
-@@ -728,7 +733,9 @@ int main (int argc, char **argv) {
- 		PianoDestroyPlaylist (app.song_history);
- 		PianoDestroyPlaylist (app.playlist);
- 		WaitressFree (&app.waith);
-+#if !defined(USE_POLARSSL)
- 		gnutls_global_deinit ();
-+#endif
- 		settings_destroy (&app.settings);
- 	}
- 	
---- a/src/libwaitress/waitress.c
-+++ b/src/libwaitress/waitress.c
-@@ -41,11 +41,33 @@ THE SOFTWARE.
- #include <assert.h>
- #include <stdint.h>
- 
--#include <gnutls/x509.h>
- 
- #include "config.h"
- #include "waitress.h"
- 
-+#if defined(USE_POLARSSL)
-+
-+#include <polarssl/ssl.h>
-+#include <polarssl/entropy.h>
-+#include <polarssl/ctr_drbg.h>
-+#include <polarssl/x509.h>
-+#include <polarssl/sha1.h>
-+
-+struct _polarssl_ctx
-+{
-+	ssl_context		ssl;
-+	ssl_session		session;
-+	entropy_context		entrophy;
-+	ctr_drbg_context	rnd;
-+};
-+
-+#else
-+
-+// Use gnutls by default (USE_POLARSSL not defined)
-+#include <gnutls/x509.h>
-+
-+#endif
-+
- #define strcaseeq(a,b) (strcasecmp(a,b) == 0)
- #define WAITRESS_HTTP_VERSION "1.1"
- 
-@@ -56,6 +78,13 @@ typedef struct {
- 
- static WaitressReturn_t WaitressReceiveHeaders (WaitressHandle_t *, size_t *);
- 
-+// gnutls wants (void *) and polarssl want (unsigned char *)
-+#if defined(USE_POLARSSL)
-+#define BUFFER_CAST unsigned char
-+#else
-+#define BUFFER_CAST void
-+#endif
-+
- #define READ_RET(buf, count, size) \
- 		if ((wRet = waith->request.read (waith, buf, count, size)) != \
- 				WAITRESS_RET_OK) { \
-@@ -444,7 +473,7 @@ static int WaitressPollLoop (int fd, sho
-  *	@param write count bytes
-  *	@return number of written bytes or -1 on error
-  */
--static ssize_t WaitressPollWrite (void *data, const void *buf, size_t count) {
-+static ssize_t WaitressPollWrite (void *data, const BUFFER_CAST *buf, size_t count) {
- 	int pollres = -1;
- 	ssize_t retSize;
- 	WaitressHandle_t *waith = data;
-@@ -478,13 +507,20 @@ static WaitressReturn_t WaitressOrdinary
- 	return waith->request.readWriteRet;
- }
- 
--static WaitressReturn_t WaitressGnutlsWrite (void *data, const char *buf,
-+static WaitressReturn_t WaitressTlsWrite (void *data, const char *buf,
- 		const size_t size) {
- 	WaitressHandle_t *waith = data;
-+#if defined(USE_POLARSSL)
-+
-+	if (ssl_write (&waith->request.sslCtx->ssl, buf, size) < 0) {
-+		return WAITRESS_RET_TLS_WRITE_ERR;
-+	}
-+#else
- 
- 	if (gnutls_record_send (waith->request.tlsSession, buf, size) < 0) {
- 		return WAITRESS_RET_TLS_WRITE_ERR;
- 	}
-+#endif
- 	return waith->request.readWriteRet;
- }
- 
-@@ -494,7 +530,7 @@ static WaitressReturn_t WaitressGnutlsWr
-  *	@param buffer size
-  *	@return number of read bytes or -1 on error
-  */
--static ssize_t WaitressPollRead (void *data, void *buf, size_t count) {
-+static ssize_t WaitressPollRead (void *data, BUFFER_CAST *buf, size_t count) {
- 	int pollres = -1;
- 	ssize_t retSize;
- 	WaitressHandle_t *waith = data;
-@@ -531,16 +567,34 @@ static WaitressReturn_t WaitressOrdinary
- 	return waith->request.readWriteRet;
- }
- 
--static WaitressReturn_t WaitressGnutlsRead (void *data, char *buf,
-+static WaitressReturn_t WaitressTlsRead (void *data, char *buf,
- 		const size_t size, size_t *retSize) {
- 	WaitressHandle_t *waith = data;
- 
-+#if defined(USE_POLARSSL)
-+	int ret;
-+
-+	*retSize = 0;
-+	waith->request.readWriteRet = WAITRESS_RET_OK;
-+	ret = ssl_read (&waith->request.sslCtx->ssl, buf, size);
-+
-+	if (ret < 0) {
-+		if (ret != POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY) {
-+			waith->request.readWriteRet = WAITRESS_RET_TLS_READ_ERR;
-+		}
-+
-+		return waith->request.readWriteRet;
-+	}
-+
-+	*retSize = ret;
-+#else
- 	ssize_t ret = gnutls_record_recv (waith->request.tlsSession, buf, size);
- 	if (ret < 0) {
- 		return WAITRESS_RET_TLS_READ_ERR;
- 	} else {
- 		*retSize = ret;
- 	}
-+#endif
- 	return waith->request.readWriteRet;
- }
- 
-@@ -727,10 +781,28 @@ static int WaitressParseStatusline (cons
- /*	verify server certificate
-  */
- static WaitressReturn_t WaitressTlsVerify (const WaitressHandle_t *waith) {
-+
-+#if defined(USE_POLARSSL)
-+	unsigned char fingerprint[20];
-+
-+	const x509_crt* cert = ssl_get_peer_cert (&waith->request.sslCtx->ssl);
-+
-+	if (NULL == cert) {
-+		return WAITRESS_RET_TLS_HANDSHAKE_ERR;
-+	}
-+
-+	sha1 (cert->raw.p, cert->raw.len, fingerprint);
-+
-+	if (memcmp (fingerprint, waith->tlsFingerprint, sizeof (fingerprint)) != 0) {
-+		return WAITRESS_RET_TLS_FINGERPRINT_MISMATCH;
-+	}
-+
-+#else
- 	gnutls_session_t session = waith->request.tlsSession;
- 	unsigned int certListSize;
- 	const gnutls_datum_t *certList;
- 	gnutls_x509_crt_t cert;
-+	char fingerprint[20];
- 
- 	if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
- 		return WAITRESS_RET_TLS_HANDSHAKE_ERR;
-@@ -750,7 +822,6 @@ static WaitressReturn_t WaitressTlsVerif
- 		return WAITRESS_RET_TLS_HANDSHAKE_ERR;
- 	}
- 
--	char fingerprint[20];
- 	size_t fingerprintSize = sizeof (fingerprint);
- 	if (gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1, fingerprint,
- 			&fingerprintSize) != 0) {
-@@ -763,7 +834,7 @@ static WaitressReturn_t WaitressTlsVerif
- 	}
- 
- 	gnutls_x509_crt_deinit (cert);
--
-+#endif
- 	return WAITRESS_RET_OK;
- }
- 
-@@ -876,6 +947,12 @@ static WaitressReturn_t WaitressConnect
- 			}
- 		}
- 
-+#if defined(USE_POLARSSL)
-+		ssl_set_hostname (&waith->request.sslCtx->ssl, waith->url.host);
-+		if (ssl_handshake (&waith->request.sslCtx->ssl) != 0) {
-+			return WAITRESS_RET_TLS_HANDSHAKE_ERR;
-+		}
-+#else
- 		/* Ignore return code as connection will likely still succeed */
- 		gnutls_server_name_set (waith->request.tlsSession, GNUTLS_NAME_DNS,
- 				waith->url.host, strlen (waith->url.host));
-@@ -883,14 +960,15 @@ static WaitressReturn_t WaitressConnect
- 		if (gnutls_handshake (waith->request.tlsSession) != GNUTLS_E_SUCCESS) {
- 			return WAITRESS_RET_TLS_HANDSHAKE_ERR;
- 		}
-+#endif
- 
- 		if ((wRet = WaitressTlsVerify (waith)) != WAITRESS_RET_OK) {
- 			return wRet;
- 		}
- 
- 		/* now we can talk encrypted */
--		waith->request.read = WaitressGnutlsRead;
--		waith->request.write = WaitressGnutlsWrite;
-+		waith->request.read = WaitressTlsRead;
-+		waith->request.write = WaitressTlsWrite;
- 	}
- 
- 	return WAITRESS_RET_OK;
-@@ -1116,6 +1194,21 @@ WaitressReturn_t WaitressFetchCall (Wait
- 	waith->request.contentLengthKnown = false;
- 
- 	if (waith->url.tls) {
-+#if defined(USE_POLARSSL)
-+		waith->request.sslCtx = calloc (1, sizeof(polarssl_ctx));
-+
-+		entropy_init (&waith->request.sslCtx->entrophy);
-+		ctr_drbg_init (&waith->request.sslCtx->rnd, entropy_func, &waith->request.sslCtx->entrophy, "libwaitress", 11);
-+		ssl_init (&waith->request.sslCtx->ssl);
-+
-+		ssl_set_endpoint (&waith->request.sslCtx->ssl, SSL_IS_CLIENT);
-+		ssl_set_authmode (&waith->request.sslCtx->ssl, SSL_VERIFY_NONE);
-+		ssl_set_rng (&waith->request.sslCtx->ssl, ctr_drbg_random, &waith->request.sslCtx->rnd);
-+		ssl_set_session (&waith->request.sslCtx->ssl, &waith->request.sslCtx->session);
-+		ssl_set_bio (&waith->request.sslCtx->ssl,
-+			     WaitressPollRead, waith,
-+			     WaitressPollWrite, waith);
-+#else
- 		gnutls_init (&waith->request.tlsSession, GNUTLS_CLIENT);
- 		gnutls_set_default_priority (waith->request.tlsSession);
- 
-@@ -1133,6 +1226,7 @@ WaitressReturn_t WaitressFetchCall (Wait
- 				WaitressPollRead);
- 		gnutls_transport_set_push_function (waith->request.tlsSession,
- 				WaitressPollWrite);
-+#endif
- 	}
- 
- 	/* buffer is required for connect already */
-@@ -1144,15 +1238,22 @@ WaitressReturn_t WaitressFetchCall (Wait
- 		if ((wRet = WaitressSendRequest (waith)) == WAITRESS_RET_OK) {
- 			wRet = WaitressReceiveResponse (waith);
- 		}
-+#if !defined(USE_POLARSSL)
- 		if (waith->url.tls) {
- 			gnutls_bye (waith->request.tlsSession, GNUTLS_SHUT_RDWR);
- 		}
-+#endif
- 	}
- 
- 	/* cleanup */
- 	if (waith->url.tls) {
-+#if defined(USE_POLARSSL)
-+		ssl_free (&waith->request.sslCtx->ssl);
-+		free (waith->request.sslCtx);
-+#else
- 		gnutls_deinit (waith->request.tlsSession);
- 		gnutls_certificate_free_credentials (waith->tlsCred);
-+#endif
- 	}
- 	if (waith->request.sockfd != -1) {
- 		close (waith->request.sockfd);
diff --git a/trunk/package/feeds/packages/picocom/Makefile b/trunk/package/feeds/packages/picocom/Makefile
deleted file mode 100644
index b5251b41..00000000
--- a/trunk/package/feeds/packages/picocom/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=picocom
-PKG_VERSION:=1.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://picocom.googlecode.com/files
-PKG_MD5SUM:=8eaba1d31407e8408674d6e57af447ef
-
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=GPL-2.0+
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/picocom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=A minimal dumb-terminal emulation program
-  URL:=http://code.google.com/p/picocom/
-  SUBMENU:=Terminal
-endef
-
-define Package/picocom/description
- minimal dumb-terminal emulation program
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
-		picocom
-endef
-
-define Package/picocom/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/picocom $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,picocom))
diff --git a/trunk/package/feeds/packages/polipo/Makefile b/trunk/package/feeds/packages/polipo/Makefile
deleted file mode 100644
index 48c24a1d..00000000
--- a/trunk/package/feeds/packages/polipo/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=polipo
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/$(PKG_NAME)/
-PKG_MD5SUM:=86939e331e656f638271f578b6e3f893
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/polipo
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A caching web proxy
-  URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
-  MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-endef
-
-define Package/polipo/description
- Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy,
- a proxy server). While Polipo was designed to be used by one person or a
- small group of people, there is nothing that prevents it from being used
- by a larger group.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		polipo
-endef
-
-define Package/polipo/conffiles
-/etc/config/polipo
-/etc/polipo/config
-endef
-
-define Package/polipo/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/polipo $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/polipo
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config.sample $(1)/etc/polipo/config
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/polipo.config $(1)/etc/config/polipo
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/polipo.init $(1)/etc/init.d/polipo
-endef
-
-$(eval $(call BuildPackage,polipo))
diff --git a/trunk/package/feeds/packages/polipo/files/polipo.config b/trunk/package/feeds/packages/polipo/files/polipo.config
deleted file mode 100644
index 8f853319..00000000
--- a/trunk/package/feeds/packages/polipo/files/polipo.config
+++ /dev/null
@@ -1,42 +0,0 @@
-# polipo daemon configuration
-config 'polipo' 'daemon'
-	# daemonise polipo (fork in background)
-	option 'daemonise' '1'
-	# where polipo will store its process pid
-	option 'pidFile' '/var/run/polipo.pid'
-
-config 'polipo' 'general'
-	option 'enabled' '1'
-	# adress on which polipo will listen, 0.0.0.0 means all addresses
-	option 'proxyAddress' '0.0.0.0'
-	# port on which polipo will listen, default is 8123
-	#option 'proxyPort' '8123'
-	# list of allowed clients to connect
-	list 'allowedClients' '192.168.1.0/24'
-	#list 'allowedClients' '127.0.0.1'
-	#list 'allowedClients' '192.168.2.1'
-	# how much RAM memory should Polipo use (in bytes).
-	option 'chunkHighMark' '1048576'
-	# enable disk cache index and serverlist of integrated polipo web interface
-	#option 'disableIndexing' '0'
-	#option 'disableServersList' '0'
-	# disable loging to syslog 
-	option 'logSyslog' '0'
-	# set log file location (disabled when not set)
-	#option 'logFile' '/mnt/usbdrive/polipo/log'
-
-config 'polipo' 'cache'
-	# disk cache location, you should always use external storage device
-	# (disabled when not set)
-	#option 'diskCacheRoot' '/mnt/usbdrive-p2/polipo/cache'
-	# disk cache cleanup settings
-	#option 'diskCacheUnlinkTime' '20d'
-	#option 'diskCacheTruncateTime' '5d'
-	#option 'diskCacheTruncateSize' '3145728'
-	# set to 1 if proxy is used by multiple users
-	#option 'cacheIsShared' '1'
-
-config 'polipo' 'pmm'
-	# poor man's multiplexing semgnet size to fetch
-	#option 'pmmSize' '8192'
-
diff --git a/trunk/package/feeds/packages/polipo/files/polipo.init b/trunk/package/feeds/packages/polipo/files/polipo.init
deleted file mode 100644
index 3cd73d49..00000000
--- a/trunk/package/feeds/packages/polipo/files/polipo.init
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=99
-
-CFGFILE=/var/etc/polipo.conf
-
-start() {
-	config_load 'polipo'
-
-	config_get_bool enabled "general" 'enabled' '0'
-	[ $enabled -gt 0 ] || return 1
-
-	mkdir -m 0755 -p /var/etc/
-	echo '### AUTOGENERATED CONFIGURATION' > $CFGFILE
-	echo '### DO NOT EDIT' >> $CFGFILE
-	echo '### SEE /etc/config/polipo INSTEAD' >> $CFGFILE
-	echo '' >> $CFGFILE
-
-	config_foreach polipo_config 'polipo'
-
-	# handle values that are disabled when not defined or empty
-	echo "### VALUES THAT ARE DISABLED WHEN EMPTY" >> $CFGFILE
-	polipo_atom "cache" "diskCacheRoot" '"' "1" >> $CFGFILE
-	polipo_atom "general" "logFile" '"' "1" >> $CFGFILE
-	polipo_atom "general" "localDocumentRoot" '"' "1" >> $CFGFILE
-
-	service_start /usr/sbin/polipo -c "$CFGFILE"
-}
-
-stop() {
-	service_stop /usr/sbin/polipo -c "$CFGFILE"
-}
-
-polipo_config() {
-	echo "### SECTION $1" >> $CFGFILE
-
-	string_options='authCredentials authRealm dnsNameServer forbiddenFile
-		forbiddenUrl logFacility pidFile parentAuthCredentials parentProxy
-		proxyAddress proxyName redirector socksParentProxy socksProxyType
-		socksUserName uncachableFile'
-
-	number_options='bigBufferSize chunkCriticalMark chunkHighMark chunkLowMark
-		diskCacheDirectoryPermissions diskCacheFilePermissions
-		diskCacheTruncateSize diskCacheWriteoutOnClose forbiddenRedirectCode
-		logFilePermissions logLevel maxDiskCacheEntrySize maxDiskEntries
-		maxObjectsWhenIdle maxPipelineTrain maxSideBuffering maxWriteoutWhenIdle
-		objectHashTableSize objectHighMark pmmFirstSize pmmSize proxyPort
-		publicObjectLowMark redirectorRedirectCode replyUnpipelineSize
-		serverMaxSlots serverSlots serverSlots1 maxAgeFraction'
-
-	time_options='clientTimeout diskCacheTruncateTime diskCacheUnlinkTime
-		dnsGethostbynameTtl dnsMaxTimeout dnsNegativeTtl idleTime maxAge
-		maxConnectionAge maxConnectionRequests maxExpiresAge maxNoModifiedAge
-		replyUnpipelineTime serverExpireTime serverIdleTimeout serverTimeout
-		smallRequestTime'
-
-	multistate_options='censorReferer dnsQueryIPv6 dnsUseGethostbyname
-		dontTrustVaryETag expectContinue pipelineAdditionalRequests
-		useTemporarySourceAddress relaxTransparency'
-
-	boolean_options='cacheIsShared daemonise disableConfiguration disableIndexing
-		disableLocalInterface disableProxy disableServersList disableVia
-		dontCacheCookies dontCacheRedirects logSyslog mindlesslyCacheVary
-		preciseExpiry proxyOffline scrubLogs laxHttpParser'
-
-	string_list_options='allowedClients censoredHeaders'
-
-	number_list_options='allowedPorts tunnelAllowedPorts'
-
-	for option in $string_options; do
-		polipo_atom "$1" "$option" '"' >> $CFGFILE
-	done
-
-	for option in $number_options; do
-		polipo_atom "$1" "$option" >> $CFGFILE
-	done
-
-	for option in $time_options; do
-		polipo_atom "$1" "$option" >> $CFGFILE
-	done
-	
-	for option in $multistate_options; do
-		polipo_atom "$1" "$option" >> $CFGFILE
-	done
-
-	for option in $boolean_options; do
-		polipo_boolean "$1" "$option" >> $CFGFILE
-	done
-
-	for option in $string_list_options; do
-		polipo_list "$1" "$option" '"' >> $CFGFILE
-	done
-	
-	for option in $number_list_options; do
-		polipo_list "$1" "$option" >> $CFGFILE
-	done
-}
-
-polipo_atom() {
-	local SECTION=$1
-	local OPTION=$2
-	local QUOTE=$3
-	local EMPTY_DISABLED=${4:-0}
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -n "$_value" -o "$EMPTY_DISABLED" -eq "1" ] && {
-		echo "$OPTION = ${QUOTE}${_value}${QUOTE}"
-	}
-}
-
-polipo_boolean() {
-	local SECTION=$1
-	local OPTION=$2
-
-	config_get_bool _value "$SECTION" "$OPTION"
-	[ -n "$_value" ] && {
-		[ "$_value" -eq "1" ] && _value="true" || _value="false"
-		echo "$OPTION = $_value"
-	}
-}
-
-polipo_list() {
-	local SECTION=$1
-	local OPTION=$2
-	local QUOTE=$3
-
-	config_get _value "$SECTION" "$OPTION"
-	
-	[ "$SECTION" = general ] && [ "$OPTION" = allowedClients ] && {
-		case "$_value" in
-			*127.0.0.1*) : ;;
-			*) _value="127.0.0.1 $_value" ;;
-		esac
-	}
-	
-	[ -n "$_value" ] && {
-		echo -n "$OPTION = "
-		
-		local FIRST=1
-		for entry in $_value; do
-			[ "$FIRST" -ne "1" ] && echo -n ", " || FIRST=0
-			
-			echo -n "${QUOTE}${entry}${QUOTE}"
-		done
-		
-		echo ''
-	}
-}
-
diff --git a/trunk/package/feeds/packages/portaudio/Makefile b/trunk/package/feeds/packages/portaudio/Makefile
deleted file mode 100644
index ffa5cfb0..00000000
--- a/trunk/package/feeds/packages/portaudio/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=portaudio
-PKG_VERSION:=19_20140130
-PKG_RELEASE:=1
-
-PKG_SOURCE:=pa_stable_v$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.portaudio.com/archives/
-PKG_MD5SUM:=7f220406902af9dca009668e198cbd23
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE.txt
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/portaudio
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+alsa-lib +libpthread +librt
-  TITLE:=Portable cross-platform audio I/O
-  URL:=http://www.portaudio.com/
-endef
-
-define Package/portaudio/description
- PortAudio is a free, cross-platform, open-source, audio I/O library.  It lets
- you write simple audio programs in 'C' or C++ that will compile and run on many
- platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is
- intended to promote the exchange of audio software between developers on
- different platforms. Many applications use PortAudio for Audio I/O.
-endef
-
-CONFIGURE_ARGS+= \
-	--with-alsa \
-	--without-asihpi \
-	--without-jack \
-	--with-oss \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/portaudio.h \
-		$(PKG_INSTALL_DIR)/usr/include/pa_linux_alsa.h \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libportaudio.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/portaudio-*.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/portaudio/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libportaudio.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,portaudio))
diff --git a/trunk/package/feeds/packages/portmap/Makefile b/trunk/package/feeds/packages/portmap/Makefile
deleted file mode 100644
index 03969f79..00000000
--- a/trunk/package/feeds/packages/portmap/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=portmap
-PKG_VERSION:=6.0
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://neil.brown.name/portmap/
-PKG_MD5SUM:=ac108ab68bf0f34477f8317791aaf1ff
-
-PKG_LICENSE:=BSD-4c
-PKG_LICENSE_FILES:=portmap.man
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/portmap
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libwrap $(LIBRPC_DEPENDS)
-  TITLE:=The RPC Portmapper
-  URL:=http://neil.brown.name/portmap/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  USERID:=rpc=65533:rpc=65533
-endef
-
-define Package/portmap/description
- Portmap is a server that converts RPC (Remote Procedure Call) program
- numbers into DARPA protocol port numbers.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" \
-	RPCUSER="rpc" \
-	LDLIBS="$(TARGET_LDFLAGS) -lwrap $(LIBRPC)" \
-	all
-
-define Package/portmap/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/portmap.init $(1)/etc/init.d/portmap
-endef
-
-$(eval $(call BuildPackage,portmap))
diff --git a/trunk/package/feeds/packages/portmap/files/portmap.init b/trunk/package/feeds/packages/portmap/files/portmap.init
deleted file mode 100644
index 621c313a..00000000
--- a/trunk/package/feeds/packages/portmap/files/portmap.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=19
-STOP=19
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command /usr/sbin/portmap -f
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/portmap/patches/101-no_pie.patch b/trunk/package/feeds/packages/portmap/patches/101-no_pie.patch
deleted file mode 100644
index 6cbdece9..00000000
--- a/trunk/package/feeds/packages/portmap/patches/101-no_pie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur portmap_6.0.org/Makefile portmap_6.0/Makefile
---- portmap_6.0.org/Makefile	2008-04-19 22:44:35.000000000 +0200
-+++ portmap_6.0/Makefile	2008-04-19 00:02:01.000000000 +0200
-@@ -127,7 +127,7 @@
- CPPFLAGS += $(HOSTS_ACCESS)
- portmap: CFLAGS   += -fpie
- portmap: LDLIBS   += $(WRAP_LIB)
--portmap: LDFLAGS  += -pie
-+#portmap: LDFLAGS  += -pie
- portmap: portmap.o pmap_check.o from_local.o
- 
- from_local: CPPFLAGS += -DTEST
diff --git a/trunk/package/feeds/packages/postfix/Makefile b/trunk/package/feeds/packages/postfix/Makefile
deleted file mode 100644
index 36c0f76f..00000000
--- a/trunk/package/feeds/packages/postfix/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=postfix
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-PKG_VERSION:=3.0.0
-PKG_MD5SUM:=a4a83f8d729f31c803bf9c2277701d56
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
-PKG_LICENSE:=IPL-1.0
-PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=+POSTFIX_CDB:tinycdb
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/postfix
-  SECTION:=mail
-  CATEGORY:=Mail
-  TITLE:=Postfix Mail Transmit Agent
-  URL:=http://www.postfix.org/
-  DEPENDS:=+POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +POSTFIX_DB:libdb47 +libpcre
-endef
-
-define Package/postfix/description
- Postfix is Wietse Venema's mailer that started life as an alternative to the widely-used Sendmail program. Postfix attempts to be fast, easy to administer, and secure, while at the same time being sendmail compatible enough to not upset existing users. Thus, the outside has a sendmail-ish flavor, but the inside is completely different.
-endef
-
-define Package/postfix/config
-	menu "Select postfix build options"
-		config POSTFIX_TLS
-			bool "TLS support"
-			default y
-			help
-			  Implements TLS support in postfix (using OpenSSL).
-		config POSTFIX_SASL
-			bool "SASL support"
-			default y
-			help
-			  Implements SASL support in postfix (using Cyrus SASL).
-		config POSTFIX_LDAP
-			bool "LDAP support"
-			default y
-			help
-			  Implements LDAP support in postfix (using OpenLDAP).
-		config POSTFIX_DB
-			bool "BerkeleyDB support"
-			default n
-			help
-			  Implements support for btree files using Berkeley DB. Note that hash files support is not compiled into Berkeley DB OpenWRT distribution
-		config POSTFIX_CDB
-			bool "CDB support"
-			default y
-			help
-			  Implements support for cdb files using tinycdb
-	endmenu
-endef
-
-CCARGS=-DNO_EPOLL -DNO_SIGSETJMP -DNO_NIS -DNO_EAI
-AUXLIBS=-L$(STAGING_DIR)/usr/lib
-default_database_type=cdb
-
-ifdef CONFIG_POSTFIX_TLS
-  CCARGS+=-DUSE_TLS
-  AUXLIBS+=-lssl -lcrypto
-endif
-
-ifdef CONFIG_POSTFIX_SASL
-  CCARGS+=-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I$(STAGING_DIR)/usr/include/sasl
-  AUXLIBS+=-lsasl2
-endif
-
-ifdef CONFIG_POSTFIX_LDAP
-  CCARGS+=-DHAS_LDAP
-  AUXLIBS+=-lldap -llber
-endif
-
-ifdef CONFIG_POSTFIX_CDB
-  CCARGS+=-DHAS_CDB
-  AUXLIBS+=-lcdb
-endif
-
-ifdef CONFIG_POSTFIX_DB
-  AUXLIBS+=-ldb
-  CCARGS+=-DHAS_DB
-  ifndef CONFIG_POSTFIX_CDB
-    default_database_type=btree
-  endif
-else
-  CCARGS+=-DNO_DB
-endif
-
-CCARGS+=-DDEF_DB_TYPE=\"$(default_database_type)\"
-
-config_directory=/etc/postfix# also add this to postfix init file
-sample_directory=/etc/postfix
-command_directory=/usr/sbin
-daemon_directory=/usr/libexec/postfix
-data_directory=/usr/var/lib/postfix
-queue_directory=/usr/var/spool/postfix
-mail_spool_directory=/usr/var/mail
-html_directory=no
-manpage_directory=no
-readme_directory=no
-sendmail_path=/usr/sbin/sendmail
-newaliases_path=/usr/bin/newaliases
-mailq_path=/usr/bin/mailq
-shlib_directory=/usr/lib/postfix
-meta_directory=/etc/postfix
-
-ln_suffix=.postfix
-ln_old_suffix=.old
-
-define Package/postfix/conffiles
-$(config_directory)/main.cf
-$(config_directory)/master.cf
-$(config_directory)/aliases
-endef
-
-define Build/Configure
-	if [ "$(CONFIG_POSTFIX_DB)" = "" -a "$(CONFIG_POSTFIX_CDB)" = "" ]; then\
-	  echo "Build error: You must select at least one of the DB types";\
-          exit 1;\
-	fi
-
-	cd $(PKG_BUILD_DIR); $(MAKE) makefiles CCARGS='$(CCARGS)' $(TARGET_CONFIGURE_OPTS) AUXLIBS="$(AUXLIBS)"
-endef
-
-# Steps to regenerate files/main.cf.default:
-#
-# 1. Compile the package with current file
-# 2. Execute the following command on target device:
-# 	postconf -d > /tmp/main.cf.new
-# 3. Transfer /tmp/main.cf.new file to the build system
-# 4. Execute the following command:
-# 	cat /tmp/main.cf.new | ( echo '# DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE'; echo '# TEXT HERE JUST SHOWS DEFAULT SETTINGS BUILT INTO POSTFIX.'; echo '#'; grep -v ^alias_maps\ = |grep -v ^alias_database\ = |grep -v ^command_directory\ = |grep -v ^config_directory\ = |grep -v ^daemon_directory\ = |grep -v ^data_directory\ = |grep -v ^default_database_type\ = |grep -v ^html_directory\ = |grep -v ^mail_spool_directory\ = |grep -v ^mailq_path\ = |grep -v ^manpage_directory\ = |grep -v ^meta_directory\ = |grep -v ^mydomain\ = |grep -v ^myhostname\ = |grep -v ^mynetworks\ = |grep -v ^mynetworks_style\ = |grep -v ^newaliases_path\ = |grep -v ^queue_directory\ = |grep -v ^readme_directory\ = |grep -v ^sample_directory\ = |grep -v ^sendmail_path\ = |grep -v ^shlib_directory\ = |grep -v ^smtputf8_enable\ = ) > files/main.cf.default
-# 5. Done. Now you can rebuild the package with new main.cf.default.
-#
-
-define Build/Compile
-	# Currently postfix has a bug with Makefiles that CCARGS are not passed to the compiler, so we are copying them to CC
-	cd $(PKG_BUILD_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) CC='$(TARGET_CC) $(CCARGS)'
-	cp ./files/main.cf.default $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "default_database_type = $(default_database_type)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "alias_database = $(default_database_type):$(config_directory)/aliases" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "alias_maps = $(default_database_type):$(config_directory)/aliases" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "sendmail_path = $(sendmail_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "newaliases_path = $(newaliases_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "mailq_path = $(mailq_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "html_directory = $(html_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "manpage_directory = $(manpage_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "sample_directory = $(sample_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "readme_directory = $(readme_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "command_directory = $(command_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "daemon_directory = $(daemon_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "data_directory = $(data_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "queue_directory = $(queue_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "config_directory = $(config_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "mail_spool_directory = $(mail_spool_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "shlib_directory = $(shlib_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "meta_directory = $(meta_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-	echo "smtputf8_enable = no" >> $(PKG_BUILD_DIR)/conf/main.cf.default
-endef
-
-define Package/postfix/install
-	cd $(PKG_BUILD_DIR); $(MAKE) install_root=$(1) command_directory=$(command_directory) daemon_directory=$(daemon_directory) data_directory=$(data_directory) html_directory=$(html_directory) mail_owner=postfix mailq_path=$(mailq_path)$(ln_suffix) manpage_directory=$(manpage_directory) newaliases_path=$(newaliases_path)$(ln_suffix) queue_directory=$(queue_directory) readme_directory=$(readme_directory) sendmail_path=$(sendmail_path)$(ln_suffix) setgid_group=postdrop sample_directory=$(sample_directory) config_directory=$(config_directory) shlib_directory=$(shlib_directory) meta_directory=$(meta_directory) mail_version=$(PKG_VERSION) non-interactive-package
-	$(INSTALL_DIR) $(1)$(mail_spool_directory)
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/postfix.init $(1)/etc/init.d/postfix
-endef
-
-define Package/postfix/postinst
-#!/bin/sh
-
- if [ -f "$${IPKG_INSTROOT}$(sendmail_path)" -a "$$(readlink "$${IPKG_INSTROOT}$(sendmail_path)")" != "$(sendmail_path)$(ln_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(sendmail_path)" "$${IPKG_INSTROOT}$(sendmail_path)$(ln_old_suffix)"
-  echo "Warning: $${IPKG_INSTROOT}$(sendmail_path) saved as $${IPKG_INSTROOT}$(sendmail_path)$(ln_old_suffix)"
- fi
- if [ ! -f "$${IPKG_INSTROOT}$(sendmail_path)" ]; then
-  ln -s "$${IPKG_INSTROOT}$(sendmail_path)$(ln_suffix)" "$(sendmail_path)"
- fi
-
- if [ -f "$${IPKG_INSTROOT}$(newaliases_path)" -a "$$(readlink "$${IPKG_INSTROOT}$(newaliases_path)")" != "$(newaliases_path)$(ln_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(newaliases_path)" "$${IPKG_INSTROOT}$(newaliases_path)$(ln_old_suffix)"
-  echo "Warning: $${IPKG_INSTROOT}$(newaliases_path) saved as $${IPKG_INSTROOT}$(newaliases_path)$(ln_old_suffix)"
- fi
- if [ ! -f "$${IPKG_INSTROOT}$(newaliases_path)" ]; then
-  ln -s "$${IPKG_INSTROOT}$(newaliases_path)$(ln_suffix)" "$(newaliases_path)"
- fi
-
- if [ -f "$${IPKG_INSTROOT}$(mailq_path)" -a "$$(readlink "$${IPKG_INSTROOT}$(mailq_path)")" != "$(mailq_path)$(ln_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(mailq_path)" "$${IPKG_INSTROOT}$(mailq_path)$(ln_old_suffix)"
-  echo "Warning: $${IPKG_INSTROOT}$(mailq_path) saved as $${IPKG_INSTROOT}$(mailq_path)$(ln_old_suffix)"
- fi
- if [ ! -f "$(mailq_path)" ]; then
-  ln -s "$${IPKG_INSTROOT}$(mailq_path)$(ln_suffix)" "$(mailq_path)"
- fi
-
- grep -qc main\.cf "$${IPKG_INSTROOT}"/etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/main.cf" >> "$${IPKG_INSTROOT}"/etc/sysupgrade.conf
- grep -qc master\.cf "$${IPKG_INSTROOT}"/etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/master.cf" >> "$${IPKG_INSTROOT}"/etc/sysupgrade.conf
- grep -qc aliases "$${IPKG_INSTROOT}"/etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/aliases" >> "$${IPKG_INSTROOT}"/etc/sysupgrade.conf
-
- touch "$${IPKG_INSTROOT}$(config_directory)"/opkg_postinst
-
- if [ -z "$${IPKG_INSTROOT}" ]; then
-  ps | grep "postfix/master" | grep -cvq grep >/dev/null && /etc/init.d/postfix reload
- fi
-
-endef
-
-define Package/postfix/prerm
-#!/bin/sh
- ps | grep "postfix/master" | grep -cvq grep >/dev/null && postfix stop
- /etc/init.d/postfix disable
-endef
-
-define Package/postfix/postrm
-#!/bin/sh
- rm -f $${IPKG_INSTROOT}$(config_directory)/aliases.cdb $${IPKG_INSTROOT}$(config_directory)/aliases.db $${IPKG_INSTROOT}$(data_directory)/master.lock
-
- rm -f "$${IPKG_INSTROOT}$(sendmail_path)" "$${IPKG_INSTROOT}$(newaliases_path)" "$${IPKG_INSTROOT}$(mailq_path)"
-
- if [ -f "$${IPKG_INSTROOT}$(sendmail_path)$(ln_old_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(sendmail_path)$(ln_old_suffix)" "$${IPKG_INSTROOT}$(sendmail_path)"
-  echo "Warning: $${IPKG_INSTROOT}$(sendmail_path) restored from $${IPKG_INSTROOT}$(sendmail_path)$(ln_old_suffix)"
- fi
- if [ -f "$${IPKG_INSTROOT}$(newaliases_path)$(ln_old_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(newaliases_path)$(ln_old_suffix)" "$${IPKG_INSTROOT}$(newaliases_path)"
-  echo "Warning: $${IPKG_INSTROOT}$(newaliases_path) restored from $${IPKG_INSTROOT}$(newaliases_path)$(ln_old_suffix)"
- fi
- if [ -f "$${IPKG_INSTROOT}$(mailq_path)$(ln_old_suffix)" ]; then
-  mv "$${IPKG_INSTROOT}$(mailq_path)$(ln_old_suffix)" "$${IPKG_INSTROOT}$(mailq_path)"
-  echo "Warning: $${IPKG_INSTROOT}$(mailq_path) restored from $${IPKG_INSTROOT}$(mailq_path)$(ln_old_suffix)"
- fi
-endef
-
-$(eval $(call BuildPackage,postfix))
diff --git a/trunk/package/feeds/packages/postfix/files/main.cf.default b/trunk/package/feeds/packages/postfix/files/main.cf.default
deleted file mode 100644
index d9eec99e..00000000
--- a/trunk/package/feeds/packages/postfix/files/main.cf.default
+++ /dev/null
@@ -1,840 +0,0 @@
-# DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE
-# TEXT HERE JUST SHOWS DEFAULT SETTINGS BUILT INTO POSTFIX.
-#
-2bounce_notice_recipient = postmaster
-access_map_defer_code = 450
-access_map_reject_code = 554
-address_verify_cache_cleanup_interval = 12h
-address_verify_default_transport = $default_transport
-address_verify_local_transport = $local_transport
-address_verify_map = btree:$data_directory/verify_cache
-address_verify_negative_cache = yes
-address_verify_negative_expire_time = 3d
-address_verify_negative_refresh_time = 3h
-address_verify_poll_count = ${stress?{1}:{3}}
-address_verify_poll_delay = 3s
-address_verify_positive_expire_time = 31d
-address_verify_positive_refresh_time = 7d
-address_verify_relay_transport = $relay_transport
-address_verify_relayhost = $relayhost
-address_verify_sender = $double_bounce_sender
-address_verify_sender_dependent_default_transport_maps = $sender_dependent_default_transport_maps
-address_verify_sender_dependent_relayhost_maps = $sender_dependent_relayhost_maps
-address_verify_sender_ttl = 0s
-address_verify_service_name = verify
-address_verify_transport_maps = $transport_maps
-address_verify_virtual_transport = $virtual_transport
-allow_mail_to_commands = alias, forward
-allow_mail_to_files = alias, forward
-allow_min_user = no
-allow_percent_hack = yes
-allow_untrusted_routing = no
-alternate_config_directories =
-always_add_missing_headers = no
-always_bcc =
-anvil_rate_time_unit = 60s
-anvil_status_update_time = 600s
-append_at_myorigin = yes
-append_dot_mydomain = ${{$compatibility_level} < {1} ? {yes} : {no}}
-application_event_drain_time = 100s
-authorized_flush_users = static:anyone
-authorized_mailq_users = static:anyone
-authorized_submit_users = static:anyone
-backwards_bounce_logfile_compatibility = yes
-berkeley_db_create_buffer_size = 16777216
-berkeley_db_read_buffer_size = 131072
-best_mx_transport =
-biff = yes
-body_checks =
-body_checks_size_limit = 51200
-bounce_notice_recipient = postmaster
-bounce_queue_lifetime = 5d
-bounce_service_name = bounce
-bounce_size_limit = 50000
-bounce_template_file =
-broken_sasl_auth_clients = no
-canonical_classes = envelope_sender, envelope_recipient, header_sender, header_recipient
-canonical_maps =
-cleanup_service_name = cleanup
-command_execution_directory =
-command_expansion_filter = 1234567890!@%-_=+:,./abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-command_time_limit = 1000s
-compatibility_level = 0
-confirm_delay_cleared = no
-connection_cache_protocol_timeout = 5s
-connection_cache_service_name = scache
-connection_cache_status_update_time = 600s
-connection_cache_ttl_limit = 2s
-content_filter =
-cyrus_sasl_config_path =
-daemon_table_open_error_is_fatal = no
-daemon_timeout = 18000s
-debug_peer_level = 2
-debug_peer_list =
-debugger_command =
-default_delivery_slot_cost = 5
-default_delivery_slot_discount = 50
-default_delivery_slot_loan = 3
-default_delivery_status_filter =
-default_destination_concurrency_failed_cohort_limit = 1
-default_destination_concurrency_limit = 20
-default_destination_concurrency_negative_feedback = 1
-default_destination_concurrency_positive_feedback = 1
-default_destination_rate_delay = 0s
-default_destination_recipient_limit = 50
-default_extra_recipient_limit = 1000
-default_filter_nexthop =
-default_minimum_delivery_slots = 3
-default_privs = nobody
-default_process_limit = 100
-default_rbl_reply = $rbl_code Service unavailable; $rbl_class [$rbl_what] blocked using $rbl_domain${rbl_reason?; $rbl_reason}
-default_recipient_limit = 20000
-default_recipient_refill_delay = 5s
-default_recipient_refill_limit = 100
-default_transport = smtp
-default_verp_delimiters = +=
-defer_code = 450
-defer_service_name = defer
-defer_transports =
-delay_logging_resolution_limit = 2
-delay_notice_recipient = postmaster
-delay_warning_time = 0h
-deliver_lock_attempts = 20
-deliver_lock_delay = 1s
-destination_concurrency_feedback_debug = no
-detect_8bit_encoding_header = yes
-disable_dns_lookups = no
-disable_mime_input_processing = no
-disable_mime_output_conversion = no
-disable_verp_bounces = no
-disable_vrfy_command = no
-dnsblog_reply_delay = 0s
-dnsblog_service_name = dnsblog
-dont_remove = 0
-double_bounce_sender = double-bounce
-duplicate_filter_limit = 1000
-empty_address_default_transport_maps_lookup_key = <>
-empty_address_recipient = MAILER-DAEMON
-empty_address_relayhost_maps_lookup_key = <>
-enable_long_queue_ids = no
-enable_original_recipient = yes
-error_delivery_slot_cost = $default_delivery_slot_cost
-error_delivery_slot_discount = $default_delivery_slot_discount
-error_delivery_slot_loan = $default_delivery_slot_loan
-error_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-error_destination_concurrency_limit = $default_destination_concurrency_limit
-error_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-error_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-error_destination_rate_delay = $default_destination_rate_delay
-error_destination_recipient_limit = $default_destination_recipient_limit
-error_extra_recipient_limit = $default_extra_recipient_limit
-error_initial_destination_concurrency = $initial_destination_concurrency
-error_minimum_delivery_slots = $default_minimum_delivery_slots
-error_notice_recipient = postmaster
-error_recipient_limit = $default_recipient_limit
-error_recipient_refill_delay = $default_recipient_refill_delay
-error_recipient_refill_limit = $default_recipient_refill_limit
-error_service_name = error
-execution_directory_expansion_filter = 1234567890!@%-_=+:,./abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-expand_owner_alias = no
-export_environment = TZ MAIL_CONFIG LANG
-fallback_transport =
-fallback_transport_maps =
-fast_flush_domains = $relay_domains
-fast_flush_purge_time = 7d
-fast_flush_refresh_time = 12h
-fault_injection_code = 0
-flush_service_name = flush
-fork_attempts = 5
-fork_delay = 1s
-forward_expansion_filter = 1234567890!@%-_=+:,./abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-forward_path = $home/.forward${recipient_delimiter}${extension}, $home/.forward
-frozen_delivered_to = yes
-hash_queue_depth = 1
-hash_queue_names = deferred, defer
-header_address_token_limit = 10240
-header_checks =
-header_size_limit = 102400
-helpful_warnings = yes
-home_mailbox =
-hopcount_limit = 50
-ignore_mx_lookup_error = no
-import_environment = MAIL_CONFIG MAIL_DEBUG MAIL_LOGTAG TZ XAUTHORITY DISPLAY LANG=C
-in_flow_delay = 1s
-inet_interfaces = all
-inet_protocols = all
-initial_destination_concurrency = 5
-internal_mail_filter_classes =
-invalid_hostname_reject_code = 501
-ipc_idle = 5s
-ipc_timeout = 3600s
-ipc_ttl = 1000s
-line_length_limit = 2048
-lmdb_map_size = 16777216
-lmtp_address_preference = any
-lmtp_address_verify_target = rcpt
-lmtp_assume_final = no
-lmtp_bind_address =
-lmtp_bind_address6 =
-lmtp_body_checks =
-lmtp_cname_overrides_servername = no
-lmtp_connect_timeout = 0s
-lmtp_connection_cache_destinations =
-lmtp_connection_cache_on_demand = yes
-lmtp_connection_cache_time_limit = 2s
-lmtp_connection_reuse_count_limit = 0
-lmtp_connection_reuse_time_limit = 300s
-lmtp_data_done_timeout = 600s
-lmtp_data_init_timeout = 120s
-lmtp_data_xfer_timeout = 180s
-lmtp_defer_if_no_mx_address_found = no
-lmtp_delivery_slot_cost = $default_delivery_slot_cost
-lmtp_delivery_slot_discount = $default_delivery_slot_discount
-lmtp_delivery_slot_loan = $default_delivery_slot_loan
-lmtp_delivery_status_filter = $default_delivery_status_filter
-lmtp_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-lmtp_destination_concurrency_limit = $default_destination_concurrency_limit
-lmtp_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-lmtp_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-lmtp_destination_rate_delay = $default_destination_rate_delay
-lmtp_destination_recipient_limit = $default_destination_recipient_limit
-lmtp_discard_lhlo_keyword_address_maps =
-lmtp_discard_lhlo_keywords =
-lmtp_dns_reply_filter =
-lmtp_dns_resolver_options =
-lmtp_dns_support_level =
-lmtp_enforce_tls = no
-lmtp_extra_recipient_limit = $default_extra_recipient_limit
-lmtp_generic_maps =
-lmtp_header_checks =
-lmtp_host_lookup = dns
-lmtp_initial_destination_concurrency = $initial_destination_concurrency
-lmtp_lhlo_name = $myhostname
-lmtp_lhlo_timeout = 300s
-lmtp_line_length_limit = 998
-lmtp_mail_timeout = 300s
-lmtp_mime_header_checks =
-lmtp_minimum_delivery_slots = $default_minimum_delivery_slots
-lmtp_mx_address_limit = 5
-lmtp_mx_session_limit = 2
-lmtp_nested_header_checks =
-lmtp_per_record_deadline = no
-lmtp_pix_workaround_delay_time = 10s
-lmtp_pix_workaround_maps =
-lmtp_pix_workaround_threshold_time = 500s
-lmtp_pix_workarounds = disable_esmtp,delay_dotcrlf
-lmtp_quit_timeout = 300s
-lmtp_quote_rfc821_envelope = yes
-lmtp_randomize_addresses = yes
-lmtp_rcpt_timeout = 300s
-lmtp_recipient_limit = $default_recipient_limit
-lmtp_recipient_refill_delay = $default_recipient_refill_delay
-lmtp_recipient_refill_limit = $default_recipient_refill_limit
-lmtp_reply_filter =
-lmtp_rset_timeout = 20s
-lmtp_sasl_auth_cache_name =
-lmtp_sasl_auth_cache_time = 90d
-lmtp_sasl_auth_enable = no
-lmtp_sasl_auth_soft_bounce = yes
-lmtp_sasl_mechanism_filter =
-lmtp_sasl_password_maps =
-lmtp_sasl_path =
-lmtp_sasl_security_options = noplaintext, noanonymous
-lmtp_sasl_tls_security_options = $lmtp_sasl_security_options
-lmtp_sasl_tls_verified_security_options = $lmtp_sasl_tls_security_options
-lmtp_sasl_type = cyrus
-lmtp_send_dummy_mail_auth = no
-lmtp_send_xforward_command = no
-lmtp_sender_dependent_authentication = no
-lmtp_skip_5xx_greeting = yes
-lmtp_skip_quit_response = no
-lmtp_starttls_timeout = 300s
-lmtp_tcp_port = 24
-lmtp_tls_CAfile =
-lmtp_tls_CApath =
-lmtp_tls_block_early_mail_reply = no
-lmtp_tls_cert_file =
-lmtp_tls_ciphers = export
-lmtp_tls_dcert_file =
-lmtp_tls_dkey_file = $lmtp_tls_dcert_file
-lmtp_tls_eccert_file =
-lmtp_tls_eckey_file = $lmtp_tls_eccert_file
-lmtp_tls_enforce_peername = yes
-lmtp_tls_exclude_ciphers =
-lmtp_tls_fingerprint_cert_match =
-lmtp_tls_fingerprint_digest = md5
-lmtp_tls_force_insecure_host_tlsa_lookup = no
-lmtp_tls_key_file = $lmtp_tls_cert_file
-lmtp_tls_loglevel = 0
-lmtp_tls_mandatory_ciphers = medium
-lmtp_tls_mandatory_exclude_ciphers =
-lmtp_tls_mandatory_protocols = !SSLv2
-lmtp_tls_note_starttls_offer = no
-lmtp_tls_per_site =
-lmtp_tls_policy_maps =
-lmtp_tls_protocols = !SSLv2
-lmtp_tls_scert_verifydepth = 9
-lmtp_tls_secure_cert_match = nexthop
-lmtp_tls_security_level =
-lmtp_tls_session_cache_database =
-lmtp_tls_session_cache_timeout = 3600s
-lmtp_tls_trust_anchor_file =
-lmtp_tls_verify_cert_match = hostname
-lmtp_tls_wrappermode = no
-lmtp_use_tls = no
-lmtp_xforward_timeout = 300s
-local_command_shell =
-local_delivery_slot_cost = $default_delivery_slot_cost
-local_delivery_slot_discount = $default_delivery_slot_discount
-local_delivery_slot_loan = $default_delivery_slot_loan
-local_delivery_status_filter = $default_delivery_status_filter
-local_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-local_destination_concurrency_limit = 2
-local_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-local_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-local_destination_rate_delay = $default_destination_rate_delay
-local_destination_recipient_limit = 1
-local_extra_recipient_limit = $default_extra_recipient_limit
-local_header_rewrite_clients = permit_inet_interfaces
-local_initial_destination_concurrency = $initial_destination_concurrency
-local_minimum_delivery_slots = $default_minimum_delivery_slots
-local_recipient_limit = $default_recipient_limit
-local_recipient_maps = proxy:unix:passwd.byname $alias_maps
-local_recipient_refill_delay = $default_recipient_refill_delay
-local_recipient_refill_limit = $default_recipient_refill_limit
-local_transport = local:$myhostname
-luser_relay =
-mail_name = Postfix
-mail_owner = postfix
-mail_release_date = 20150208
-mail_version = 3.0.0
-mailbox_command =
-mailbox_command_maps =
-mailbox_delivery_lock = fcntl, dotlock
-mailbox_size_limit = 51200000
-mailbox_transport =
-mailbox_transport_maps =
-maps_rbl_domains =
-maps_rbl_reject_code = 554
-masquerade_classes = envelope_sender, header_sender, header_recipient
-masquerade_domains =
-masquerade_exceptions =
-master_service_disable =
-max_idle = 100s
-max_use = 100
-maximal_backoff_time = 4000s
-maximal_queue_lifetime = 5d
-message_drop_headers = bcc, content-length, resent-bcc, return-path
-message_reject_characters =
-message_size_limit = 10240000
-message_strip_characters =
-milter_command_timeout = 30s
-milter_connect_macros = j {daemon_name} v
-milter_connect_timeout = 30s
-milter_content_timeout = 300s
-milter_data_macros = i
-milter_default_action = tempfail
-milter_end_of_data_macros = i
-milter_end_of_header_macros = i
-milter_header_checks =
-milter_helo_macros = {tls_version} {cipher} {cipher_bits} {cert_subject} {cert_issuer}
-milter_macro_daemon_name = $myhostname
-milter_macro_v = $mail_name $mail_version
-milter_mail_macros = i {auth_type} {auth_authen} {auth_author} {mail_addr} {mail_host} {mail_mailer}
-milter_protocol = 6
-milter_rcpt_macros = i {rcpt_addr} {rcpt_host} {rcpt_mailer}
-milter_unknown_command_macros =
-mime_boundary_length_limit = 2048
-mime_header_checks = $header_checks
-mime_nesting_limit = 100
-minimal_backoff_time = 300s
-multi_instance_directories =
-multi_instance_enable = no
-multi_instance_group =
-multi_instance_name =
-multi_instance_wrapper =
-multi_recipient_bounce_reject_code = 550
-mydestination = $myhostname, localhost.$mydomain, localhost
-myorigin = $myhostname
-nested_header_checks = $header_checks
-non_fqdn_reject_code = 504
-non_smtpd_milters =
-notify_classes = resource, software
-owner_request_special = yes
-parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains,mynetworks,permit_mx_backup_networks,qmqpd_authorized_clients,relay_domains,smtpd_access_maps
-permit_mx_backup_networks =
-pickup_service_name = pickup
-pipe_delivery_status_filter = $default_delivery_status_filter
-plaintext_reject_code = 450
-postmulti_control_commands = reload flush
-postmulti_start_commands = start
-postmulti_stop_commands = stop abort drain quick-stop
-postscreen_access_list = permit_mynetworks
-postscreen_bare_newline_action = ignore
-postscreen_bare_newline_enable = no
-postscreen_bare_newline_ttl = 30d
-postscreen_blacklist_action = ignore
-postscreen_cache_cleanup_interval = 12h
-postscreen_cache_map = btree:$data_directory/postscreen_cache
-postscreen_cache_retention_time = 7d
-postscreen_client_connection_count_limit = $smtpd_client_connection_count_limit
-postscreen_command_count_limit = 20
-postscreen_command_filter =
-postscreen_command_time_limit = ${stress?{10}:{300}}s
-postscreen_disable_vrfy_command = $disable_vrfy_command
-postscreen_discard_ehlo_keyword_address_maps = $smtpd_discard_ehlo_keyword_address_maps
-postscreen_discard_ehlo_keywords = $smtpd_discard_ehlo_keywords
-postscreen_dnsbl_action = ignore
-postscreen_dnsbl_reply_map =
-postscreen_dnsbl_sites =
-postscreen_dnsbl_threshold = 1
-postscreen_dnsbl_timeout = 10s
-postscreen_dnsbl_ttl = 1h
-postscreen_dnsbl_whitelist_threshold = 0
-postscreen_enforce_tls = $smtpd_enforce_tls
-postscreen_expansion_filter = $smtpd_expansion_filter
-postscreen_forbidden_commands = $smtpd_forbidden_commands
-postscreen_greet_action = ignore
-postscreen_greet_banner = $smtpd_banner
-postscreen_greet_ttl = 1d
-postscreen_greet_wait = ${stress?{2}:{6}}s
-postscreen_helo_required = $smtpd_helo_required
-postscreen_non_smtp_command_action = drop
-postscreen_non_smtp_command_enable = no
-postscreen_non_smtp_command_ttl = 30d
-postscreen_pipelining_action = enforce
-postscreen_pipelining_enable = no
-postscreen_pipelining_ttl = 30d
-postscreen_post_queue_limit = $default_process_limit
-postscreen_pre_queue_limit = $default_process_limit
-postscreen_reject_footer = $smtpd_reject_footer
-postscreen_tls_security_level = $smtpd_tls_security_level
-postscreen_upstream_proxy_protocol =
-postscreen_upstream_proxy_timeout = 5s
-postscreen_use_tls = $smtpd_use_tls
-postscreen_watchdog_timeout = 10s
-postscreen_whitelist_interfaces = static:all
-prepend_delivered_header = command, file, forward
-process_id = 25939
-process_id_directory = pid
-process_name = postconf
-propagate_unmatched_extensions = canonical, virtual
-proxy_interfaces =
-proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $sender_bcc_maps $recipient_bcc_maps $smtp_generic_maps $lmtp_generic_maps $alias_maps $smtpd_client_restrictions $smtpd_helo_restrictions $smtpd_sender_restrictions $smtpd_relay_restrictions $smtpd_recipient_restrictions
-proxy_write_maps = $smtp_sasl_auth_cache_name $lmtp_sasl_auth_cache_name $address_verify_map $postscreen_cache_map
-proxymap_service_name = proxymap
-proxywrite_service_name = proxywrite
-qmgr_clog_warn_time = 300s
-qmgr_daemon_timeout = 1000s
-qmgr_fudge_factor = 100
-qmgr_ipc_timeout = 60s
-qmgr_message_active_limit = 20000
-qmgr_message_recipient_limit = 20000
-qmgr_message_recipient_minimum = 10
-qmqpd_authorized_clients =
-qmqpd_client_port_logging = no
-qmqpd_error_delay = 1s
-qmqpd_timeout = 300s
-queue_file_attribute_count_limit = 100
-queue_minfree = 0
-queue_run_delay = 300s
-queue_service_name = qmgr
-rbl_reply_maps =
-receive_override_options =
-recipient_bcc_maps =
-recipient_canonical_classes = envelope_recipient, header_recipient
-recipient_canonical_maps =
-recipient_delimiter =
-reject_code = 554
-reject_tempfail_action = defer_if_permit
-relay_clientcerts =
-relay_delivery_slot_cost = $default_delivery_slot_cost
-relay_delivery_slot_discount = $default_delivery_slot_discount
-relay_delivery_slot_loan = $default_delivery_slot_loan
-relay_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-relay_destination_concurrency_limit = $default_destination_concurrency_limit
-relay_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-relay_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-relay_destination_rate_delay = $default_destination_rate_delay
-relay_destination_recipient_limit = $default_destination_recipient_limit
-relay_domains = ${{$compatibility_level} < {2} ? {$mydestination} : {}}
-relay_domains_reject_code = 554
-relay_extra_recipient_limit = $default_extra_recipient_limit
-relay_initial_destination_concurrency = $initial_destination_concurrency
-relay_minimum_delivery_slots = $default_minimum_delivery_slots
-relay_recipient_limit = $default_recipient_limit
-relay_recipient_maps =
-relay_recipient_refill_delay = $default_recipient_refill_delay
-relay_recipient_refill_limit = $default_recipient_refill_limit
-relay_transport = relay
-relayhost =
-relocated_maps =
-remote_header_rewrite_domain =
-require_home_directory = no
-reset_owner_alias = no
-resolve_dequoted_address = yes
-resolve_null_domain = no
-resolve_numeric_domain = no
-retry_delivery_slot_cost = $default_delivery_slot_cost
-retry_delivery_slot_discount = $default_delivery_slot_discount
-retry_delivery_slot_loan = $default_delivery_slot_loan
-retry_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-retry_destination_concurrency_limit = $default_destination_concurrency_limit
-retry_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-retry_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-retry_destination_rate_delay = $default_destination_rate_delay
-retry_destination_recipient_limit = $default_destination_recipient_limit
-retry_extra_recipient_limit = $default_extra_recipient_limit
-retry_initial_destination_concurrency = $initial_destination_concurrency
-retry_minimum_delivery_slots = $default_minimum_delivery_slots
-retry_recipient_limit = $default_recipient_limit
-retry_recipient_refill_delay = $default_recipient_refill_delay
-retry_recipient_refill_limit = $default_recipient_refill_limit
-rewrite_service_name = rewrite
-send_cyrus_sasl_authzid = no
-sender_bcc_maps =
-sender_canonical_classes = envelope_sender, header_sender
-sender_canonical_maps =
-sender_dependent_default_transport_maps =
-sender_dependent_relayhost_maps =
-sendmail_fix_line_endings = always
-service_throttle_time = 60s
-setgid_group = postdrop
-show_user_unknown_table_name = yes
-showq_service_name = showq
-smtp_address_preference = any
-smtp_address_verify_target = rcpt
-smtp_always_send_ehlo = yes
-smtp_bind_address =
-smtp_bind_address6 =
-smtp_body_checks =
-smtp_cname_overrides_servername = no
-smtp_connect_timeout = 30s
-smtp_connection_cache_destinations =
-smtp_connection_cache_on_demand = yes
-smtp_connection_cache_time_limit = 2s
-smtp_connection_reuse_count_limit = 0
-smtp_connection_reuse_time_limit = 300s
-smtp_data_done_timeout = 600s
-smtp_data_init_timeout = 120s
-smtp_data_xfer_timeout = 180s
-smtp_defer_if_no_mx_address_found = no
-smtp_delivery_slot_cost = $default_delivery_slot_cost
-smtp_delivery_slot_discount = $default_delivery_slot_discount
-smtp_delivery_slot_loan = $default_delivery_slot_loan
-smtp_delivery_status_filter = $default_delivery_status_filter
-smtp_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-smtp_destination_concurrency_limit = $default_destination_concurrency_limit
-smtp_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-smtp_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-smtp_destination_rate_delay = $default_destination_rate_delay
-smtp_destination_recipient_limit = $default_destination_recipient_limit
-smtp_discard_ehlo_keyword_address_maps =
-smtp_discard_ehlo_keywords =
-smtp_dns_reply_filter =
-smtp_dns_resolver_options =
-smtp_dns_support_level =
-smtp_enforce_tls = no
-smtp_extra_recipient_limit = $default_extra_recipient_limit
-smtp_fallback_relay = $fallback_relay
-smtp_generic_maps =
-smtp_header_checks =
-smtp_helo_name = $myhostname
-smtp_helo_timeout = 300s
-smtp_host_lookup = dns
-smtp_initial_destination_concurrency = $initial_destination_concurrency
-smtp_line_length_limit = 998
-smtp_mail_timeout = 300s
-smtp_mime_header_checks =
-smtp_minimum_delivery_slots = $default_minimum_delivery_slots
-smtp_mx_address_limit = 5
-smtp_mx_session_limit = 2
-smtp_nested_header_checks =
-smtp_never_send_ehlo = no
-smtp_per_record_deadline = no
-smtp_pix_workaround_delay_time = 10s
-smtp_pix_workaround_maps =
-smtp_pix_workaround_threshold_time = 500s
-smtp_pix_workarounds = disable_esmtp,delay_dotcrlf
-smtp_quit_timeout = 300s
-smtp_quote_rfc821_envelope = yes
-smtp_randomize_addresses = yes
-smtp_rcpt_timeout = 300s
-smtp_recipient_limit = $default_recipient_limit
-smtp_recipient_refill_delay = $default_recipient_refill_delay
-smtp_recipient_refill_limit = $default_recipient_refill_limit
-smtp_reply_filter =
-smtp_rset_timeout = 20s
-smtp_sasl_auth_cache_name =
-smtp_sasl_auth_cache_time = 90d
-smtp_sasl_auth_enable = no
-smtp_sasl_auth_soft_bounce = yes
-smtp_sasl_mechanism_filter =
-smtp_sasl_password_maps =
-smtp_sasl_path =
-smtp_sasl_security_options = noplaintext, noanonymous
-smtp_sasl_tls_security_options = $smtp_sasl_security_options
-smtp_sasl_tls_verified_security_options = $smtp_sasl_tls_security_options
-smtp_sasl_type = cyrus
-smtp_send_dummy_mail_auth = no
-smtp_send_xforward_command = no
-smtp_sender_dependent_authentication = no
-smtp_skip_5xx_greeting = yes
-smtp_skip_quit_response = yes
-smtp_starttls_timeout = 300s
-smtp_tls_CAfile =
-smtp_tls_CApath =
-smtp_tls_block_early_mail_reply = no
-smtp_tls_cert_file =
-smtp_tls_ciphers = export
-smtp_tls_dcert_file =
-smtp_tls_dkey_file = $smtp_tls_dcert_file
-smtp_tls_eccert_file =
-smtp_tls_eckey_file = $smtp_tls_eccert_file
-smtp_tls_enforce_peername = yes
-smtp_tls_exclude_ciphers =
-smtp_tls_fingerprint_cert_match =
-smtp_tls_fingerprint_digest = md5
-smtp_tls_force_insecure_host_tlsa_lookup = no
-smtp_tls_key_file = $smtp_tls_cert_file
-smtp_tls_loglevel = 0
-smtp_tls_mandatory_ciphers = medium
-smtp_tls_mandatory_exclude_ciphers =
-smtp_tls_mandatory_protocols = !SSLv2
-smtp_tls_note_starttls_offer = no
-smtp_tls_per_site =
-smtp_tls_policy_maps =
-smtp_tls_protocols = !SSLv2
-smtp_tls_scert_verifydepth = 9
-smtp_tls_secure_cert_match = nexthop, dot-nexthop
-smtp_tls_security_level =
-smtp_tls_session_cache_database =
-smtp_tls_session_cache_timeout = 3600s
-smtp_tls_trust_anchor_file =
-smtp_tls_verify_cert_match = hostname
-smtp_tls_wrappermode = no
-smtp_use_tls = no
-smtp_xforward_timeout = 300s
-smtpd_authorized_verp_clients = $authorized_verp_clients
-smtpd_authorized_xclient_hosts =
-smtpd_authorized_xforward_hosts =
-smtpd_banner = $myhostname ESMTP $mail_name
-smtpd_client_connection_count_limit = 50
-smtpd_client_connection_rate_limit = 0
-smtpd_client_event_limit_exceptions = ${smtpd_client_connection_limit_exceptions:$mynetworks}
-smtpd_client_message_rate_limit = 0
-smtpd_client_new_tls_session_rate_limit = 0
-smtpd_client_port_logging = no
-smtpd_client_recipient_rate_limit = 0
-smtpd_client_restrictions =
-smtpd_command_filter =
-smtpd_data_restrictions =
-smtpd_delay_open_until_valid_rcpt = yes
-smtpd_delay_reject = yes
-smtpd_discard_ehlo_keyword_address_maps =
-smtpd_discard_ehlo_keywords =
-smtpd_dns_reply_filter =
-smtpd_end_of_data_restrictions =
-smtpd_enforce_tls = no
-smtpd_error_sleep_time = 1s
-smtpd_etrn_restrictions =
-smtpd_expansion_filter = \t\40!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-smtpd_forbidden_commands = CONNECT GET POST
-smtpd_hard_error_limit = ${stress?{1}:{20}}
-smtpd_helo_required = no
-smtpd_helo_restrictions =
-smtpd_history_flush_threshold = 100
-smtpd_junk_command_limit = ${stress?{1}:{100}}
-smtpd_log_access_permit_actions =
-smtpd_milters =
-smtpd_noop_commands =
-smtpd_null_access_lookup_key = <>
-smtpd_peername_lookup = yes
-smtpd_per_record_deadline = ${stress?{yes}:{no}}
-smtpd_policy_service_default_action = 451 4.3.5 Server configuration problem
-smtpd_policy_service_max_idle = 300s
-smtpd_policy_service_max_ttl = 1000s
-smtpd_policy_service_request_limit = 0
-smtpd_policy_service_retry_delay = 1s
-smtpd_policy_service_timeout = 100s
-smtpd_policy_service_try_limit = 2
-smtpd_proxy_ehlo = $myhostname
-smtpd_proxy_filter =
-smtpd_proxy_options =
-smtpd_proxy_timeout = 100s
-smtpd_recipient_limit = 1000
-smtpd_recipient_overshoot_limit = 1000
-smtpd_recipient_restrictions =
-smtpd_reject_footer =
-smtpd_reject_unlisted_recipient = yes
-smtpd_reject_unlisted_sender = no
-smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination
-smtpd_restriction_classes =
-smtpd_sasl_auth_enable = no
-smtpd_sasl_authenticated_header = no
-smtpd_sasl_exceptions_networks =
-smtpd_sasl_local_domain =
-smtpd_sasl_path = smtpd
-smtpd_sasl_security_options = noanonymous
-smtpd_sasl_service = smtp
-smtpd_sasl_tls_security_options = $smtpd_sasl_security_options
-smtpd_sasl_type = cyrus
-smtpd_sender_login_maps =
-smtpd_sender_restrictions =
-smtpd_service_name = smtpd
-smtpd_soft_error_limit = 10
-smtpd_starttls_timeout = ${stress?{10}:{300}}s
-smtpd_timeout = ${stress?{10}:{300}}s
-smtpd_tls_CAfile =
-smtpd_tls_CApath =
-smtpd_tls_always_issue_session_ids = yes
-smtpd_tls_ask_ccert = no
-smtpd_tls_auth_only = no
-smtpd_tls_ccert_verifydepth = 9
-smtpd_tls_cert_file =
-smtpd_tls_ciphers = export
-smtpd_tls_dcert_file =
-smtpd_tls_dh1024_param_file =
-smtpd_tls_dh512_param_file =
-smtpd_tls_dkey_file = $smtpd_tls_dcert_file
-smtpd_tls_eccert_file =
-smtpd_tls_eckey_file = $smtpd_tls_eccert_file
-smtpd_tls_eecdh_grade = strong
-smtpd_tls_exclude_ciphers =
-smtpd_tls_fingerprint_digest = md5
-smtpd_tls_key_file = $smtpd_tls_cert_file
-smtpd_tls_loglevel = 0
-smtpd_tls_mandatory_ciphers = medium
-smtpd_tls_mandatory_exclude_ciphers =
-smtpd_tls_mandatory_protocols = !SSLv2
-smtpd_tls_protocols =
-smtpd_tls_received_header = no
-smtpd_tls_req_ccert = no
-smtpd_tls_security_level =
-smtpd_tls_session_cache_database =
-smtpd_tls_session_cache_timeout = 3600s
-smtpd_tls_wrappermode = no
-smtpd_upstream_proxy_protocol =
-smtpd_upstream_proxy_timeout = 5s
-smtpd_use_tls = no
-smtputf8_autodetect_classes = sendmail, verify
-soft_bounce = no
-stale_lock_time = 500s
-stress =
-strict_7bit_headers = no
-strict_8bitmime = no
-strict_8bitmime_body = no
-strict_mailbox_ownership = yes
-strict_mime_encoding_domain = no
-strict_rfc821_envelopes = no
-strict_smtputf8 = no
-sun_mailtool_compatibility = no
-swap_bangpath = yes
-syslog_facility = mail
-syslog_name = ${multi_instance_name?{$multi_instance_name}:{postfix}}
-tcp_windowsize = 0
-tls_append_default_CA = no
-tls_daemon_random_bytes = 32
-tls_dane_digest_agility = on
-tls_dane_digests = sha512 sha256
-tls_dane_trust_anchor_digest_enable = yes
-tls_disable_workarounds =
-tls_eecdh_strong_curve = prime256v1
-tls_eecdh_ultra_curve = secp384r1
-tls_export_cipherlist = aNULL:-aNULL:ALL:+RC4:@STRENGTH
-tls_high_cipherlist = aNULL:-aNULL:ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH
-tls_legacy_public_key_fingerprints = no
-tls_low_cipherlist = aNULL:-aNULL:ALL:!EXPORT:+RC4:@STRENGTH
-tls_medium_cipherlist = aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH
-tls_null_cipherlist = eNULL:!aNULL
-tls_preempt_cipherlist = no
-tls_random_bytes = 32
-tls_random_exchange_name = ${data_directory}/prng_exch
-tls_random_prng_update_period = 3600s
-tls_random_reseed_period = 3600s
-tls_random_source = dev:/dev/urandom
-tls_session_ticket_cipher = aes-128-cbc
-tls_ssl_options =
-tls_wildcard_matches_multiple_labels = yes
-tlsmgr_service_name = tlsmgr
-tlsproxy_enforce_tls = $smtpd_enforce_tls
-tlsproxy_service_name = tlsproxy
-tlsproxy_tls_CAfile = $smtpd_tls_CAfile
-tlsproxy_tls_CApath = $smtpd_tls_CApath
-tlsproxy_tls_always_issue_session_ids = $smtpd_tls_always_issue_session_ids
-tlsproxy_tls_ask_ccert = $smtpd_tls_ask_ccert
-tlsproxy_tls_ccert_verifydepth = $smtpd_tls_ccert_verifydepth
-tlsproxy_tls_cert_file = $smtpd_tls_cert_file
-tlsproxy_tls_ciphers = $smtpd_tls_ciphers
-tlsproxy_tls_dcert_file = $smtpd_tls_dcert_file
-tlsproxy_tls_dh1024_param_file = $smtpd_tls_dh1024_param_file
-tlsproxy_tls_dh512_param_file = $smtpd_tls_dh512_param_file
-tlsproxy_tls_dkey_file = $smtpd_tls_dkey_file
-tlsproxy_tls_eccert_file = $smtpd_tls_eccert_file
-tlsproxy_tls_eckey_file = $smtpd_tls_eckey_file
-tlsproxy_tls_eecdh_grade = $smtpd_tls_eecdh_grade
-tlsproxy_tls_exclude_ciphers = $smtpd_tls_exclude_ciphers
-tlsproxy_tls_fingerprint_digest = $smtpd_tls_fingerprint_digest
-tlsproxy_tls_key_file = $smtpd_tls_key_file
-tlsproxy_tls_loglevel = $smtpd_tls_loglevel
-tlsproxy_tls_mandatory_ciphers = $smtpd_tls_mandatory_ciphers
-tlsproxy_tls_mandatory_exclude_ciphers = $smtpd_tls_mandatory_exclude_ciphers
-tlsproxy_tls_mandatory_protocols = $smtpd_tls_mandatory_protocols
-tlsproxy_tls_protocols = $smtpd_tls_protocols
-tlsproxy_tls_req_ccert = $smtpd_tls_req_ccert
-tlsproxy_tls_security_level = $smtpd_tls_security_level
-tlsproxy_use_tls = $smtpd_use_tls
-tlsproxy_watchdog_timeout = 10s
-trace_service_name = trace
-transport_maps =
-transport_retry_time = 60s
-trigger_timeout = 10s
-undisclosed_recipients_header =
-unknown_address_reject_code = 450
-unknown_address_tempfail_action = $reject_tempfail_action
-unknown_client_reject_code = 450
-unknown_helo_hostname_tempfail_action = $reject_tempfail_action
-unknown_hostname_reject_code = 450
-unknown_local_recipient_reject_code = 550
-unknown_relay_recipient_reject_code = 550
-unknown_virtual_alias_reject_code = 550
-unknown_virtual_mailbox_reject_code = 550
-unverified_recipient_defer_code = 450
-unverified_recipient_reject_code = 450
-unverified_recipient_reject_reason =
-unverified_recipient_tempfail_action = $reject_tempfail_action
-unverified_sender_defer_code = 450
-unverified_sender_reject_code = 450
-unverified_sender_reject_reason =
-unverified_sender_tempfail_action = $reject_tempfail_action
-verp_delimiter_filter = -=+
-virtual_alias_address_length_limit = 1000
-virtual_alias_domains = $virtual_alias_maps
-virtual_alias_expansion_limit = 1000
-virtual_alias_maps = $virtual_maps
-virtual_alias_recursion_limit = 1000
-virtual_delivery_slot_cost = $default_delivery_slot_cost
-virtual_delivery_slot_discount = $default_delivery_slot_discount
-virtual_delivery_slot_loan = $default_delivery_slot_loan
-virtual_delivery_status_filter = $default_delivery_status_filter
-virtual_destination_concurrency_failed_cohort_limit = $default_destination_concurrency_failed_cohort_limit
-virtual_destination_concurrency_limit = $default_destination_concurrency_limit
-virtual_destination_concurrency_negative_feedback = $default_destination_concurrency_negative_feedback
-virtual_destination_concurrency_positive_feedback = $default_destination_concurrency_positive_feedback
-virtual_destination_rate_delay = $default_destination_rate_delay
-virtual_destination_recipient_limit = $default_destination_recipient_limit
-virtual_extra_recipient_limit = $default_extra_recipient_limit
-virtual_gid_maps =
-virtual_initial_destination_concurrency = $initial_destination_concurrency
-virtual_mailbox_base =
-virtual_mailbox_domains = $virtual_mailbox_maps
-virtual_mailbox_limit = 51200000
-virtual_mailbox_lock = fcntl, dotlock
-virtual_mailbox_maps =
-virtual_minimum_delivery_slots = $default_minimum_delivery_slots
-virtual_minimum_uid = 100
-virtual_recipient_limit = $default_recipient_limit
-virtual_recipient_refill_delay = $default_recipient_refill_delay
-virtual_recipient_refill_limit = $default_recipient_refill_limit
-virtual_transport = virtual
-virtual_uid_maps =
diff --git a/trunk/package/feeds/packages/postfix/files/postfix.init b/trunk/package/feeds/packages/postfix/files/postfix.init
deleted file mode 100644
index 1f3bc5e8..00000000
--- a/trunk/package/feeds/packages/postfix/files/postfix.init
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=50
-STOP=50
-
-upgrade() {
-	config_directory="$IPKG_INSTROOT"/etc/postfix
-
-	if [ -f "$config_directory"/opkg_postinst ]; then
-		rm -f "$config_directory"/opkg_postinst
-
-		group_exists postfix || group_add postfix 87
-		user_exists postfix || user_add postfix 87
-		group_exists postdrop || group_add postdrop 88
-
-		echo "myhostname = $(uci get system.@system[0].hostname)" >> "$config_directory"/main.cf.default
-		echo "mydomain = $(uci get system.@system[0].hostname|sed -e "s/[^\.]*\.\(.*\)/\1/")" >> "$config_directory"/main.cf.default
-		ifconfig | grep "inet addr" | sed -e "s/.*inet addr:\([0-9.]*\).*Mask:/\1 /" | while read IP NETMASK; do eval "$(ipcalc.sh $IP $NETMASK)"; echo "$NETWORK/$PREFIX"; done | xargs echo "mynetworks =" >> "$config_directory"/main.cf.default
-		echo "mynetworks_style = subnet" >> "$config_directory"/main.cf.default
-
-		grep -qc "^sendmail_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sendmail_path =" "$config_directory"/main.cf.default)"
-		grep -qc "^newaliases_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^newaliases_path =" "$config_directory"/main.cf.default)"
-		grep -qc "^mailq_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mailq_path =" "$config_directory"/main.cf.default)"
-		grep -qc "^html_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^html_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^manpage_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^manpage_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^sample_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sample_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^readme_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^readme_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^command_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^command_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^daemon_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^daemon_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^data_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^data_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^queue_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^queue_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^config_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^config_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^mail_spool_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_spool_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^mail_owner[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_owner =" "$config_directory"/main.cf.default)"
-		grep -qc "^setgid_group[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^setgid_group =" "$config_directory"/main.cf.default)"
-		grep -qc "^myhostname[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^myhostname =" "$config_directory"/main.cf.default)"
-		grep -qc "^mydomain[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mydomain =" "$config_directory"/main.cf.default)"
-		grep -qc "^mynetworks[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks =" "$config_directory"/main.cf.default)"
-		grep -qc "^mynetworks_style[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks_style =" "$config_directory"/main.cf.default)"
-		grep -qc "^shlib_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^shlib_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^meta_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^meta_directory =" "$config_directory"/main.cf.default)"
-		grep -qc "^smtputf8_enable[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^smtputf8_enable =" "$config_directory"/main.cf.default)"
-
-		postfix set-permissions
-		postfix post-install upgrade-source
-		postfix upgrade-configuration
-		newaliases
-	fi
-}
-
-start() {
-	upgrade
-	postfix start
-}
-
-stop() {
-	postfix stop
-}
-
-reload() {
-	upgrade
-	postfix reload
-}
diff --git a/trunk/package/feeds/packages/postfix/patches/100-fsstat.patch b/trunk/package/feeds/packages/postfix/patches/100-fsstat.patch
deleted file mode 100644
index ca43025c..00000000
--- a/trunk/package/feeds/packages/postfix/patches/100-fsstat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN postfix-2.8.1/src/smtpd/smtpd_check.c postfix-2.8.1_patched/src/smtpd/smtpd_check.c
---- postfix-2.8.1/src/smtpd/smtpd_check.c	2011-01-04 22:03:50.000000000 +0300
-+++ postfix-2.8.1_patched/src/smtpd/smtpd_check.c	2011-03-06 19:35:39.000000000 +0300
-@@ -5277,7 +5277,7 @@ char   *smtpd_check_queue(SMTPD_STATE *s
-      */
- #define BLOCKS(x)	((x) / fsbuf.block_size)
- 
--    fsspace(".", &fsbuf);
-+    fsspace("/overlay", &fsbuf);
-     if (msg_verbose)
- 	msg_info("%s: blocks %lu avail %lu min_free %lu msg_size_limit %lu",
- 		 myname,
diff --git a/trunk/package/feeds/packages/postfix/patches/200-manpages.patch b/trunk/package/feeds/packages/postfix/patches/200-manpages.patch
deleted file mode 100644
index 6344e93b..00000000
--- a/trunk/package/feeds/packages/postfix/patches/200-manpages.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-install
---- postfix-2.10.2/conf/post-install	2013-06-13 18:07:46.000000000 +0400
-+++ postfix-2.10.2_patched/conf/post-install	2013-11-19 21:17:49.572820573 +0400
-@@ -359,10 +359,10 @@
- 
- # Sanity checks
- 
--case $manpage_directory in
-- no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
--     echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
--esac
-+#case $manpage_directory in
-+# no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
-+#     echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
-+#esac
- 
- case $setgid_group in
-  no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2
-@@ -370,7 +370,7 @@
- esac
- 
- for path in "$daemon_directory" "$command_directory" "$queue_directory" \
--    "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
-+    "$sendmail_path" "$newaliases_path" "$mailq_path" \
-     "$meta_directory"
- do
-    case "$path" in
-@@ -379,7 +379,7 @@
-    esac
- done
- 
--for path in "$html_directory" "$readme_directory" "$shlib_directory"
-+for path in "$html_directory" "$readme_directory" "$shlib_directory" "$manpage_directory"
- do
-    case "$path" in
-    /*) ;;
-diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
---- postfix-2.10.2/postfix-install	2012-05-22 23:40:29.000000000 +0400
-+++ postfix-2.10.2_patched/postfix-install	2013-11-19 21:12:20.694160734 +0400
-@@ -543,13 +543,13 @@
-      exit 1;;
- esac
- 
--case "$manpage_directory" in
-- no) (echo $0: Error: the manpage_directory parameter no longer accepts 
--     echo \"no\" values.  Try again with \"manpage_directory=/path/name\" 
--     echo on the command line or execute \"make install\" and specify
--     echo manpage_directory interactively.) | ${FMT} 1>&2
--     exit 1;;
--esac
-+#case "$manpage_directory" in
-+# no) (echo $0: Error: the manpage_directory parameter no longer accepts 
-+#     echo \"no\" values.  Try again with \"manpage_directory=/path/name\" 
-+#     echo on the command line or execute \"make install\" and specify
-+#     echo manpage_directory interactively.) | ${FMT} 1>&2
-+#     exit 1;;
-+#esac
- 
- for path in "$html_directory" "$readme_directory" "$shlib_directory"
- do
-@@ -562,7 +562,7 @@
- done
- 
- for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \
--    "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
-+    "$sendmail_path" "$newaliases_path" "$mailq_path" \
-     "$meta_directory"
- do
-    case "$path" in
-@@ -758,8 +758,8 @@
- 		compare_or_replace $mode "$owner" "$group" html/$file \
- 		    $HTML_DIRECTORY/$file || exit 1;;
- 	'$manpage_directory')
--	    check_parent $MANPAGE_DIRECTORY/$file || exit 1
--	    compare_or_replace $mode "$owner" "$group" man/$file \
-+	    test "$manpage_directory" = "no" || check_parent $MANPAGE_DIRECTORY/$file || exit 1
-+	    test "$manpage_directory" = "no" || compare_or_replace $mode "$owner" "$group" man/$file \
- 		$MANPAGE_DIRECTORY/$file || exit 1;;
- 	'$readme_directory')
- 	    test "$readme_directory" = "no" ||
diff --git a/trunk/package/feeds/packages/postfix/patches/300-bdb_hash_segfault.patch b/trunk/package/feeds/packages/postfix/patches/300-bdb_hash_segfault.patch
deleted file mode 100644
index 1a9d8e9d..00000000
--- a/trunk/package/feeds/packages/postfix/patches/300-bdb_hash_segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur postfix-2.11.3/src/util/dict_db.c postfix-2.11.3_patched/src/util/dict_db.c
---- postfix-2.11.3/src/util/dict_db.c	2012-01-25 04:41:08.000000000 +0400
-+++ postfix-2.11.3_patched/src/util/dict_db.c	2014-11-01 12:36:44.287641712 +0300
-@@ -687,8 +687,8 @@
- 	msg_panic("db_create null result");
-     if ((errno = db->set_cachesize(db, 0, dict_db_cache_size, 0)) != 0)
- 	msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
--    if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
--	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
-+//    if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
-+//	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
- #if DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || \
- 	(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
-     if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
diff --git a/trunk/package/feeds/packages/postfix/patches/400-cdb.patch b/trunk/package/feeds/packages/postfix/patches/400-cdb.patch
deleted file mode 100644
index 8aeaea5e..00000000
--- a/trunk/package/feeds/packages/postfix/patches/400-cdb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur postfix-2.11.1/src/util/sys_defs.h postfix-2.11.1.patched/src/util/sys_defs.h
---- postfix-2.11.1/src/util/sys_defs.h	2013-09-30 00:51:55.000000000 +0400
-+++ postfix-2.11.1.patched/src/util/sys_defs.h	2014-09-29 03:11:48.962277971 +0400
-@@ -768,9 +768,8 @@
- #define INTERNAL_LOCK	MYFLOCK_STYLE_FLOCK
- #define DEF_MAILBOX_LOCK "fcntl, dotlock"	/* RedHat >= 4.x */
- #define HAS_FSYNC
--#define HAS_DB
- #define NATIVE_DB_TYPE	"hash"
--#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
-+#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/postfix/aliases"
- #ifndef NO_NIS
- #define HAS_NIS
- #endif
diff --git a/trunk/package/feeds/packages/postfix/patches/500-crosscompile.patch b/trunk/package/feeds/packages/postfix/patches/500-crosscompile.patch
deleted file mode 100644
index e4123ef0..00000000
--- a/trunk/package/feeds/packages/postfix/patches/500-crosscompile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- postfix-2.10.2/makedefs	2013-02-04 05:33:13.000000000 +0400
-+++ postfix-2.10.2_patched/makedefs	2013-11-19 22:48:50.528560454 +0400
-@@ -190,9 +190,9 @@
- 
- case $# in
-  # Officially supported usage.
-- 0) SYSTEM=`(uname -s) 2>/dev/null`
--    RELEASE=`(uname -r) 2>/dev/null`
--    VERSION=`(uname -v) 2>/dev/null`
-+ 0) SYSTEM="Linux"
-+    RELEASE="3.10.18"
-+    VERSION="OpenWRT"
-     case "$VERSION" in
-      dcosx*) SYSTEM=$VERSION;;
-     esac;;
-@@ -522,9 +522,9 @@
- 		esac
- 		for name in nsl resolv
- 		do
--		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-+		    for lib in /usr/lib64 /usr/lib64/* /usr/lib /usr/lib/* /lib /lib/*
- 		    do
--			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
-+			test -e $PKG_BUILD_DIR/$lib/lib$name.a -o -e $PKG_BUILD_DIR/$lib/lib$name.so && {
- 			    SYSLIBS="$SYSLIBS -l$name"
- 			    break
- 			}
diff --git a/trunk/package/feeds/packages/postfix/patches/600-nopostconf.patch b/trunk/package/feeds/packages/postfix/patches/600-nopostconf.patch
deleted file mode 100644
index 6140e23f..00000000
--- a/trunk/package/feeds/packages/postfix/patches/600-nopostconf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur postfix-2.11.1/postfix-install postfix-2.11.1.patched/postfix-install
---- postfix-2.11.1/postfix-install	2014-10-05 20:43:58.598876904 +0400
-+++ postfix-2.11.1.patched/postfix-install	2014-10-05 20:47:36.076700082 +0400
-@@ -830,23 +830,23 @@
-     esac
- done
- 
--bin/postconf -c $CONFIG_DIRECTORY -e \
--    "daemon_directory = $daemon_directory" \
--    "data_directory = $data_directory" \
--    "command_directory = $command_directory" \
--    "queue_directory = $queue_directory" \
--    "mail_owner = $mail_owner" \
--    "setgid_group = $setgid_group" \
--    "sendmail_path = $sendmail_path" \
--    "mailq_path = $mailq_path" \
--    "newaliases_path = $newaliases_path" \
--    "html_directory = $html_directory" \
--    "manpage_directory = $manpage_directory" \
--    "sample_directory = $sample_directory" \
--    "readme_directory = $readme_directory" \
--    "shlib_directory = $shlib_directory" \
--    "meta_directory = $meta_directory" \
--|| exit 1
-+#bin/postconf -c $CONFIG_DIRECTORY -e \
-+#    "daemon_directory = $daemon_directory" \
-+#    "data_directory = $data_directory" \
-+#    "command_directory = $command_directory" \
-+#    "queue_directory = $queue_directory" \
-+#    "mail_owner = $mail_owner" \
-+#    "setgid_group = $setgid_group" \
-+#    "sendmail_path = $sendmail_path" \
-+#    "mailq_path = $mailq_path" \
-+#    "newaliases_path = $newaliases_path" \
-+#    "html_directory = $html_directory" \
-+#    "manpage_directory = $manpage_directory" \
-+#    "sample_directory = $sample_directory" \
-+#    "readme_directory = $readme_directory" \
-+#    "shlib_directory = $shlib_directory" \
-+#    "meta_directory = $meta_directory" \
-+#|| exit 1
- 
- # If Postfix is being installed locally from source code, do the
- # post-install processing now.
diff --git a/trunk/package/feeds/packages/postfix/patches/700-defaultconfig.patch b/trunk/package/feeds/packages/postfix/patches/700-defaultconfig.patch
deleted file mode 100644
index 99088d19..00000000
--- a/trunk/package/feeds/packages/postfix/patches/700-defaultconfig.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naur postfix-2.11.1/conf/main.cf postfix-2.11.1.patched/conf/main.cf
---- postfix-2.11.1/conf/main.cf	2013-12-24 18:57:25.000000000 +0400
-+++ postfix-2.11.1.patched/conf/main.cf	2014-10-05 21:35:53.427534410 +0400
-@@ -40,43 +40,8 @@
- #
- #soft_bounce = no
- 
--# LOCAL PATHNAME INFORMATION
--#
--# The queue_directory specifies the location of the Postfix queue.
--# This is also the root directory of Postfix daemons that run chrooted.
--# See the files in examples/chroot-setup for setting up Postfix chroot
--# environments on different UNIX systems.
--#
--queue_directory = /var/spool/postfix
--
--# The command_directory parameter specifies the location of all
--# postXXX commands.
--#
--command_directory = /usr/sbin
--
--# The daemon_directory parameter specifies the location of all Postfix
--# daemon programs (i.e. programs listed in the master.cf file). This
--# directory must be owned by root.
--#
--daemon_directory = /usr/libexec/postfix
--
--# The data_directory parameter specifies the location of Postfix-writable
--# data files (caches, random numbers). This directory must be owned
--# by the mail_owner account (see below).
--#
--data_directory = /var/lib/postfix
--
- # QUEUE AND PROCESS OWNERSHIP
- #
--# The mail_owner parameter specifies the owner of the Postfix queue
--# and of most Postfix daemon processes.  Specify the name of a user
--# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS
--# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In
--# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED
--# USER.
--#
--mail_owner = postfix
--
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
- # These rights are used in the absence of a recipient user context.
-@@ -632,45 +597,4 @@
- #	-dmS $process_name gdb $daemon_directory/$process_name
- #	$process_id & sleep 1
- 
--# INSTALL-TIME CONFIGURATION INFORMATION
--#
--# The following parameters are used when installing a new Postfix version.
--# 
--# sendmail_path: The full pathname of the Postfix sendmail command.
--# This is the Sendmail-compatible mail posting interface.
--# 
--sendmail_path =
--
--# newaliases_path: The full pathname of the Postfix newaliases command.
--# This is the Sendmail-compatible command to build alias databases.
--#
--newaliases_path =
--
--# mailq_path: The full pathname of the Postfix mailq command.  This
--# is the Sendmail-compatible mail queue listing command.
--# 
--mailq_path =
--
--# setgid_group: The group for mail submission and queue management
--# commands.  This must be a group name with a numerical group ID that
--# is not shared with other accounts, not even with the Postfix account.
--#
--setgid_group =
--
--# html_directory: The location of the Postfix HTML documentation.
--#
--html_directory =
--
--# manpage_directory: The location of the Postfix on-line manual pages.
--#
--manpage_directory =
--
--# sample_directory: The location of the Postfix sample configuration files.
--# This parameter is obsolete as of Postfix 2.1.
--#
--sample_directory =
--
--# readme_directory: The location of the Postfix README files.
--#
--readme_directory =
- inet_protocols = ipv4
diff --git a/trunk/package/feeds/packages/postfix/patches/800-fmt.patch b/trunk/package/feeds/packages/postfix/patches/800-fmt.patch
deleted file mode 100644
index 97a165c3..00000000
--- a/trunk/package/feeds/packages/postfix/patches/800-fmt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur postfix-2.11.1/conf/post-install postfix-2.11.1.patched/conf/post-install
---- postfix-2.11.1/conf/post-install	2014-10-05 20:43:58.597876946 +0400
-+++ postfix-2.11.1.patched/conf/post-install	2014-10-11 16:28:01.258874097 +0400
-@@ -319,7 +319,7 @@
- case `uname -s` in
- HP-UX*) FMT=cat;;
- SunOS*) FMT=fake_fmt;;
--     *) FMT=fmt;;
-+     *) FMT="xargs echo";;
- esac
- 
- # If a parameter is not set via the command line or environment,
diff --git a/trunk/package/feeds/packages/postgresql/Makefile b/trunk/package/feeds/packages/postgresql/Makefile
deleted file mode 100644
index e3b5ceeb..00000000
--- a/trunk/package/feeds/packages/postgresql/Makefile
+++ /dev/null
@@ -1,254 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=postgresql
-PKG_VERSION:=9.0.17
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-PKG_LICENSE:=PostgreSQL
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=\
-	http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v$(PKG_VERSION) \
-	http://ftp.be.postgresql.org/postgresql/source/v$(PKG_VERSION) \
-	ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION)
-PKG_MD5SUM:=46bf3ef3761c091fb0d2e25012c1709e
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libpq
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib +libreadline +libpthread +libncurses +shadow-utils +shadow-su
-  TITLE:=PostgreSQL client library
-  URL:=http://www.postgresql.org/
-  SUBMENU:=database
-endef
-
-define Package/libpq/description
-PostgreSQL client library.
-endef
-
-define Package/pgsql-cli
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpq
-  TITLE:=Command Line Interface (CLI) to PostgreSQL databases
-  URL:=http://www.postgresql.org/
-  SUBMENU:=database
-endef
-
-define Package/pgsql-cli/description
-Command Line Interface (CLI) to PostgreSQL databases.
-endef
-
-define Package/pgsql-server
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpq
-  TITLE:=PostgreSQL databases Server
-  URL:=http://www.postgresql.org/
-  SUBMENU:=database
-endef
-
-define Package/pgsql-server/description
-PostgreSQL databases Server.
-endef
-
-# Need a native ecpg ,pg_config, and zic for build
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		./configure \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-integer-datetimes \
-			--disable-rpath \
-			--without-java \
-			--without-krb4 \
-			--without-krb5 \
-			--without-openssl \
-			--without-pam \
-			--without-perl \
-			--without-python \
-			--without-readline \
-			--without-rendezvous \
-			--without-tcl \
-			--without-tk \
-			--with-zlib="yes" \
-			--enable-depend \
-			--with-system-timezone=/tmp \
-	);
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc CC="$(HOSTCC)" CFLAGS+="-I../../libpq"
-	mv $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg \
-		$(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/timezone CC="$(HOSTCC)"
-	mv $(PKG_BUILD_DIR)/src/timezone/zic $(PKG_BUILD_DIR)/host-zic
-	$(INSTALL_DIR) $(STAGING_DIR)/host/bin/
-	$(CP) $(PKG_BUILD_DIR)/host-zic $(STAGING_DIR)/host/bin/zic
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/bin/pg_config CC="$(HOSTCC)"
-	mv $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config \
-		$(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host
-	$(MAKE) -C $(PKG_BUILD_DIR) distclean
-
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-integer-datetimes \
-			--disable-rpath \
-			--without-java \
-			--without-krb4 \
-			--without-krb5 \
-			--without-openssl \
-			--without-pam \
-			--without-perl \
-			--without-python \
-			--without-rendezvous \
-			--without-tcl \
-			--without-tk \
-			--with-zlib="yes" \
-			--enable-depend \
-			$(if $(CONFIG_TARGET_avr32),--disable-spinlocks) \
-	);
-	$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = ../../preproc/ecpg.host@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
-endef
-
-TARGET_CFLAGS += $(FPIC) -lpthread
-
-# because PROFILE means something else in the project Makefile
-unexport PROFILE
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all
-	+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Package/libpq/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(1)/usr/lib/
-endef
-
-define Package/pgsql-cli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psql $(1)/usr/bin/
-endef
-
-define Package/pgsql-server/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/share/postgresql
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-	ln -sf postgres $(1)/usr/bin/postmaster
-
-	$(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
-
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/share/postgresql/* \
-		$(1)/usr/share/postgresql
-
-	$(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/postgresql
-
-	$(CP) -r \
-		$(PKG_INSTALL_DIR)/usr/lib/postgresql \
-		$(1)/usr/lib
-endef
-
-define Package/pgsql-server/conffiles
-/etc/config/postgresql
-endef
-
-define Package/pgsql-server/postinst
-#!/bin/sh
-grep -q '^postgres:' /etc/passwd && exit 0
-group=$$(grep '^postgres:' /etc/group | cut -f3 -d:)
-if [ -z "$${group}" ] ; then
-	group=1000
-	tst=$$(cat /etc/group | grep ":$${group}:")
-	while [ -n "$${tst}" ] ; do
-		group=$$(($${group}+1))
-		tst=$$(cat /etc/group | grep ":$${group}:")
-	done
-	echo "postgres:x:$${group}:" >>/etc/group
-fi
-
-user=$$(cat /etc/passwd | grep "^postgres:")
-if [ -z "$${user}" ] ; then
-	num="$${group}"
-	tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
-	while [ -n "$${tst}" ] ; do
-		num=$$(($${num}+1))
-		tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
-	done
-	echo "postgres:*:$${num}:$${group}:PostgreSQL administrator:/tmp:/bin/ash" >>/etc/passwd
-fi
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config_manual.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(1)/usr/bin/ecpg
-	$(CP) $(PKG_BUILD_DIR)/host-zic $(1)/usr/bin/zic
-endef
-
-$(eval $(call BuildPackage,libpq))
-$(eval $(call BuildPackage,pgsql-cli))
-$(eval $(call BuildPackage,pgsql-server))
diff --git a/trunk/package/feeds/packages/postgresql/files/postgresql.config b/trunk/package/feeds/packages/postgresql/files/postgresql.config
deleted file mode 100644
index df17c127..00000000
--- a/trunk/package/feeds/packages/postgresql/files/postgresql.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config postgresql config
-	option PGUSER	postgres
-	option PGDATA	/var/postgresql/data
-	option PGLOG	/var/postgresql/data/postgresql.log
-	option PG_CTL	/usr/bin/pg_ctl
diff --git a/trunk/package/feeds/packages/postgresql/files/postgresql.init b/trunk/package/feeds/packages/postgresql/files/postgresql.init
deleted file mode 100644
index 1e1c52f9..00000000
--- a/trunk/package/feeds/packages/postgresql/files/postgresql.init
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
-
-EXTRA_COMMANDS="status reload"
-
-config_load "postgresql"
-config_get pgdata config PGDATA
-config_get pguser config PGUSER
-config_get pgctl config PG_CTL
-config_get pglog config PGLOG
-
-start() {
-    if [ ! -e /usr/bin/su ]; then
-        echo "The su command is requred to run postgres"
-        exit 1
-    fi
-
-    if [ ! -d ${pgdata} ]; then
-        echo "Create the data directory (${pgdata}) and try again"
-        exit 1
-    fi
-
-    echo "starting postgres..."
-    # make sure localhost (without a dot) is in /etc/hosts
-    grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts
-
-    # for whatever reason, /dev/null gets wrong perms
-    chmod a+w /dev/null
-
-    if [ -f ${pgdata}/postmaster.pid ]; then
-        rm ${pgdata}/postmaster.pid
-    fi
-
-    config_get pgopts config PGOPTS
-    if [ -n "${pgopts}" ]; then
-        pgopts="-o ${pgopts}"
-    fi
-    /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
-
-    while :
-    do
-        cnt=$((${cnt} + 1))
-        if [ -f "${pgdata}/postmaster.pid" ]; then
-            ret=0
-            break
-        fi
-
-        if [ ${cnt} -eq 30 ]; then
-            echo "Postgres failed to start.  See ${pglog} for details"
-            ret=1
-            break
-        fi
-        sleep 1
-    done
-
-    echo "ok"
-    return ${ret}
-}
-
-stop() {
-    echo "stopping postgres..."
-    /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast"
-    ret=$?
-    if [ -f ${pgdata}/postmaster.pid ]; then
-        rm ${pgdata}/postmaster.pid
-    fi
-    echo "ok"
-    return ${ret}
-}
-
-restart() {
-    echo "restarting postgres..."
-    /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast -w"
-    if [ -f ${pgdata}/postmaster.pid ]; then
-        rm ${pgdata}/postmaster.pid
-    fi
-    /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
-    echo "ok"
-    return $?
-}
-
-reload() {
-    echo "reloading postgres..."
-    /usr/bin/su ${pguser} -c "${pgctl} reload -D '${pgdata}' -s"
-    echo "ok"
-}
-
-status() {
-    echo "status postgres..."
-    /usr/bin/su ${pguser} -c "${pgctl} status -D '${pgdata}'"
-    echo "ok"
-}
diff --git a/trunk/package/feeds/packages/postgresql/patches/200-ranlib.patch b/trunk/package/feeds/packages/postgresql/patches/200-ranlib.patch
deleted file mode 100644
index 1b68b837..00000000
--- a/trunk/package/feeds/packages/postgresql/patches/200-ranlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/port/Makefile
-+++ b/src/port/Makefile
-@@ -53,6 +53,7 @@ uninstall:
- 
- libpgport.a: $(OBJS)
- 	$(AR) $(AROPT) $@ $^
-+	$(RANLIB) libpgport.a
- 
- # thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not)
- thread.o: thread.c
diff --git a/trunk/package/feeds/packages/postgresql/patches/800-busybox-default-pager.patch b/trunk/package/feeds/packages/postgresql/patches/800-busybox-default-pager.patch
deleted file mode 100644
index 3cd25323..00000000
--- a/trunk/package/feeds/packages/postgresql/patches/800-busybox-default-pager.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/bin/psql/print.h
-+++ b/src/bin/psql/print.h
-@@ -171,10 +171,6 @@ extern void printQuery(const PGresult *r
- extern void setDecimalLocale(void);
- extern const printTextFormat *get_line_style(const printTableOpt *opt);
- 
--#ifndef __CYGWIN__
--#define DEFAULT_PAGER "more"
--#else
- #define DEFAULT_PAGER "less"
--#endif
- 
- #endif   /* PRINT_H */
diff --git a/trunk/package/feeds/packages/pps-tools/Makefile b/trunk/package/feeds/packages/pps-tools/Makefile
deleted file mode 100644
index 93d0578d..00000000
--- a/trunk/package/feeds/packages/pps-tools/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pps-tools
-PKG_VERSION:=2014-08-01
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/ago/pps-tools
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0deb9c7e135e9380a6d09e9d2e938a146bb698c8
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-PKG_MAINTAINER := Zoltan HERPAI <wigyori@uid0.hu>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pps-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=PPS-tools
-  DEPENDS:=@LINUX_3_10||@LINUX_3_13||@LINUX_3_14
-endef
-
-define Package/pps-tools/description
-  Userland tools for GPS and DCF-77 Clock syncronization. PPS support in Kernel must be enabled.
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/timepps.h $(1)/usr/include/
-endef
-
-define Package/pps-tools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ppsctl $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ppstest $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ppswatch $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,pps-tools))
diff --git a/trunk/package/feeds/packages/privoxy/Makefile b/trunk/package/feeds/packages/privoxy/Makefile
deleted file mode 100644
index 76f56156..00000000
--- a/trunk/package/feeds/packages/privoxy/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=privoxy
-PKG_VERSION:=3.0.23
-PKG_RELEASE:=3
-
-PKG_SOURCE:=privoxy-$(PKG_VERSION)-stable-src.tar.gz
-PKG_SOURCE_URL:=@SF/ijbswa
-PKG_MD5SUM:=bbe47d5ff1a54d9f9fc93a160532697f
-PKG_BUILD_DIR:=$(BUILD_DIR)/privoxy-$(PKG_VERSION)-stable
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_MAINTAINER:=christian.schoenebeck@gmail.com
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  DEPENDS:=+libpcre +libpthread +zlib
-  TITLE:=Privoxy WEB Proxy
-  URL:=http://www.privoxy.org/
-  USERID:=privoxy=8118:privoxy=8118
-endef
-
-# shown in LuCI package description
-define Package/$(PKG_NAME)/description
-$(TITLE) - Homepage: www.privoxy.org
-endef
-
-# shown in make menuconfig <Help>
-define Package/$(PKG_NAME)/config
-help
-	Privoxy is a web proxy with advanced filtering capabilities for protecting
-	privacy, modifying web page content, managing cookies, controlling access,
-	and removing ads, banners, pop-ups and other obnoxious Internet junk. 
-	Privoxy has a very flexible configuration and can be customized to suit
-	individual needs and tastes. 
-	Privoxy has application for both stand-alone systems and multi-user networks.
-
-	Run as : $(USERID)
-	Version: $(PKG_VERSION)-$(PKG_RELEASE)
-	Home   : $(URL)
-
-	$(PKG_MAINTAINER)
-endef
-
-CONFIGURE_ARGS += \
-	--sysconfdir=/etc/privoxy
-
-# needed otherwise errors during compile
-MAKE_FLAGS:=
-
-define Package/$(PKG_NAME)/conffiles
-/etc/config/privoxy
-/etc/privoxy/user.action
-/etc/privoxy/user.filter
-/etc/privoxy/user.trust
-endef
-
-define Package/$(PKG_NAME)/preinst
-	#!/bin/sh
-	[ -n "$${IPKG_INSTROOT}" ] && exit 0	# if run within buildroot exit
-
-	# stop service if PKG_UPGRADE
-	[ "$${PKG_UPGRADE}" = "1" ] && /etc/init.d/privoxy stop >/dev/null 2>&1
-		
-	exit 0	# supress errors from stop command
-endef
-
-define Package/$(PKG_NAME)/install
-	if [ -f $(PKG_INSTALL_DIR)/etc/privoxy/trust ]; then \
-		mv -f $(PKG_INSTALL_DIR)/etc/privoxy/trust $(PKG_INSTALL_DIR)/etc/privoxy/user.trust; \
-	fi
-	if [ -f $(PKG_INSTALL_DIR)/etc/privoxy/config ]; then \
-		rm -f $(PKG_INSTALL_DIR)/etc/privoxy/config; \
-	fi
-
-	$(INSTALL_DIR) \
-		$(1)/usr/sbin\
-		$(1)/etc/privoxy/templates
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/
-	find $(PKG_INSTALL_DIR)/etc/privoxy/templates -maxdepth 1 -type f \
-		-exec $(INSTALL_DATA) -t $(1)/etc/privoxy/templates {} \;
-	find $(PKG_INSTALL_DIR)/etc/privoxy -maxdepth 1 -type f \
-		-exec install -m0664 -t $(1)/etc/privoxy {} \;
-
-	$(INSTALL_DIR) \
-		$(1)/etc/init.d \
-		$(1)/etc/hotplug.d/iface \
-		$(1)/etc/config
-	$(INSTALL_BIN)  ./files/privoxy.init $(1)/etc/init.d/privoxy
-	$(INSTALL_BIN)  ./files/privoxy.hotplug $(1)/etc/hotplug.d/iface/80-privoxy
-	$(INSTALL_CONF) ./files/privoxy.config $(1)/etc/config/privoxy
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/trunk/package/feeds/packages/privoxy/files/privoxy.config b/trunk/package/feeds/packages/privoxy/files/privoxy.config
deleted file mode 100644
index 95b6cf10..00000000
--- a/trunk/package/feeds/packages/privoxy/files/privoxy.config
+++ /dev/null
@@ -1,44 +0,0 @@
-# this file support all available configuration options of Privoxy web-proxy
-# the scripts move all options to the final privoxy readable configuration file
-#
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# !!! privoxy uses "-" in option names but uci only support "_"         !!!
-# !!! privoxy "listen-address" must be uci "listen_address"             !!!
-# !!!                                                                   !!!
-# !!! if you add entries please use                                     !!!
-# !!! option for options with one parameter (option confdir)            !!!
-# !!! list   for options with multiple parameters (list listen_address) !!!
-# !!!                                                                   !!!
-# !!! special handling for debug option                                 !!!
-# !!! privoxy option "debug 1024" must be uci option debug_1024 '1'     !!!
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-config	privoxy	'privoxy'
-	option	confdir		'/etc/privoxy'
-	option	logdir		'/var/log'
-	option	logfile		'privoxy.log'
-	list	filterfile	'default.filter'
-#	list	filterfile	'user.filter'
-	list	actionsfile	'match-all.action'
-	list	actionsfile	'default.action'
-#	list	actionsfile	'user.action'
-#	list	listen_address	'127.0.0.1:8118'
-	list	listen_address	'192.168.1.1:8118'
-	option	toggle		'1'
-	option	enable_remote_toggle	'1'
-	option	enable_remote_http_toggle	'0'
-	option	enable_edit_actions	'1'
-	option	enforce_blocks		'0'
-	option	buffer_limit		'4096'
-	option	forwarded_connect_retries	'0'
-	option	accept_intercepted_requests	'0'
-	option	allow_cgi_request_crunching	'0'
-	option	split_large_forms	'0'
-	option	keep_alive_timeout	'300'
-	option	socket_timeout		'300'
-	list	permit_access		'192.168.1.0/24'
-	option	debug_1		'0'
-	option	debug_512	'1'
-	option	debug_1024	'0'
-	option	debug_4096	'1'
-	option	debug_8192	'1'
diff --git a/trunk/package/feeds/packages/privoxy/files/privoxy.hotplug b/trunk/package/feeds/packages/privoxy/files/privoxy.hotplug
deleted file mode 100644
index bd668017..00000000
--- a/trunk/package/feeds/packages/privoxy/files/privoxy.hotplug
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# only (re-)start on ifup
-[ "$ACTION" = "ifup" ] || exit 0
-
-PIDFILE=/var/run/privoxy.pid
-
-_PID=$(cat $PIDFILE 2>/dev/null)
-kill -1 $_PID 2>/dev/null
-if [ $? -eq 0 ]; then
-	# only restart if already running
-	logger -p daemon.info -t "privoxy[$_PID]" \
-		"Restart request due to '$ACTION' of interface '$INTERFACE'"
-	/etc/init.d/privoxy restart
-else
-	# only start if enabled
-	/etc/init.d/privoxy enabled && /etc/init.d/privoxy start
-fi
diff --git a/trunk/package/feeds/packages/privoxy/files/privoxy.init b/trunk/package/feeds/packages/privoxy/files/privoxy.init
deleted file mode 100644
index b8d978fc..00000000
--- a/trunk/package/feeds/packages/privoxy/files/privoxy.init
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=80
-STOP=20
-
-PIDFILE=/var/run/privoxy.pid
-CFGFILE=/var/etc/privoxy.conf
-CFGTEMP=/var/etc/privoxy.conf.tmp
-
-_uci2conf() {
-	# redefined callback for options when calling config_load
-	option_cb()
-	{
-		# $1	name of variable
-		# $2	value
-		local __OPT="$1"
-		local __VAL="$2"
-		case $__OPT in
-			confdir|templdir|temporary_directory|logdir|logfile)
-				# needs to be handled separately because we need to set permissions
-				# AND needs to be defined first because of a BUG inside privoxy
-				# require directories to be defined first inside config 
-				;;
-			debug_*)
-				[ $__VAL -eq 0 ] && return	# not set ignore
-				echo -e "debug\t$(echo $__OPT | sed -e 's#debug_##g')" >> $CFGTEMP ;;
-			*)
-				# detect list options (LENGTH) and ignore
-				echo $__OPT | grep -i "_LENGTH" >/dev/null 2>&1 && return
-				# detect list options (ITEM) and ignore
-				echo $__OPT | grep -i "_ITEM" >/dev/null 2>&1 && __OPT=$(echo $__OPT | sed -e "s#_ITEM.##g")
-				# uci only accept "_" but we need "-"
-				local __OPT=$(echo $__OPT | sed -e "s#_#-#g")
-				# write to config
-				echo -e "$__OPT\t$__VAL" >> $CFGTEMP
-				;;
-		esac
-	}
-
-	# temporary config file
-	# privoxy need read access
-	mkdir -m0755 -p /var/etc
-	echo "" > $CFGTEMP
-	chmod 644 $CFGTEMP
-	chgrp privoxy $CFGTEMP
-
-	echo '### AUTO-GENERATED CONFIGURATION'	   >> $CFGTEMP
-	echo '### USED BY PRIVOXY'		   >> $CFGTEMP
-	echo '### DO NOT EDIT'			   >> $CFGTEMP
-	echo '### SEE /etc/config/privoxy INSTEAD' >> $CFGTEMP
-	echo ''					   >> $CFGTEMP
-
-	# confdir
-	# privoxy needs read access (possibly write access)
-	_CONFDIR=$(uci -q get privoxy.privoxy.confdir) || _CONFDIR="/etc/privoxy"
-	chmod 755 $_CONFDIR
-	chmod 664 $_CONFDIR/*
-	chgrp privoxy $_CONFDIR $_CONFDIR/*
-	echo -e "confdir\t$_CONFDIR" >> $CFGTEMP
-
-	# templdir
-	# privoxy need read access
-	_TEMPLDIR=$(uci -q get privoxy.privoxy.templdir)	# no default needed
-	if [ -z "$_TEMPLDIR" ]; then
-		chmod 755 $_CONFDIR/templates
-		chmod 644 $_CONFDIR/templates/*
-		chgrp privoxy $_CONFDIR/templates $_CONFDIR/templates/*
-	else
-		chmod 755 $_TEMPLDIR
-		chmod 644 $_TEMPLDIR/*
-		chgrp privoxy $_TEMPLDIR $_TEMPLDIR/*
-		echo -e "templdir\t$_TEMPLDIR" >> $CFGTEMP
-	fi
-
-	# logdir and logfile
-	# privoxy needs read/write access
-	_LOGDIR=$(uci -q get privoxy.privoxy.logdir)   || _LOGDIR="/var/log"
-	_LOGFILE=$(uci -q get privoxy.privoxy.logfile) || _LOGFILE="privoxy.log"
-	mkdir -m0755 -p $_LOGDIR
-	touch $_LOGDIR/$_LOGFILE
-	chmod 664 $_LOGDIR/$_LOGFILE
-	chown privoxy:privoxy $_LOGDIR/$_LOGFILE
-	echo -e "logdir\t$_LOGDIR" >> $CFGTEMP
-	echo -e "logfile\t$_LOGFILE" >> $CFGTEMP
-
-	# temporary-directory
-	# privoxy needs read/write access
-	_TMP_DIR=$(uci -q get privoxy.privoxy.temporary_directory)	# no default needed
-	if [ -n "$_TMP_DIR" ]; then
-		mkdir -m0750 -p $_TMP_DIR
-		chown privoxy:privoxy $_TMP_DIR
-		echo -e "temporary-directory\t$_TMP_DIR" >> $CFGTEMP
-	fi
-
-	config_load privoxy	# calling above option_cb() and write the rest into $CFGTEMP
-
-	# move temp to final privoxy readable configuration
-	mv -f $CFGTEMP $CFGFILE
-	return 0
-}
-
-boot() {
-	return 0	# will be started by "iface" hotplug events
-}
-
-start() {
-	# if already running do nothing
-	local _PID=$(cat $PIDFILE 2>/dev/null)
-	kill -1 $_PID 2>/dev/null && return 0
-
-	_uci2conf
-	/usr/sbin/privoxy --pidfile $PIDFILE --user privoxy.privoxy $CFGFILE
-
-	# verify startup
-	_PID=$(cat $PIDFILE 2>/dev/null)
-	kill -1 $_PID 2>/dev/null
-	local _ERR=$?
-	[ $_ERR -eq 0 ] \
-		&& logger -p daemon.notice -t "privoxy[$_PID]" "Started successfully"\
-		|| logger -p daemon.warn -t "privoxy[-----]" "Failed to start"
-	return $_ERR
-}
-
-reload() {
-	# reload is also used by luci-app-privoxy
-	local _PID=$(cat $PIDFILE 2>/dev/null)
-	kill -1 $_PID 2>/dev/null
-	if [ $? -eq 0 ]; then
-		# only restart if already running
-		restart
-	else
-		# only start if enabled
-		enabled && start
-	fi
-	return 0
-}
-
-stop() {
-	local _PID=$(cat $PIDFILE 2>/dev/null)
-	kill -15 $_PID 2>/dev/null
-	sleep 1			# give time to shutdown
-	local _tmp=$(pgrep privoxy | tr "\n" " ")
-	if [ -z "$_tmp" ]; then
-		logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully"
-	else
-		kill -9 $_tmp	# Normally never come here
-		logger -p daemon.warn -t "privoxy[-----]" "Shutdown forced by KILL"
-	fi
-	return 0
-}
diff --git a/trunk/package/feeds/packages/procps/Makefile b/trunk/package/feeds/packages/procps/Makefile
deleted file mode 100644
index 25d1ddbc..00000000
--- a/trunk/package/feeds/packages/procps/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=procps
-PKG_VERSION:=3.2.8
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING COPYING.LIB
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://procps.sourceforge.net
-PKG_MD5SUM:=9532714b6846013ca9898984ba4cd7e0
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-PROCPS_APPLETS := \
-    ps free pgrep pkill pmap pwdx skill w \
-    slabtop snice tload top vmstat watch
-
-define Package/procps/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=proc utilities
-  URL:=http://procps.sourceforge.net/
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-endef
-
-define Package/procps
-  $(call Package/procps/Default)
-  MENU:=1
-endef
-
-define Package/procps/description
- procps is the package that has a bunch of small useful utilities that give
- information about processes using the /proc filesystem. The package
- includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill.
-endef
-
-define GenPlugin
- define Package/$(1)
-   $(call Package/procps/Default)
-   DEPENDS:=procps
-   TITLE:=Applet $(2) from the procps package
-   DEFAULT:=y
- endef
-
- define Package/$(1)/description
-  Installs the applet $(2).
- endef
-endef
-
-$(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,procps-$(a),$(a))))
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-
-define Package/procps/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/proc/libproc-$(PKG_VERSION).so $(1)/usr/lib/
-endef
-
-AUXDIR_ps := "ps/"
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(AUXDIR_$(2))$(2) $$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,procps-$(a),$(a))))
-$(eval $(call BuildPackage,procps))
diff --git a/trunk/package/feeds/packages/procps/patches/010-make_fix.patch b/trunk/package/feeds/packages/procps/patches/010-make_fix.patch
deleted file mode 100644
index 74b1d3cc..00000000
--- a/trunk/package/feeds/packages/procps/patches/010-make_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES)
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk ps/module.mk 
- 
- do_all:    $(ALL)
- 
diff --git a/trunk/package/feeds/packages/procps/patches/020_hz_fix.patch b/trunk/package/feeds/packages/procps/patches/020_hz_fix.patch
deleted file mode 100644
index 1954453a..00000000
--- a/trunk/package/feeds/packages/procps/patches/020_hz_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/proc/sysinfo.c
-+++ b/proc/sysinfo.c
-@@ -209,7 +209,12 @@ static int check_for_privs(void){
-   return !!rc;
- }
- 
-+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3
- static void init_libproc(void) __attribute__((constructor));
-+#else
-+static void init_libproc(void) __attribute__((constructor(200)));
-+#endif
-+
- static void init_libproc(void){
-   have_privs = check_for_privs();
-   // ought to count CPUs in /proc/stat instead of relying
---- a/proc/version.c
-+++ b/proc/version.c
-@@ -33,7 +33,12 @@ void display_version(void) {
- 
- int linux_version_code;
- 
-+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3
- static void init_Linux_version(void) __attribute__((constructor));
-+#else
-+static void init_Linux_version(void) __attribute__((constructor(100)));
-+#endif
-+
- static void init_Linux_version(void) {
-     static struct utsname uts;
-     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
---- a/proc/module.mk
-+++ b/proc/module.mk
-@@ -76,7 +76,7 @@ proc/$(ANAME): $(LIBOBJ)
- 
- #proc/$(SONAME): proc/library.map
- proc/$(SONAME): $(LIBOBJ)
--	$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc
-+	$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $(sort $^) -lc
- 
- 
- # AUTOMATIC DEPENDENCY GENERATION -- GCC AND GNUMAKE DEPENDENT
diff --git a/trunk/package/feeds/packages/procps/patches/030-fix-string-problems.patch b/trunk/package/feeds/packages/procps/patches/030-fix-string-problems.patch
deleted file mode 100644
index de3756bb..00000000
--- a/trunk/package/feeds/packages/procps/patches/030-fix-string-problems.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/proc/sig.c
-+++ b/proc/sig.c
-@@ -214,7 +214,7 @@ void pretty_print_signals(void){
-   while(++i <= number_of_signals){
-     int n;
-     n = printf("%2d %s", i, signal_number_to_name(i));
--    if(i%7) printf("           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
-+    if(i%7) printf("%s", "           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
-     else printf("\n");
-   }
-   if((i-1)%7) printf("\n");
diff --git a/trunk/package/feeds/packages/prosody/Makefile b/trunk/package/feeds/packages/prosody/Makefile
deleted file mode 100644
index 4ff6d38a..00000000
--- a/trunk/package/feeds/packages/prosody/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright (C) 2009-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=prosody
-PKG_VERSION:=0.9.8
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://prosody.im/downloads/source
-PKG_MD5SUM:=5144cd832a1860443e21e336dc560ee7
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=MIT/X11
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/prosody
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Instant Messaging
-  DEPENDS:=+luafilesystem +libidn +luaexpat +luasec +libopenssl +libidn +liblua 
-  TITLE:=XMPP server
-  URL:=http://prosody.im/
-  USERID:=prosody=54:prosody=54
-endef
-
-define Package/prosody/description
-  Prosody is an exciting new server for Jabber/XMPP
-  written in Lua. It aims to be easy to use, and light
-  on resources
-endef
-
-define Package/prosody/conffiles
-/etc/prosody/prosody.cfg.lua
-endef
-
-TARGET_CFLAGS += $(FPIC) 
-
-TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib 
-
-
-define Build/Configure
-	# this is *NOT* GNU autoconf stuff
-	(cd $(PKG_BUILD_DIR); ./configure \
-		--prefix=/usr \
-		--with-lua="$(STAGING_DIR)/host/bin" \
-		--with-lua-include="$(STAGING_DIR)/usr/include" \
-		--with-lua-lib="$(STAGING_DIR)/usr/lib" \
-		--cflags="$(TARGET_CFLAGS)" \
-		--ldflags="$(TARGET_LDFLAGS) -llua -lm -ldl -shared" \
-		--c-compiler="$(CC)" \
-		--linker="$(LD)" \
-		--datadir="/etc/prosody/data" \
-	)
-endef
-#	LDFLAGS="$(TARGET_LDFLAGS) -llua -lm -ldl" \
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
-	PREFIX="/usr" \
-
-define Package/prosody/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/prosody.init $(1)/etc/init.d/prosody
-	$(INSTALL_DIR) $(1)/etc/prosody
-	#$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/prosody/prosody.cfg.lua $(1)/etc/prosody/
-	$(INSTALL_CONF) ./files/prosody.cfg.lua $(1)/etc/prosody/
-	$(INSTALL_DIR) $(1)/etc/prosody/certs
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/prosody/certs/localhost.{crt,key} $(1)/etc/prosody/certs/
-	$(INSTALL_DIR) $(1)/etc/prosody/data
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prosody{,ctl} $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/prosody.version $(1)/usr/lib/prosody/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/core
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/core/*.lua $(1)/usr/lib/prosody/core/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/fallbacks
-	#$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/fallbacks/*.lua $(1)/usr/lib/prosody/fallbacks/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/*.lua $(1)/usr/lib/prosody/modules/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules/adhoc
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/adhoc/*.lua $(1)/usr/lib/prosody/modules/adhoc/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules/mod_s2s
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/mod_s2s/*.lua $(1)/usr/lib/prosody/modules/mod_s2s/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules/muc
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/muc/*.lua $(1)/usr/lib/prosody/modules/muc/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/modules/storage
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/modules/storage/*.lua $(1)/usr/lib/prosody/modules/storage/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/net
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/net/*.lua $(1)/usr/lib/prosody/net/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/net/http
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/net/http/*.lua $(1)/usr/lib/prosody/net/http/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/util
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.lua $(1)/usr/lib/prosody/util/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/*.so $(1)/usr/lib/prosody/util/
-	$(INSTALL_DIR) $(1)/usr/lib/prosody/util/sasl
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/sasl/*.lua $(1)/usr/lib/prosody/util/sasl/
-	#$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/prosody/util/sasl/*.so $(1)/usr/lib/prosody/util/sasl/
-endef
-
-define Package/prosody/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || {
-	echo "Fixing lua with paxctl if needed!!!"
-	[ -f /sbin/paxctl ] && {
-		paxctl  -v /usr/bin/ > /dev/null  2>&1
-		[ $$? -ne 0 ] && {
-			cp /usr/bin/lua /tmp
-			paxctl -c -m /tmp/lua > /dev/null  2>&1 
-			cp -f /tmp/lua /usr/bin/lua
-		}
-	}
-	exit 0
-}
-endef
-
-$(eval $(call BuildPackage,prosody))
diff --git a/trunk/package/feeds/packages/prosody/files/prosody.cfg.lua b/trunk/package/feeds/packages/prosody/files/prosody.cfg.lua
deleted file mode 100644
index 0fe42163..00000000
--- a/trunk/package/feeds/packages/prosody/files/prosody.cfg.lua
+++ /dev/null
@@ -1,170 +0,0 @@
--- Prosody Example Configuration File
---
--- Information on configuring Prosody can be found on our
--- website at http://prosody.im/doc/configure
---
--- Tip: You can check that the syntax of this file is correct
--- when you have finished by running: luac -p prosody.cfg.lua
--- If there are any errors, it will let you know what and where
--- they are, otherwise it will keep quiet.
---
--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
--- blanks. Good luck, and happy Jabbering!
-
-
----------- Server-wide settings ----------
--- Settings in this section apply to the whole server and are the default settings
--- for any virtual hosts
-
--- This is a (by default, empty) list of accounts that are admins
--- for the server. Note that you must create the accounts separately
--- (see http://prosody.im/doc/creating_accounts for info)
--- Example: admins = { "user1@example.com", "user2@example.net" }
-admins = { }
-
--- Enable use of libevent for better performance under high load
--- For more information see: http://prosody.im/doc/libevent
---use_libevent = true;
-
--- This is the list of modules Prosody will load on startup.
--- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
--- Documentation on modules can be found at: http://prosody.im/doc/modules
-modules_enabled = {
-
-	-- Generally required
-		"roster"; -- Allow users to have a roster. Recommended ;)
-		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-		"tls"; -- Add support for secure TLS on c2s/s2s connections
-		"dialback"; -- s2s dialback support
-		"disco"; -- Service discovery
-
-	-- Not essential, but recommended
-		"private"; -- Private XML storage (for room bookmarks, etc.)
-		"vcard"; -- Allow users to set vCards
-		--"privacy"; -- Support privacy lists
-		--"compression"; -- Stream compression
-
-	-- Nice to have
-		"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-		"version"; -- Replies to server version requests
-		"uptime"; -- Report how long server has been running
-		"time"; -- Let others know the time here on this server
-		"ping"; -- Replies to XMPP pings with pongs
-		"pep"; -- Enables users to publish their mood, activity, playing music and more
-		"register"; -- Allow users to register on this server using a client and change passwords
-		"adhoc"; -- Support for "ad-hoc commands" that can be executed with an XMPP client
-
-	-- Admin interfaces
-		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-
-	-- Other specific functionality
-		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-		--"httpserver"; -- Serve static files from a directory over HTTP
-		--"groups"; -- Shared roster support
-		--"announce"; -- Send announcement to all online users
-		--"welcome"; -- Welcome users who register accounts
-		--"watchregistrations"; -- Alert admins of registrations
-		--"motd"; -- Send a message to users when they log in
-};
-
--- These modules are auto-loaded, should you
--- (for some mad reason) want to disable
--- them then uncomment them below
-modules_disabled = {
-	-- "presence"; -- Route user/contact status information
-	-- "message"; -- Route messages
-	-- "iq"; -- Route info queries
-	-- "offline"; -- Store offline messages
-};
-
--- Disable account creation by default, for security
--- For more information see http://prosody.im/doc/creating_accounts
-allow_registration = false;
-
--- Only allow encrypted streams? Encryption is already used when
--- available. These options will cause Prosody to deny connections that
--- are not encrypted. Note that some servers do not support s2s
--- encryption or have it disabled, including gmail.com and Google Apps
--- domains.
-
---c2s_require_encryption = false
---s2s_require_encryption = false
-
--- Select the authentication backend to use. The 'internal' providers
--- use Prosody's configured data storage to store the authentication data.
--- To allow Prosody to offer secure authentication mechanisms to clients, the
--- default provider stores passwords in plaintext. If you do not trust your
--- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
--- for information about using the hashed backend.
--- See http://prosody.im/doc/authentication for other possibilities including
--- Cyrus SASL.
-
-authentication = "internal_plain"
-
--- Select the storage backend to use. By default Prosody uses flat files
--- in its configured data directory, but it also supports more backends
--- through modules. An "sql" backend is included by default, but requires
--- additional dependencies. See http://prosody.im/doc/storage for more info.
-
---storage = "sql" -- Default is "internal"
-
--- For the "sql" backend, you can uncomment *one* of the below to configure:
---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
-
--- Logging configuration
--- For advanced logging see http://prosody.im/doc/logging
-log = {
-	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-	error = "/var/log/prosody/prosody.err";
-	-- "*syslog"; -- Uncomment this for logging to syslog; needs mod_posix
-	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
-}
-
--- Pidfile, used by prosodyctl and the init.d script
-pidfile = "/var/run/prosody/prosody.pid"
-
--- User and group, used for daemon
-prosody_user = "prosody"
-prosody_group = "prosody"
-
------------ Virtual hosts -----------
--- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
--- Settings under each VirtualHost entry apply *only* to that host.
-
-VirtualHost "localhost"
-
-VirtualHost "example.com"
-	enabled = false -- Remove this line to enable this host
-
-	-- Assign this host a certificate for TLS, otherwise it would use the one
-	-- set in the global section (if any).
-	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
-	-- use the global one.
-	ssl = {
-		key = "/etc/prosody/certs/example.com.key";
-		certificate = "/etc/prosody/certs/example.com.crt";
-	}
-
------- Components ------
--- You can specify components to add hosts that provide special services,
--- like multi-user conferences, and transports.
--- For more information on components, see http://prosody.im/doc/components
-
----Set up a MUC (multi-user chat) room server on conference.example.com:
---Component "conference.example.com" "muc"
-
--- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
---Component "proxy.example.com" "proxy65"
-
----Set up an external component (default component port is 5347)
---
--- External components allow adding various services, such as gateways/
--- transports to other networks like ICQ, MSN and Yahoo. For more info
--- see: http://prosody.im/doc/components#adding_an_external_component
---
---Component "gateway.example.com"
---	component_secret = "password"
diff --git a/trunk/package/feeds/packages/prosody/files/prosody.init b/trunk/package/feeds/packages/prosody/files/prosody.init
deleted file mode 100644
index bab0ae7d..00000000
--- a/trunk/package/feeds/packages/prosody/files/prosody.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
-
-START=99
-
-EXTRA_COMMANDS="status"
-EXTRA_HELP="	status	Print the status of the service"
-
-BIN=/usr/bin/prosodyctl
-LOG_D=/var/log/prosody
-RUN_D=/var/run/prosody
-PID_F=$RUN_D/prosody.pid
-RUN_USER=prosody
-RUN_GROUP=prosody
-
-start() {
-	[ -d /var/run/prosody ] || {
-		mkdir -m 0755 -p /var/run/prosody
-		chown prosody:prosody /var/run/prosody
-	}
-	[ -d /var/log/prosody ] || {
-		mkdir -m 0755 -p /var/log/prosody
-		chown prosody:prosody /var/log/prosody
-	}
-
-	[ -d /var/log/prosody ] && {
-		chown -R prosody:prosody /etc/prosody
-	}
-
-	[ -f /sbin/paxctl ] && {
-		paxctl  -v /usr/bin/ > /dev/null  2>&1	
-		[ $? -ne 0 ] && {
-			cp /usr/bin/lua /tmp
-			paxctl -c -m /tmp/lua
-			cp -f /tmp/lua /usr/bin/lua
-		}
-	}
-
-	
-	$BIN start
-}
-
-stop() {
-	$BIN stop
-}
-
-reload() {
-	[ -f $PID_F ] && kill -HUP $(cat $PID_F)
-}
-
-status() {
-	$BIN status
-}
diff --git a/trunk/package/feeds/packages/prosody/patches/010-fix-randomseed.patch b/trunk/package/feeds/packages/prosody/patches/010-fix-randomseed.patch
deleted file mode 100644
index 05bdffa6..00000000
--- a/trunk/package/feeds/packages/prosody/patches/010-fix-randomseed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u --recursive prosody-0.9.7-vanilla/net/dns.lua prosody-0.9.7/net/dns.lua
---- prosody-0.9.7-vanilla/net/dns.lua	2015-01-02 00:26:19.981433830 -0500
-+++ prosody-0.9.7/net/dns.lua	2015-01-02 00:33:10.467077715 -0500
-@@ -225,7 +225,7 @@
- 
- 
- function dns.random(...)    -- - - - - - - - - - - - - - - - - - -  dns.random
--	math.randomseed(math.floor(10000*socket.gettime()) % 0x100000000);
-+	math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000);
- 	dns.random = math.random;
- 	return dns.random(...);
- end
diff --git a/trunk/package/feeds/packages/protobuf-c/Makefile b/trunk/package/feeds/packages/protobuf-c/Makefile
deleted file mode 100644
index f4af211a..00000000
--- a/trunk/package/feeds/packages/protobuf-c/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libprotobuf-c
-PKG_VERSION:=v1.0.1
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/protobuf-c/protobuf-c.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-PKG_LICENSE:=BSD-2c
-
-PKG_MAINTAINER:=Jacob Siverskog <jacob@teenageengineering.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libprotobuf-c
-  TITLE:=Protocol Buffers library
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=http://code.google.com/p/protobuf-c/
-endef
-
-define Package/libprotobuf-c/description
-  Runtime library to use Google Protocol Buffers from C applications.
-  Protocol Buffers are a way of encoding structured data in an efficient yet
-  extensible format. Google uses Protocol Buffers for almost all of its
-  internal RPC protocols and file formats.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-protoc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libprotobuf-c/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libprotobuf-c))
diff --git a/trunk/package/feeds/packages/protobuf/Makefile b/trunk/package/feeds/packages/protobuf/Makefile
deleted file mode 100644
index e1d99f67..00000000
--- a/trunk/package/feeds/packages/protobuf/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=protobuf
-PKG_VERSION:=2.5.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://protobuf.googlecode.com/files
-PKG_MD5SUM:=a72001a9067a4c2c4e0e836d0f92ece4
-
-PKG_BUILD_DEPENDS:=protobuf/host
-PKG_USE_MIPS16:=0
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/protobuf
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A structured data encoding library
-  URL:=http://code.google.com/p/protobuf/
-  DEPENDS:=+zlib +libpthread +libstdcpp
-  MAINTAINER:=Obinou <obconseil@gmail.com>
-endef
-
-define Package/protobuf/description
- Protocol Buffers are a way of encoding structured data in an efficient
- yet extensible format. Google uses Protocol Buffers for almost all
- of its internal RPC protocols and file formats.
-endef
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-CONFIGURE_ARGS += --with-protoc=$(HOST_BUILD_DIR)/src/protoc
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/lib \
-		$(1)/usr/include
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/* \
-		$(1)/usr/lib/
-endef
-
-define Package/protobuf/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotoc.so*  \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf-lite.so* \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,protobuf))
-$(eval $(call HostBuild))
diff --git a/trunk/package/feeds/packages/protobuf/patches/001-mipseb-compile.patch b/trunk/package/feeds/packages/protobuf/patches/001-mipseb-compile.patch
deleted file mode 100644
index 6eb05900..00000000
--- a/trunk/package/feeds/packages/protobuf/patches/001-mipseb-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/google/protobuf/stubs/platform_macros.h
-+++ b/src/google/protobuf/stubs/platform_macros.h
-@@ -49,7 +49,7 @@
- #elif defined(__ARMEL__)
- #define GOOGLE_PROTOBUF_ARCH_ARM 1
- #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
--#elif defined(__MIPSEL__)
-+#elif defined(__MIPSEL__) || defined(__MIPSEB__)
- #define GOOGLE_PROTOBUF_ARCH_MIPS 1
- #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
- #elif defined(__pnacl__)
diff --git a/trunk/package/feeds/packages/pthsem/Makefile b/trunk/package/feeds/packages/pthsem/Makefile
deleted file mode 100644
index 6e07e685..00000000
--- a/trunk/package/feeds/packages/pthsem/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pthsem
-PKG_VERSION:=2.0.8
-PKG_RELEASE:=3
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/
-PKG_MD5SUM:=9144b26dcc27e67498d63dd5456f934c
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pthsem
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU pth extended with semaphore support
-  URL:=http://www.auto.tuwien.ac.at/~mkoegler/index.php/pth
-endef
-
-define Package/pthsem/description
-  GNU pth is a user mode multi threading library.
-  pthsem is an extend version, with support for semaphores added. It can be installed parallel to a normal pth.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pthsem-config $(1)/usr/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/pthsem-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/libpthsem.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/pthsem.pc $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DIR) $(2)/bin
-	$(LN) ../../usr/bin/pthsem-config $(2)/bin/
-endef
-
-define Package/pthsem/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpthsem.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,pthsem))
diff --git a/trunk/package/feeds/packages/pthsem/patches/001-linux3x-fix.patch b/trunk/package/feeds/packages/pthsem/patches/001-linux3x-fix.patch
deleted file mode 100644
index 3b968f72..00000000
--- a/trunk/package/feeds/packages/pthsem/patches/001-linux3x-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pthsem-2.0.8/acinclude.m4
-+++ pthsem-2.0.8/acinclude.m4
-@@ -892,6 +892,8 @@
-         case "x`uname -r`" in
- changequote(, )dnl
-             x2.[23456789]* ) ;;
-+changequote(, )dnl
-+            x3.* ) ;;
- changequote([, ])
-             * ) braindead=yes ;;
-         esac
-
diff --git a/trunk/package/feeds/packages/pulseaudio/Makefile b/trunk/package/feeds/packages/pulseaudio/Makefile
deleted file mode 100644
index 23a8c80d..00000000
--- a/trunk/package/feeds/packages/pulseaudio/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pulseaudio
-PKG_VERSION:=6.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/
-PKG_MD5SUM:=b691e83b7434c678dffacfa3a027750e
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=GPL LICENSE
-
-PKG_BUILD_DEPENDS:=intltool/host
-
-PKG_FIXUP:=autoreconf
-PKG_USE_MIPS16:=0
-
-PKG_INSTALL = 1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-#TODO: split pulse into executable and library (or even better into several libraries since they're used as loadable modules, so not linked into)
-define Package/pulseaudio/Default
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libspeexdsp +libsndfile +libltdl +libpthread \
-	+librt +alsa-lib +libjson +libopenssl +libwrap +libcap $(ICONV_DEPENDS) $(INTL_DEPENDS)
-  TITLE:=Network sound server
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.pulseaudio.org
-  PROVIDES:=pulseaudio
-  USERID:=pulse=51:pulse=51
-endef
-
-define Package/pulseaudio-daemon
-  $(call Package/pulseaudio/Default)
-  DEPENDS+=+libjson-c
-endef
-
-define Package/pulseaudio/Default/description
-  PulseAudio (formerly Polypaudio) is a cross-platform, networked sound server.
-endef
-
-define Package/pulseaudio-daemon/description
-  $(call Package/pulseaudio/Default/description)
-endef
-
-define Package/pulseaudio-daemon/conffiles
-/etc/pulse/client.conf
-/etc/pulse/daemon.conf
-/etc/pulse/default.pa
-/etc/pulse/system.pa
-endef
-
-define Package/pulseaudio-tools
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libsndfile pulseaudio
-  TITLE:=Tools for Pulseaudio
-  URL:=http://www.pulseaudio.org
-endef
-
-define Package/pulseaudio-profiles
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=pulseaudio
-  TITLE:=Profiles for Pulseaudio
-  URL:=http://www.pulseaudio.org
-endef
-
-CONFIGURE_ARGS += \
-	--with-system-user=pulse \
-	--with-system-group=pulse \
-	--with-access-group=audio \
-	--with-database=simple \
-	--enable-alsa \
-	--disable-hal \
-	--disable-gconf \
-	--disable-nls \
-	--disable-manpages \
-	--enable-oss-output \
-	--disable-oss-wrapper \
-	--disable-samplerate \
-	--disable-per-user-esound-socket \
-	--disable-solaris \
-	--disable-gtk2 \
-	--disable-glib2 \
-	--disable-jack \
-	--disable-asyncns \
-	--disable-lirc \
-	--disable-bluez \
-	--disable-udev \
-	--without-fftw \
-	--disable-avahi \
-	--disable-dbus
-
-CONFIGURE_VARS += \
-	PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
-
-#SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib
-TARGET_CFLAGS += -std=gnu99
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/lib/pkgconfig \
-		$(1)/usr/include/pulse \
-		$(1)/usr/lib \
-		$(1)/usr/lib/pulseaudio
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/pulse/* \
-		$(1)/usr/include/pulse
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
-		$(1)/usr/lib/pulseaudio/
-endef
-
-define Package/pulseaudio-daemon/install
-	$(INSTALL_DIR) \
-		$(1)/etc/pulse \
-		$(1)/etc/init.d \
-		$(1)/usr/bin \
-		$(1)/usr/lib \
-		$(1)/usr/lib/pulseaudio \
-		$(1)/usr/lib/pulse-$(PKG_VERSION)/modules
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/pulseaudio \
-		$(1)/usr/bin/pulseaudio
-
-	$(INSTALL_BIN) \
-		./files/pulseaudio.init \
-		$(1)/etc/init.d/pulseaudio
-
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/etc/pulse/* \
-		$(1)/etc/pulse
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
-		$(1)/usr/lib/pulseaudio/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \
-		$(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
-
-	chmod -R 0644 $(1)/etc/pulse/*
-endef
-
-define Package/pulseaudio-tools/install
-	$(INSTALL_DIR) \
-		$(1)/usr/bin
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/pa* \
-		$(1)/usr/bin/
-endef
-
-define Package/pulseaudio-profiles/install
-	$(INSTALL_DIR) \
-		$(1)/usr/share/pulseaudio/alsa-mixer/paths \
-		$(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
-
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/paths/* \
-		$(1)/usr/share/pulseaudio/alsa-mixer/paths
-
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/* \
-		$(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
-endef
-
-$(eval $(call BuildPackage,pulseaudio-daemon))
-$(eval $(call BuildPackage,pulseaudio-tools))
-$(eval $(call BuildPackage,pulseaudio-profiles))
diff --git a/trunk/package/feeds/packages/pulseaudio/files/pulseaudio.init b/trunk/package/feeds/packages/pulseaudio/files/pulseaudio.init
deleted file mode 100644
index 1262b941..00000000
--- a/trunk/package/feeds/packages/pulseaudio/files/pulseaudio.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
-
-START=65
-STOP=65
-
-USE_PROCD=1
-PROG=/usr/bin/pulseaudio
-
-start_service() {
-	[ -d /var/run/pulse ] || {
-		mkdir -m 0755 -p /var/run/pulse
-		chmod 0750 /var/run/pulse
-		chown pulse:pulse /var/run/pulse
-	}
-	[ -d /var/lib/pulse ] || {
-		mkdir -m 0755 -p /var/lib/pulse
-		chmod 0750 /var/lib/pulse
-		chown pulse:pulse /var/lib/pulse
-	}
-
-	chown root:pulse /dev/snd/* /dev/mixer /dev/dsp
-	chmod 664 /dev/snd/* /dev/mixer /dev/dsp
-
-	procd_open_instance
-	procd_set_param command $PROG --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false
-	procd_close_instance
-}
-
diff --git a/trunk/package/feeds/packages/pulseaudio/patches/001-no_default_64mb_alloc.patch b/trunk/package/feeds/packages/pulseaudio/patches/001-no_default_64mb_alloc.patch
deleted file mode 100644
index 8dd000b3..00000000
--- a/trunk/package/feeds/packages/pulseaudio/patches/001-no_default_64mb_alloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/pulsecore/memblock.c
-+++ b/src/pulsecore/memblock.c
-@@ -55,7 +55,7 @@
-  * stored in SHM and our OS does not commit the memory before we use
-  * it for the first time. */
- #define PA_MEMPOOL_SLOTS_MAX 1024
--#define PA_MEMPOOL_SLOT_SIZE (64*1024)
-+#define PA_MEMPOOL_SLOT_SIZE 64
- 
- #define PA_MEMEXPORT_SLOTS_MAX 128
- 
diff --git a/trunk/package/feeds/packages/pv/Makefile b/trunk/package/feeds/packages/pv/Makefile
deleted file mode 100644
index cbe44e51..00000000
--- a/trunk/package/feeds/packages/pv/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2008 David Cooper
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=pv
-PKG_VERSION:=1.5.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.ivarch.com/programs/sources/
-PKG_MD5SUM:=efe8e9e4cad5f3264a32258a63bf2c8e
-PKG_LICENSE:=Artistic-2.0
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pv
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Shell pipeline element to meter data passing through
-  URL:=http://www.ivarch.com/programs/pv.shtml
-endef
-
-define Package/pv/description
- Pipe Viewer is a terminal-based tool for monitoring the progress of data
- through a pipeline. It can be inserted into any normal pipeline between
- two processes to give a visual indication of how quickly data is passing
- through, how long it has taken, how near to completion it is, and an
- estimate of how long it will be until completion.
-endef
-
-define Package/pv/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pv $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,pv))
-
diff --git a/trunk/package/feeds/packages/python-dns/Makefile b/trunk/package/feeds/packages/python-dns/Makefile
deleted file mode 100644
index 8dd7106d..00000000
--- a/trunk/package/feeds/packages/python-dns/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python-dns
-PKG_RELEASE:=1
-PKG_VERSION:=1.12.0
-PKG_SOURCE_URL:=http://www.dnspython.org/kits/$(PKG_VERSION)
-PKG_MD5SUM:=3f2601ef3c8b77fc6d21a9c77a81efeb
-PKG_SOURCE:=dnspython-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DIR:=$(BUILD_DIR)/dnspython-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-dns
-	SECTION:=language-python
-	CATEGORY:=Languages
-	SUBMENU:=Python
-	TITLE:=dnspython
-	URL:=http://www.dnspython.org/
-	DEPENDS:=+python
-endef
-
-define Package/python-dns/description
- dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0.
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,\
-		install --prefix="$(PKG_INSTALL_DIR)/usr" \
-	)
-endef
-
-$(eval $(call PyPackage,python-dns))
-$(eval $(call BuildPackage,python-dns))
diff --git a/trunk/package/feeds/packages/python-imglib/Makefile b/trunk/package/feeds/packages/python-imglib/Makefile
deleted file mode 100644
index 1d12004a..00000000
--- a/trunk/package/feeds/packages/python-imglib/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (c) 1997-2009 by Secret Labs AB
-# Copyright (c) 1995-2009 by Fredrik Lundh
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python-imglib
-PKG_VERSION:=1.1.7
-PKG_RELEASE:=1
-PKG_LICENSE:=CUSTOM
-PKG_LICENSE_FILES:=README
-
-PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://effbot.org/downloads
-PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=python python-setuptools
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-imglib
-  SECTION:=language-python
-  CATEGORY:=Languages
-  SUBMENU:=Python
-  TITLE:=Python Imaging Library (PIL)
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-  URL:=http://www.pythonware.com/products/pil/
-  DEPENDS:=+python +libfreetype +libjpeg +zlib
-endef
-
-define Package/python-imglib/description
- The Python Imaging Library adds image processing capabilities to your
- Python interpreter.
-
- This library provides extensive file format support, an efficient
- internal representation, and fairly powerful image processing
- capabilities.
-
- The core image library is designed for fast access to data stored in a
- few basic pixel formats. It should provide a solid foundation for a
- general image processing tool.
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,., \
-		install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \
-	)
-endef
-
-define Package/python-imglib/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) \
-		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-		$(1)$(PYTHON_PKG_DIR)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,python-imglib))
diff --git a/trunk/package/feeds/packages/python-imglib/patches/010-cross-compile.patch b/trunk/package/feeds/packages/python-imglib/patches/010-cross-compile.patch
deleted file mode 100644
index 0aca43b3..00000000
--- a/trunk/package/feeds/packages/python-imglib/patches/010-cross-compile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rupN Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
---- Imaging-1.1.7.orig/setup.py	2009-11-15 17:06:10.000000000 +0100
-+++ Imaging-1.1.7/setup.py	2014-12-11 01:01:10.857100877 +0100
-@@ -34,10 +34,10 @@ def libinclude(root):
- # TIFF_ROOT = libinclude("/opt/tiff")
- 
- TCL_ROOT = None
--JPEG_ROOT = None
--ZLIB_ROOT = None
-+JPEG_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
-+ZLIB_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
- TIFF_ROOT = None
--FREETYPE_ROOT = None
-+FREETYPE_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
- LCMS_ROOT = None
- 
- # FIXME: add mechanism to explicitly *disable* the use of a library
-@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
-             add_directory(library_dirs, "/opt/local/lib")
-             add_directory(include_dirs, "/opt/local/include")
- 
--        add_directory(library_dirs, "/usr/local/lib")
-         # FIXME: check /opt/stuff directories here?
- 
-         prefix = sysconfig.get_config_var("prefix")
-@@ -199,22 +198,6 @@ class pil_build_ext(build_ext):
-             add_directory(include_dirs, include_root)
- 
-         #
--        # add standard directories
--
--        # look for tcl specific subdirectory (e.g debian)
--        if _tkinter:
--            tcl_dir = "/usr/include/tcl" + TCL_VERSION
--            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
--                add_directory(include_dirs, tcl_dir)
--
--        # standard locations
--        add_directory(library_dirs, "/usr/local/lib")
--        add_directory(include_dirs, "/usr/local/include")
--
--        add_directory(library_dirs, "/usr/lib")
--        add_directory(include_dirs, "/usr/include")
--
--        #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
- 
diff --git a/trunk/package/feeds/packages/python-imglib/patches/020-freetype-header-include.patch b/trunk/package/feeds/packages/python-imglib/patches/020-freetype-header-include.patch
deleted file mode 100644
index bf131aa7..00000000
--- a/trunk/package/feeds/packages/python-imglib/patches/020-freetype-header-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN Imaging-1.1.7.orig/_imagingft.c Imaging-1.1.7/_imagingft.c
---- Imaging-1.1.7.orig/_imagingft.c	2009-11-01 01:44:12.000000000 +0100
-+++ Imaging-1.1.7/_imagingft.c	2014-12-11 01:05:21.290135484 +0100
-@@ -32,7 +32,7 @@
- #include FT_FREETYPE_H
- #else
- /* freetype 2.0 */
--#include <freetype/freetype.h>
-+#include <freetype2/freetype.h>
- #endif
- 
- #if PY_VERSION_HEX < 0x01060000
-@@ -70,7 +70,7 @@ struct {
-     const char* message;
- } ft_errors[] =
- 
--#include <freetype/fterrors.h>
-+#include <freetype2/fterrors.h>
- 
- /* -------------------------------------------------------------------- */
- /* font objects */
diff --git a/trunk/package/feeds/packages/python-mysql/Makefile b/trunk/package/feeds/packages/python-mysql/Makefile
deleted file mode 100644
index 04ebe5be..00000000
--- a/trunk/package/feeds/packages/python-mysql/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=MySQL-python
-PKG_VERSION:=1.2.5
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=https://pypi.python.org/packages/source/M/MySQL-python/
-PKG_MD5SUM:=654f75b302db6ed8dc5a898c625e030c
-
-PKG_BUILD_DEPENDS:=python python-setuptools libmysqlclient
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-mysql
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=MySQL database adapter for Python
-  URL:=https://pypi.python.org/pypi/MySQL-python
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-  DEPENDS:=+python +libmysqlclient
-endef
-
-define Package/python-mysql/description
- MySQLdb is an thread-compatible interface to the popular MySQL database
- server that provides the Python database API.
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
-endef
-
-define Package/python-mysql/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) \
-	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-	    $(1)$(PYTHON_PKG_DIR)
-endef
-
-$(eval $(call BuildPackage,python-mysql))
diff --git a/trunk/package/feeds/packages/python-mysql/patches/010-threadsafe.patch b/trunk/package/feeds/packages/python-mysql/patches/010-threadsafe.patch
deleted file mode 100644
index bcd9af8d..00000000
--- a/trunk/package/feeds/packages/python-mysql/patches/010-threadsafe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MySQL-python-1.2.2/site_orig.cfg	2007-08-15 12:58:40.000000000 +0200
-+++ MySQL-python-1.2.2/site.cfg	2007-08-15 12:58:49.000000000 +0200
-@@ -4,7 +4,7 @@
- # static: link against a static library (probably required for embedded)
- 
- embedded = False
--threadsafe = True
-+threadsafe = False
- static = False
- 
- # The path to mysql_config.
diff --git a/trunk/package/feeds/packages/python-pip/Makefile b/trunk/package/feeds/packages/python-pip/Makefile
deleted file mode 100644
index d0607d16..00000000
--- a/trunk/package/feeds/packages/python-pip/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python-pip
-PKG_VERSION:=1.5.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=pip-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pip/
-PKG_MD5SUM:=01026f87978932060cc86c1dc527903e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pip-$(PKG_VERSION)
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-pip
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Tool for installing Python packages.
-  URL:=https://pip.pypa.io
-  DEPENDS:=+python +python-setuptools
-endef
-
-define Package/python-pip/description
-  A tool for installing and managing Python packages.
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,\
-		install --prefix="$(PKG_INSTALL_DIR)/usr" \
-	)
-endef
-
-PYTHON_PIP_PKG_DIR:=$(PYTHON_PKG_DIR)/pip-$(PKG_VERSION)-py$(PYTHON_VERSION).egg/pip
-define PyPackage/python-pip/filespec
-+|$(PYTHON_PKG_DIR)
--|$(PYTHON_PIP_PKG_DIR)/_vendor/distlib/*.exe
-endef
-
-# Backup these files, so that they do not clash with python-setuptools
-# If we install python-pip python-setuptools, we want these to be replaced,
-# since python-pip replaces python-setuptools (when installed)
-define Package/python-pip/preinst
-#!/bin/sh
-cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
-mv -f easy-install.pth easy-install.pth.old
-mv -f site.py site.py.old
-exit 0
-endef
-
-# And put them back on remove
-define Package/python-pip/postrm
-#!/bin/sh
-cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
-mv -f easy-install.pth.old easy-install.pth
-mv -f site.py.old site.py
-exit 0
-endef
-
-define PyPackage/python-pip/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-endef
-
-$(eval $(call PyPackage,python-pip))
-$(eval $(call BuildPackage,python-pip))
-
diff --git a/trunk/package/feeds/packages/python-setuptools/Makefile b/trunk/package/feeds/packages/python-setuptools/Makefile
deleted file mode 100644
index a2521192..00000000
--- a/trunk/package/feeds/packages/python-setuptools/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python-setuptools
-PKG_VERSION:=7.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=setuptools-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/setuptools/
-PKG_MD5SUM:=6245d6752e2ef803c365f560f7f2f940
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/setuptools-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-setuptools
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Tool for installing Python packages.
-  URL:=https://bitbucket.org/pypa/setuptools
-  DEPENDS:=+python
-endef
-
-define Package/python-setuptools/description
-  Easily download, build, install, upgrade, and uninstall Python packages
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,\
-		install --prefix="$(PKG_INSTALL_DIR)/usr" \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(PYTHON_LIB_DIR)
-	$(CP) \
-		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-		$(PYTHON_LIB_DIR)
-endef
-
-define PyPackage/python-setuptools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call PyPackage,python-setuptools))
-$(eval $(call BuildPackage,python-setuptools))
-
diff --git a/trunk/package/feeds/packages/python-setuptools/patches/0001-remove-windows-support.patch b/trunk/package/feeds/packages/python-setuptools/patches/0001-remove-windows-support.patch
deleted file mode 100644
index 0a2d50ba..00000000
--- a/trunk/package/feeds/packages/python-setuptools/patches/0001-remove-windows-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/setuptools/dist.py b/setuptools/dist.py
-index 6b9d350..1350e8a 100644
---- a/setuptools/dist.py
-+++ b/setuptools/dist.py
-@@ -15,7 +15,6 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
- 
- from setuptools.depends import Require
- from setuptools.compat import basestring, PY2
--from setuptools import windows_support
- import pkg_resources
- 
- def _get_unpatched(cls):
-@@ -310,7 +309,6 @@ class Distribution(_Distribution):
-         egg_cache_dir = os.path.join(os.curdir, '.eggs')
-         if not os.path.exists(egg_cache_dir):
-             os.mkdir(egg_cache_dir)
--            windows_support.hide_file(egg_cache_dir)
-             readme_txt_filename = os.path.join(egg_cache_dir, 'README.txt')
-             with open(readme_txt_filename, 'w') as f:
-                 f.write('This directory contains eggs that were downloaded '
diff --git a/trunk/package/feeds/packages/python/Makefile b/trunk/package/feeds/packages/python/Makefile
deleted file mode 100644
index 4a740dcd..00000000
--- a/trunk/package/feeds/packages/python/Makefile
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-# The file included below defines PYTHON_VERSION
-include ./files/python-package.mk
-
-PKG_NAME:=python
-PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-PKG_RELEASE:=5
-
-PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_MD5SUM:=38d530f7efc373d64a8fb1637e3baaa7
-
-PKG_LICENSE:=PSF
-PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=python/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/python/Default
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Python $(PYTHON_VERSION) programming language
-  URL:=http://www.python.org/
-  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-endef
-
-define Package/python/Default/description
- Python is a dynamic object-oriented programming language that can be used
- for many kinds of software development. It offers strong support for
- integration with other languages and tools, comes with extensive standard
- libraries, and can be learned in a few days. Many Python programmers
- report substantial productivity gains and feel the language encourages
- the development of higher quality, more maintainable code.
-endef
-
-define Package/python-base
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) interpreter
-  DEPENDS:=+libpthread +zlib
-endef
-
-define Package/python-base/description
-  This package contains only the interpreter and the bare minimum
-  for the interpreter to start.
-endef
-
-define Package/python-light
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) light installation
-  DEPENDS:=+python-base +libffi +libbz2
-endef
-
-define Package/python-light/description
-  This package is essentially the python-base package plus
-  a few of the rarely used (and big) libraries stripped out
-  into separate packages.
-endef
-
-# Define newline here, since it's not defined in OpenWRT
-define newline
-
-
-endef
-
-PYTHON_LIB_FILES_DEL:=
-PYTHON_PACKAGES:=
-define PyBasePackage
-  PYTHON_PACKAGES+=$(1)
-  PYTHON_LIB_FILES_DEL+=$(2)
-  define PyPackage/$(1)/filespec
-    $(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file)))
-  endef
-endef
-
-include ./files/python-package-*.mk
-
-define Package/python
-$(call Package/python/Default)
-  DEPENDS:=+python-light $(foreach package,$(PYTHON_PACKAGES),+$(package))
-endef
-
-define Package/python/description
-  This package contains the (almost) full Python install.
-  It's python-light + all other packages.
-endef
-
-MAKE_FLAGS+=\
-	CROSS_COMPILE=yes \
-	LD="$(TARGET_CC)" \
-	PGEN=pgen2
-
-EXTRA_CFLAGS+= \
-	-DNDEBUG -fno-inline
-EXTRA_LDFLAGS+= \
-	-L$(PKG_BUILD_DIR)
-
-ENABLE_IPV6:=
-ifeq ($(CONFIG_IPV6),y)
-	ENABLE_IPV6 += --enable-ipv6
-endif
-
-CONFIGURE_ARGS+= \
-	--sysconfdir=/etc \
-	--enable-shared \
-	--without-cxx-main \
-	--with-threads \
-	--with-system-ffi="$(STAGING_DIR)/usr" \
-	--without-pymalloc \
-	$(ENABLE_IPV6) \
-	CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
-	OPT="$(TARGET_CFLAGS)"
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/mk/
-	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
-	$(INSTALL_DATA) ./files/python-package.mk $(STAGING_DIR)/mk/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
-		$(1)/usr/include/
-	$(CP) \
-		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
-		$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(STAGING_DIR_HOST)/lib/pkgconfig/python.pc \
-		$(STAGING_DIR_HOST)/lib/pkgconfig/python2.pc \
-		$(STAGING_DIR_HOST)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
-		$(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
-		$(1)/usr/lib/python$(PYTHON_VERSION)/
-endef
-
-PYTHON_BASE_LIB_FILES:= \
-	/usr/lib/python$(PYTHON_VERSION)/_abcoll.py \
-	/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py \
-	/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py \
-	/usr/lib/python$(PYTHON_VERSION)/abc.py \
-	/usr/lib/python$(PYTHON_VERSION)/copy_reg.py \
-	/usr/lib/python$(PYTHON_VERSION)/genericpath.py \
-	/usr/lib/python$(PYTHON_VERSION)/linecache.py \
-	/usr/lib/python$(PYTHON_VERSION)/posixpath.py \
-	/usr/lib/python$(PYTHON_VERSION)/os.py \
-	/usr/lib/python$(PYTHON_VERSION)/re.py \
-	/usr/lib/python$(PYTHON_VERSION)/site.py \
-	/usr/lib/python$(PYTHON_VERSION)/sre_compile.py \
-	/usr/lib/python$(PYTHON_VERSION)/sre_constants.py \
-	/usr/lib/python$(PYTHON_VERSION)/sre_parse.py \
-	/usr/lib/python$(PYTHON_VERSION)/sysconfig.py \
-	/usr/lib/python$(PYTHON_VERSION)/stat.py \
-	/usr/lib/python$(PYTHON_VERSION)/traceback.py \
-	/usr/lib/python$(PYTHON_VERSION)/types.py \
-	/usr/lib/python$(PYTHON_VERSION)/UserDict.py \
-	/usr/lib/python$(PYTHON_VERSION)/warnings.py
-
-PYTHON_LIB_FILES_DEL+=$(PYTHON_BASE_LIB_FILES)
-
-define PyPackage/python-base/filespec
-+|/usr/bin/python$(PYTHON_VERSION)
-$(subst $(space),$(newline),$(foreach lib_file,$(PYTHON_BASE_LIB_FILES),+|$(lib_file)))
-endef
-
-define PyPackage/python-light/filespec
-+|/usr/lib/python$(PYTHON_VERSION)
--|/usr/lib/python$(PYTHON_VERSION)/config
--|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py
--|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst*
--|/usr/lib/python$(PYTHON_VERSION)/ensurepip
--|/usr/lib/python$(PYTHON_VERSION)/idlelib
--|/usr/lib/python$(PYTHON_VERSION)/lib2to3
--|/usr/lib/python$(PYTHON_VERSION)/lib-tk
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so
--|/usr/lib/python$(PYTHON_VERSION)/pdb.doc
--|/usr/lib/python$(PYTHON_VERSION)/test
--|/usr/lib/python$(PYTHON_VERSION)/webbrowser.py
--|/usr/lib/python$(PYTHON_VERSION)/*/test
--|/usr/lib/python$(PYTHON_VERSION)/*/tests
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
-$(subst $(space),$(newline),$(foreach lib_file,$(PYTHON_LIB_FILES_DEL),-|$(lib_file)))
-endef
-
-define PyPackage/python-base/install
-	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python
-	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
-endef
-
-define PyPackage/python/filespec
--|$(PYTHON_PKG_DIR)
-endef
-
-HOST_CFLAGS+= \
-	-I/usr/include/ncursesw \
-	-I/usr/include/ncurses
-
-HOST_CONFIGURE_ARGS+= \
-	--without-cxx-main \
-	--without-pymalloc \
-	--with-threads \
-	--prefix=$(STAGING_DIR_HOST) \
-	--with-ensurepip=upgrade \
-	CONFIG_SITE= \
-	CFLAGS="$(HOST_CFLAGS)"
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2
-endef
-
-$(eval $(call HostBuild))
-
-$(foreach package, $(PYTHON_PACKAGES),  \
-	$(eval $(call PyPackage,$(package))) \
-	$(eval $(call BuildPackage,$(package))) \
-)
-
-$(eval $(call PyPackage,python-base))
-$(eval $(call PyPackage,python-light))
-$(eval $(call PyPackage,python))
-
-$(eval $(call BuildPackage,python-base))
-$(eval $(call BuildPackage,python-light))
-$(eval $(call BuildPackage,python))
diff --git a/trunk/package/feeds/packages/python/files/config.site b/trunk/package/feeds/packages/python/files/config.site
deleted file mode 100644
index cfa56b89..00000000
--- a/trunk/package/feeds/packages/python/files/config.site
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ac_cv_file__dev_ptmx=yes
-ac_cv_file__dev_ptc=no
-ac_cv_buggy_getaddrinfo=no
-
diff --git a/trunk/package/feeds/packages/python/files/python-package-codecs.mk b/trunk/package/feeds/packages/python/files/python-package-codecs.mk
deleted file mode 100644
index d6e18350..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-codecs.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-codecs
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) codecs + unicode support
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-codecs, \
-	/usr/lib/python$(PYTHON_VERSION)/encodings \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_cn.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_hk.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_iso2022.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_jp.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_kr.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_codecs_tw.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-compiler.mk b/trunk/package/feeds/packages/python/files/python-package-compiler.mk
deleted file mode 100644
index fbe8bf2e..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-compiler.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-compiler
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) compiler module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-compiler, \
-	/usr/lib/python$(PYTHON_VERSION)/compiler \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-ctypes.mk b/trunk/package/feeds/packages/python/files/python-package-ctypes.mk
deleted file mode 100644
index 66b30331..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-ctypes.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-ctypes
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) ctypes module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-ctypes, \
-	/usr/lib/python$(PYTHON_VERSION)/ctypes \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ctypes.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ctypes_test.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-db.mk b/trunk/package/feeds/packages/python/files/python-package-db.mk
deleted file mode 100644
index 26f35d88..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-db.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-db
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) db module
-  DEPENDS:=+python-light +libdb47
-endef
-
-$(eval $(call PyBasePackage,python-db, \
-	/usr/lib/python$(PYTHON_VERSION)/bsddb \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bsddb.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/dbm.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-decimal.mk b/trunk/package/feeds/packages/python/files/python-package-decimal.mk
deleted file mode 100644
index 33e3a21d..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-decimal.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-decimal
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) decimal module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-decimal, \
-	/usr/lib/python$(PYTHON_VERSION)/decimal.py \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-distutils.mk b/trunk/package/feeds/packages/python/files/python-package-distutils.mk
deleted file mode 100644
index f5119fac..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-distutils.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-distutils
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) distutils
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-distutils, \
-	/usr/lib/python$(PYTHON_VERSION)/distutils \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-email.mk b/trunk/package/feeds/packages/python/files/python-package-email.mk
deleted file mode 100644
index 51fa8d12..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-email.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-email
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) email module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-email, \
-	/usr/lib/python$(PYTHON_VERSION)/email \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-gdbm.mk b/trunk/package/feeds/packages/python/files/python-package-gdbm.mk
deleted file mode 100644
index 8e0b16f9..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-gdbm.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-gdbm
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) gdbm module
-  DEPENDS:=+python-light +libgdbm
-endef
-
-$(eval $(call PyBasePackage,python-gdbm, \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-logging.mk b/trunk/package/feeds/packages/python/files/python-package-logging.mk
deleted file mode 100644
index f45de35d..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-logging.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-logging
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) logging module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-logging, \
-	/usr/lib/python$(PYTHON_VERSION)/logging \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-multiprocessing.mk b/trunk/package/feeds/packages/python/files/python-package-multiprocessing.mk
deleted file mode 100644
index 2a9f5b18..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-multiprocessing.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-multiprocessing
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) multiprocessing
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-multiprocessing, \
-	/usr/lib/python$(PYTHON_VERSION)/multiprocessing \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_multiprocessing.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-ncurses.mk b/trunk/package/feeds/packages/python/files/python-package-ncurses.mk
deleted file mode 100644
index 04751ef8..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-ncurses.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-ncurses
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) ncurses module
-  DEPENDS:=+python-light +libncursesw
-endef
-
-$(eval $(call PyBasePackage,python-ncurses, \
-	/usr/lib/python$(PYTHON_VERSION)/curses \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses_panel.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-openssl.mk b/trunk/package/feeds/packages/python/files/python-package-openssl.mk
deleted file mode 100644
index 4d897eb8..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-openssl.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-openssl
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) SSL module
-  DEPENDS:=+python-light +libopenssl
-endef
-
-$(eval $(call PyBasePackage,python-openssl, \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_hashlib.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-pydoc.mk b/trunk/package/feeds/packages/python/files/python-package-pydoc.mk
deleted file mode 100644
index ca27f9b3..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-pydoc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-pydoc
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) pydoc module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-pydoc, \
-	/usr/lib/python$(PYTHON_VERSION)/doctest.py \
-	/usr/lib/python$(PYTHON_VERSION)/pydoc.py \
-	/usr/lib/python$(PYTHON_VERSION)/pydoc_data \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-sqlite3.mk b/trunk/package/feeds/packages/python/files/python-package-sqlite3.mk
deleted file mode 100644
index c5abb122..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-sqlite3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-sqlite3
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) sqlite3 module
-  DEPENDS:=+python-light +libsqlite3
-endef
-
-$(eval $(call PyBasePackage,python-sqlite3, \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so \
-	/usr/lib/python$(PYTHON_VERSION)/sqlite3 \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-unittest.mk b/trunk/package/feeds/packages/python/files/python-package-unittest.mk
deleted file mode 100644
index 6e1ab552..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-unittest.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-unittest
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) unittest module
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-unittest, \
-	/usr/lib/python$(PYTHON_VERSION)/unittest \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package-xml.mk b/trunk/package/feeds/packages/python/files/python-package-xml.mk
deleted file mode 100644
index 69074ccb..00000000
--- a/trunk/package/feeds/packages/python/files/python-package-xml.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python-xml
-$(call Package/python/Default)
-  TITLE:=Python $(PYTHON_VERSION) xml libs
-  DEPENDS:=+python-light
-endef
-
-$(eval $(call PyBasePackage,python-xml, \
-	/usr/lib/python$(PYTHON_VERSION)/xml \
-	/usr/lib/python$(PYTHON_VERSION)/xmllib.py \
-	/usr/lib/python$(PYTHON_VERSION)/xmlrpclib.py \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_elementtree.so \
-	/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so \
-))
diff --git a/trunk/package/feeds/packages/python/files/python-package.mk b/trunk/package/feeds/packages/python/files/python-package.mk
deleted file mode 100644
index 4895b91a..00000000
--- a/trunk/package/feeds/packages/python/files/python-package.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-PYTHON_VERSION:=2.7
-PYTHON_VERSION_MICRO:=9
-
-PYTHON_DIR:=$(STAGING_DIR)/usr
-PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
-PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
-PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
-
-PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
-
-PYTHON:=python$(PYTHON_VERSION)
-
-HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION)
-HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2
-
-PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
-define HostPython
-	(	export PYTHONPATH="$(PYTHONPATH)"; \
-		export PYTHONOPTIMIZE=""; \
-		export PYTHONDONTWRITEBYTECODE=1; \
-		export _python_sysroot="$(STAGING_DIR)"; \
-		export _python_prefix="/usr"; \
-		export _python_exec_prefix="/usr"; \
-		$(1) \
-		$(HOST_PYTHON_BIN) $(2); \
-	)
-endef
-
-# These configure args are needed in detection of path to Python header files
-# using autotools.
-CONFIGURE_ARGS += \
-	_python_sysroot="$(STAGING_DIR)" \
-	_python_prefix="/usr" \
-	_python_exec_prefix="/usr"
-
-PKG_USE_MIPS16:=0
-# This is required in addition to PKG_USE_MIPS16:=0 because otherwise MIPS16
-# flags are inherited from the Python base package (via sysconfig module)
-ifdef CONFIG_USE_MIPS16
-  TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
-endif
-
-define PyPackage
-
-  # Add default PyPackage filespec none defined
-  ifndef PyPackage/$(1)/filespec
-    define PyPackage/$(1)/filespec
-      +|$(PYTHON_PKG_DIR)
-    endef
-  endif
-
-  $(call shexport,PyPackage/$(1)/filespec)
-
-  define Package/$(1)/install
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-	@echo "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" | ( \
-		IFS='|'; \
-		while read fop fspec fperm; do \
-		  fop=`echo "$$$$$$$$fop" | tr -d ' \t\n'`; \
-		  if [ "$$$$$$$$fop" = "+" ]; then \
-			if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \
-			  echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \
-			  exit 1; \
-			fi; \
-			dpath=`dirname "$$$$$$$$fspec"`; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  dperm="-m$$$$$$$$fperm"; \
-			else \
-			  dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \
-			fi; \
-			mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \
-			echo "copying: '$$$$$$$$fspec'"; \
-			cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-			fi; \
-		  elif [ "$$$$$$$$fop" = "-" ]; then \
-			echo "removing: '$$$$$$$$fspec'"; \
-			rm -fR $$(1)$$$$$$$$fspec; \
-		  elif [ "$$$$$$$$fop" = "=" ]; then \
-			echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \
-			chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-		  fi; \
-		done; \
-	)
-	$(call PyPackage/$(1)/install,$$(1))
-  endef
-endef
-
-# $(1) => build subdir
-# $(2) => additional arguments to setup.py
-# $(3) => additional variables
-define Build/Compile/PyMod
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
-	$(call HostPython, \
-		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
-		CC="$(TARGET_CC)" \
-		CCSHARED="$(TARGET_CC) $(FPIC)" \
-		LD="$(TARGET_CC)" \
-		LDSHARED="$(TARGET_CC) -shared" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON_INC_DIR)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)" \
-		_PYTHON_HOST_PLATFORM=linux2 \
-		__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON)" \
-		$(3) \
-		, \
-		./setup.py $(2) \
-	)
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-endef
-
diff --git a/trunk/package/feeds/packages/python/patches/001-enable-zlib.patch b/trunk/package/feeds/packages/python/patches/001-enable-zlib.patch
deleted file mode 100644
index 780831e8..00000000
--- a/trunk/package/feeds/packages/python/patches/001-enable-zlib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6eeab87bc852481e599325549c854b701bf2e39f Mon Sep 17 00:00:00 2001
-From: Alexandru Ardelean <aa@ocedo.com>
-Date: Thu, 25 Sep 2014 18:18:29 +0300
-Subject: [PATCH] enable zlib
-
----
- Modules/Setup.dist | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/Setup.dist b/Modules/Setup.dist
-index 01fb85f..01ac492 100644
---- a/Modules/Setup.dist
-+++ b/Modules/Setup.dist
-@@ -358,7 +358,7 @@ _symtable symtablemodule.c
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -lz
- 
- # Interface to the Expat XML parser
- #
--- 
-1.8.4.5
-
diff --git a/trunk/package/feeds/packages/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch b/trunk/package/feeds/packages/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
deleted file mode 100644
index fb2fe8a7..00000000
--- a/trunk/package/feeds/packages/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index cbdeaf3..5154412 100644
---- a/setup.py
-+++ b/setup.py
-@@ -480,7 +480,8 @@ class PyBuildExt(build_ext):
-                         add_dir_to_list(dir_list, directory)
- 
-         if os.path.normpath(sys.prefix) != '/usr' \
--                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-+                and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
-+                and not cross_compiling:
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-             # building a framework with different architectures than
diff --git a/trunk/package/feeds/packages/python/patches/003-do-not-compile-tests-at-build.patch b/trunk/package/feeds/packages/python/patches/003-do-not-compile-tests-at-build.patch
deleted file mode 100644
index a6774e17..00000000
--- a/trunk/package/feeds/packages/python/patches/003-do-not-compile-tests-at-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7f4ec2f..e270bf2 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1038,6 +1038,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		done; \
- 	done
- 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
-+ifeq (@COMPILE_ALL_TESTS@,yes)
- 	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
-@@ -1064,6 +1065,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-+endif
- 
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
diff --git a/trunk/package/feeds/packages/python/patches/004-do-not-write-bytes-codes.patch b/trunk/package/feeds/packages/python/patches/004-do-not-write-bytes-codes.patch
deleted file mode 100644
index f67e7dca..00000000
--- a/trunk/package/feeds/packages/python/patches/004-do-not-write-bytes-codes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Python/pythonrun.c b/Python/pythonrun.c
-index 748a63b..cb6e291 100644
---- a/Python/pythonrun.c
-+++ b/Python/pythonrun.c
-@@ -79,7 +79,7 @@ int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
- int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
- int Py_NoSiteFlag; /* Suppress 'import site' */
- int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
--int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
-+int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
- int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
- int Py_FrozenFlag; /* Needed by getpath.c */
- int Py_UnicodeFlag = 0; /* Needed by compile.c */
-@@ -174,7 +174,7 @@ Py_InitializeEx(int install_sigs)
-     if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
-         Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
-     if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
--        Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
-+        Py_DontWriteBytecodeFlag = atoi(p);
-     /* The variable is only tested for existence here; _PyRandom_Init will
-        check its value further. */
-     if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0')
diff --git a/trunk/package/feeds/packages/python/patches/005-fix-libffi-x86-64-configure.patch b/trunk/package/feeds/packages/python/patches/005-fix-libffi-x86-64-configure.patch
deleted file mode 100644
index ea062a35..00000000
--- a/trunk/package/feeds/packages/python/patches/005-fix-libffi-x86-64-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
-index 75f62a7..4d6c9f2 100755
---- a/Modules/_ctypes/libffi/configure
-+++ b/Modules/_ctypes/libffi/configure
-@@ -17257,20 +17257,12 @@ case "$host" in
- 	fi
- 	;;
- 
--  i?86-*-* | x86_64-*-*)
--	TARGETDIR=x86
--	if test $ac_cv_sizeof_size_t = 4; then
--	  case "$host" in
--	    *-gnux32)
--	      TARGET=X86_64
--	      ;;
--	    *)
--	      TARGET=X86
--	      ;;
--          esac
--	else
--	  TARGET=X86_64;
--	fi
-+  i?86-*-*)
-+	TARGET=X86; TARGETDIR=x86
-+	;;
-+
-+  x86_64-*-*)
-+	TARGET=X86_64; TARGETDIR=x86
- 	;;
- 
-   ia64*-*-*)
diff --git a/trunk/package/feeds/packages/python/patches/006-remove-debian-multiarch-support.patch b/trunk/package/feeds/packages/python/patches/006-remove-debian-multiarch-support.patch
deleted file mode 100644
index 52d52b94..00000000
--- a/trunk/package/feeds/packages/python/patches/006-remove-debian-multiarch-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7868b7b..9ae0ef2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -444,7 +444,6 @@ class PyBuildExt(build_ext):
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
diff --git a/trunk/package/feeds/packages/python/patches/007-distutils-do-not-adjust-path.patch b/trunk/package/feeds/packages/python/patches/007-distutils-do-not-adjust-path.patch
deleted file mode 100644
index 49fe9262..00000000
--- a/trunk/package/feeds/packages/python/patches/007-distutils-do-not-adjust-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,6 +89,7 @@ class build_scripts (Command):
-                     adjust = 1
-                     post_interp = match.group(1) or ''
- 
-+            adjust = 0
-             if adjust:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
diff --git a/trunk/package/feeds/packages/python/patches/008-distutils-use-python-sysroot.patch b/trunk/package/feeds/packages/python/patches/008-distutils-use-python-sysroot.patch
deleted file mode 100644
index 7cd74876..00000000
--- a/trunk/package/feeds/packages/python/patches/008-distutils-use-python-sysroot.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Adjust library/header paths for cross-compilation
-
-When cross-compiling third-party extensions, the get_python_inc() or
-get_python_lib() can be called, to return the path to headers or
-libraries. However, they use the sys.prefix of the host Python, which
-returns incorrect paths when cross-compiling (paths pointing to host
-headers and libraries).
-
-In order to fix this, we introduce the _python_sysroot, _python_prefix
-and _python_exec_prefix variables, that allow to override these
-values, and get correct header/library paths when cross-compiling
-third-party Python modules.
-
-The _python_sysroot variable is also used to prefix the LIBDIR value
-taken from the sysconfigdata module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -19,8 +19,13 @@
- from distutils.errors import DistutilsPlatformError
- 
- # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+if "_python_sysroot" in os.environ:
-+    _sysroot=os.environ.get('_python_sysroot')
-+    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
-+    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
-+else:
-+    PREFIX = os.path.normpath(sys.prefix)
-+    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
- 
- # Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -237,7 +237,10 @@
-         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-             if not sysconfig.python_build:
-                 # building third party extensions
--                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+                libdir = sysconfig.get_config_var('LIBDIR')
-+                if "_python_sysroot" in os.environ:
-+                    libdir = os.environ.get("_python_sysroot") + libdir
-+                self.library_dirs.append(libdir)
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
diff --git a/trunk/package/feeds/packages/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch b/trunk/package/feeds/packages/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
deleted file mode 100644
index b5980975..00000000
--- a/trunk/package/feeds/packages/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7868b7b..10ec68f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1067,6 +1067,7 @@ class PyBuildExt(build_ext):
-                         if db_setup_debug: print "db lib: ", dblib, "not found"
- 
-         except db_found:
-+            rt_dblib_dir = None if cross_compiling else dblib_dir
-             if db_setup_debug:
-                 print "bsddb using BerkeleyDB lib:", db_ver, dblib
-                 print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
-@@ -1081,7 +1082,7 @@ class PyBuildExt(build_ext):
-             exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                   depends = ['bsddb.h'],
-                                   library_dirs=dblib_dir,
--                                  runtime_library_dirs=dblib_dir,
-+                                  runtime_library_dirs=rt_dblib_dir,
-                                   include_dirs=db_incs,
-                                   libraries=dblibs))
-         else:
-@@ -1292,10 +1293,11 @@ class PyBuildExt(build_ext):
-                             break
-                 elif cand == "bdb":
-                     if db_incs is not None:
-+                        rt_dblib_dir = None if cross_compiling else dblib_dir
-                         print "building dbm using bdb"
-                         dbmext = Extension('dbm', ['dbmmodule.c'],
-                                            library_dirs=dblib_dir,
--                                           runtime_library_dirs=dblib_dir,
-+                                           runtime_library_dirs=rt_dblib_dir,
-                                            include_dirs=db_incs,
-                                            define_macros=[
-                                                ('HAVE_BERKDB_H', None),
diff --git a/trunk/package/feeds/packages/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/trunk/package/feeds/packages/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
deleted file mode 100644
index 5a106d4e..00000000
--- a/trunk/package/feeds/packages/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7868b7b..544fa7e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -452,8 +452,9 @@ class PyBuildExt(build_ext):
-         # directly since an inconsistently reproducible issue comes up where
-         # the environment variable is not set even though the value were passed
-         # into configure and stored in the Makefile (issue found on OS X 10.3).
-+        rt_lib_dirs = [] if cross_compiling else self.compiler.runtime_library_dirs
-         for env_var, arg_name, dir_list in (
--                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-+                ('LDFLAGS', '-R', rt_lib_dirs),
-                 ('LDFLAGS', '-L', self.compiler.library_dirs),
-                 ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-             env_val = sysconfig.get_config_var(env_var)
diff --git a/trunk/package/feeds/packages/python3-bottle/Makefile b/trunk/package/feeds/packages/python3-bottle/Makefile
deleted file mode 100644
index b69d8517..00000000
--- a/trunk/package/feeds/packages/python3-bottle/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python3-bottle
-PKG_VERSION:=0.12.8
-PKG_RELEASE:=1
-
-PKG_LICENSE:=MIT
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/bottlepy/bottle/archive
-PKG_MD5SUM:=50a6ebada59391e8d01b2bd2ec52f05b
-PKG_BUILD_DIR:=$(BUILD_DIR)/bottle-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python3-package.mk)
-
-define Package/python3-bottle
-	SECTION:=lang
-	CATEGORY:=Languages
-	SUBMENU:=Python
-	TITLE:=Bottle is a fast, simple and lightweight WSGI micro web-framework for Python
-	URL:=http://bottlepy.org
-	DEPENDS:=+python3
-endef
-
-define Package/python3-bottle/description
- Bottle is a fast, simple and lightweight WSGI micro web-framework for Python.
- It is distributed as a single file module and has no dependencies other than the
- Python Standard Library.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/python3-bottle/install
-	$(INSTALL_DIR) $(1)$(PYTHON3_PKG_DIR)
-	$(CP) $(PKG_BUILD_DIR)/bottle.py $(1)$(PYTHON3_PKG_DIR)
-endef
-
-$(eval $(call BuildPackage,python3-bottle))
diff --git a/trunk/package/feeds/packages/python3/Makefile b/trunk/package/feeds/packages/python3/Makefile
deleted file mode 100644
index b9d29aab..00000000
--- a/trunk/package/feeds/packages/python3/Makefile
+++ /dev/null
@@ -1,255 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-# The file included below defines PYTHON_VERSION
-include ./files/python3-package.mk
-
-PYTHON_VERSION:=$(PYTHON3_VERSION)
-PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
-
-PKG_NAME:=python3
-PKG_RELEASE:=2
-PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-
-PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_MD5SUM:=7d092d1bba6e17f0d9bd21b49e441dd5
-
-PKG_LICENSE:=PSF
-PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=python3/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/python3/Default
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Python $(PYTHON_VERSION) programming language
-  URL:=http://www.python.org/
-  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-endef
-
-define Package/python3/Default/description
- Python is a dynamic object-oriented programming language that can be used
- for many kinds of software development. It offers strong support for
- integration with other languages and tools, comes with extensive standard
- libraries, and can be learned in a few days. Many Python programmers
- report substantial productivity gains and feel the language encourages
- the development of higher quality, more maintainable code.
-endef
-
-define Package/python3-base
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON_VERSION) interpreter
-  DEPENDS:=+libpthread +zlib
-endef
-
-define Package/python3-base/description
-  This package contains only the interpreter and the bare minimum
-  for the interpreter to start.
-endef
-
-define Package/python3-light
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON_VERSION) light installation
-  DEPENDS:=+python3-base +libffi +libbz2
-endef
-
-define Package/python3-light/description
-  This package is essentially the python3-base package plus
-  a few of the rarely used (and big) libraries stripped out
-  into separate packages.
-endef
-
-# Define newline here, since it's not defined in OpenWRT
-define newline
-
-
-endef
-
-PYTHON3_LIB_FILES_DEL:=
-PYTHON3_PACKAGES:=
-PYTHON3_SO_SUFFIX:=cpython-34.so
-define Py3BasePackage
-  PYTHON3_PACKAGES+=$(1)
-  PYTHON3_LIB_FILES_DEL+=$(2)
-  define Py3Package/$(1)/filespec
-    $(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file)))
-  endef
-endef
-
-include ./files/python3-package-*.mk
-
-define Package/python3
-$(call Package/python3/Default)
-  DEPENDS:=+python3-light $(foreach package,$(PYTHON3_PACKAGES),+$(package))
-endef
-
-define Package/python3/description
-  This package contains the (almost) full Python install.
-  It's python3-light + all other packages.
-endef
-
-MAKE_FLAGS+=\
-	CROSS_COMPILE=yes \
-	LD="$(TARGET_CC)" \
-	PGEN=pgen3
-
-ifeq ($(ARCH),i386)
-MAKE_FLAGS+=PYTHON_DECIMAL_WITH_MACHINE=ansi32
-endif
-
-EXTRA_CFLAGS+= \
-	-DNDEBUG -fno-inline
-EXTRA_LDFLAGS+= \
-	-L$(PKG_BUILD_DIR)
-
-ENABLE_IPV6:=
-ifeq ($(CONFIG_IPV6),y)
-	ENABLE_IPV6 += --enable-ipv6
-endif
-
-CONFIGURE_ARGS+= \
-	--sysconfdir=/etc \
-	--enable-shared \
-	--without-cxx-main \
-	--with-threads \
-	--with-system-ffi="$(STAGING_DIR)/usr" \
-	--without-pymalloc \
-	--without-ensurepip \
-	$(ENABLE_IPV6) \
-	CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
-	OPT="$(TARGET_CFLAGS)"
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/mk/
-	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
-	$(INSTALL_DATA) ./files/python3-package.mk $(STAGING_DIR)/mk/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
-		$(1)/usr/include/
-	$(CP) \
-		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
-		$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION) \
-		$(1)/usr/lib/python$(PYTHON_VERSION)/
-endef
-
-PYTHON3_BASE_LIB_FILES:= \
-	/usr/lib/python$(PYTHON_VERSION)/encodings \
-	/usr/lib/python$(PYTHON_VERSION)/_collections_abc.py \
-	/usr/lib/python$(PYTHON_VERSION)/_sitebuiltins.py \
-	/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py \
-	/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py \
-	/usr/lib/python$(PYTHON_VERSION)/abc.py \
-	/usr/lib/python$(PYTHON_VERSION)/codecs.py \
-	/usr/lib/python$(PYTHON_VERSION)/genericpath.py \
-	/usr/lib/python$(PYTHON_VERSION)/io.py \
-	/usr/lib/python$(PYTHON_VERSION)/os.py \
-	/usr/lib/python$(PYTHON_VERSION)/posixpath.py \
-	/usr/lib/python$(PYTHON_VERSION)/site.py \
-	/usr/lib/python$(PYTHON_VERSION)/sysconfig.py \
-	/usr/lib/python$(PYTHON_VERSION)/stat.py
-
-PYTHON3_LIB_FILES_DEL+=$(PYTHON3_BASE_LIB_FILES)
-
-define Py3Package/python3-base/filespec
-+|/usr/bin/python$(PYTHON_VERSION)
-$(subst $(space),$(newline),$(foreach lib_file,$(PYTHON3_BASE_LIB_FILES),+|$(lib_file)))
-endef
-
-define Py3Package/python3-light/filespec
-+|/usr/lib/python$(PYTHON_VERSION)
--|/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION)
--|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py
--|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst*
--|/usr/lib/python$(PYTHON_VERSION)/ensurepip
--|/usr/lib/python$(PYTHON_VERSION)/idlelib
--|/usr/lib/python$(PYTHON_VERSION)/lib2to3
--|/usr/lib/python$(PYTHON_VERSION)/tkinter
--|/usr/lib/python$(PYTHON_VERSION)/turtledemo
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_test*.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline*.so
--|/usr/lib/python$(PYTHON_VERSION)/pdb.doc
--|/usr/lib/python$(PYTHON_VERSION)/test
--|/usr/lib/python$(PYTHON_VERSION)/webbrowser.py
--|/usr/lib/python$(PYTHON_VERSION)/*/test
--|/usr/lib/python$(PYTHON_VERSION)/*/tests
--|/usr/lib/python$(PYTHON_VERSION)/_osx_support.py
-$(subst $(space),$(newline),$(foreach lib_file,$(PYTHON3_LIB_FILES_DEL),-|$(lib_file)))
-endef
-
-define Py3Package/python3-base/install
-	# Adding the lib-dynload folder (even just empty) suppresses 2 warnings when starting Python
-	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/lib-dynload/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python3
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
-endef
-
-define Py3Package/python3/filespec
--|$(PYTHON3_PKG_DIR)
-endef
-
-HOST_CFLAGS+= \
-	-I/usr/include/ncursesw \
-	-I/usr/include/ncurses
-
-HOST_CONFIGURE_ARGS+= \
-	--without-cxx-main \
-	--without-pymalloc \
-	--with-threads \
-	--prefix=$(STAGING_DIR_HOST) \
-	--with-ensurepip=upgrade \
-	CONFIG_SITE= \
-	CFLAGS="$(HOST_CFLAGS)"
-
-define Host/Compile
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) python Parser/pgen
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) sharedmods
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen3
-endef
-
-$(eval $(call HostBuild))
-
-$(foreach package, $(PYTHON3_PACKAGES),  \
-	$(eval $(call Py3Package,$(package))) \
-	$(eval $(call BuildPackage,$(package))) \
-)
-
-$(eval $(call Py3Package,python3-base))
-$(eval $(call Py3Package,python3-light))
-$(eval $(call Py3Package,python3))
-
-$(eval $(call BuildPackage,python3-base))
-$(eval $(call BuildPackage,python3-light))
-$(eval $(call BuildPackage,python3))
diff --git a/trunk/package/feeds/packages/python3/files/config.site b/trunk/package/feeds/packages/python3/files/config.site
deleted file mode 100644
index cfa56b89..00000000
--- a/trunk/package/feeds/packages/python3/files/config.site
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ac_cv_file__dev_ptmx=yes
-ac_cv_file__dev_ptc=no
-ac_cv_buggy_getaddrinfo=no
-
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-asyncio.mk b/trunk/package/feeds/packages/python3/files/python3-package-asyncio.mk
deleted file mode 100644
index 1d2faab3..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-asyncio.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-asyncio
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) asyncio module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-asyncio, \
-	/usr/lib/python$(PYTHON3_VERSION)/asyncio \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-codecs.mk b/trunk/package/feeds/packages/python3/files/python3-package-codecs.mk
deleted file mode 100644
index 66101e1f..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-codecs.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-codecs
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) codecs + unicode support
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-codecs, \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_cn.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_hk.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_iso2022.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_jp.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_kr.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_tw.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/unicodedata.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-ctypes.mk b/trunk/package/feeds/packages/python3/files/python3-package-ctypes.mk
deleted file mode 100644
index 97c2c768..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-ctypes.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-ctypes
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) ctypes module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-ctypes, \
-	/usr/lib/python$(PYTHON3_VERSION)/ctypes \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_ctypes.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_ctypes_test.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-dbm.mk b/trunk/package/feeds/packages/python3/files/python3-package-dbm.mk
deleted file mode 100644
index ed343d81..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-dbm.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-dbm
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) dbm module
-  DEPENDS:=+python3-light +libdb47
-endef
-
-$(eval $(call Py3BasePackage,python3-dbm, \
-	/usr/lib/python$(PYTHON3_VERSION)/dbm \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_dbm.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-decimal.mk b/trunk/package/feeds/packages/python3/files/python3-package-decimal.mk
deleted file mode 100644
index 81ecbb0d..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-decimal.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-decimal
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) decimal module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-decimal, \
-	/usr/lib/python$(PYTHON3_VERSION)/decimal.py \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_decimal.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-distutils.mk b/trunk/package/feeds/packages/python3/files/python3-package-distutils.mk
deleted file mode 100644
index 65f4b5aa..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-distutils.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-distutils
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) distutils module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-distutils, \
-	/usr/lib/python$(PYTHON3_VERSION)/distutils \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-email.mk b/trunk/package/feeds/packages/python3/files/python3-package-email.mk
deleted file mode 100644
index dae35197..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-email.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-email
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) email module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-email, \
-	/usr/lib/python$(PYTHON3_VERSION)/email \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-gdbm.mk b/trunk/package/feeds/packages/python3/files/python3-package-gdbm.mk
deleted file mode 100644
index cc929132..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-gdbm.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-gdbm
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) gdbm module
-  DEPENDS:=+python3-light +libgdbm
-endef
-
-$(eval $(call Py3BasePackage,python3-gdbm, \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_gdbm.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-logging.mk b/trunk/package/feeds/packages/python3/files/python3-package-logging.mk
deleted file mode 100644
index 4cd6ea97..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-logging.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-logging
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) logging module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-logging, \
-	/usr/lib/python$(PYTHON3_VERSION)/logging \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-multiprocessing.mk b/trunk/package/feeds/packages/python3/files/python3-package-multiprocessing.mk
deleted file mode 100644
index 784aabb8..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-multiprocessing.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-multiprocessing
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) multiprocessing
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-multiprocessing, \
-	/usr/lib/python$(PYTHON3_VERSION)/multiprocessing \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_multiprocessing.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-ncurses.mk b/trunk/package/feeds/packages/python3/files/python3-package-ncurses.mk
deleted file mode 100644
index 74bedfe2..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-ncurses.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-ncurses
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) ncurses module
-  DEPENDS:=+python3-light +libncursesw
-endef
-
-$(eval $(call Py3BasePackage,python3-ncurses, \
-	/usr/lib/python$(PYTHON3_VERSION)/curses \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_curses.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_curses_panel.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-openssl.mk b/trunk/package/feeds/packages/python3/files/python3-package-openssl.mk
deleted file mode 100644
index 255d5809..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-openssl.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-openssl
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) SSL module
-  DEPENDS:=+python3-light +libopenssl
-endef
-
-$(eval $(call Py3BasePackage,python3-openssl, \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_hashlib.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_ssl.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-pydoc.mk b/trunk/package/feeds/packages/python3/files/python3-package-pydoc.mk
deleted file mode 100644
index 7ed8c211..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-pydoc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-pydoc
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) pydoc module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-pydoc, \
-	/usr/lib/python$(PYTHON3_VERSION)/doctest.py \
-	/usr/lib/python$(PYTHON3_VERSION)/pydoc.py \
-	/usr/lib/python$(PYTHON3_VERSION)/pydoc_data \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-sqlite3.mk b/trunk/package/feeds/packages/python3/files/python3-package-sqlite3.mk
deleted file mode 100644
index 4b097a36..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-sqlite3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-sqlite3
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) sqlite3 module
-  DEPENDS:=+python3-light +libsqlite3
-endef
-
-$(eval $(call Py3BasePackage,python3-sqlite3, \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_sqlite3.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/sqlite3 \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-unittest.mk b/trunk/package/feeds/packages/python3/files/python3-package-unittest.mk
deleted file mode 100644
index 6d3643a7..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-unittest.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-unittest
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) unittest module
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-unittest, \
-	/usr/lib/python$(PYTHON3_VERSION)/unittest \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package-xml.mk b/trunk/package/feeds/packages/python3/files/python3-package-xml.mk
deleted file mode 100644
index e734f0c7..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package-xml.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-xml
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) xml libs
-  DEPENDS:=+python3-light
-endef
-
-$(eval $(call Py3BasePackage,python3-xml, \
-	/usr/lib/python$(PYTHON3_VERSION)/xml \
-	/usr/lib/python$(PYTHON3_VERSION)/xmlrpc \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_elementtree.$(PYTHON3_SO_SUFFIX) \
-	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/pyexpat.$(PYTHON3_SO_SUFFIX) \
-))
diff --git a/trunk/package/feeds/packages/python3/files/python3-package.mk b/trunk/package/feeds/packages/python3/files/python3-package.mk
deleted file mode 100644
index e76dc0bc..00000000
--- a/trunk/package/feeds/packages/python3/files/python3-package.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-PYTHON3_VERSION:=3.4
-PYTHON3_VERSION_MICRO:=3
-
-PYTHON3_DIR:=$(STAGING_DIR)/usr
-PYTHON3_BIN_DIR:=$(PYTHON3_DIR)/bin
-PYTHON3_INC_DIR:=$(PYTHON3_DIR)/include/python$(PYTHON3_VERSION)
-PYTHON3_LIB_DIR:=$(PYTHON3_DIR)/lib/python$(PYTHON3_VERSION)
-
-PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages
-
-PYTHON3:=python$(PYTHON3_VERSION)
-
-HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION)
-HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3
-
-PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
-define HostPython3
-	(	export PYTHONPATH="$(PYTHON3PATH)"; \
-		export PYTHONOPTIMIZE=""; \
-		export PYTHONDONTWRITEBYTECODE=1; \
-		$(1) \
-		$(HOST_PYTHON3_BIN) $(2); \
-	)
-endef
-
-PKG_USE_MIPS16:=0
-# This is required in addition to PKG_USE_MIPS16:=0 because otherwise MIPS16
-# flags are inherited from the Python base package (via sysconfig module)
-ifdef CONFIG_USE_MIPS16
-  TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
-endif
-
-define Py3Package
-
-  # Add default PyPackage filespec none defined
-  ifndef Py3Package/$(1)/filespec
-    define Py3Package/$(1)/filespec
-      +|$(PYTHON3_PKG_DIR)
-    endef
-  endif
-
-  $(call shexport,Py3Package/$(1)/filespec)
-
-  define Package/$(1)/install
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-	@echo "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" | ( \
-		IFS='|'; \
-		while read fop fspec fperm; do \
-		  fop=`echo "$$$$$$$$fop" | tr -d ' \t\n'`; \
-		  if [ "$$$$$$$$fop" = "+" ]; then \
-			if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \
-			  echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \
-			  exit 1; \
-			fi; \
-			dpath=`dirname "$$$$$$$$fspec"`; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  dperm="-m$$$$$$$$fperm"; \
-			else \
-			  dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \
-			fi; \
-			mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \
-			echo "copying: '$$$$$$$$fspec'"; \
-			cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-			fi; \
-		  elif [ "$$$$$$$$fop" = "-" ]; then \
-			echo "removing: '$$$$$$$$fspec'"; \
-			rm -fR $$(1)$$$$$$$$fspec; \
-		  elif [ "$$$$$$$$fop" = "=" ]; then \
-			echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \
-			chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-		  fi; \
-		done; \
-	)
-	$(call Py3Package/$(1)/install,$$(1))
-  endef
-endef
-
-# $(1) => build subdir
-# $(2) => additional arguments to setup.py
-# $(3) => additional variables
-define Build/Compile/Py3Mod
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
-	$(call HostPython3, \
-		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
-		CC="$(TARGET_CC)" \
-		CCSHARED="$(TARGET_CC) $(FPIC)" \
-		LD="$(TARGET_CC)" \
-		LDSHARED="$(TARGET_CC) -shared" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \
-		_PYTHON_HOST_PLATFORM=linux2 \
-		__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \
-		$(3) \
-		, \
-		./setup.py $(2) \
-	)
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-endef
-
diff --git a/trunk/package/feeds/packages/python3/patches/001-enable-zlib.patch b/trunk/package/feeds/packages/python3/patches/001-enable-zlib.patch
deleted file mode 100644
index 780831e8..00000000
--- a/trunk/package/feeds/packages/python3/patches/001-enable-zlib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6eeab87bc852481e599325549c854b701bf2e39f Mon Sep 17 00:00:00 2001
-From: Alexandru Ardelean <aa@ocedo.com>
-Date: Thu, 25 Sep 2014 18:18:29 +0300
-Subject: [PATCH] enable zlib
-
----
- Modules/Setup.dist | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/Setup.dist b/Modules/Setup.dist
-index 01fb85f..01ac492 100644
---- a/Modules/Setup.dist
-+++ b/Modules/Setup.dist
-@@ -358,7 +358,7 @@ _symtable symtablemodule.c
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -lz
- 
- # Interface to the Expat XML parser
- #
--- 
-1.8.4.5
-
diff --git a/trunk/package/feeds/packages/python3/patches/002-do-not-add-include-dirs-when-cross-compiling.patch b/trunk/package/feeds/packages/python3/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
deleted file mode 100644
index 44be1c8f..00000000
--- a/trunk/package/feeds/packages/python3/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 93f390f..ace1494 100644
---- a/setup.py
-+++ b/setup.py
-@@ -461,7 +461,8 @@ class PyBuildExt(build_ext):
-                         add_dir_to_list(dir_list, directory)
- 
-         if os.path.normpath(sys.base_prefix) != '/usr' \
--                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-+                and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
-+                and not cross_compiling:
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-             # building a framework with different architectures than
diff --git a/trunk/package/feeds/packages/python3/patches/003-do-not-run-distutils-tests.patch b/trunk/package/feeds/packages/python3/patches/003-do-not-run-distutils-tests.patch
deleted file mode 100644
index 0291eb19..00000000
--- a/trunk/package/feeds/packages/python3/patches/003-do-not-run-distutils-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f36c11d..f2b6c71 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1217,32 +1217,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		done; \
- 	done
- 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
--	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
--		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
--			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
--	fi
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
- 
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
diff --git a/trunk/package/feeds/packages/python3/patches/004-do-not-write-bytes-codes.patch b/trunk/package/feeds/packages/python3/patches/004-do-not-write-bytes-codes.patch
deleted file mode 100644
index f624d586..00000000
--- a/trunk/package/feeds/packages/python3/patches/004-do-not-write-bytes-codes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Python/pythonrun.c b/Python/pythonrun.c
-index 0327830..df41cda 100644
---- a/Python/pythonrun.c
-+++ b/Python/pythonrun.c
-@@ -124,7 +124,7 @@ int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
- int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
- int Py_NoSiteFlag; /* Suppress 'import site' */
- int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
--int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
-+int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
- int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
- int Py_FrozenFlag; /* Needed by getpath.c */
- int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
-@@ -350,7 +350,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
-     if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
-         Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
-     if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
--        Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
-+        Py_DontWriteBytecodeFlag = atoi(p);
-     /* The variable is only tested for existence here; _PyRandom_Init will
-        check its value further. */
-     if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0')
diff --git a/trunk/package/feeds/packages/python3/patches/005-fix-libffi-x86-64-configure.patch b/trunk/package/feeds/packages/python3/patches/005-fix-libffi-x86-64-configure.patch
deleted file mode 100644
index ea062a35..00000000
--- a/trunk/package/feeds/packages/python3/patches/005-fix-libffi-x86-64-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
-index 75f62a7..4d6c9f2 100755
---- a/Modules/_ctypes/libffi/configure
-+++ b/Modules/_ctypes/libffi/configure
-@@ -17257,20 +17257,12 @@ case "$host" in
- 	fi
- 	;;
- 
--  i?86-*-* | x86_64-*-*)
--	TARGETDIR=x86
--	if test $ac_cv_sizeof_size_t = 4; then
--	  case "$host" in
--	    *-gnux32)
--	      TARGET=X86_64
--	      ;;
--	    *)
--	      TARGET=X86
--	      ;;
--          esac
--	else
--	  TARGET=X86_64;
--	fi
-+  i?86-*-*)
-+	TARGET=X86; TARGETDIR=x86
-+	;;
-+
-+  x86_64-*-*)
-+	TARGET=X86_64; TARGETDIR=x86
- 	;;
- 
-   ia64*-*-*)
diff --git a/trunk/package/feeds/packages/python3/patches/006-remove-debian-multiarch-support.patch b/trunk/package/feeds/packages/python3/patches/006-remove-debian-multiarch-support.patch
deleted file mode 100644
index 52d52b94..00000000
--- a/trunk/package/feeds/packages/python3/patches/006-remove-debian-multiarch-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7868b7b..9ae0ef2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -444,7 +444,6 @@ class PyBuildExt(build_ext):
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
diff --git a/trunk/package/feeds/packages/python3/patches/007-distutils-do-not-adjust-path.patch b/trunk/package/feeds/packages/python3/patches/007-distutils-do-not-adjust-path.patch
deleted file mode 100644
index 49fe9262..00000000
--- a/trunk/package/feeds/packages/python3/patches/007-distutils-do-not-adjust-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,6 +89,7 @@ class build_scripts (Command):
-                     adjust = 1
-                     post_interp = match.group(1) or ''
- 
-+            adjust = 0
-             if adjust:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
diff --git a/trunk/package/feeds/packages/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/trunk/package/feeds/packages/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
deleted file mode 100644
index 5a106d4e..00000000
--- a/trunk/package/feeds/packages/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7868b7b..544fa7e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -452,8 +452,9 @@ class PyBuildExt(build_ext):
-         # directly since an inconsistently reproducible issue comes up where
-         # the environment variable is not set even though the value were passed
-         # into configure and stored in the Makefile (issue found on OS X 10.3).
-+        rt_lib_dirs = [] if cross_compiling else self.compiler.runtime_library_dirs
-         for env_var, arg_name, dir_list in (
--                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-+                ('LDFLAGS', '-R', rt_lib_dirs),
-                 ('LDFLAGS', '-L', self.compiler.library_dirs),
-                 ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-             env_val = sysconfig.get_config_var(env_var)
diff --git a/trunk/package/feeds/packages/radsecproxy/Makefile b/trunk/package/feeds/packages/radsecproxy/Makefile
deleted file mode 100644
index f155532c..00000000
--- a/trunk/package/feeds/packages/radsecproxy/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2008-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=radsecproxy
-PKG_VERSION:=1.6.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://software.uninett.no/radsecproxy/
-PKG_MD5SUM:=8270b2a9d7cb1dcf30ddd677f3e7ac5f
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/radsecproxy
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +libpthread
-  TITLE:=radsecproxy
-  URL:=http://software.uninett.no/radsecproxy
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-endef
-
-define Package/radsecproxy/description
-  A generic radius proxy for UDP/TLS (RadSec)
-endef
-
-CONFIGURE_ARGS+= \
-	--with-ssl="$(STAGING_DIR)/usr"
-
-#TARGET_CFLAGS += -ansi
-#TARGET_CFLAGS += -std=c99
-TARGET_CFLAGS += -Wno-long-long
-
-
-define Package/radsecproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radsecproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/
-	$(CP) $(PKG_BUILD_DIR)/radsecproxy.conf-example $(1)/etc/radsecproxy.conf
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/radsecproxy.init $(1)/etc/init.d/radsecproxy
-endef
-
-define Package/radsecproxy/conffiles
-/etc/radsecproxy.conf
-endef
-
-$(eval $(call BuildPackage,radsecproxy))
-
diff --git a/trunk/package/feeds/packages/radsecproxy/files/radsecproxy.init b/trunk/package/feeds/packages/radsecproxy/files/radsecproxy.init
deleted file mode 100644
index 39bdc6e4..00000000
--- a/trunk/package/feeds/packages/radsecproxy/files/radsecproxy.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=70
-
-USE_PROCD=1
-PROG=/usr/sbin/radsecproxy
-CONFFILE=/etc/radsecproxy.conf
-
-start_service() {
-	procd_open_instance
-	procd_set_param command $PROG -f -c $CONFFILE
-	procd_set_param file $CONFFILE
-	procd_set_param respawn
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/radsecproxy/patches/100-missing-return.patch b/trunk/package/feeds/packages/radsecproxy/patches/100-missing-return.patch
deleted file mode 100644
index 871fc6e1..00000000
--- a/trunk/package/feeds/packages/radsecproxy/patches/100-missing-return.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/dtls.c
-+++ b/dtls.c
-@@ -523,6 +523,7 @@ void *udpdtlsserverrd(void *arg) {
- 	free(params);
- 	cacheexpire(sessioncache, &lastexpiry);
-     }
-+    return NULL;
- }
- 
- int dtlsconnect(struct server *server, struct timeval *when, int timeout, char *text) {
-@@ -642,6 +643,7 @@ void *udpdtlsclientrd(void *arg) {
- 	if (udp2bio(s, conf->servers->rbios, cnt))
- 	    debug(DBG_DBG, "radudpget: got DTLS in UDP from %s", addr2string((struct sockaddr *)&from));
-     }
-+    return NULL;
- }
- 
- void *dtlsclientrd(void *arg) {
---- a/radsecproxy.c
-+++ b/radsecproxy.c
-@@ -3203,6 +3203,8 @@ void *sighandler(void *arg) {
-             debug(DBG_WARN, "sighandler: ignoring signal %d", sig);
-         }
-     }
-+
-+    return NULL;
- }
- 
- int createpidfile(const char *pidfile) {
-@@ -3289,6 +3291,8 @@ int radsecproxy_main(int argc, char **ar
-     /* just hang around doing nothing, anything to do here? */
-     for (;;)
- 	sleep(1000);
-+
-+    return 0;
- }
- 
- /* Local Variables: */
---- a/udp.c
-+++ b/udp.c
-@@ -266,6 +266,8 @@ void *udpclientrd(void *arg) {
- 	buf = radudpget(*s, NULL, &server, NULL);
- 	replyh(server, buf);
-     }
-+
-+    return NULL;
- }
- 
- void *udpserverrd(void *arg) {
-@@ -310,6 +312,8 @@ void *udpserverwr(void *arg) {
- 	debug(DBG_DBG, "udpserverwr: refcount %d", reply->refcount);
- 	freerq(reply);
-     }
-+
-+    return NULL;
- }
- 
- void addclientudp(struct client *client) {
diff --git a/trunk/package/feeds/packages/radsecproxy/patches/200-logdest-on-foreground.patch b/trunk/package/feeds/packages/radsecproxy/patches/200-logdest-on-foreground.patch
deleted file mode 100644
index 6678448a..00000000
--- a/trunk/package/feeds/packages/radsecproxy/patches/200-logdest-on-foreground.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/radsecproxy.c b/radsecproxy.c
-index 563c4a8..9fa076d 100644
---- a/radsecproxy.c
-+++ b/radsecproxy.c
-@@ -3382,18 +3382,16 @@ int radsecproxy_main(int argc, char **argv) {
- 	options.loglevel = loglevel;
-     else if (options.loglevel)
- 	debug_set_level(options.loglevel);
--    if (!foreground) {
--	debug_set_destination(options.logdestination
--                              ? options.logdestination
--                              : "x-syslog:///", LOG_TYPE_DEBUG);
-+    debug_set_destination(options.logdestination
-+			  ? options.logdestination
-+			  : "x-syslog:///", LOG_TYPE_DEBUG);
- #if defined(WANT_FTICKS)
--    	if (options.ftickssyslogfacility) {
--            debug_set_destination(options.ftickssyslogfacility,
--                                  LOG_TYPE_FTICKS);
--            free(options.ftickssyslogfacility);
--    	}
--#endif
-+    if (options.ftickssyslogfacility) {
-+	debug_set_destination(options.ftickssyslogfacility,
-+			      LOG_TYPE_FTICKS);
-+	free(options.ftickssyslogfacility);
-     }
-+#endif
-     free(options.logdestination);
- 
-     if (!list_first(clconfs))
diff --git a/trunk/package/feeds/packages/redsocks/Makefile b/trunk/package/feeds/packages/redsocks/Makefile
deleted file mode 100644
index 91f04773..00000000
--- a/trunk/package/feeds/packages/redsocks/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=redsocks
-PKG_VERSION:=0.4
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
-PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/darkk/redsocks/archive/
-PKG_MD5SUM:=810102ef06a9ea796f310ae811afc6a8
-PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
-PKG_LICENSE:=Apache-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/redsocks
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libevent2
-  TITLE:=Redirect any TCP connection to a SOCKS or HTTPS proxy server
-endef
-
-define Package/redsocks/conffiles
-/etc/redsocks.conf
-endef
-
-define Package/redsocks/description
- Redsocks is a daemon running on the local system, that will transparently
- tunnel any TCP connection via a remote SOCKS4, SOCKS5 or HTTP proxy server. It
- uses the system firewall's redirection facility to intercept TCP connections,
- thus the redirection is system-wide, with fine-grained control, and does
- not depend on LD_PRELOAD libraries.
- 
- Redsocks supports tunneling TCP connections and UDP packets. It has
- authentication support for both, SOCKS and HTTP proxies.
- 
- Also included is a small DNS server returning answers with the "truncated" flag
- set for any UDP query, forcing the resolver to use TCP.
-endef
-
-define Package/redsocks/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/redsocks $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/redsocks.init $(1)/etc/init.d/redsocks
-	$(INSTALL_CONF) files/redsocks.conf $(1)/etc/
-endef
-
-$(eval $(call BuildPackage,redsocks))
diff --git a/trunk/package/feeds/packages/redsocks/files/redsocks.conf b/trunk/package/feeds/packages/redsocks/files/redsocks.conf
deleted file mode 100644
index 64307c71..00000000
--- a/trunk/package/feeds/packages/redsocks/files/redsocks.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-base {
-	// debug: connection progress & client list on SIGUSR1
-	log_debug = off;
-
-	// info: start and end of client session
-	log_info = on;
-
-	/* possible `log' values are:
-	 *   stderr
-	 *   "file:/path/to/file"
-	 *   syslog:FACILITY  facility is any of "daemon", "local0"..."local7"
-	 */
-	// log = stderr;
-	// log = "file:/path/to/file";
-	log = "syslog:local7";
-
-	// detach from console
-	daemon = on;
-
-	/* Change uid, gid and root directory, these options require root
-	 * privilegies on startup.
-	 * Note, your chroot may requre /etc/localtime if you write log to syslog.
-	 * Log is opened before chroot & uid changing.
-	 */
-	// user = nobody;
-	// group = nobody;
-	// chroot = "/var/chroot";
-
-	/* possible `redirector' values are:
-	 *   iptables   - for Linux
-	 *   ipf        - for FreeBSD
-	 *   pf         - for OpenBSD
-	 *   generic    - some generic redirector that MAY work
-	 */
-	redirector = iptables;
-}
-
-redsocks {
-	/* `local_ip' defaults to 127.0.0.1 for security reasons,
-	 * use 0.0.0.0 if you want to listen on every interface.
-	 * `local_*' are used as port to redirect to.
-	 */
-	local_ip = 127.0.0.1;
-	local_port = 12345;
-
-	// listen() queue length. Default value is SOMAXCONN and it should be
-	// good enough for most of us.
-	// listenq = 128; // SOMAXCONN equals 128 on my Linux box.
-
-	// `max_accept_backoff` is a delay to retry `accept()` after accept
-	// failure (e.g. due to lack of file descriptors). It's measured in
-	// milliseconds and maximal value is 65535. `min_accept_backoff` is
-	// used as initial backoff value and as a damper for `accept() after
-	// close()` logic.
-	// min_accept_backoff = 100;
-	// max_accept_backoff = 60000;
-
-	// `ip' and `port' are IP and tcp-port of proxy-server
-	// You can also use hostname instead of IP, only one (random)
-	// address of multihomed host will be used.
-	ip = example.org;
-	port = 1080;
-
-
-	// known types: socks4, socks5, http-connect, http-relay
-	type = socks5;
-
-	// login = "foobar";
-	// password = "baz";
-}
-
-redudp {
-	// `local_ip' should not be 0.0.0.0 as it's also used for outgoing
-	// packets that are sent as replies - and it should be fixed
-	// if we want NAT to work properly.
-	local_ip = 127.0.0.1;
-	local_port = 10053;
-
-	// `ip' and `port' of socks5 proxy server.
-	ip = 10.0.0.1;
-	port = 1080;
-	login = username;
-	password = pazzw0rd;
-
-	// redsocks knows about two options while redirecting UDP packets at
-	// linux: TPROXY and REDIRECT.  TPROXY requires more complex routing
-	// configuration and fresh kernel (>= 2.6.37 according to squid
-	// developers[1]) but has hack-free way to get original destination
-	// address, REDIRECT is easier to configure, but requires `dest_ip` and
-	// `dest_port` to be set, limiting packet redirection to single
-	// destination.
-	// [1] http://wiki.squid-cache.org/Features/Tproxy4
-	dest_ip = 8.8.8.8;
-	dest_port = 53;
-
-	udp_timeout = 30;
-	udp_timeout_stream = 180;
-}
-
-dnstc {
-	// fake and really dumb DNS server that returns "truncated answer" to
-	// every query via UDP, RFC-compliant resolver should repeat same query
-	// via TCP in this case.
-	local_ip = 127.0.0.1;
-	local_port = 5300;
-}
-
-// you can add more `redsocks' and `redudp' sections if you need.
diff --git a/trunk/package/feeds/packages/redsocks/files/redsocks.init b/trunk/package/feeds/packages/redsocks/files/redsocks.init
deleted file mode 100644
index 56c9de32..00000000
--- a/trunk/package/feeds/packages/redsocks/files/redsocks.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-
-START=90
-
-# check if configuration exists
-[ -e "/etc/redsocks.conf" ] || exit 0
-
-start() {
-	if [ -e "/var/run/redsocks.pid" ]; then
-		echo "redsocks is already running"
-		exit 0
-	fi
-
-	/bin/echo -n "running redsocks ..."
-	
-	# startup the safety-wrapper for the daemon
-	/usr/sbin/redsocks -p /var/run/redsocks.pid
-	
-	/bin/echo " done"
-}
-
-stop() {
-	if [ ! -e "/var/run/redsocks.pid" ]; then
-		echo "redsocks is not running"
-		exit 0
-	fi
-
-	/bin/echo -n "stopping redsocks ..."
-	
-	# kill the process
-	/bin/kill $(cat /var/run/redsocks.pid)
-	rm /var/run/redsocks.pid
-	
-	echo " done"
-}
diff --git a/trunk/package/feeds/packages/redsocks/patches/0001-Fix-bug-in-DNS-resolution-results-were-ignored-since.patch b/trunk/package/feeds/packages/redsocks/patches/0001-Fix-bug-in-DNS-resolution-results-were-ignored-since.patch
deleted file mode 100644
index 595be191..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0001-Fix-bug-in-DNS-resolution-results-were-ignored-since.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 290f19972e9f7b74f818ae211cb535e32f1f314f Mon Sep 17 00:00:00 2001
-From: Leonid Evdokimov <leon@darkk.net.ru>
-Date: Tue, 10 Apr 2012 00:57:26 +0400
-Subject: [PATCH 01/12] Fix bug in DNS resolution - results were ignored (since
- 8179a1ff).
-
----
- parser.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index 85d3533..6198828 100644
---- a/parser.c
-+++ b/parser.c
-@@ -295,22 +295,22 @@ static int vp_in_addr(parser_context *context, void *addr, const char *token)
- 		memcpy(addr, &ia, sizeof(ia));
- 	}
- 	else {
--		struct addrinfo *addr, hints;
-+		struct addrinfo *ainfo, hints;
- 		int err;
- 		memset(&hints, 0, sizeof(hints));
- 		hints.ai_family = AF_INET; /* IPv4-only */
- 		hints.ai_socktype = SOCK_STREAM; /* I want to have one address once and ONLY once, that's why I specify socktype and protocol */
- 		hints.ai_protocol = IPPROTO_TCP;
- 		hints.ai_flags = AI_ADDRCONFIG; /* I don't need IPv4 addrs without IPv4 connectivity */
--		err = getaddrinfo(token, NULL, &hints, &addr);
-+		err = getaddrinfo(token, NULL, &hints, &ainfo);
- 		if (err == 0) {
- 			int count, taken;
- 			struct addrinfo *iter;
- 			struct sockaddr_in *resolved_addr;
--			for (iter = addr, count = 0; iter; iter = iter->ai_next, ++count)
-+			for (iter = ainfo, count = 0; iter; iter = iter->ai_next, ++count)
- 				;
- 			taken = rand() % count;
--			for (iter = addr; taken > 0; iter = iter->ai_next, --taken)
-+			for (iter = ainfo; taken > 0; iter = iter->ai_next, --taken)
- 				;
- 			resolved_addr = (struct sockaddr_in*)iter->ai_addr;
- 			assert(resolved_addr->sin_family == iter->ai_family && iter->ai_family == AF_INET);
-@@ -318,7 +318,7 @@ static int vp_in_addr(parser_context *context, void *addr, const char *token)
- 				log_error(LOG_WARNING, "%s resolves to %d addresses, using %s",
- 				          token, count, inet_ntoa(resolved_addr->sin_addr));
- 			memcpy(addr, &resolved_addr->sin_addr, sizeof(ia));
--			freeaddrinfo(addr);
-+			freeaddrinfo(ainfo);
- 		}
- 		else {
- 			if (err == EAI_SYSTEM)
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/redsocks/patches/0002-inet_ntop-red_inet_ntop.patch b/trunk/package/feeds/packages/redsocks/patches/0002-inet_ntop-red_inet_ntop.patch
deleted file mode 100644
index 058556e7..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0002-inet_ntop-red_inet_ntop.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 6015b3a6f26e04dd5d78cd6c1320886fc9035612 Mon Sep 17 00:00:00 2001
-From: Leonid Evdokimov <leon@darkk.net.ru>
-Date: Tue, 10 Apr 2012 01:37:34 +0400
-Subject: [PATCH 02/12] inet_ntop -> red_inet_ntop
-
----
- redsocks.c | 13 ++++---------
- redudp.c   | 19 +++++++++++--------
- utils.c    | 37 +++++++++++++++++++++++++++++++++----
- utils.h    |  7 +++++++
- 4 files changed, 55 insertions(+), 21 deletions(-)
-
-diff --git a/redsocks.c b/redsocks.c
-index d085e10..ba5eab2 100644
---- a/redsocks.c
-+++ b/redsocks.c
-@@ -207,22 +207,17 @@ void redsocks_log_write_plain(
- 	int saved_errno = errno;
- 	struct evbuffer *fmt = evbuffer_new();
- 	va_list ap;
--	char clientaddr_str[INET6_ADDRSTRLEN], destaddr_str[INET6_ADDRSTRLEN];
-+	char clientaddr_str[RED_INET_ADDRSTRLEN], destaddr_str[RED_INET_ADDRSTRLEN];
- 
- 	if (!fmt) {
- 		log_errno(LOG_ERR, "evbuffer_new()");
- 		// no return, as I have to call va_start/va_end
- 	}
- 
--	if (!inet_ntop(clientaddr->sin_family, &clientaddr->sin_addr, clientaddr_str, sizeof(clientaddr_str)))
--		strncpy(clientaddr_str, "???", sizeof(clientaddr_str));
--	if (!inet_ntop(destaddr->sin_family, &destaddr->sin_addr, destaddr_str, sizeof(destaddr_str)))
--		strncpy(destaddr_str, "???", sizeof(destaddr_str));
--
- 	if (fmt) {
--		evbuffer_add_printf(fmt, "[%s:%i->%s:%i]: %s",
--				clientaddr_str, ntohs(clientaddr->sin_port),
--				destaddr_str, ntohs(destaddr->sin_port),
-+		evbuffer_add_printf(fmt, "[%s->%s]: %s",
-+				red_inet_ntop(clientaddr, clientaddr_str, sizeof(clientaddr_str)),
-+				red_inet_ntop(destaddr, destaddr_str, sizeof(destaddr_str)),
- 				orig_fmt);
- 	}
- 
-diff --git a/redudp.c b/redudp.c
-index 0a97852..9516a50 100644
---- a/redudp.c
-+++ b/redudp.c
-@@ -436,10 +436,9 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- 		return;
- 
- 	if (memcmp(&udprelayaddr, &client->udprelayaddr, sizeof(udprelayaddr)) != 0) {
--		char buf[INET6_ADDRSTRLEN];
--		const char *addr = inet_ntop(udprelayaddr.sin_family, &udprelayaddr.sin_addr, buf, sizeof(buf));
--		redudp_log_error(client, LOG_NOTICE, "Got packet from unexpected address %s:%u.",
--		                 addr ? addr : "?", ntohs(udprelayaddr.sin_port));
-+		char buf[RED_INET_ADDRSTRLEN];
-+		redudp_log_error(client, LOG_NOTICE, "Got packet from unexpected address %s.",
-+		                 red_inet_ntop(&udprelayaddr, buf, sizeof(buf)));
- 		return;
- 	}
- 
-@@ -459,10 +458,14 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- 	if (pkt.header.ip.port != client->instance->config.destaddr.sin_port ||
- 	    pkt.header.ip.addr != client->instance->config.destaddr.sin_addr.s_addr)
- 	{
--		char buf[INET6_ADDRSTRLEN];
--		const char *addr = inet_ntop(AF_INET, &pkt.header.ip.addr, buf, sizeof(buf));
--		redudp_log_error(client, LOG_NOTICE, "Socks5 server relayed packet from unexpected address %s:%u.",
--		                 addr ? addr : "?", ntohs(pkt.header.ip.port));
-+		char buf[RED_INET_ADDRSTRLEN];
-+		struct sockaddr_in pktaddr = {
-+			.sin_family = AF_INET,
-+			.sin_addr   = { pkt.header.ip.addr },
-+			.sin_port   = pkt.header.ip.port,
-+		};
-+		redudp_log_error(client, LOG_NOTICE, "Socks5 server relayed packet from unexpected address %s.",
-+		                 red_inet_ntop(&pktaddr, buf, sizeof(buf)));
- 		return;
- 	}
- 
-diff --git a/utils.c b/utils.c
-index c6ced51..6e1f3af 100644
---- a/utils.c
-+++ b/utils.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <assert.h>
- #include <fcntl.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -42,10 +43,9 @@ int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *inadd
- 	}
- 
- 	if (pktlen >= buflen) {
--		char buf[INET6_ADDRSTRLEN];
--		const char *addr = inet_ntop(inaddr->sin_family, &inaddr->sin_addr, buf, sizeof(buf));
--		log_error(LOG_WARNING, "wow! Truncated udp packet of size %zd from %s:%u! impossible! dropping it...",
--		          pktlen, addr ? addr : "?", ntohs(inaddr->sin_port));
-+		char buf[RED_INET_ADDRSTRLEN];
-+		log_error(LOG_WARNING, "wow! Truncated udp packet of size %zd from %s! impossible! dropping it...",
-+		          pktlen, red_inet_ntop(inaddr, buf, sizeof(buf)));
- 		return -1;
- 	}
- 
-@@ -176,4 +176,33 @@ int red_is_socket_connected_ok(struct bufferevent *buffev)
- 	}
- }
- 
-+char *red_inet_ntop(const struct sockaddr_in* sa, char* buffer, size_t buffer_size)
-+{
-+	const char *retval = 0;
-+	size_t len = 0;
-+	uint16_t port;
-+	const char placeholder[] = "???:???";
-+
-+	assert(buffer_size >= sizeof(placeholder));
-+
-+	memset(buffer, buffer_size, 0);
-+	if (sa->sin_family == AF_INET) {
-+		retval = inet_ntop(AF_INET, &sa->sin_addr, buffer, buffer_size);
-+		port = ((struct sockaddr_in*)sa)->sin_port;
-+	}
-+	else if (sa->sin_family == AF_INET6) {
-+		retval = inet_ntop(AF_INET6, &((const struct sockaddr_in6*)sa)->sin6_addr, buffer, buffer_size);
-+		port = ((struct sockaddr_in6*)sa)->sin6_port;
-+	}
-+	if (retval) {
-+		assert(retval == buffer);
-+		len = strlen(retval);
-+		snprintf(buffer + len, buffer_size - len, ":%d", ntohs(port));
-+	}
-+	else {
-+		strcpy(buffer, placeholder);
-+	}
-+	return buffer;
-+}
-+
- /* vim:set tabstop=4 softtabstop=4 shiftwidth=4: */
-diff --git a/utils.h b/utils.h
-index f691b77..d3af00f 100644
---- a/utils.h
-+++ b/utils.h
-@@ -57,6 +57,13 @@ int fcntl_nonblock(int fd);
- 				(what) & EVBUFFER_TIMEOUT ? "EVBUFFER_TIMEOUT" : "0", \
- 				(what) & ~(EVBUFFER_READ|EVBUFFER_WRITE|EVBUFFER_EOF|EVBUFFER_ERROR|EVBUFFER_TIMEOUT)
- 
-+#if INET6_ADDRSTRLEN < INET_ADDRSTRLEN
-+#	error Impossible happens: INET6_ADDRSTRLEN < INET_ADDRSTRLEN
-+#else
-+#	define RED_INET_ADDRSTRLEN (INET6_ADDRSTRLEN + 1 + 5 + 1) // addr + : + port + \0
-+#endif
-+char *red_inet_ntop(const struct sockaddr_in* sa, char* buffer, size_t buffer_size);
-+
- /* vim:set tabstop=4 softtabstop=4 shiftwidth=4: */
- /* vim:set foldmethod=marker foldlevel=32 foldmarker={,}: */
- #endif /* UTILS_H_SAT_FEB__2_02_24_05_2008 */
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/redsocks/patches/0003-Initial-support-for-UDP-TPROXY-redirection.-No-more-.patch b/trunk/package/feeds/packages/redsocks/patches/0003-Initial-support-for-UDP-TPROXY-redirection.-No-more-.patch
deleted file mode 100644
index b89f4be9..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0003-Initial-support-for-UDP-TPROXY-redirection.-No-more-.patch
+++ /dev/null
@@ -1,449 +0,0 @@
-From 709646d59d96cb73a7e70347f37de9823e4e5f14 Mon Sep 17 00:00:00 2001
-From: Leonid Evdokimov <leon@darkk.net.ru>
-Date: Fri, 13 Apr 2012 01:57:23 +0400
-Subject: [PATCH 03/12] Initial support for UDP + TPROXY redirection. No more
- dest_ip in redudp.
-
- * TPROXY requires Linux 2.6.29+ (see man 7 ip[1]).
- * all redsocks code is running as root to bind to arbitrary port.
- * Non-Linux and old-Linux builds are broken at the moment.
-
-[1] http://www.kernel.org/doc/man-pages/online/pages/man7/ip.7.html
----
- dnstc.c  |   2 +-
- redudp.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
- redudp.h |   2 +
- utils.c  |  43 +++++++++++++-
- utils.h  |   2 +-
- 5 files changed, 227 insertions(+), 19 deletions(-)
-
-diff --git a/dnstc.c b/dnstc.c
-index 43881d8..5f9fedd 100644
---- a/dnstc.c
-+++ b/dnstc.c
-@@ -68,7 +68,7 @@ static void dnstc_pkt_from_client(int fd, short what, void *_arg)
- 	ssize_t pktlen, outgoing;
- 
- 	assert(fd == EVENT_FD(&self->listener));
--	pktlen = red_recv_udp_pkt(fd, buf.raw, sizeof(buf), &clientaddr);
-+	pktlen = red_recv_udp_pkt(fd, buf.raw, sizeof(buf), &clientaddr, NULL);
- 	if (pktlen == -1)
- 		return;
- 
-diff --git a/redudp.c b/redudp.c
-index 9516a50..262af3e 100644
---- a/redudp.c
-+++ b/redudp.c
-@@ -15,6 +15,7 @@
-  */
- 
- #include <stdlib.h>
-+#include <search.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/uio.h>
-@@ -33,30 +34,157 @@
- #include "redudp.h"
- 
- #define redudp_log_error(client, prio, msg...) \
--	redsocks_log_write_plain(__FILE__, __LINE__, __func__, 0, &(client)->clientaddr, &(client)->instance->config.destaddr, prio, ## msg)
-+	redsocks_log_write_plain(__FILE__, __LINE__, __func__, 0, &(client)->clientaddr, get_destaddr(client), prio, ## msg)
- #define redudp_log_errno(client, prio, msg...) \
--	redsocks_log_write_plain(__FILE__, __LINE__, __func__, 1, &(client)->clientaddr, &(client)->instance->config.destaddr, prio, ## msg)
-+	redsocks_log_write_plain(__FILE__, __LINE__, __func__, 1, &(client)->clientaddr, get_destaddr(client), prio, ## msg)
- 
- static void redudp_pkt_from_socks(int fd, short what, void *_arg);
- static void redudp_drop_client(redudp_client *client);
- static void redudp_fini_instance(redudp_instance *instance);
- static int redudp_fini();
-+static int redudp_transparent(int fd);
- 
- typedef struct redudp_expected_assoc_reply_t {
- 	socks5_reply h;
- 	socks5_addr_ipv4 ip;
- } PACKED redudp_expected_assoc_reply;
- 
-+struct bound_udp4_key {
-+	struct in_addr sin_addr;
-+	uint16_t       sin_port;
-+};
-+
-+struct bound_udp4 {
-+	struct bound_udp4_key key;
-+	int ref;
-+	int fd;
-+};
-+
- /***********************************************************************
-  * Helpers
-  */
-+// TODO: separate binding to privileged process (this operation requires uid-0)
-+static void* root_bound_udp4 = NULL; // to avoid two binds to same IP:port
-+
-+static int bound_udp4_cmp(const void *a, const void *b)
-+{
-+	return memcmp(a, b, sizeof(struct bound_udp4_key));
-+}
-+
-+static void bound_udp4_mkkey(struct bound_udp4_key *key, const struct sockaddr_in *addr)
-+{
-+	memset(key, 0, sizeof(*key));
-+	key->sin_addr = addr->sin_addr;
-+	key->sin_port = addr->sin_port;
-+}
-+
-+static int bound_udp4_get(const struct sockaddr_in *addr)
-+{
-+	struct bound_udp4_key key;
-+	struct bound_udp4 *node, **pnode;
-+
-+	bound_udp4_mkkey(&key, addr);
-+	// I assume, that memory allocation for lookup is awful, so I use
-+	// tfind/tsearch pair instead of tsearch/check-result.
-+	pnode = tfind(&key, &root_bound_udp4, bound_udp4_cmp);
-+	if (pnode) {
-+		assert((*pnode)->ref > 0);
-+		(*pnode)->ref++;
-+		return (*pnode)->fd;
-+	}
-+
-+	node = calloc(1, sizeof(*node));
-+	if (!node) {
-+		log_errno(LOG_ERR, "calloc");
-+		goto fail;
-+	}
-+
-+	node->key = key;
-+	node->ref = 1;
-+	node->fd = socket(AF_INET, SOCK_DGRAM, 0);
-+	if (node->fd == -1) {
-+		log_errno(LOG_ERR, "socket");
-+		goto fail;
-+	}
-+
-+	if (0 != redudp_transparent(node->fd))
-+		goto fail;
-+
-+	if (0 != bind(node->fd, (struct sockaddr*)addr, sizeof(*addr))) {
-+		log_errno(LOG_ERR, "bind");
-+		goto fail;
-+	}
-+
-+	pnode = tsearch(node, &root_bound_udp4, bound_udp4_cmp);
-+	if (!pnode) {
-+		log_errno(LOG_ERR, "tsearch(%p) == %p", node, pnode);
-+		goto fail;
-+	}
-+	assert(node == *pnode);
-+
-+	return node->fd;
-+
-+fail:
-+	if (node) {
-+		if (node->fd != -1)
-+			redsocks_close(node->fd);
-+		free(node);
-+	}
-+	return -1;
-+}
-+
-+static void bound_udp4_put(const struct sockaddr_in *addr)
-+{
-+	struct bound_udp4_key key;
-+	struct bound_udp4 **pnode, *node;
-+	void *parent;
-+
-+	bound_udp4_mkkey(&key, addr);
-+	pnode = tfind(&key, &root_bound_udp4, bound_udp4_cmp);
-+	assert(pnode && (*pnode)->ref > 0);
-+
-+	node = *pnode;
-+
-+	node->ref--;
-+	if (node->ref)
-+		return;
-+
-+	parent = tdelete(node, &root_bound_udp4, bound_udp4_cmp);
-+	assert(parent);
-+
-+	redsocks_close(node->fd); // expanding `pnode` to avoid use after free
-+	free(node);
-+}
-+
-+static int redudp_transparent(int fd)
-+{
-+	int on = 1;
-+	int error = setsockopt(fd, SOL_IP, IP_TRANSPARENT, &on, sizeof(on));
-+	if (error)
-+		log_errno(LOG_ERR, "setsockopt(..., SOL_IP, IP_TRANSPARENT)");
-+	return error;
-+}
-+
-+static int do_tproxy(redudp_instance* instance)
-+{
-+	return instance->config.destaddr.sin_addr.s_addr == 0;
-+}
-+
-+static struct sockaddr_in* get_destaddr(redudp_client *client)
-+{
-+	if (do_tproxy(client->instance))
-+		return &client->destaddr;
-+	else
-+		return &client->instance->config.destaddr;
-+}
-+
- static void redudp_fill_preamble(socks5_udp_preabmle *preamble, redudp_client *client)
- {
- 	preamble->reserved = 0;
- 	preamble->frag_no = 0; /* fragmentation is not supported */
- 	preamble->addrtype = socks5_addrtype_ipv4;
--	preamble->ip.addr = client->instance->config.destaddr.sin_addr.s_addr;
--	preamble->ip.port = client->instance->config.destaddr.sin_port;
-+	preamble->ip.addr = get_destaddr(client)->sin_addr.s_addr;
-+	preamble->ip.port = get_destaddr(client)->sin_port;
- }
- 
- static struct evbuffer* socks5_mkmethods_plain_wrapper(void *p)
-@@ -104,6 +232,8 @@ static void redudp_drop_client(redudp_client *client)
- 			redudp_log_errno(client, LOG_ERR, "event_del");
- 		redsocks_close(fd);
- 	}
-+	if (client->sender_fd != -1)
-+		bound_udp4_put(&client->destaddr);
- 	list_for_each_entry_safe(q, tmp, &client->queue, list) {
- 		list_del(&q->list);
- 		free(q);
-@@ -344,7 +474,8 @@ static void redudp_relay_connected(struct bufferevent *buffev, void *_arg)
- 	redudp_client *client = _arg;
- 	int do_password = socks5_is_valid_cred(client->instance->config.login, client->instance->config.password);
- 	int error;
--	redudp_log_error(client, LOG_DEBUG, "<trace>");
-+	char relayaddr_str[RED_INET_ADDRSTRLEN];
-+	redudp_log_error(client, LOG_DEBUG, "via %s", red_inet_ntop(&client->instance->config.relayaddr, relayaddr_str, sizeof(relayaddr_str)));
- 
- 	if (!red_is_socket_connected_ok(buffev)) {
- 		redudp_log_errno(client, LOG_NOTICE, "red_is_socket_connected_ok");
-@@ -382,7 +513,7 @@ static void redudp_timeout(int fd, short what, void *_arg)
- 	redudp_drop_client(client);
- }
- 
--static void redudp_first_pkt_from_client(redudp_instance *self, struct sockaddr_in *clientaddr, char *buf, size_t pktlen)
-+static void redudp_first_pkt_from_client(redudp_instance *self, struct sockaddr_in *clientaddr, struct sockaddr_in *destaddr, char *buf, size_t pktlen)
- {
- 	redudp_client *client = calloc(1, sizeof(*client));
- 
-@@ -395,9 +526,13 @@ static void redudp_first_pkt_from_client(redudp_instance *self, struct sockaddr_
- 	INIT_LIST_HEAD(&client->queue);
- 	client->instance = self;
- 	memcpy(&client->clientaddr, clientaddr, sizeof(*clientaddr));
-+	if (destaddr)
-+		memcpy(&client->destaddr, destaddr, sizeof(client->destaddr));
- 	evtimer_set(&client->timeout, redudp_timeout, client);
- 	// XXX: self->relay_ss->init(client);
- 
-+	client->sender_fd = -1; // it's postponed until socks-server replies to avoid trivial DoS
-+
- 	client->relay = red_connect_relay(&client->instance->config.relayaddr,
- 	                                  redudp_relay_connected, redudp_relay_error, client);
- 	if (!client->relay)
-@@ -431,7 +566,7 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- 
- 	assert(fd == EVENT_FD(&client->udprelay));
- 
--	pktlen = red_recv_udp_pkt(fd, pkt.buf, sizeof(pkt.buf), &udprelayaddr);
-+	pktlen = red_recv_udp_pkt(fd, pkt.buf, sizeof(pkt.buf), &udprelayaddr, NULL);
- 	if (pktlen == -1)
- 		return;
- 
-@@ -455,8 +590,8 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- 		return;
- 	}
- 
--	if (pkt.header.ip.port != client->instance->config.destaddr.sin_port ||
--	    pkt.header.ip.addr != client->instance->config.destaddr.sin_addr.s_addr)
-+	if (pkt.header.ip.port != get_destaddr(client)->sin_port ||
-+	    pkt.header.ip.addr != get_destaddr(client)->sin_addr.s_addr)
- 	{
- 		char buf[RED_INET_ADDRSTRLEN];
- 		struct sockaddr_in pktaddr = {
-@@ -472,8 +607,18 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- 	redsocks_time(&client->last_relay_event);
- 	redudp_bump_timeout(client);
- 
-+	if (do_tproxy(client->instance) && client->sender_fd == -1) {
-+		client->sender_fd = bound_udp4_get(&client->destaddr);
-+		if (client->sender_fd == -1) {
-+			redudp_log_error(client, LOG_WARNING, "bound_udp4_get failure");
-+			return;
-+		}
-+	}
-+
- 	fwdlen = pktlen - sizeof(pkt.header);
--	outgoing = sendto(EVENT_FD(&client->instance->listener),
-+	outgoing = sendto(do_tproxy(client->instance)
-+	                      ? client->sender_fd
-+	                      : EVENT_FD(&client->instance->listener),
- 	                  pkt.buf + sizeof(pkt.header), fwdlen, 0,
- 	                  (struct sockaddr*)&client->clientaddr, sizeof(client->clientaddr));
- 	if (outgoing != fwdlen) {
-@@ -486,18 +631,21 @@ static void redudp_pkt_from_socks(int fd, short what, void *_arg)
- static void redudp_pkt_from_client(int fd, short what, void *_arg)
- {
- 	redudp_instance *self = _arg;
--	struct sockaddr_in clientaddr;
-+	struct sockaddr_in clientaddr, destaddr, *pdestaddr;
- 	char buf[0xFFFF]; // UDP packet can't be larger then that
- 	ssize_t pktlen;
- 	redudp_client *tmp, *client = NULL;
- 
-+	pdestaddr = do_tproxy(self) ? &destaddr : NULL;
-+
- 	assert(fd == EVENT_FD(&self->listener));
--	pktlen = red_recv_udp_pkt(fd, buf, sizeof(buf), &clientaddr);
-+	pktlen = red_recv_udp_pkt(fd, buf, sizeof(buf), &clientaddr, pdestaddr);
- 	if (pktlen == -1)
- 		return;
- 
- 	// TODO: this lookup may be SLOOOOOW.
- 	list_for_each_entry(tmp, &self->clients, list) {
-+		// TODO: check destaddr
- 		if (0 == memcmp(&clientaddr, &tmp->clientaddr, sizeof(clientaddr))) {
- 			client = tmp;
- 			break;
-@@ -515,7 +663,7 @@ static void redudp_pkt_from_client(int fd, short what, void *_arg)
- 		}
- 	}
- 	else {
--		redudp_first_pkt_from_client(self, &clientaddr, buf, pktlen);
-+		redudp_first_pkt_from_client(self, &clientaddr, pdestaddr, buf, pktlen);
- 	}
- }
- 
-@@ -554,7 +702,6 @@ static int redudp_onenter(parser_section *section)
- 	instance->config.relayaddr.sin_family = AF_INET;
- 	instance->config.relayaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- 	instance->config.destaddr.sin_family = AF_INET;
--	instance->config.destaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- 	instance->config.max_pktqueue = 5;
- 	instance->config.udp_timeout = 30;
- 	instance->config.udp_timeout_stream = 180;
-@@ -614,6 +761,28 @@ static int redudp_init_instance(redudp_instance *instance)
- 		goto fail;
- 	}
- 
-+	if (do_tproxy(instance)) {
-+		int on = 1;
-+		char buf[RED_INET_ADDRSTRLEN];
-+		// iptables TPROXY target does not send packets to non-transparent sockets
-+		if (0 != redudp_transparent(fd))
-+			goto fail;
-+
-+		error = setsockopt(fd, SOL_IP, IP_RECVORIGDSTADDR, &on, sizeof(on));
-+		if (error) {
-+			log_errno(LOG_ERR, "setsockopt(listener, SOL_IP, IP_RECVORIGDSTADDR)");
-+			goto fail;
-+		}
-+
-+		log_error(LOG_DEBUG, "redudp @ %s: TPROXY", red_inet_ntop(&instance->config.bindaddr, buf, sizeof(buf)));
-+	}
-+	else {
-+		char buf1[RED_INET_ADDRSTRLEN], buf2[RED_INET_ADDRSTRLEN];
-+		log_error(LOG_DEBUG, "redudp @ %s: destaddr=%s",
-+			red_inet_ntop(&instance->config.bindaddr, buf1, sizeof(buf1)),
-+			red_inet_ntop(&instance->config.destaddr, buf2, sizeof(buf2)));
-+	}
-+
- 	error = bind(fd, (struct sockaddr*)&instance->config.bindaddr, sizeof(instance->config.bindaddr));
- 	if (error) {
- 		log_errno(LOG_ERR, "bind");
-diff --git a/redudp.h b/redudp.h
-index 308bd33..3f1d9d1 100644
---- a/redudp.h
-+++ b/redudp.h
-@@ -24,6 +24,8 @@ typedef struct redudp_client_t {
- 	list_head           list;
- 	redudp_instance    *instance;
- 	struct sockaddr_in  clientaddr;
-+	struct sockaddr_in  destaddr;
-+	int                 sender_fd; // shared between several clients socket (bound to `destaddr`)
- 	struct event        timeout;
- 	struct bufferevent *relay;
- 	struct event        udprelay;
-diff --git a/utils.c b/utils.c
-index 6e1f3af..afdeea8 100644
---- a/utils.c
-+++ b/utils.c
-@@ -26,17 +26,54 @@
- #include "utils.h"
- #include "redsocks.h" // for redsocks_close
- 
--int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *inaddr)
-+int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *inaddr, struct sockaddr_in *toaddr)
- {
- 	socklen_t addrlen = sizeof(*inaddr);
- 	ssize_t pktlen;
--
--	pktlen = recvfrom(fd, buf, buflen, 0, (struct sockaddr*)inaddr, &addrlen);
-+	struct msghdr msg;
-+	struct iovec io;
-+	char control[1024];
-+
-+	memset(&msg, 0, sizeof(msg));
-+	msg.msg_name = inaddr;
-+	msg.msg_namelen = sizeof(*inaddr);
-+	msg.msg_iov = &io;
-+	msg.msg_iovlen = 1;
-+	msg.msg_control = control;
-+	msg.msg_controllen = sizeof(control);
-+	io.iov_base = buf;
-+	io.iov_len = buflen;
-+
-+	pktlen = recvmsg(fd, &msg, 0);
- 	if (pktlen == -1) {
- 		log_errno(LOG_WARNING, "recvfrom");
- 		return -1;
- 	}
- 
-+	if (toaddr) {
-+		memset(toaddr, 0, sizeof(*toaddr));
-+		for (struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-+			if (
-+				cmsg->cmsg_level == SOL_IP &&
-+				cmsg->cmsg_type == IP_ORIGDSTADDR &&
-+				cmsg->cmsg_len >= CMSG_LEN(sizeof(*toaddr))
-+			) {
-+				struct sockaddr_in* cmsgaddr = (struct sockaddr_in*)CMSG_DATA(cmsg);
-+				char buf[RED_INET_ADDRSTRLEN];
-+				log_error(LOG_DEBUG, "IP_ORIGDSTADDR: %s", red_inet_ntop(cmsgaddr, buf, sizeof(buf)));
-+				memcpy(toaddr, cmsgaddr, sizeof(*toaddr));
-+			}
-+			else {
-+				log_error(LOG_WARNING, "unexepcted cmsg (level,type) = (%d,%d)",
-+					cmsg->cmsg_level, cmsg->cmsg_type);
-+			}
-+		}
-+		if (toaddr->sin_family != AF_INET) {
-+			log_error(LOG_WARNING, "(SOL_IP, IP_ORIGDSTADDR) not found");
-+			return -1;
-+		}
-+	}
-+
- 	if (addrlen != sizeof(*inaddr)) {
- 		log_error(LOG_WARNING, "unexpected address length %u instead of %zu", addrlen, sizeof(*inaddr));
- 		return -1;
-diff --git a/utils.h b/utils.h
-index d3af00f..c2277e9 100644
---- a/utils.h
-+++ b/utils.h
-@@ -44,7 +44,7 @@ char *redsocks_evbuffer_readline(struct evbuffer *buf);
- struct bufferevent* red_connect_relay(struct sockaddr_in *addr, evbuffercb writecb, everrorcb errorcb, void *cbarg);
- int red_socket_geterrno(struct bufferevent *buffev);
- int red_is_socket_connected_ok(struct bufferevent *buffev);
--int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *inaddr);
-+int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *fromaddr, struct sockaddr_in *toaddr);
- 
- int fcntl_nonblock(int fd);
- 
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/redsocks/patches/0004-Fix-transposition-of-memset-parameters.patch b/trunk/package/feeds/packages/redsocks/patches/0004-Fix-transposition-of-memset-parameters.patch
deleted file mode 100644
index cb6fa1e4..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0004-Fix-transposition-of-memset-parameters.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b60b492602448b59aea194afd4991910d3613e5c Mon Sep 17 00:00:00 2001
-From: Cody Schafer <jmesmon@gmail.com>
-Date: Tue, 24 Apr 2012 04:33:13 -0500
-Subject: [PATCH 04/12] Fix transposition of memset parameters.
-
----
- utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils.c b/utils.c
-index afdeea8..31c6894 100644
---- a/utils.c
-+++ b/utils.c
-@@ -222,7 +222,7 @@ char *red_inet_ntop(const struct sockaddr_in* sa, char* buffer, size_t buffer_si
- 
- 	assert(buffer_size >= sizeof(placeholder));
- 
--	memset(buffer, buffer_size, 0);
-+	memset(buffer, 0, buffer_size);
- 	if (sa->sin_family == AF_INET) {
- 		retval = inet_ntop(AF_INET, &sa->sin_addr, buffer, buffer_size);
- 		port = ((struct sockaddr_in*)sa)->sin_port;
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/redsocks/patches/0005-Fix-compilation-on-Ubuntu-10.04-LTS-and-hopefully-De.patch b/trunk/package/feeds/packages/redsocks/patches/0005-Fix-compilation-on-Ubuntu-10.04-LTS-and-hopefully-De.patch
deleted file mode 100644
index f0f09aa5..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0005-Fix-compilation-on-Ubuntu-10.04-LTS-and-hopefully-De.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 18e2b5ed1ffb3e7c5dfec8ff41b3027163f680ed Mon Sep 17 00:00:00 2001
-From: Leonid Evdokimov <leon@darkk.net.ru>
-Date: Wed, 12 Sep 2012 02:05:39 +0400
-Subject: [PATCH 09/12] Fix compilation on Ubuntu 10.04 LTS and (hopefully)
- Debian squeeze[1]
-
-fixes #28, fixes #22, fixes #24
-[1] current "stable" release
----
- libc-compat.h     | 25 +++++++++++++++++++++++++
- libevent-compat.h | 11 +++++++++++
- redsocks.c        |  1 +
- redudp.c          |  1 +
- utils.c           |  1 +
- 5 files changed, 39 insertions(+)
- create mode 100644 libc-compat.h
- create mode 100644 libevent-compat.h
-
-diff --git a/libc-compat.h b/libc-compat.h
-new file mode 100644
-index 0000000..adcf63b
---- /dev/null
-+++ b/libc-compat.h
-@@ -0,0 +1,25 @@
-+#ifndef UUID_67C91670_FCCB_4855_BDF7_609F1EECB8B4
-+#define UUID_67C91670_FCCB_4855_BDF7_609F1EECB8B4
-+
-+/* all these definitions, are included into bits/in.h from libc6-dev 2.15-0ubuntu10
-+ * from Ubuntu 12.04 and is not included into libc6-dev 2.11.1-0ubuntu7.10 from
-+ * Ubuntu 10.04.
-+ * linux/in.h is not included directly because of lots of redefinitions,
-+ * extracting single value from linux/in.h is not done because it looks like
-+ * autotools reinvention */
-+#ifndef IP_ORIGDSTADDR
-+#   warning Using hardcoded value for IP_ORIGDSTADDR as libc headers do not define it.
-+#   define IP_ORIGDSTADDR 20
-+#endif
-+
-+#ifndef IP_RECVORIGDSTADDR
-+#   warning Using hardcoded value for IP_RECVORIGDSTADDR as libc headers do not define it.
-+#   define IP_RECVORIGDSTADDR IP_ORIGDSTADDR
-+#endif
-+
-+#ifndef IP_TRANSPARENT
-+#   warning Using hardcoded value for IP_TRANSPARENT as libc headers do not define it.
-+#   define IP_TRANSPARENT 19
-+#endif
-+
-+#endif // 67C91670_FCCB_4855_BDF7_609F1EECB8B4
-diff --git a/libevent-compat.h b/libevent-compat.h
-new file mode 100644
-index 0000000..a7f1ca1
---- /dev/null
-+++ b/libevent-compat.h
-@@ -0,0 +1,11 @@
-+#ifndef UUID_FC148CFA_5ECC_488E_8A62_CD39406C9F1E
-+#define UUID_FC148CFA_5ECC_488E_8A62_CD39406C9F1E
-+
-+/* evutil_socket_t is macros in libevent-2.0, not typedef, libevent-1.4 is
-+ * still supported because of Ubuntu 10.04 LTS */
-+#ifndef evutil_socket_t
-+#   warning Using hardcoded value for evutil_socket_t as libevent headers do not define it.
-+#   define evutil_socket_t int
-+#endif
-+
-+#endif // FC148CFA_5ECC_488E_8A62_CD39406C9F1E
-diff --git a/redsocks.c b/redsocks.c
-index ba5eab2..878576f 100644
---- a/redsocks.c
-+++ b/redsocks.c
-@@ -33,6 +33,7 @@
- #include "base.h"
- #include "redsocks.h"
- #include "utils.h"
-+#include "libevent-compat.h"
- 
- 
- #define REDSOCKS_RELAY_HALFBUFF  4096
-diff --git a/redudp.c b/redudp.c
-index 262af3e..05460dc 100644
---- a/redudp.c
-+++ b/redudp.c
-@@ -32,6 +32,7 @@
- #include "main.h"
- #include "redsocks.h"
- #include "redudp.h"
-+#include "libc-compat.h"
- 
- #define redudp_log_error(client, prio, msg...) \
- 	redsocks_log_write_plain(__FILE__, __LINE__, __func__, 0, &(client)->clientaddr, get_destaddr(client), prio, ## msg)
-diff --git a/utils.c b/utils.c
-index 31c6894..7de3969 100644
---- a/utils.c
-+++ b/utils.c
-@@ -25,6 +25,7 @@
- #include "log.h"
- #include "utils.h"
- #include "redsocks.h" // for redsocks_close
-+#include "libc-compat.h"
- 
- int red_recv_udp_pkt(int fd, char *buf, size_t buflen, struct sockaddr_in *inaddr, struct sockaddr_in *toaddr)
- {
--- 
-1.9.1
-
diff --git a/trunk/package/feeds/packages/redsocks/patches/0006-fix_default_config_location.patch b/trunk/package/feeds/packages/redsocks/patches/0006-fix_default_config_location.patch
deleted file mode 100644
index 1994befa..00000000
--- a/trunk/package/feeds/packages/redsocks/patches/0006-fix_default_config_location.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: change the default config file location
- redsocks by default looks for ./redsocks.conf. Change this to
- /etc/redsocks.conf for a more deterministic behaviour.
-Author: Apollon Oikonomopoulos <apoikos@gmail.com>
-Forwared: no
-Last-Update: 2013-04-23
---- a/main.c
-+++ b/main.c
-@@ -39,7 +39,7 @@
- 	&dnstc_subsys,
- };
- 
--static const char *confname = "redsocks.conf";
-+static const char *confname = "/etc/redsocks.conf";
- static const char *pidfile = NULL;
- 
- static void terminate(int sig, short what, void *_arg)
diff --git a/trunk/package/feeds/packages/remserial/Makefile b/trunk/package/feeds/packages/remserial/Makefile
deleted file mode 100644
index 4fe476d4..00000000
--- a/trunk/package/feeds/packages/remserial/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=remserial
-PKG_VERSION:=1.4
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://lpccomp.bc.ca/remserial/
-PKG_MD5SUM:=b19b57fd118329c5ea3aaf9887f946a6
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/remserial
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Bridge TCP/IP port with a device
-  URL:=http://lpccomp.bc.ca/remserial/
-endef
-
-define Package/remserial/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/remserial $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,remserial))
diff --git a/trunk/package/feeds/packages/rng-tools/Makefile b/trunk/package/feeds/packages/rng-tools/Makefile
deleted file mode 100644
index d45a197c..00000000
--- a/trunk/package/feeds/packages/rng-tools/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rng-tools
-PKG_VERSION:=5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/
-PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68
-PKG_LICENSE:=GPLv2
-PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
-
-PKG_FIXUP:=autoreconf
-
-PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rng-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Daemon for adding entropy to kernel entropy pool
-  URL:=http://sourceforge.net/projects/gkernel/
-endef
-
-ifdef CONFIG_USE_UCLIBC
-CONFIGURE_VARS += \
-    LIBS="-largp"
-endif
-
-CONFIGURE_ARGS += \
-	--without-libgcrypt
-
-define Package/rng-tools/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngd $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,rng-tools))
diff --git a/trunk/package/feeds/packages/rng-tools/files/rngd.init b/trunk/package/feeds/packages/rng-tools/files/rngd.init
deleted file mode 100644
index 805559c4..00000000
--- a/trunk/package/feeds/packages/rng-tools/files/rngd.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011-2014 OpenWrt.org
-
-START=98
-
-RNGD_INTERVAL=30
-RNGD_AMOUNT=4000
-RNGD_DEVICE="/dev/urandom"
-
-start() {
-	service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT
-}
-
-stop() {
-	service_stop /sbin/rngd
-}
diff --git a/trunk/package/feeds/packages/rpcd-mod-lxc/Makefile b/trunk/package/feeds/packages/rpcd-mod-lxc/Makefile
deleted file mode 100644
index 154336b7..00000000
--- a/trunk/package/feeds/packages/rpcd-mod-lxc/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rpcd-mod-lxc
-PKG_RELEASE=20141012
-
-PKG_LICENSE:=ISC
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/rpcd-mod-lxc
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=LXC rpcd module
-  DEPENDS:=+rpcd +liblxc
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Build/Prepare
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/rpcd-mod-lxc/install
-	$(INSTALL_DIR) $(1)/usr/lib/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/lxc.so $(1)/usr/lib/rpcd/
-endef
-
-$(eval $(call BuildPackage,rpcd-mod-lxc))
diff --git a/trunk/package/feeds/packages/rpcd-mod-lxc/files/CMakeLists.txt b/trunk/package/feeds/packages/rpcd-mod-lxc/files/CMakeLists.txt
deleted file mode 100644
index 4a728a0b..00000000
--- a/trunk/package/feeds/packages/rpcd-mod-lxc/files/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-PROJECT(rpcd-mod-lxc)
-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -Wmissing-declarations)
-
-INCLUDE_DIRECTORIES(include)
-FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-
-SET(SOURCES lxc.c)
-
-ADD_LIBRARY(rpcd-mod-lxc SHARED ${SOURCES})
-
-FIND_LIBRARY(lxc NAMES lxc liblxc)
-TARGET_LINK_LIBRARIES(rpcd-mod-lxc ${lxc})
-
-SET_TARGET_PROPERTIES(rpcd-mod-lxc PROPERTIES OUTPUT_NAME lxc PREFIX "")
-INSTALL(TARGETS rpcd-mod-lxc LIBRARY DESTINATION lib)
diff --git a/trunk/package/feeds/packages/rpcd-mod-lxc/files/lxc.c b/trunk/package/feeds/packages/rpcd-mod-lxc/files/lxc.c
deleted file mode 100644
index 0d52f167..00000000
--- a/trunk/package/feeds/packages/rpcd-mod-lxc/files/lxc.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * rpcd-lxc-plugin
- *
- * Copyright (C) 2014 Cisco Systems, Inc.
- * Author: Luka Perkov <luka@openwrt.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <libubus.h>
-
-#include <lxc/lxccontainer.h>
-
-#include <rpcd/plugin.h>
-
-static struct blob_buf buf;
-
-struct rpc_lxc {
-	/* ubus options */
-	char *name;
-	char *config;
-	/* lxc container */
-	struct lxc_container *container;
-};
-
-enum {
-	RPC_LXC_NAME,
-	RPC_LXC_CONFIG,
-	__RPC_LXC_MAX,
-};
-
-enum {
-	RPC_LXC_SHUTDOWN_NAME,
-	RPC_LXC_SHUTDOWN_CONFIG,
-	RPC_LXC_SHUTDOWN_TIMEOUT,
-	__RPC_LXC_SHUTDOWN_MAX,
-};
-
-enum {
-	RPC_LXC_RENAME_NAME,
-	RPC_LXC_RENAME_CONFIG,
-	RPC_LXC_RENAME_NEWNAME,
-	__RPC_LXC_RENAME_MAX,
-};
-
-enum {
-	RPC_LXC_CREATE_NAME,
-	RPC_LXC_CREATE_CONFIG,
-	RPC_LXC_CREATE_TEMPLATE,
-	RPC_LXC_CREATE_FLAGS,
-	RPC_LXC_CREATE_ARGS,
-	__RPC_LXC_CREATE_MAX,
-};
-
-static const struct blobmsg_policy rpc_lxc_min_policy[__RPC_LXC_MAX] = {
-	[RPC_LXC_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
-};
-
-static const struct blobmsg_policy rpc_lxc_shutdown_policy[__RPC_LXC_SHUTDOWN_MAX] = {
-	[RPC_LXC_SHUTDOWN_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_SHUTDOWN_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_SHUTDOWN_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
-};
-
-static const struct blobmsg_policy rpc_lxc_rename_policy[__RPC_LXC_RENAME_MAX] = {
-	[RPC_LXC_RENAME_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_RENAME_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_RENAME_NEWNAME] = { .name = "newname", .type = BLOBMSG_TYPE_STRING },
-};
-
-static const struct blobmsg_policy rpc_lxc_create_policy[__RPC_LXC_CREATE_MAX] = {
-	[RPC_LXC_CREATE_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_CREATE_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_CREATE_TEMPLATE] = { .name = "template", .type = BLOBMSG_TYPE_STRING },
-	[RPC_LXC_CREATE_FLAGS] = { .name = "flags", .type = BLOBMSG_TYPE_INT32 },
-	[RPC_LXC_CREATE_ARGS] = { .name = "args", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-static struct rpc_lxc *
-rpc_lxc_init(struct blob_attr *tb[__RPC_LXC_MAX])
-{
-	struct rpc_lxc *l = NULL;
-
-	l = calloc(1, sizeof(struct rpc_lxc));
-	if (!l) return NULL;
-
-	if (tb[RPC_LXC_NAME]) {
-		l->name = blobmsg_data(tb[RPC_LXC_NAME]);
-	} else {
-		goto error;
-	}
-
-	if (tb[RPC_LXC_CONFIG]) {
-		l->config = blobmsg_data(tb[RPC_LXC_CONFIG]);
-	} else {
-		l->config = NULL;
-	}
-
-	l->container = lxc_container_new(l->name, l->config);
-	if (!l->container) {
-		goto error;
-	}
-
-	return l;
-error:
-	free(l);
-	return NULL;
-}
-
-static void
-rpc_lxc_done(struct rpc_lxc *l)
-{
-	if (l) {
-		lxc_container_put(l->container);
-		free(l);
-	}
-
-	return;
-}
-
-static int
-rpc_lxc_start(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->start(l->container, 0, NULL)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-
-static int
-rpc_lxc_reboot(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->reboot(l->container)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_shutdown(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_SHUTDOWN_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_shutdown_policy, __RPC_LXC_SHUTDOWN_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	/* define default timeout */
-	int timeout = 30;
-	if (tb[RPC_LXC_SHUTDOWN_TIMEOUT]) {
-		timeout = blobmsg_get_u32(tb[RPC_LXC_SHUTDOWN_TIMEOUT]);
-	}
-
-	if (!l->container->shutdown(l->container, timeout)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_stop(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->stop(l->container)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_freeze(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->freeze(l->container)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_unfreeze(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->unfreeze(l->container)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_rename(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_RENAME_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_rename_policy, __RPC_LXC_RENAME_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (!tb[RPC_LXC_RENAME_NEWNAME]) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	if (l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	char *newname = blobmsg_data(tb[RPC_LXC_RENAME_NEWNAME]);
-	if (!newname || !l->container->rename(l->container, newname)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_create(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_CREATE_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	char *template = "none";
-	int flags = 0;
-	char **args = NULL;
-
-	blobmsg_parse(rpc_lxc_create_policy, __RPC_LXC_CREATE_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (tb[RPC_LXC_CREATE_TEMPLATE])
-		template = blobmsg_data(tb[RPC_LXC_CREATE_TEMPLATE]);
-
-	if (tb[RPC_LXC_CREATE_FLAGS])
-		flags = blobmsg_get_u32(tb[RPC_LXC_CREATE_FLAGS]);
-
-	if (tb[RPC_LXC_CREATE_ARGS]) {
-		struct blob_attr *cur;
-		int num, rem;
-
-		num = blobmsg_check_array(tb[RPC_LXC_CREATE_ARGS], BLOBMSG_TYPE_STRING);
-
-		// trailing NULL is needed
-		args = calloc(num + 1, sizeof(char *));
-		if (!args) {
-			rc = UBUS_STATUS_UNKNOWN_ERROR;
-			goto out;
-		}
-
-		num = 0;
-		blobmsg_for_each_attr(cur, tb[RPC_LXC_CREATE_ARGS], rem)
-		{
-			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
-				continue;
-
-			args[num++] = (char *) blobmsg_data(cur);
-		}
-	}
-
-	if (!l->container->create(l->container, template, NULL, NULL, flags, args)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	free(args);
-	return rc;
-}
-
-static int
-rpc_lxc_destroy(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-	struct blob_attr *tb[__RPC_LXC_MAX];
-	struct rpc_lxc *l = NULL;
-	int rc;
-
-	blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg));
-
-	l = rpc_lxc_init(tb);
-	if (!l) return UBUS_STATUS_INVALID_ARGUMENT;
-
-	if (l->container->is_running(l->container)) {
-		rc = UBUS_STATUS_UNKNOWN_ERROR;
-		goto out;
-	}
-
-	if (!l->container->destroy(l->container)) {
-		rc = UBUS_STATUS_INVALID_ARGUMENT;
-		goto out;
-	}
-
-	rc = UBUS_STATUS_OK;
-out:
-	rpc_lxc_done(l);
-	return rc;
-}
-
-static int
-rpc_lxc_list(struct ubus_context *ctx, struct ubus_object *obj,
-		struct ubus_request_data *req, const char *method,
-		struct blob_attr *msg)
-{
-
-	blob_buf_init(&buf, 0);
-
-	int rc;
-	char **names;
-	struct lxc_container **cret;
-
-	rc = list_all_containers(NULL, &names, &cret);
-	if (rc == -1)
-		return UBUS_STATUS_UNKNOWN_ERROR;
-
-	for (int i = 0; i < rc; i++) {
-		struct lxc_container *c = cret[i];
-		blobmsg_add_string(&buf, names[i], c->state(c));
-
-		free(names[i]);
-		lxc_container_put(c);
-	}
-
-	ubus_send_reply(ctx, req, buf.head);
-
-	return UBUS_STATUS_OK;
-}
-
-static int
-rpc_lxc_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
-{
-	static const struct ubus_method lxc_methods[] = {
-		UBUS_METHOD("start", rpc_lxc_start, rpc_lxc_min_policy),
-		UBUS_METHOD("reboot", rpc_lxc_reboot, rpc_lxc_min_policy),
-		UBUS_METHOD("shutdown", rpc_lxc_shutdown, rpc_lxc_shutdown_policy),
-		UBUS_METHOD("stop", rpc_lxc_stop, rpc_lxc_min_policy),
-		UBUS_METHOD("freeze", rpc_lxc_freeze, rpc_lxc_min_policy),
-		UBUS_METHOD("unfreeze", rpc_lxc_unfreeze, rpc_lxc_min_policy),
-		UBUS_METHOD("rename", rpc_lxc_rename, rpc_lxc_rename_policy),
-		UBUS_METHOD("create", rpc_lxc_create, rpc_lxc_create_policy),
-		UBUS_METHOD("destroy", rpc_lxc_destroy, rpc_lxc_min_policy),
-		UBUS_METHOD_NOARG("list", rpc_lxc_list),
-	};
-
-	static struct ubus_object_type lxc_type =
-		UBUS_OBJECT_TYPE("luci-rpc-lxc", lxc_methods);
-
-	static struct ubus_object obj = {
-		.name = "lxc",
-		.type = &lxc_type,
-		.methods = lxc_methods,
-		.n_methods = ARRAY_SIZE(lxc_methods),
-	};
-
-	return ubus_add_object(ctx, &obj);
-}
-
-struct rpc_plugin rpc_plugin = {
-	.init = rpc_lxc_api_init
-};
diff --git a/trunk/package/feeds/packages/rrdtool1/Makefile b/trunk/package/feeds/packages/rrdtool1/Makefile
deleted file mode 100644
index 98c02353..00000000
--- a/trunk/package/feeds/packages/rrdtool1/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rrdtool1
-PKG_VERSION:=1.0.50
-PKG_RELEASE:=2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
-PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x \
-	http://www.fastmirrors.org/rrdtool/rrdtool-1.0.x \
-	ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x
-PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rrdtool1/Default
-  TITLE:=Round Robin Database (RRD)
-  URL:=http://oss.oetiker.ch/rrdtool/
-endef
-
-define Package/rrdtool1/description/Default
- RRD is the Acronym for Round Robin Database. RRD is a system to store and
- display time-series data (i.e. network bandwidth, machine-room temperature,
- server load average). It stores the data in a very compact way that will
- not expand over time, and it presents useful graphs by processing the data
- to enforce a certain data density. It can be used either via simple wrapper
- scripts (from shell or Perl) or via frontends that poll network devices and
- put friendly user interface on it.
-
- This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into
- librrd.so. The library is much smaller compared to the 1.2.x version with
- separate dynamic linked libraries.
-endef
-
-define Package/librrd1
-$(call Package/rrdtool1/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib
-  TITLE+= management library
-endef
-
-define Package/librrd1/description
-$(call Package/rrdtool1/description/Default)
- This package contains a shared library, used by other programs.
-endef
-
-define Package/rrdcgi1
-$(call Package/rrdtool1/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librrd1
-  TITLE+= CGI graphing tool
-endef
-
-define Package/rrdcgi1/description
-$(call Package/rrdtool1/description/Default)
- This package contains the rrdcgi tool used to create web pages containing
- RRD graphs based on templates.
-endef
-
-define Package/rrdtool1
-$(call Package/rrdtool1/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librrd1
-  TITLE+= management tools
-endef
-
-define Package/rrdtool1/description
-$(call Package/rrdtool1/description/Default)
- This package contains command line tools used to manage RRDs.
-endef
-
-TARGET_CFLAGS += $(FPIC) --std=c99
-
-CONFIGURE_ARGS += \
-	$(DISABLE_NLS) \
-	--enable-shared=yes \
-	--enable-static=yes \
-	--disable-rpath \
-	--with-gnu-ld \
-	--enable-local-zlib
-
-CONFIGURE_VARS += \
-	ac_cv_path_PERL=no \
-	rd_cv_ieee_works=yes \
-	shrext_cmds=".so"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		shrext_cmds=".so" \
-		all install
-endef
-
-define Package/rrdtool1/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/
-endef
-
-define Package/rrdcgi1/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
-endef
-
-define Package/librrd1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.0/include/
-	$(INSTALL_DIR)  $(1)/usr/lib/rrdtool-1.0/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/rrdtool-1.0/lib/
-endef
-
-$(eval $(call BuildPackage,librrd1))
-$(eval $(call BuildPackage,rrdcgi1))
-$(eval $(call BuildPackage,rrdtool1))
diff --git a/trunk/package/feeds/packages/rrdtool1/patches/001-no_ordering_cd_joke.patch b/trunk/package/feeds/packages/rrdtool1/patches/001-no_ordering_cd_joke.patch
deleted file mode 100644
index 442fe497..00000000
--- a/trunk/package/feeds/packages/rrdtool1/patches/001-no_ordering_cd_joke.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure
---- rrdtool-1.0.50/configure	2005-04-25 22:48:09.000000000 +0200
-+++ rrdtool-1.0.50.new/configure	2009-03-09 17:25:38.000000000 +0100
-@@ -24873,17 +24873,12 @@
- echo "${ECHO_T}and out again" >&6
- 
- echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6
--sleep 1
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 2
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 1
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 3
- echo $ECHO_N ".$ac_c" 1>&6
- echo $ECHO_N ".$ac_c" 1>&6
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 2
- echo "$as_me:$LINENO: result:  just kidding ;-)" >&5
- echo "${ECHO_T} just kidding ;-)" >&6
- echo
diff --git a/trunk/package/feeds/packages/rrdtool1/patches/002-no_timezone.patch b/trunk/package/feeds/packages/rrdtool1/patches/002-no_timezone.patch
deleted file mode 100644
index 07564b4d..00000000
--- a/trunk/package/feeds/packages/rrdtool1/patches/002-no_timezone.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -225,11 +225,8 @@
- 	  struct rusage  myusage;
- 	  struct timeval starttime;
- 	  struct timeval currenttime;
--	  struct timezone tz;
- 
--	    tz.tz_minuteswest =0;
--	    tz.tz_dsttime=0;
--	    gettimeofday(&starttime,&tz);
-+	    gettimeofday(&starttime,NULL);
- #endif
- 
- 	    while (fgets(aLine, sizeof(aLine)-1, stdin)){
-@@ -252,7 +249,7 @@
- 
- #if HAVE_GETRUSAGE
- 		getrusage(RUSAGE_SELF,&myusage);
--		gettimeofday(&currenttime,&tz);
-+		gettimeofday(&currenttime,NULL);
- 		printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
- 		       (double)myusage.ru_utime.tv_sec+
- 		       (double)myusage.ru_utime.tv_usec/1000000.0,
diff --git a/trunk/package/feeds/packages/rrdtool1/patches/020-x86-float-cast.patch b/trunk/package/feeds/packages/rrdtool1/patches/020-x86-float-cast.patch
deleted file mode 100644
index 5b8a6627..00000000
--- a/trunk/package/feeds/packages/rrdtool1/patches/020-x86-float-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rrdtool-1.0.50/src/rrd_format.h
-===================================================================
---- rrdtool-1.0.50.orig/src/rrd_format.h
-+++ rrdtool-1.0.50/src/rrd_format.h
-@@ -20,7 +20,7 @@
- 
- #define RRD_COOKIE    "RRD"
- #define RRD_VERSION   "0001"
--#define FLOAT_COOKIE  8.642135E130
-+#define FLOAT_COOKIE  ((double)8.642135E130)
- 
- #if defined(WIN32)
- #define DNAN          ((double)fmod(0.0,0.0))    
diff --git a/trunk/package/feeds/packages/rrdtool1/patches/030-pod2man-stderr.patch b/trunk/package/feeds/packages/rrdtool1/patches/030-pod2man-stderr.patch
deleted file mode 100644
index feadf3aa..00000000
--- a/trunk/package/feeds/packages/rrdtool1/patches/030-pod2man-stderr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rrdtool-1.0.50/doc/Makefile.am.orig	2013-11-16 11:44:50.940231208 -0500
-+++ rrdtool-1.0.50/doc/Makefile.am	2013-11-16 11:45:09.802229483 -0500
-@@ -35,7 +35,7 @@
- all-local: link txt man html
- 
- .pod.1 .pm.1 .pl.1:
--	pod2man --release=$(VERSION) --center=RRDtool $<  > $@
-+	pod2man --stderr --release=$(VERSION) --center=RRDtool $<  > $@
- 
- .1.txt:
- 	@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@
diff --git a/trunk/package/feeds/packages/rsync/Config.in b/trunk/package/feeds/packages/rsync/Config.in
deleted file mode 100644
index dfbfdf16..00000000
--- a/trunk/package/feeds/packages/rsync/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-if PACKAGE_rsync
-
-	config RSYNC_xattr
-		bool
-		prompt "Enable xattr support"
-		default n
-
-	config RSYNC_acl
-		bool
-		prompt "Enable ACL support"
-		default n
-
-	config RSYNC_zlib
-		bool
-		prompt "Enable system zlib"
-		help 
-			Use the system's zlib library instead of rsync's internal copy. Enabling
-			this may create compatibility errors when using compression  with older
-			clients, or those using the current default of the bundled zlib.
-
-			rsync's upstream default is to use their bundled zlib. OpenWrt uses the
-			system zlib for space reasons. The system zlib will eventually become 
-			default for upstream as well.
-		default y
-endif
diff --git a/trunk/package/feeds/packages/rsync/Makefile b/trunk/package/feeds/packages/rsync/Makefile
deleted file mode 100644
index f4419d3d..00000000
--- a/trunk/package/feeds/packages/rsync/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rsync
-PKG_VERSION:=3.1.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
-PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rsync
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=File Transfer
-  TITLE:=Fast remote file copy program (like rcp)
-  DEPENDS:=+libpopt +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zlib:zlib
-  URL:=http://rsync.samba.org/
-  MENU:=1
-endef
-
-define Package/rsync/config
-	source "$(SOURCE)/Config.in"
-endef
-
-CONFIGURE_ARGS += \
-	--with-included-popt=no \
-	--disable-debug \
-	--disable-locale \
-
-ifeq ($(CONFIG_RSYNC_xattr),y)
-	CONFIGURE_ARGS+= --enable-xattr-support
-else
-	CONFIGURE_ARGS+= --disable-xattr-support
-endif
-
-ifeq ($(CONFIG_RSYNC_acl),y)
-	CONFIGURE_ARGS+= --enable-acl-support
-else
-	CONFIGURE_ARGS+= --disable-acl-support
-endif
-
-ifeq ($(CONFIG_RSYNC_zlib),y)
-	CONFIGURE_ARGS+= --with-included-zlib=no
-else
-	CONFIGURE_ARGS+= --with-included-zlib=yes
-endif
-
-define Package/rsyncd
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=File Transfer
-  TITLE:=Rsync daemon
-  DEPENDS:=+rsync
-  URL:=http://rsync.samba.org/
-endef
-
-define Package/rsync/description
- rsync is a program that allows files to be copied to and from remote machines
- in much the same way as rcp. It has many more options than rcp, and uses the
- rsync remote-update protocol to greatly speed up file transfers when the
- destination file already exists.
-
- The rsync remote-update protocol allows rsync to transfer just the differences
- between two sets of files across the network link.
-endef
-
-define Package/rsync/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-define Package/rsyncd/description
- rsyncd is a configuration file and initscript to utilize rsync as a daemon. It
- uses the same binary as rsync.
-endef
-
-define Package/rsyncd/conffiles
-/etc/rsyncd.conf
-endef
-
-define Package/rsyncd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd
-endef
-
-$(eval $(call BuildPackage,rsync))
-$(eval $(call BuildPackage,rsyncd))
diff --git a/trunk/package/feeds/packages/rsync/files/rsyncd.conf b/trunk/package/feeds/packages/rsync/files/rsyncd.conf
deleted file mode 100644
index 2f4cd9e9..00000000
--- a/trunk/package/feeds/packages/rsync/files/rsyncd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/rsyncd.conf
-# Minimal configuration for rsync daemon
-
-# Next line required for init script
-pid file = /var/run/rsyncd.pid
-log file = /var/log/rsyncd.log
-use chroot = yes
-uid = nobody
-gid = nogroup
-read only = yes
-
-# Simple example to configure server
-#[openwrt-etc]
-#path = /etc
-#comment = OpenWrt Configuration Files
-#exclude = /init.d
diff --git a/trunk/package/feeds/packages/rsync/files/rsyncd.init b/trunk/package/feeds/packages/rsync/files/rsyncd.init
deleted file mode 100644
index d226d0f3..00000000
--- a/trunk/package/feeds/packages/rsync/files/rsyncd.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011-2014 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/bin/rsync
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "$PROG" --daemon --no-detach
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/rsync/patches/000-CVE-2014-9512.patch b/trunk/package/feeds/packages/rsync/patches/000-CVE-2014-9512.patch
deleted file mode 100644
index aaefbad8..00000000
--- a/trunk/package/feeds/packages/rsync/patches/000-CVE-2014-9512.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Wayne Davison <wayned@samba.org>
-Date: Wed, 31 Dec 2014 20:41:03 +0000 (-0800)
-Subject: Complain if an inc-recursive path is not right for its dir.
-X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=962f8b90045ab331fc04c9e65f80f1a53e68243b
-
-Complain if an inc-recursive path is not right for its dir.
-This ensures that a malicious sender can't use a just-sent
-symlink as a trasnfer path.
----
-
-diff --git a/flist.c b/flist.c
-index c24672e..92e4b65 100644
---- a/flist.c
-+++ b/flist.c
-@@ -2435,8 +2435,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
- 	return flist;
- }
- 
--struct file_list *recv_file_list(int f)
-+struct file_list *recv_file_list(int f, int dir_ndx)
- {
-+	const char *good_dirname = NULL;
- 	struct file_list *flist;
- 	int dstart, flags;
- 	int64 start_read;
-@@ -2492,6 +2493,23 @@ struct file_list *recv_file_list(int f)
- 		flist_expand(flist, 1);
- 		file = recv_file_entry(f, flist, flags);
- 
-+		if (inc_recurse) {
-+			static const char empty_dir[] = "\0";
-+			const char *cur_dir = file->dirname ? file->dirname : empty_dir;
-+			if (relative_paths && *cur_dir == '/')
-+				cur_dir++;
-+			if (cur_dir != good_dirname) {
-+				const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
-+				if (strcmp(cur_dir, d) != 0) {
-+					rprintf(FERROR,
-+						"ABORTING due to invalid dir prefix from sender: %s (should be: %s)\n",
-+						cur_dir, d);
-+					exit_cleanup(RERR_PROTOCOL);
-+				}
-+				good_dirname = cur_dir;
-+			}
-+		}
-+
- 		if (S_ISREG(file->mode)) {
- 			/* Already counted */
- 		} else if (S_ISDIR(file->mode)) {
-@@ -2615,7 +2633,7 @@ void recv_additional_file_list(int f)
- 			rprintf(FINFO, "[%s] receiving flist for dir %d\n",
- 				who_am_i(), ndx);
- 		}
--		flist = recv_file_list(f);
-+		flist = recv_file_list(f, ndx);
- 		flist->parent_ndx = ndx;
- 	}
- }
-diff --git a/io.c b/io.c
-index b9a9bd0..a868fa9 100644
---- a/io.c
-+++ b/io.c
-@@ -1685,7 +1685,7 @@ void wait_for_receiver(void)
- 				rprintf(FINFO, "[%s] receiving flist for dir %d\n",
- 					who_am_i(), ndx);
- 			}
--			flist = recv_file_list(iobuf.in_fd);
-+			flist = recv_file_list(iobuf.in_fd, ndx);
- 			flist->parent_ndx = ndx;
- #ifdef SUPPORT_HARD_LINKS
- 			if (preserve_hard_links)
-diff --git a/main.c b/main.c
-index e7a13f7..713b818 100644
---- a/main.c
-+++ b/main.c
-@@ -1009,7 +1009,7 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
- 		filesfrom_fd = -1;
- 	}
- 
--	flist = recv_file_list(f_in);
-+	flist = recv_file_list(f_in, -1);
- 	if (!flist) {
- 		rprintf(FERROR,"server_recv: recv_file_list error\n");
- 		exit_cleanup(RERR_FILESELECT);
-@@ -1183,7 +1183,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
- 
- 	if (write_batch && !am_server)
- 		start_write_batch(f_in);
--	flist = recv_file_list(f_in);
-+	flist = recv_file_list(f_in, -1);
- 	if (inc_recurse && file_total == 1)
- 		recv_additional_file_list(f_in);
- 
-diff --git a/rsync.c b/rsync.c
-index 68ff6b1..c3ecc51 100644
---- a/rsync.c
-+++ b/rsync.c
-@@ -364,7 +364,7 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
- 		}
- 		/* Send all the data we read for this flist to the generator. */
- 		start_flist_forward(ndx);
--		flist = recv_file_list(f_in);
-+		flist = recv_file_list(f_in, ndx);
- 		flist->parent_ndx = ndx;
- 		stop_flist_forward();
- 	}
diff --git a/trunk/package/feeds/packages/rtklib/Makefile b/trunk/package/feeds/packages/rtklib/Makefile
deleted file mode 100644
index 224e851b..00000000
--- a/trunk/package/feeds/packages/rtklib/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rtklib
-PKG_VERSION:=2.4.2_p9
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/tomojitakasu/RTKLIB.git
-PKG_SOURCE_VERSION:=5592bb575ceb27f2ce0f0f5a84eda38497006c15
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rtklib/default
-  SUBMENU:=RTKLIB Suite
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://www.rtklib.com/
-  DEPENDS:=+libpthread +librt
-endef
-
-define Package/convbin
-$(call Package/rtklib/default)
-  TITLE:=RINEX Converter
-endef
-
-define Package/pos2kml
-$(call Package/rtklib/default)
-  TITLE:=Solution to KML converter
-endef
-
-define Package/rnx2rtkp
-$(call Package/rtklib/default)
-  TITLE:=Post-Processing Analysis
-endef
-
-define Package/rtkrcv
-$(call Package/rtklib/default)
-  TITLE:=Real-Time Positioning
-endef
-
-define Package/str2str
-$(call Package/rtklib/default)
-  TITLE:=Communication Server
-endef
-
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR)/app/convbin/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/app/pos2kml/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/app/rnx2rtkp/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/app/rtkrcv/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-	$(MAKE) -C $(PKG_BUILD_DIR)/app/str2str/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-endef
-
-define Package/convbin/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/convbin/gcc/convbin $(1)/usr/bin/
-endef
-
-define Package/pos2kml/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/pos2kml/gcc/pos2kml $(1)/usr/bin/
-endef
-
-define Package/rnx2rtkp/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/rnx2rtkp/gcc/rnx2rtkp $(1)/usr/bin/
-endef
-
-define Package/rtkrcv/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/rtkrcv/gcc/rtkrcv $(1)/usr/bin/
-endef
-
-define Package/str2str/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/str2str/gcc/str2str $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,convbin))
-$(eval $(call BuildPackage,pos2kml))
-$(eval $(call BuildPackage,rnx2rtkp))
-$(eval $(call BuildPackage,rtkrcv))
-$(eval $(call BuildPackage,str2str))
diff --git a/trunk/package/feeds/packages/rtl-sdr/Makefile b/trunk/package/feeds/packages/rtl-sdr/Makefile
deleted file mode 100644
index 093b22ce..00000000
--- a/trunk/package/feeds/packages/rtl-sdr/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rtl-sdr
-PKG_VERSION:=2014-02-10
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.osmocom.org/rtl-sdr.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6ee557360645da158e3065111349c318894b497b
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-CMAKE_INSTALL:=1
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/rtl-sdr/Default
-  TITLE:=Software Defined Radio with Realtek RTL2832U
-  URL:=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-endef
-
-define Package/rtl-sdr/Default/description
-  rtl-sdr allows DVB-T dongles based on the Realtek RTL2832U to be used as
-  an inexpensive SDR.
-endef
-
-define Package/rtl-sdr
-  $(call Package/rtl-sdr/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librt +libpthread +librtlsdr
-endef
-
-define Package/rtl-sdr/description
-  $(call Package/rtl-sdr/Default/description)
-
-  This package contains the utilities and daemons.
-endef
-
-define Package/librtlsdr
-  $(call Package/rtl-sdr/Default)
-  TITLE+= shared library
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+libusb-1.0
-endef
-
-define Package/librtlsdr/description
-  $(call Package/rtl-sdr/Default/description)
-
-  This package contains the librtlsdr shared library.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librtlsdr.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librtlsdr.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/rtl-sdr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rtl_* $(1)/usr/bin/
-endef
-
-define Package/librtlsdr/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librtlsdr.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,rtl-sdr))
-$(eval $(call BuildPackage,librtlsdr))
diff --git a/trunk/package/feeds/packages/rtorrent/Makefile b/trunk/package/feeds/packages/rtorrent/Makefile
deleted file mode 100644
index af644100..00000000
--- a/trunk/package/feeds/packages/rtorrent/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2007-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rtorrent
-PKG_VERSION:=0.9.4-git-0
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rakshasa/rtorrent.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7343e33a6a0d279179b304a380bf011f1c8be64a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rtorrent/Default
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=BitTorrent client for ncurses
-  URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libcurl +libtorrent +libncursesw +libsigcxx +libpthread
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/rtorrent/Default/description
- rTorrent is a BitTorrent client for ncurses, using the libtorrent library.
- The client and library is written in C++ with emphasis on speed and
- efficiency, while delivering equivalent features to those found in GUI based
- clients in an ncurses client.
-endef
-
-define Package/rtorrent
-$(call Package/rtorrent/Default)
-  VARIANT:=norpc
-endef
-
-define Package/rtorrent/description
-$(call Package/rtorrent/Default/description)
- This package is built without xmlrpc support
-endef
-
-define Package/rtorrent-rpc
-$(call Package/rtorrent/Default)
-  VARIANT:=rpc
-  DEPENDS+=+xmlrpc-c-server
-  TITLE+=(with rpc support)
-endef
-
-define Package/rtorrent-rpc/description
-$(call Package/rtorrent/Default/description)
- This package is built with xmlrpc support
-endef
-
-TARGET_LDFLAGS += -lz -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--disable-static \
-	--disable-debug
-
-ifeq ($(BUILD_VARIANT),rpc)
-	CONFIGURE_ARGS += \
-		--with-xmlrpc-c
-endif
-
-
-define Package/rtorrent/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/
-endef
-
-Package/rtorrent-rpc/install = $(Package/rtorrent/install)
-
-$(eval $(call BuildPackage,rtorrent))
-$(eval $(call BuildPackage,rtorrent-rpc))
diff --git a/trunk/package/feeds/packages/rtorrent/patches/100-fix-cross_compile.patch b/trunk/package/feeds/packages/rtorrent/patches/100-fix-cross_compile.patch
deleted file mode 100644
index a4213514..00000000
--- a/trunk/package/feeds/packages/rtorrent/patches/100-fix-cross_compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 8, api version)
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- AC_PROG_LIBTOOL
---- a/scripts/common.m4
-+++ b/scripts/common.m4
-@@ -153,7 +153,7 @@ dnl   Need to fix this so that it uses t
- AC_DEFUN([TORRENT_CHECK_EXECINFO], [
-   AC_MSG_CHECKING(for execinfo.h)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <execinfo.h>
-       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
-       ])],
-@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
- AC_DEFUN([TORRENT_CHECK_ALIGNED], [
-   AC_MSG_CHECKING(the byte alignment)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <inttypes.h>
-       int main() {
-         char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
diff --git a/trunk/package/feeds/packages/rtorrent/patches/120-fix-ncurses.patch b/trunk/package/feeds/packages/rtorrent/patches/120-fix-ncurses.patch
deleted file mode 100644
index f491de36..00000000
--- a/trunk/package/feeds/packages/rtorrent/patches/120-fix-ncurses.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/display/canvas.h
-+++ b/src/display/canvas.h
-@@ -48,7 +48,7 @@ class Canvas {
- public:
-   typedef std::vector<Attributes> attributes_list;
- 
--  Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
-+  Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
-   ~Canvas() { delwin(m_window); }
- 
-   void                refresh()                                               { wnoutrefresh(m_window); }
diff --git a/trunk/package/feeds/packages/ruby/Makefile b/trunk/package/feeds/packages/ruby/Makefile
deleted file mode 100644
index 97a32f27..00000000
--- a/trunk/package/feeds/packages/ruby/Makefile
+++ /dev/null
@@ -1,1374 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# To Do:
-#  - dirs not removed when uninstalling!
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ruby
-PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
-
-PKG_LIBVER:=2.2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://cache.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
-PKG_MD5SUM:=06973777736d8e6bdad8dcaa469a9da3
-PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DEPENDS:=ruby/host
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/ruby/Default
-  SUBMENU:=Ruby
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Ruby scripting language
-  URL:=http://www.ruby-lang.org/
-endef
-
-define Package/ruby/Default/description
- Ruby is the interpreted scripting language for quick and easy
- object-oriented programming.  It has many features to process text files
- and to do system management tasks (as in perl).  It is simple,
- straight-forward, and extensible.
-
-endef
-
-define Package/ruby
-$(call Package/ruby/Default)
-  TITLE+= (interpreter)
-  DEPENDS:=+libruby
-endef
-
-define Package/ruby/description
-$(call Package/ruby/Default/description)
-endef
-
-define Package/libruby
-$(call Package/ruby/Default)
-  SUBMENU:=
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (shared library)
-  DEPENDS+= +libpthread +librt +libgmp
-endef
-
-define Package/ruby-stdlib
-$(call Package/ruby/Default)
-  TITLE:=Ruby standard libraries (metadata for all stdlib subsets)
-  DEPENDS:=ruby +ruby-misc +ruby-bigdecimal +ruby-cgi +ruby-csv +ruby-datetime +ruby-dbm +ruby-debuglib\
-			+ruby-digest +ruby-drb +ruby-enc +ruby-enc-extra +ruby-erb +ruby-gdbm +ruby-gems \
-			+ruby-json +ruby-io-console +ruby-irb +ruby-fiddle +ruby-filelib +ruby-logger +ruby-math \
-			+ruby-minitest +ruby-mkmf +ruby-multithread +ruby-nkf +ruby-net +ruby-openssl +ruby-optparse \
-			+ruby-patterns +ruby-powerassert +ruby-prettyprint +ruby-pstore +ruby-psych +ruby-racc +ruby-rake \
-			+ruby-rbconfig +ruby-rdoc +ruby-readline +ruby-rexml +ruby-rinda +ruby-ripper +ruby-rss +ruby-sdbm \
-			+ruby-shell +ruby-socket +ruby-testunit +ruby-unicodenormalize +ruby-uri +ruby-webrick +ruby-xmlrpc \
-			+ruby-yaml +ruby-zlib
-endef
-
-define Package/ruby-stdlib/description
- This metapackage currently install all ruby-* packages,
- providing a complete Ruby Standard Library.
-
-endef
-
-define Package/ruby-bigdecimal
-$(call Package/ruby/Default)
-  TITLE:=Arbitrary-precision decimal floating-point lib for Ruby
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-bigdecimal/description
- Provides bigdecimal* files
-endef
-
-define Package/ruby-cgi
-$(call Package/ruby/Default)
-  TITLE:=Ruby CGI support toolkit
-  DEPENDS:=ruby +ruby-filelib +ruby-pstore
-endef
-
-define Package/ruby-bigdecimal/description
- Provides bigdecimal* files
-
-endef
-
-define Package/ruby-csv
-$(call Package/ruby/Default)
-  TITLE+=CSV library
-  DEPENDS:=ruby +ruby-patterns +ruby-datetime +ruby-enc
-endef
-
-define Package/ruby-csv/description
- Provides csv.rb file
-
-endef
-
-define Package/ruby-datetime
-$(call Package/ruby/Default)
-  TITLE+= date library
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-datetime/description
- Provides date.rb and time.rb
-
-endef
-
-define Package/ruby-dbm
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for dbm
-  DEPENDS:=ruby +libdb47
-endef
-
-define Package/ruby-dbm/description
- The DBM class provides a wrapper to a Unix-style dbm or Database Manager library.
- This package provides dbm.so file.
-
-endef
-
-define Package/ruby-debuglib
-$(call Package/ruby/Default)
-  TITLE+= debug library
-  DEPENDS:=ruby +ruby-multithread +ruby-prettyprint
-endef
-
-define Package/ruby-debuglib/description
- Provides files for debugging:
- - benchmark.rb
- - debug.rb
- - objspace.so
- - profile.rb
- - profiler.rb
- - tracer.rb
-
-endef
-
-define Package/ruby-digest
-$(call Package/ruby/Default)
-  TITLE:=Ruby Digest Library
-  DEPENDS:=ruby +RUBY_DIGEST_USE_OPENSSL:libopenssl
-endef
-
-define Package/ruby-digest/description
- Provides digest* files. Can be configured to use OpenSSL or
- bundled hash functions.
-
-endef
-
-define Package/ruby-digest/config
-
-	config RUBY_DIGEST_USE_OPENSSL
-		bool "Use OpenSSL functions for ruby digest hash functions"
-        depends on PACKAGE_ruby-digest
-		help
-			Ruby can use OpenSSL hash functions or compile alternative implementations. Using
-			OpenSSL saves about 30KBytes (less when compressed) but requires OpenSSL (that
-			is way bigger than that). However, if OpenSSL is already needed by another usage,
-			as ruby-openssl or any other non ruby package, it is better to mark this option.
-		default n
-
-endef
-
-define Package/ruby-drb
-$(call Package/ruby/Default)
-  TITLE:=Ruby distributed object system
-  DEPENDS:=ruby +ruby-filelib +ruby-patterns +ruby-socket
-endef
-
-define Package/ruby-drb/description
- Provides drb* files
-
-endef
-
-define Package/ruby-enc
-$(call Package/ruby/Default)
-  TITLE:=Ruby character re-coding library charset (small subset)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-enc/description
- Provides ruby encoding library for encodings used directly by
- libraries in Ruby Standard Library:
- - enc/encdb.so
- - enc/euc_jp.so
- - enc/iso_8859_1.so
- - enc/utf_16be.so
- - enc/utf_16le.so
- - enc/utf_32be.so
- - enc/utf_32le.so
- FYI: ASCII-8BIT, UTF-7, UTF-8 and US-ASCII are already in Core.
-
-endef
-
-define Package/ruby-enc-extra
-$(call Package/ruby/Default)
-  TITLE:=Ruby character re-coding library charset (extra subset)
-  DEPENDS:=ruby +ruby-enc
-endef
-
-define Package/ruby-enc-extra/description
- Provides extra encodings not provided by ruby-enc:
- - enc/big5.so
- - enc/cp949.so
- - enc/emacs_mule.so
- - enc/euc_kr.so
- - enc/euc_tw.so
- - enc/gb18030.so
- - enc/gb2312.so
- - enc/gbk.so
- - enc/iso_8859_10.so
- - enc/iso_8859_11.so
- - enc/iso_8859_13.so
- - enc/iso_8859_14.so
- - enc/iso_8859_15.so
- - enc/iso_8859_16.so
- - enc/iso_8859_2.so
- - enc/iso_8859_3.so
- - enc/iso_8859_4.so
- - enc/iso_8859_5.so
- - enc/iso_8859_6.so
- - enc/iso_8859_7.so
- - enc/iso_8859_8.so
- - enc/iso_8859_9.so
- - enc/koi8_r.so
- - enc/koi8_u.so
- - enc/shift_jis.so
- - enc/trans/big5.so
- - enc/trans/chinese.so
- - enc/trans/emoji.so
- - enc/trans/emoji_iso2022_kddi.so
- - enc/trans/emoji_sjis_docomo.so
- - enc/trans/emoji_sjis_kddi.so
- - enc/trans/emoji_sjis_softbank.so
- - enc/trans/escape.so
- - enc/trans/gb18030.so
- - enc/trans/gbk.so
- - enc/trans/iso2022.so
- - enc/trans/japanese.so
- - enc/trans/japanese_euc.so
- - enc/trans/japanese_sjis.so
- - enc/trans/korean.so
- - enc/trans/single_byte.so
- - enc/trans/transdb.so
- - enc/trans/utf8_mac.so
- - enc/trans/utf_16_32.so
- - enc/windows_1251.so
- - enc/windows_31j.so
-
-endef
-
-define Package/ruby-erb
-$(call Package/ruby/Default)
-  TITLE+= (embedded interpreter)
-  DEPENDS:=ruby +ruby-cgi
-endef
-
-define Package/ruby-erb/description
- Provides erb* files
-
-endef
-
-define Package/ruby-fiddle
-$(call Package/ruby/Default)
-  TITLE:=A libffi wrapper for Ruby
-  DEPENDS:=ruby +libffi
-endef
-
-define Package/ruby-fiddle/description
- Provides fiddle* files
-
-endef
-
-define Package/ruby-filelib
-$(call Package/ruby/Default)
-  TITLE+= File utils library
-  DEPENDS:=ruby +ruby-enc +ruby-misc
-endef
-
-define Package/ruby-filelib/description
- Provides filesystem interaction files, including
- path and temp:
- - fileutils.rb
- - find.rb
- - pathname.rb
- - pathname.so
- - tempfile.rb
- - tmpdir.rb
-
-endef
-
-define Package/ruby-gdbm
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for gdbm
-  DEPENDS:=ruby +libgdbm
-endef
-
-define Package/ruby-gdbm/description
- Provides gdbm* files
-
-endef
-
-define Package/ruby-gems
-$(call Package/ruby/Default)
-  TITLE:=Ruby gems packet management
-  DEPENDS:=ruby +ruby-net +ruby-rdoc
-endef
-
-define Package/ruby-gems/description
- Provides rubygems for gems usage, download and installation
-
-endef
-
-define Package/ruby-io-console
-$(call Package/ruby/Default)
-  TITLE+= Console interface
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-io-console/description
- Provides io-console* files
-
-endef
-
-define Package/ruby-irb
-$(call Package/ruby/Default)
-  TITLE+= (interactive shell)
-  DEPENDS:=ruby +ruby-debuglib +ruby-filelib +ruby-math
-endef
-
-define Package/ruby-irb/description
- Provides irb* files
-
-endef
-
-define Package/ruby-json
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for JSON
-  DEPENDS:=ruby +ruby-datetime +ruby-misc
-endef
-
-define Package/ruby-json/description
- Provides json* files
-
-endef
-
-define Package/ruby-logger
-$(call Package/ruby/Default)
-  TITLE+= logger and syslog library
-  DEPENDS:=ruby +ruby-multithread
-endef
-
-define Package/ruby-logger/description
- Provides log library, including syslog:
- - logger.rb
- - syslog.so
- - syslog/logger.rb
-
-endef
-
-define Package/ruby-math
-$(call Package/ruby/Default)
-  TITLE+= math library
-  DEPENDS:=ruby +ruby-patterns
-endef
-
-define Package/ruby-math/description
- Provides math related files:
- - cmath.rb
- - complex.rb
- - mathn.rb
- - mathn/complex.so
- - mathn/rational.so
- - matrix.rb
- - matrix/eigenvalue_decomposition.rb
- - matrix/lup_decomposition.rb
- - prime.rb
- - rational.rb
-
-endef
-
-define Package/ruby-minitest
-$(call Package/ruby/Default)
-  TITLE:=Gem minitest shipped with Ruby
-  DEPENDS:=ruby +ruby-gems
-endef
-
-define Package/ruby-minitest/description
- Provides minitest gem
-
-endef
-
-define Package/ruby-misc
-$(call Package/ruby/Default)
-  TITLE:=Ruby standard libraries subset (miscelaneous files)
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-misc/description
- This package contains miscellaneous files from stdlib
- not splitted in other ruby packages like stringio:
- - English.rb
- - abbrev.rb
- - base64.rb
- - continuation.so
- - coverage.so
- - delegate.rb
- - e2mmap.rb
- - etc.so
- - expect.rb
- - fcntl.so
- - fiber.so
- - getoptlong.rb
- - open3.rb
- - ostruct.rb
- - pty.so
- - scanf.rb
- - securerandom.rb
- - set.rb
- - shellwords.rb
- - stringio.so
- - strscan.so
- - tsort.rb
- - weakref.rb
-
-endef
-
-define Package/ruby-mkmf
-$(call Package/ruby/Default)
-  TITLE+= makefile library
-  DEPENDS:=ruby +ruby-filelib +ruby-optparse +ruby-rbconfig
-endef
-
-define Package/ruby-mkmf/description
- Provides mkmf* files
-
-endef
-
-define Package/ruby-multithread
-$(call Package/ruby/Default)
-  TITLE+= multithread library
-  DEPENDS:=ruby +ruby-misc
-endef
-
-define Package/ruby-multithread/description
- Provides files for multithread usage:
- - io/nonblock.so
- - io/wait.so
- - thread.so (FYI, Thread is a core class)
- - monitor.rb
- - mutex_m.rb
- - sync.rb
- - thwait.rb
- - timeout.rb
-
-endef
-
-define Package/ruby-net
-$(call Package/ruby/Default)
-  TITLE:=Ruby Network Protocols Library
-  DEPENDS:=ruby +ruby-datetime +ruby-digest +ruby-filelib +ruby-uri
-endef
-
-define Package/ruby-net/description
- Provides net* files
-
-endef
-
-define Package/ruby-nkf
-$(call Package/ruby/Default)
-  TITLE:=Ruby Network Kanji Filter
-  DEPENDS:=ruby +ruby-enc
-endef
-
-define Package/ruby-nkf/description
- Provides nkf* files
-
-endef
-
-define Package/ruby-openssl
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for openssl
-  DEPENDS:=ruby +ruby-enc +libopenssl +ruby-misc
-endef
-
-define Package/ruby-openssl/description
- Provides openssl* files
-
-endef
-
-define Package/ruby-optparse
-$(call Package/ruby/Default)
-  TITLE:=Ruby command-line option analysis
-  DEPENDS:=ruby +ruby-misc
-endef
-
-define Package/ruby-optparse/description
- Provides optparse* files
-
-endef
-
-define Package/ruby-patterns
-$(call Package/ruby/Default)
-  TITLE:=Ruby design patterns implementation
-  DEPENDS:=ruby +ruby-multithread
-endef
-
-define Package/ruby-patterns/description
- Provides design patterns helpers files:
- - forwardable.rb
- - observer.rb
- - singleton.rb
-
-endef
-
-define Package/ruby-powerassert
-$(call Package/ruby/Default)
-  TITLE:=Gem power_assert shipped with Ruby
-  DEPENDS:=ruby +ruby-ripper
-endef
-
-define Package/ruby-powerassert/description
-  Power Assert gem for Ruby. Power Assert shows each value of variables
-  and method calls in the expression. It is useful for testing, providing
-  which value wasn't correct when the condition is not satisfied
-
-endef
-
-define Package/ruby-prettyprint
-$(call Package/ruby/Default)
-  TITLE:=Ruby PrettyPrint librart
-  DEPENDS:=ruby +ruby-misc
-endef
-
-define Package/ruby-prettyprint/description
- Provides Pretty Print library:
- - pp.rb
- - prettyprint.rb
-
-endef
-
-define Package/ruby-pstore
-$(call Package/ruby/Default)
-  TITLE+=file based persistence
-  DEPENDS:=ruby +ruby-digest +ruby-enc
-endef
-
-define Package/ruby-pstore/description
- Provides pstore.rb file
-
-endef
-
-define Package/ruby-psych
-$(call Package/ruby/Default)
-  TITLE+=YAML parser and emitter
-  DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc
-endef
-
-define Package/ruby-psych/description
- Provides psych* files
-
-endef
-
-define Package/ruby-racc
-$(call Package/ruby/Default)
-  TITLE:=LALR parser generator in Ruby
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-racc/description
- Provides racc* files
-
-endef
-
-define Package/ruby-rake
-$(call Package/ruby/Default)
-  TITLE+=Ruby Rake (make replacement)
-  DEPENDS:=ruby +ruby-datetime +ruby-filelib +ruby-optparse +ruby-patterns +ruby-rbconfig
-endef
-
-define Package/ruby-rake/description
- Provides rake* files
-
-endef
-
-define Package/ruby-rbconfig
-$(call Package/ruby/Default)
-  TITLE+=Ruby RbConfig
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-rbconfig/description
- Provides rbconfig file
-
-endef
-
-define Package/ruby-rdoc
-$(call Package/ruby/Default)
-  TITLE+= (documentation generator)
-  DEPENDS:=ruby +ruby-erb +ruby-irb +ruby-json +ruby-racc +ruby-rake +ruby-yaml +ruby-zlib
-endef
-
-define Package/ruby-rdoc/description
- Provides rdoc* and ri files
-
-endef
-
-define Package/ruby-readline
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for readline
-  DEPENDS:=ruby +libncurses +libreadline
-endef
-
-define Package/ruby-readline/description
- Provides readline* files
-
-endef
-
-define Package/ruby-rexml
-$(call Package/ruby/Default)
-  TITLE:=Ruby XML toolkit
-  DEPENDS:=ruby +ruby-patterns +ruby-enc
-endef
-
-define Package/ruby-rexml/description
- Provides rexml* files
-
-endef
-
-define Package/ruby-rinda
-$(call Package/ruby/Default)
-  TITLE:=Ruby Linda paradigm implementation
-  DEPENDS:=ruby +ruby-drb
-endef
-
-define Package/ruby-rinda/description
- Provides rinda* files
-
-endef
-
-define Package/ruby-ripper
-$(call Package/ruby/Default)
-  TITLE:=Ruby script parser
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-ripper/description
- Provides ripper* files
-
-endef
-
-define Package/ruby-rss
-$(call Package/ruby/Default)
-  TITLE:=Ruby RSS toolkit
-  DEPENDS:=ruby +ruby-net +ruby-nkf +ruby-rexml
-endef
-
-define Package/ruby-rss/description
- Provides rss* files
-
-endef
-
-define Package/ruby-sdbm
-$(call Package/ruby/Default)
-  TITLE:=Ruby simple file-based key-value dbm implementation
-  DEPENDS:=ruby
-endef
-
-define Package/ruby-sdbm/description
- Provides sdbm* files
-
-endef
-
-define Package/ruby-shell
-$(call Package/ruby/Default)
-  TITLE:=Ruby idiomatic Ruby interface
-  DEPENDS:=ruby +ruby-patterns
-endef
-
-define Package/ruby-shell/description
- Provides shell* files
-
-endef
-
-define Package/ruby-socket
-$(call Package/ruby/Default)
-  TITLE+= socket support
-  DEPENDS:=ruby +ruby-multithread
-endef
-
-define Package/ruby-socket/description
- Provides socket-related files:
- - gserver.rb
- - ipaddr.rb
- - resolv-replace.rb
- - resolv.rb
- - socket.rb
- - socket.so
-
-endef
-
-define Package/ruby-testunit
-$(call Package/ruby/Default)
-  TITLE:=Gem test-unit shipped with Ruby
-  DEPENDS:=ruby +ruby-csv +ruby-erb +ruby-optparse +ruby-powerassert +ruby-prettyprint +ruby-rexml +ruby-yaml
-endef
-
-define Package/ruby-testunit/description
- Provides test/unit* files
-
-endef
-
-define Package/ruby-unicodenormalize
-$(call Package/ruby/Default)
-  TITLE:=Ruby String additions for Unicode normalization
-  DEPENDS:=ruby +ruby-enc +ruby-enc-extra
-endef
-
-define Package/ruby-unicodenormalize/description
-  Additions to class String for Unicode normalization
-
-endef
-
-define Package/ruby-uri
-$(call Package/ruby/Default)
-  TITLE:=Ruby library to handle URI
-  DEPENDS:=ruby +ruby-socket +ruby-enc
-endef
-
-define Package/ruby-uri/description
- Provides uri* files
-
-endef
-
-define Package/ruby-webrick
-$(call Package/ruby/Default)
-  TITLE:=Ruby Web server toolkit
-  DEPENDS:=ruby +ruby-erb +ruby-net +ruby-patterns +ruby-rbconfig
-endef
-
-define Package/ruby-webrick/description
- Provides webrick* files
-
-endef
-
-define Package/ruby-xmlrpc
-$(call Package/ruby/Default)
-  TITLE:=Ruby XML-RPC toolkit
-  DEPENDS:=ruby +ruby-rexml +ruby-webrick
-endef
-
-define Package/ruby-xmlrpc/description
- Provides xmlrpc* files
-
-endef
-
-define Package/ruby-yaml
-$(call Package/ruby/Default)
-  TITLE:=Ruby YAML toolkit
-  DEPENDS:=ruby +ruby-dbm +ruby-pstore +ruby-psych
-endef
-
-define Package/ruby-yaml/description
- Provides yaml* files
-
-endef
-
-define Package/ruby-zlib
-$(call Package/ruby/Default)
-  TITLE:=Ruby support for zlib
-  DEPENDS:=ruby +zlib
-endef
-
-define Package/ruby-zlib/description
- Provides zlib* files
-
-endef
-
-HOST_CONFIGURE_ARGS += \
-	--disable-install-doc \
-	--disable-install-rdoc \
-	--disable-install-capi \
-	--with-static-linked-ext \
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--enable-ipv6 \
-	--disable-install-doc \
-	--disable-install-capi \
-	--with-ruby-version=minor \
-	--with-iconv-dir=$(ICONV_PREFIX) \
-
-ifndef CONFIG_RUBY_DIGEST_USE_OPENSSL
-CONFIGURE_ARGS += \
-	--with-bundled-sha1\
-	--with-bundled-md5\
-	--with-bundled-rmd160\
-	--with-bundled-sha2 \
-
-endif
-
-TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
-
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	SHELL="/bin/bash"
-
-define Package/ruby/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/vendor_ruby/$(PKG_LIBVER)
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/site_ruby/$(PKG_LIBVER)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ruby $(1)/usr/lib/ruby/ruby$(PKG_LIBVER)-bin
-	$(INSTALL_BIN) ./files/ruby $(1)/usr/bin/ruby
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/vendor_ruby/$(PKG_LIBVER)/* $(1)/usr/lib/ruby/vendor_ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/site_ruby/$(PKG_LIBVER)/* $(1)/usr/lib/ruby/site_ruby/$(PKG_LIBVER)/
-	sed -i -e "s%@RUBY_LIBPATH@%/usr/lib/ruby/$(PKG_LIBVER)%" $(1)/usr/bin/ruby
-	sed -i -e "s%@RUBY_BINPATH@%/usr/lib/ruby/ruby$(PKG_LIBVER)-bin%" $(1)/usr/bin/ruby
-endef
-
-define Package/libruby/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libruby.so.* $(1)/usr/lib/
-endef
-
-define Package/ruby-stdlib/install
-	# nothing to do
-endef
-
-define Package/ruby-bigdecimal/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/bigdecimal.so \
-		usr/lib/ruby/$(PKG_LIBVER)/bigdecimal/ \
-		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/bigdecimal-*.gemspec \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-cgi/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-csv/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/csv.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-datetime/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/time.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/date.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/date/ \
-		usr/lib/ruby/$(PKG_LIBVER)/*/date_core.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-dbm/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/dbm.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-debuglib/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/profile.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/profiler.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/debug.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/tracer.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/benchmark.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/objspace.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-digest/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/digest \
-		usr/lib/ruby/$(PKG_LIBVER)/digest.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/digest.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/digest/* \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-drb/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/drb.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/drb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-enc/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc/encdb.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc/iso_8859_1.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc/utf_* \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc/euc_jp.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-enc-extra/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) \
-		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/encdb.so \
-		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/iso_8859_1.so \
-		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/utf_* \
-		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/euc_jp.so \
-		-cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/enc \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-erb/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/erb $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/erb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-fiddle/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/fiddle.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/fiddle/ \
-		usr/lib/ruby/$(PKG_LIBVER)/*/fiddle.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-filelib/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/tmpdir.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/tempfile.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/pathname.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/pathname.so \
-		usr/lib/ruby/$(PKG_LIBVER)/find.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/fileutils.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-gdbm/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/gdbm.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-gems/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gem $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/ubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	# Remove tests (avoids extra deps)
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems/test_case.rb
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems/package/tar_test_case.rb
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems/installer_test_case.rb
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/doc
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/cache
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/extensions
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/build_info
-endef
-
-define Package/ruby-io-console/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/io/console.so \
-		usr/lib/ruby/$(PKG_LIBVER)/io/console/ \
-		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/io-console-*.gemspec \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-irb/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irb $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-json/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/json.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/json \
-		usr/lib/ruby/$(PKG_LIBVER)/*/json \
-		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/json-*.gemspec \
-	) | ( cd $(1); $(TAR) -xf - )
-	rm -rf \
-		$(1)/usr/lib/ruby/$(PKG_LIBVER)/psych/json
-endef
-
-define Package/ruby-logger/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/logger.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/syslog/logger.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/syslog.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-math/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/prime.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/mathn.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/cmath.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/mathn \
-		usr/lib/ruby/$(PKG_LIBVER)/matrix.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/matrix \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-minitest/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/minitest-*.gemspec $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/
-	# Remove tests (avoids extra deps)
-	$(RM) -rf $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/minitest-*/test
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/minitest-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
-endef
-
-define Package/ruby-misc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/English.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/abbrev.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/base64.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/delegate.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/e2mmap.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/expect.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/getoptlong.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/open3.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/ostruct.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/scanf.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/securerandom.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/set.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/shellwords.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/tsort.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/weakref.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/continuation.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/coverage.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/etc.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/fcntl.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/fiber.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/pty.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/stringio.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/strscan.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-
-
-define Package/ruby-mkmf/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/mkmf.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/un.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-multithread/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/monitor.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/timeout.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/thwait.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/mutex_m.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/sync.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/thread.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/io/wait.so \
-		usr/lib/ruby/$(PKG_LIBVER)/*/io/nonblock.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-net/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/open-uri.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/net/* \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-nkf/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/kconv.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/nkf.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-openssl/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/openssl \
-		usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-optparse/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/optparse.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/optionparser.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/optparse \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-patterns/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/observer.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/singleton.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/forwardable.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-powerassert/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/power_assert-*.gemspec $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/
-	# Remove tests (avoids extra deps)
-	$(RM) -rf $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/power_assert-*/test
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/power_assert-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
-endef
-
-define Package/ruby-prettyprint/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/pp.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/prettyprint.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-pstore/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/pstore.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-psych/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/psych \
-		usr/lib/ruby/$(PKG_LIBVER)/psych.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/psych.so \
-		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/psych-*.gemspec \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-racc/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/racc \
-		usr/lib/ruby/$(PKG_LIBVER)/*/racc/*.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rake/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rake $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	# Remove tests (avoids extra deps)
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake/runtest.rb
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/rake-*.gemspec \
-		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/rake-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
-endef
-
-define Package/ruby-rbconfig/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/rbconfig.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/rbconfig/* \
-		usr/lib/ruby/$(PKG_LIBVER)/*/rbconfig/*.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rdoc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdoc $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ri $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	# Remove tests (avoids extra deps)
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc/test_case.rb
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc/markup/formatter_test_case.rb
-	$(RM) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc/markup/text_formatter_test_case.rb
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/rdoc-*.gemspec \
-		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/rdoc-* \
-		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
-endef
-
-define Package/ruby-readline/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rexml/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rexml $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-rinda/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/rinda \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-ripper/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/ripper.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/ripper \
-		usr/lib/ruby/$(PKG_LIBVER)/*/ripper.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-rss/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-sdbm/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/sdbm.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-shell/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/shell.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/shell \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-socket/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/gserver.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/ipaddr.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/resolv-replace.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/resolv.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/socket.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/*/socket.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-testunit/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/test-unit-*.gemspec $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/
-	# Remove tests (avoids extra deps)
-	$(RM) -rf $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/test-unit-*/test
-	$(RM) -rf $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/test-unit-*/sample
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/test-unit-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
-endef
-
-define Package/ruby-unicodenormalize/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/unicode_normalize.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/unicode_normalize \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-uri/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/uri.rb \
-		usr/lib/ruby/$(PKG_LIBVER)/uri \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-webrick/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-xmlrpc/install
-	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
-endef
-
-define Package/ruby-yaml/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/yaml \
-		usr/lib/ruby/$(PKG_LIBVER)/yaml.rb \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Package/ruby-zlib/install
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		usr/lib/ruby/$(PKG_LIBVER)/*/zlib.so \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-define Build/InstallDev
-	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
-		. \
-	) | ( cd $(1); $(TAR) -xf - )
-endef
-
-$(eval $(call BuildPackage,ruby))
-$(eval $(call BuildPackage,libruby))
-$(eval $(call BuildPackage,ruby-stdlib))
-$(eval $(call BuildPackage,ruby-bigdecimal))
-$(eval $(call BuildPackage,ruby-cgi))
-$(eval $(call BuildPackage,ruby-csv))
-$(eval $(call BuildPackage,ruby-datetime))
-$(eval $(call BuildPackage,ruby-dbm))
-$(eval $(call BuildPackage,ruby-debuglib))
-$(eval $(call BuildPackage,ruby-digest))
-$(eval $(call BuildPackage,ruby-drb))
-$(eval $(call BuildPackage,ruby-enc))
-$(eval $(call BuildPackage,ruby-enc-extra))
-$(eval $(call BuildPackage,ruby-erb))
-$(eval $(call BuildPackage,ruby-fiddle))
-$(eval $(call BuildPackage,ruby-filelib))
-$(eval $(call BuildPackage,ruby-gdbm))
-$(eval $(call BuildPackage,ruby-gems))
-$(eval $(call BuildPackage,ruby-io-console))
-$(eval $(call BuildPackage,ruby-irb))
-$(eval $(call BuildPackage,ruby-json))
-$(eval $(call BuildPackage,ruby-logger))
-$(eval $(call BuildPackage,ruby-math))
-$(eval $(call BuildPackage,ruby-minitest))
-$(eval $(call BuildPackage,ruby-misc))
-$(eval $(call BuildPackage,ruby-mkmf))
-$(eval $(call BuildPackage,ruby-multithread))
-$(eval $(call BuildPackage,ruby-net))
-$(eval $(call BuildPackage,ruby-nkf))
-$(eval $(call BuildPackage,ruby-openssl))
-$(eval $(call BuildPackage,ruby-optparse))
-$(eval $(call BuildPackage,ruby-patterns))
-$(eval $(call BuildPackage,ruby-powerassert))
-$(eval $(call BuildPackage,ruby-prettyprint))
-$(eval $(call BuildPackage,ruby-pstore))
-$(eval $(call BuildPackage,ruby-psych))
-$(eval $(call BuildPackage,ruby-racc))
-$(eval $(call BuildPackage,ruby-rake))
-$(eval $(call BuildPackage,ruby-rbconfig))
-$(eval $(call BuildPackage,ruby-rdoc))
-$(eval $(call BuildPackage,ruby-readline))
-$(eval $(call BuildPackage,ruby-rexml))
-$(eval $(call BuildPackage,ruby-rinda))
-$(eval $(call BuildPackage,ruby-ripper))
-$(eval $(call BuildPackage,ruby-rss))
-$(eval $(call BuildPackage,ruby-sdbm))
-$(eval $(call BuildPackage,ruby-shell))
-$(eval $(call BuildPackage,ruby-socket))
-$(eval $(call BuildPackage,ruby-testunit))
-$(eval $(call BuildPackage,ruby-unicodenormalize))
-$(eval $(call BuildPackage,ruby-uri))
-$(eval $(call BuildPackage,ruby-webrick))
-$(eval $(call BuildPackage,ruby-xmlrpc))
-$(eval $(call BuildPackage,ruby-yaml))
-$(eval $(call BuildPackage,ruby-zlib))
-$(eval $(call HostBuild))
diff --git a/trunk/package/feeds/packages/ruby/files/ruby b/trunk/package/feeds/packages/ruby/files/ruby
deleted file mode 100644
index e4904fc2..00000000
--- a/trunk/package/feeds/packages/ruby/files/ruby
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-if ! [ -r "@RUBY_LIBPATH@/rubygems.rb" ]; then
-	exec @RUBY_BINPATH@ --disable-gems "$@"
-fi
-exec @RUBY_BINPATH@ "$@"
diff --git a/trunk/package/feeds/packages/ruby/patches/001-rdoc-remove_gems_dep.patch b/trunk/package/feeds/packages/ruby/patches/001-rdoc-remove_gems_dep.patch
deleted file mode 100644
index 9630de59..00000000
--- a/trunk/package/feeds/packages/ruby/patches/001-rdoc-remove_gems_dep.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-References:
-
-https://github.com/rdoc/rdoc/pull/340
-
---- ruby-2.1.2.orig/lib/rdoc.rb	2014-09-02 17:14:28.719224215 -0300
-+++ ruby-2.1.2/lib/rdoc.rb	2014-09-02 17:14:28.762223911 -0300
-@@ -109,6 +109,8 @@
-   def self.load_yaml
-     begin
-       gem 'psych'
-+    rescue NameError => e # --disable-gems
-+       raise unless e.name == :gem
-     rescue Gem::LoadError
-     end
- 
---- ruby-2.1.2.orig/lib/rdoc/markdown.rb	2014-09-02 17:14:28.761223918 -0300
-+++ ruby-2.1.2/lib/rdoc/markdown.rb	2014-09-02 17:14:28.805223607 -0300
-@@ -525,7 +525,6 @@
- 
- 
- 
--  require 'rubygems'
-   require 'rdoc'
-   require 'rdoc/markup/to_joined_paragraph'
-   require 'rdoc/markdown/entities'
---- ruby-2.1.2.orig/lib/rdoc/text.rb	2014-09-02 17:14:28.721224201 -0300
-+++ ruby-2.1.2/lib/rdoc/text.rb	2014-09-02 17:14:28.764223897 -0300
-@@ -10,6 +10,8 @@
- 
- begin
-   gem 'json'
-+rescue NameError => e # --disable-gems
-+  raise unless e.name == :gem
- rescue Gem::LoadError
- end
- 
diff --git a/trunk/package/feeds/packages/ruby/ruby_find_pkgsdeps b/trunk/package/feeds/packages/ruby/ruby_find_pkgsdeps
deleted file mode 100644
index 946ec1fc..00000000
--- a/trunk/package/feeds/packages/ruby/ruby_find_pkgsdeps
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/usr/bin/ruby -Eutf-8
-# encoding: utf-8
-#
-# Find dependencies between ruby packages
-#
-# Must run inside a openwrt with all *ruby* packages installed
-#
-
-failed = false
-
-puts "Looking for installed ruby packages..."
-packages=`opkg list-installed '*ruby*' | cut -d' ' -f 1`.split("\n")
-
-puts "Looking for packages files..."
-package_files=Hash.new([])
-packages.each do
-	|pkg|
-	files=`opkg files "#{pkg}" | sed -e 1d`.split("\n")
-	package_files[pkg]=files if files
-end
-
-require_regex=/^require ["']([^"']+)["'].*/
-require_regex_ignore=/^require ([a-zA-Z\$]|["']$|.*\/$)/
-require_ignore=%w{drb/invokemethod16 foo rubygems/defaults/operating_system win32console java Win32API
-                  builder/xchar json/pure simplecov win32/sspi rdoc/markdown/literals_1_8 enumerator win32/resolv rbtree
-                  nqxml/streamingparser nqxml/treeparser xmlscan/parser xmlscan/scanner xmltreebuilder xml/parser xmlparser xml/encoding-ja xmlencoding-ja
-                  iconv uconv win32ole gettext/po_parser gettext/mo libxml}
-
-builtin_enc=[
-	Encoding.find("ASCII-8BIT"),
-	Encoding.find("UTF-8"),
-	Encoding.find("UTF-7"),
-	Encoding.find("US-ASCII"),
-]
-
-puts "Looking for requires in files..."
-files_requires=Hash.new([])
-packages.each do
-        |pkg|
-	package_files[pkg].each do
-		|file|
-		next if not File.file?(file)
-
-		if not file =~ /.rb$/
-			if File.executable?(file)
-				magic=`head -c50 '#{file}' | head -1`
-				begin
-					if not magic =~ /ruby/
-						next
-					end
-				rescue
-					next
-				end
-			else
-				next
-			end
-		end
-		#puts "Checking #{file}..."
-		File.open(file, "r") do
-			|f|
-			lineno=0
-			while line=f.gets() do
-				lineno+=1; encs=[]; requires=[]; need_encdb=false
-
-				line=line.chomp.gsub!(/^[[:blank:]]*/,"")
-
-				case line
-				when /^#.*coding *:/
-					if lineno <= 2
-						enc=line.sub(/.*coding *: */,"").sub(/ .*/,"")
-						encs << Encoding.find(enc)
-					end
-				end
-				line.gsub!(/#.*/,"")
-				case line
-				when "__END__"
-					break
-				when /^require /
-					#puts "#{file}:#{line}"
-					if require_regex_ignore =~ line
-						#puts "Ignoring #{line} at #{file}:#{lineno} (REGEX)..."
-						next
-					end
-					if not require_regex =~ line
-						$stderr.puts "Unknown require: '#{line}' at file #{file}:#{lineno}"
-						failed=true
-					end
-					require=line.gsub(require_regex,"\\1")
-					require.gsub!(/\.(so|rb)$/,"")
-
-					if require_ignore.include?(require)
-						#puts "Ignoring #{line} at #{file}:#{lineno} (STR)..."
-						next
-					end
-
-					files_requires[file]=files_requires[file] + [require]
-
-				when /Encoding::/
-					encs=line.scan(/Encoding::[[:alnum:]_]+/).collect {|enc| eval(enc) }.select {|enc| enc.kind_of? Encoding }
-					need_encdb=true
-				end
-
-				next if encs.empty?
-				required_encs = (encs - builtin_enc).collect {|enc| "enc/#{enc.name.downcase.gsub("-","_")}" }
-				required_encs << "enc/encdb" if need_encdb
-
-				files_requires[file] = files_requires[file] + required_encs
-			end
-		end
-	end
-end
-exit(1) if failed
-
-# Add deps from .so
-package_files.each do |(pkg,files)| files.each do |file|
-	case file
-	when /\/nkf\.so$/
-		files_requires[file]= files_requires[file] + ["enc/encdb"]
-	end
-end; end
-
-puts "Merging requirements into packages..."
-package_requires = Hash[packages.collect { |pkg| [pkg, package_files[pkg].collect {|file| files_requires[file] }.inject([],:+).uniq] }]
-
-weak_dependency=Hash.new([])
-weak_dependency.merge!({
-"ruby-misc"=>["ruby-openssl","ruby-fiddle"],			#securerandom.rb
-"ruby-debuglib"=>["ruby-readline"],				#debug.rb
-"ruby-drb"=>["ruby-openssl"],				 	#drb/ssl.rb
-"ruby-irb"=>["ruby-rdoc", "ruby-readline"],		 	#irb/cmd/help.rb
-"ruby-gems"=>["ruby-openssl","ruby-io-console","ruby-webrick"], #rubygems/commands/cert_command.rb rubygems/user_interaction.rb rubygems/server.rb
-"ruby-mkmf"=>["ruby-webrick"], 					#un.rb
-"ruby-net"=>["ruby-openssl","ruby-io-console","ruby-zlib"], 	#net/*.rb
-"ruby-optparse"=>["ruby-uri","ruby-datetime"],			#optparse/date.rb optparse/uri.rb
-"ruby-rake"=>["ruby-net","ruby-gems"],				#rake/contrib/ftptools.rb /usr/bin/rake
-"ruby-rdoc"=>["ruby-gems","ruby-readline","ruby-webrick",	#/usr/bin/rdoc and others
-	       "ruby-io-console"],				#rdoc/stats/normal.rb
-"ruby-webrick"=>["ruby-openssl"],				#webrick/ssl.rb
-})
-
-puts "Preloading gems..."
-Gem::Specification.all.each{ |x| gem x.name }
-
-puts "Looking for package dependencies..."
-package_provides = {}
-package_dependencies = Hash.new([])
-package_requires.each do
-	|(pkg,requires)|
-
-	requires.each do
-		|require|
-		if package_provides.include?(require)
-			found = package_provides[require]
-		else
-			found = package_files.detect {|(pkg,files)| files.detect {|file| $:.detect {|path| "#{path}/#{require}" == file.gsub(/\.(so|rb)$/,"") } } }
-			if not found
-				$stderr.puts "#{pkg}: Nothing provides #{require}"
-				failed = true
-				next
-			end
-			found = found.first
-			package_provides[require]=found
-		end
-		if weak_dependency[pkg].include?(found)
-			puts "#{pkg}: #{found} provides #{require} (ignored WEAK dep)"
-		else
-			puts "#{pkg}: #{found} provides #{require}"
-			package_dependencies[pkg]=package_dependencies[pkg] + [found]
-		end
-	end
-end
-if failed
-	puts "There is some missing requirements not mapped to files in packages."
-	puts "Please, fix the missing files or ignore them on require_ignore var"
-	exit(1)
-end
-
-package_dependencies.each do
-        |(pkg,deps)|
-        package_dependencies[pkg]=deps.uniq.sort - [pkg]
-end
-
-puts "Expanding dependencies..."
-begin
-	changed=false
-	package_dependencies.each do
-		|(pkg,deps)|
-
-		next if deps.empty?
-
-		deps_new = deps.collect {|dep| [dep] + package_dependencies[dep] }.inject([],:+).uniq.sort
-		if not deps == deps_new
-			puts "#{pkg}: #{deps.join(",")}"
-			puts "#{pkg}: #{deps_new.join(",")}"
-			package_dependencies[pkg]=deps_new
-			changed=true
-		end
-	end
-end if not changed
-
-puts "Checking for mutual dependencies..."
-package_dependencies.each do
-	|(pkg,deps)|
-	if deps.include? pkg
-		$stderr.puts "#{pkg}: Cycle dependency detected! "
-		failed = true
-	end
-end
-exit(1) if failed
-
-puts "Removing redundant dependencies..."
-package_dependencies.each do
-	|(pkg,deps)|
-	package_dependencies[pkg]=deps.uniq - [pkg]
-end
-
-package_dependencies2=package_dependencies.dup
-package_dependencies.each do
-	|(pkg,deps)|
-
-	# Ignore dependencies that are aready required by another dependency
-	deps_clean = deps.reject {|dep_suspect| deps.detect {|dep_provider|
-			if package_dependencies[dep_provider].include?(dep_suspect)
-				puts "#{pkg}: #{dep_suspect} is already required by #{dep_provider}"
-				true
-			end
-		 } }
-
-	if not deps==deps_clean
-		puts "before: #{deps.join(",")}"
-		puts "after: #{deps_clean.join(",")}"
-		package_dependencies2[pkg]=deps_clean
-	end
-end
-package_dependencies=package_dependencies2
-
-puts "Checking current packages dependencies..."
-ok=true
-package_dependencies.each do
-	|(pkg,deps)|
-	current_deps=`opkg depends #{pkg} | sed -r -e '1d;s/^[[:blank:]]*//'`.split("\n")
-	current_deps.reject!{|dep| dep =~ /^lib/ }
-	current_deps -= ["ruby"]
-
-	extra_dep = current_deps - deps
-	$stderr.puts "Package #{pkg} does not need to depend on #{extra_dep.join(" ")} " if not extra_dep.empty?
-	missing_dep = deps - current_deps
-	$stderr.puts "Package #{pkg} needs to depend on #{missing_dep.join(" ")} " if not missing_dep.empty?
-
-	if not extra_dep.empty? or not missing_dep.empty?
-		$stderr.puts "define Package/#{pkg}"
-		$stderr.puts "  DEPENDS:=ruby#{([""] +deps).join(" +")}"
-		ok=false
-	end
-end
-
-puts "All dependencies are OK." if ok
-
-
-__END__
-
-puts RUBY_VERSION, RUBY_PLATFORM
-puts 123
-
-puts Object.contants
-
-#RUBY_VER=2.1
-#RUBY_ARCH=i486-linux-gnu
-#RUBYLIB=/usr/lib/ruby/$RUBY_VER/
-#RUBYLIB_A=/usr/lib/ruby/$RUBY_ARCH/$RUBY_VER/
diff --git a/trunk/package/feeds/packages/ruby/ruby_missingfiles b/trunk/package/feeds/packages/ruby/ruby_missingfiles
deleted file mode 100644
index f05e9feb..00000000
--- a/trunk/package/feeds/packages/ruby/ruby_missingfiles
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-
-function list_staging_files {
-	cd staging_dir/target-*/; find \
-		\( \( -name "root-x86" -or -name "packages" -or -name "stamp" -or -name "pkginfo" \) -prune \) -or -true \
-		\( -path "*ruby*" -or -name "erb" -or -name "gem" -or -name "irb" -or -name "rake" -or -name "rdoc" -or -name "ri" -or -name "testrb" \) \
-		-print | sort
-}
-
-function list_ipkg_files {
-	for OPKG in bin/*/packages/packages/*ruby*; do
-        tar --to-stdout -xzf "$OPKG" ./data.tar.gz | tar tz | sed -e 's%/$%%'
-	done | sort -u
-}
-
-
-echo "          Staging                    Packages"
-diff -y <(list_staging_files) <(list_ipkg_files)
-
diff --git a/trunk/package/feeds/packages/sbc/Makefile b/trunk/package/feeds/packages/sbc/Makefile
deleted file mode 100644
index cca54729..00000000
--- a/trunk/package/feeds/packages/sbc/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sbc
-PKG_VERSION:=1.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.kernel.org/pub/linux/bluetooth/
-PKG_MD5SUM:=2d8b7841f2c11ab287718d562f2b981c
-
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING.LIB
-PKG_MAINTAINER:=Dirk Neukirchen <dirkneukirchen@web.de>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sbc
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=sbc encoding library
-  DEPENDS:=+libsndfile
-  URL:=http://www.bluez.org
-endef
-
-define Package/sbc/description
-  Low Complexity Subband Coding for bluetooth audio profiles encoding and decoding.
-  Needed for A2DP support.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/sbc
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/sbc/sbc.h $(1)/usr/include/sbc/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsbc* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sbc.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/sbc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sbc* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsbc.so* $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,sbc))
diff --git a/trunk/package/feeds/packages/screen/Makefile b/trunk/package/feeds/packages/screen/Makefile
deleted file mode 100644
index 3adfb0ab..00000000
--- a/trunk/package/feeds/packages/screen/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=screen
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/screen
-PKG_MD5SUM:=419a0594e2b25039239af8b90eda7d92
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/screen
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=Full-screen terminal window manager
-  URL:=http://www.gnu.org/software/screen/
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-endef
-
-define Package/screen/description
-	Screen is a full-screen window manager that multiplexes a physical
-	terminal between several processes, typically interactive shells.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default,\
-		--with-sys-screenrc=/etc/screenrc \
-	)
-	# XXX: memmove() works well with overlapped memory areas
-	echo "#define USEMEMMOVE 1" >>$(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/screen/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/screen $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/etc/screenrc $(1)/etc/screenrc
-endef
-
-define Package/screen/conffiles
-/etc/screenrc
-endef
-
-$(eval $(call BuildPackage,screen))
diff --git a/trunk/package/feeds/packages/screen/files/etc/screenrc b/trunk/package/feeds/packages/screen/files/etc/screenrc
deleted file mode 100644
index 33376745..00000000
--- a/trunk/package/feeds/packages/screen/files/etc/screenrc
+++ /dev/null
@@ -1 +0,0 @@
-startup_message off
diff --git a/trunk/package/feeds/packages/screen/patches/100-cross_compile_fix.patch b/trunk/package/feeds/packages/screen/patches/100-cross_compile_fix.patch
deleted file mode 100644
index b4bc3079..00000000
--- a/trunk/package/feeds/packages/screen/patches/100-cross_compile_fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -414,7 +414,7 @@ as_fn_error ()
-     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
-   $as_echo "$as_me: error: $2" >&2
--  as_fn_exit $as_status
-+  # as_fn_exit $as_status
- } # as_fn_error
- 
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -5941,8 +5941,6 @@ else
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
--test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
- oldlibs="$LIBS"
- LIBS="$LIBS -lsun"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5
-@@ -7023,7 +7021,7 @@ as_fn_error ()
-     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
-   $as_echo "$as_me: error: $2" >&2
--  as_fn_exit $as_status
-+  # as_fn_exit $as_status
- } # as_fn_error
- 
- 
---- a/pty.c
-+++ b/pty.c
-@@ -39,9 +39,9 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_STROPTS_H
--# include <sys/stropts.h>
--#endif
-+//#ifdef HAVE_STROPTS_H
-+//# include <sys/stropts.h>
-+//#endif
- 
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
---- a/sched.h
-+++ b/sched.h
-@@ -27,6 +27,11 @@
-  * $Id$ GNU
-  */
- 
-+#ifndef __SCHED_H
-+#define __SCHED_H
-+
-+#include <sys/time.h>
-+
- struct event
- {
-   struct event *next;
-@@ -46,3 +51,5 @@ struct event
- #define EV_READ		1
- #define EV_WRITE	2
- #define EV_ALWAYS	3
-+
-+#endif
diff --git a/trunk/package/feeds/packages/screen/patches/110-do_not_add_srcdir_to_include_path.patch b/trunk/package/feeds/packages/screen/patches/110-do_not_add_srcdir_to_include_path.patch
deleted file mode 100644
index 50d00b86..00000000
--- a/trunk/package/feeds/packages/screen/patches/110-do_not_add_srcdir_to_include_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -79,7 +79,7 @@ screen: $(OFILES)
- 	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
- 
- .c.o:
--	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
-+	$(CC) -c $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
- 	    $(OPTIONS) $(CFLAGS) $<
- 
- install_bin: .version screen
diff --git a/trunk/package/feeds/packages/seafile-ccnet/Makefile b/trunk/package/feeds/packages/seafile-ccnet/Makefile
deleted file mode 100644
index 898b939e..00000000
--- a/trunk/package/feeds/packages/seafile-ccnet/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=seafile-ccnet
-PKG_VERSION:=4.0.6
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_LICENSE:=GPL-3.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/haiwen/ccnet.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1e1aeae83cc33356ebd5f064f4a4c148186b814d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/seafile-ccnet
-    SECTION:=net
-    CATEGORY:=Network
-    TITLE:=Seafile server - ccnet component
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=http://seafile.com/
-    DEPENDS:=+libsearpc +libevent2 +libopenssl \
-		+glib2 +python +libzdb +libuuid \
-		+libpthread +libsqlite3 +jansson $(ICONV_DEPENDS)
-endef
-
-define Package/seafile-ccnet/description
-   Ccnet is a framework for writing networked applications in C.
-endef
-
-CONFIGURE_ARGS += --disable-client \
-		    --enable-server \
-		    --disable-ldap \
-		    --disable-cluster \
-		    --enable-python \
-		    --disable-server-pkg \
-		    --disable-static-build \
-		    --disable-compile-demo \
-		    --disable-console
-
-PKG_BUILD_DEPENDS:=vala/host \
-		   libsearpc/host
-
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv \
-		    -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
-
-define Package/seafile-ccnet/install
-	$(INSTALL_DIR) $(1)/usr/{bin,lib}
-	$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ccnet* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/ccnet $(1)/usr/lib/python2.7/site-packages/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libccnet.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ccnet* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libccnet.pc $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libccnet.a $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libccnet.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,seafile-ccnet))
diff --git a/trunk/package/feeds/packages/seafile-seahub/Makefile b/trunk/package/feeds/packages/seafile-seahub/Makefile
deleted file mode 100644
index 266e45c8..00000000
--- a/trunk/package/feeds/packages/seafile-seahub/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=seafile-seahub
-PKG_VERSION:=4.0.6
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_LICENSE:=Apache-2.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/haiwen/seahub.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=739b32b02c4803448d5cb75b3e22ec0073930aed
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/seafile-seahub
-    SECTION:=net
-    CATEGORY:=Network
-    TITLE:=Seafile server - seahub component
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=http://seafile.com/
-    DEPENDS:=+python +simplejson +python-imglib +python-setuptools
-endef
-
-define Package/seafile-seahub/description
-   The web end of seafile server.
-
-   NOTE: in order to have better performance, language support is turned off by default.
-   Please set 'USE_I18N = True' in seahub_settings.py to support multiple languages.
-endef
-
-PKG_BUILD_DEPENDS:=python-setuptools
-PYTHONPATH:=$(PYTHONPATH):$(PKG_BUILD_DIR)/thirdpart
-
-define Download/django
-   FILE=Django-1.5.8.tar.gz
-   URL=https://www.djangoproject.com/m/releases/1.5/
-   MD5SUM:=675fc736e2c29090f005e217ccf90b5b
-endef
-
-define Download/djblets
-   PROTO=git
-   URL=https://github.com/djblets/djblets.git
-   SUBDIR=djblets-0.6.14
-   FILE=djblets-0.6.14.tar.gz
-   VERSION=58c09bae9b71ac164f78c76746fd2e545aae6c68
-endef
-
-define Download/gunicorn
-   FILE=gunicorn-0.16.1.tar.gz
-   URL=https://pypi.python.org/packages/source/g/gunicorn/
-   MD5SUM:=d53d5d04d941f2a3089e814e753a218f
-endef
-
-define Download/six
-   FILE=six-1.4.1.tar.gz
-   URL=https://pypi.python.org/packages/source/s/six/
-   MD5SUM:=bdbb9e12d3336c198695aa4cf3a61d62
-endef
-
-define Download/chardet
-   FILE=chardet-2.1.1.tar.gz
-   URL=https://pypi.python.org/packages/source/c/chardet/
-   MD5SUM:=295367fd210d20f3febda615a88e1ef0
-endef
-
-define Download/flup
-   FILE=flup-1.0.2-py2.6.egg
-   URL=https://pypi.python.org/packages/2.6/f/flup/
-   MD5SUM:=93ec6e3baeee3e5649a8456105178d4e
-endef
-
-define Download/lockfile
-   FILE=lockfile-0.9.1.tar.gz
-   URL=https://pypi.python.org/packages/source/l/lockfile/
-   MD5SUM:=ce61468d4c1263e3005737bbed2641f0
-endef
-
-define Download/python-daemon
-   FILE=python-daemon-1.5.5.tar.gz
-   URL=https://pypi.python.org/packages/source/p/python-daemon/
-   MD5SUM:=1f6cd41473c2e201021a0aeef395b2b1
-endef
-
-define Download/python-dateutil
-   FILE=python-dateutil-1.5.tar.gz
-   URL=https://pypi.python.org/packages/source/p/python-dateutil/
-   MD5SUM:=0dcb1de5e5cad69490a3b6ab63f0cfa5
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	# Download python dependencies
-	$(eval $(call Download,django))
-	$(eval $(call Download,djblets))
-	$(eval $(call Download,gunicorn))
-	$(eval $(call Download,six))
-	$(eval $(call Download,chardet))
-	$(eval $(call Download,flup))
-	$(eval $(call Download,lockfile))
-	$(eval $(call Download,python-daemon))
-	$(eval $(call Download,python-dateutil))
-	# Install python dependencies
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/Django-1.5.8.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/djblets-0.6.14.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/gunicorn-0.16.1.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/six-1.4.1.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/chardet-2.1.1.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/flup-1.0.2-py2.6.egg)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/lockfile-0.9.1.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/python-daemon-1.5.5.tar.gz)
-	$(call HostPython,, \
-		$(STAGING_DIR_ROOT)/usr/bin/easy_install -d $(PKG_BUILD_DIR)/thirdpart -Z -N \
-		$(DL_DIR)/python-dateutil-1.5.tar.gz)
-endef
-
-define Package/seafile-seahub/install
-	$(INSTALL_DIR) $(1)/usr/share/seafile/seafile-server/seahub
-	$(CP) $(PKG_BUILD_DIR)/{locale,media,fabfile,seahub,sql,tests,thirdpart,tools} $(1)/usr/share/seafile/seafile-server/seahub/
-	$(CP) $(PKG_BUILD_DIR)/*.{sh,template,py,txt} $(1)/usr/share/seafile/seafile-server/seahub/
-	$(CP) $(PKG_BUILD_DIR)/{CONTRIBUTORS,HACKING,README.markdown} $(1)/usr/share/seafile/seafile-server/seahub/
-	$(CP) $(PKG_BUILD_DIR)/pylintrc* $(1)/usr/share/seafile/seafile-server/seahub/
-	# fix python exec path in scripts
-	sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/share/seafile/seafile-server/seahub/thirdpart/chardetect.py
-	sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/share/seafile/seafile-server/seahub/thirdpart/django-admin.py
-	sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/share/seafile/seafile-server/seahub/thirdpart/gunicorn
-	sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/share/seafile/seafile-server/seahub/thirdpart/gunicorn_django
-	sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/share/seafile/seafile-server/seahub/thirdpart/gunicorn_paster
-	find $(1) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-	sed -i "s/\(SEAFILE_VERSION\s*=\s*\)'\([0-9]\.[0-9]\.[0-9]\)'/\1'$(PKG_VERSION)'/g" $(1)/usr/share/seafile/seafile-server/seahub/seahub/settings.py
-endef
-
-$(eval $(call BuildPackage,seafile-seahub))
diff --git a/trunk/package/feeds/packages/seafile-seahub/patches/010-default-config.patch b/trunk/package/feeds/packages/seafile-seahub/patches/010-default-config.patch
deleted file mode 100644
index 4168dc15..00000000
--- a/trunk/package/feeds/packages/seafile-seahub/patches/010-default-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rupN seahub-3.1.7-server.orig/seahub/settings.py seahub-3.1.7-server/seahub/settings.py
---- seahub-3.1.7-server.orig/seahub/settings.py	2014-10-20 09:32:35.000000000 +0200
-+++ seahub-3.1.7-server/seahub/settings.py	2014-12-10 15:47:21.625104606 +0100
-@@ -46,7 +46,7 @@ SITE_ID = 1
- 
- # If you set this to False, Django will make some optimizations so as not
- # to load the internationalization machinery.
--USE_I18N = True
-+USE_I18N = False
- 
- # If you set this to False, Django will not format dates, numbers and
- # calendars according to the current locale.
-@@ -209,7 +209,7 @@ SHOW_REPO_DOWNLOAD_BUTTON = False
- REPO_PASSWORD_MIN_LENGTH = 8
- 
- # mininum length for user's password
--USER_PASSWORD_MIN_LENGTH = 6
-+USER_PASSWORD_MIN_LENGTH = 8
- 
- # LEVEL based on four types of input:
- # num, upper letter, lower letter, other symbols
-@@ -218,7 +218,7 @@ USER_PASSWORD_STRENGTH_LEVEL = 3
- 
- # default False, only check USER_PASSWORD_MIN_LENGTH
- # when True, check password strength level, STRONG(or above) is allowed
--USER_STRONG_PASSWORD_REQUIRED = False
-+USER_STRONG_PASSWORD_REQUIRED = True
- 
- # Using server side crypto by default, otherwise, let user choose crypto method.
- FORCE_SERVER_CRYPTO = True
diff --git a/trunk/package/feeds/packages/seafile-server/Makefile b/trunk/package/feeds/packages/seafile-server/Makefile
deleted file mode 100644
index a0931d1c..00000000
--- a/trunk/package/feeds/packages/seafile-server/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=seafile-server
-PKG_VERSION:=4.0.6
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_LICENSE:=GPL-3.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/haiwen/seafile.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=adf9a875a960c1471bf6c93fce397c576e985bb3
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/seafile-server
-    SECTION:=net
-    CATEGORY:=Network
-    TITLE:=Seafile server
-    MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-    URL:=http://seafile.com/
-    DEPENDS:=+shadow-useradd +libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub \
-		+sqlite3-cli +python-mysql +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 \
-		+libmysqlclient +libevhtp +libpthread +libuuid \
-		+bash +sudo +procps +procps-pkill $(ICONV_DEPENDS)
-    EXTRA_DEPENDS:=seafile-ccnet (=4.0.6-1e1aeae83cc33356ebd5f064f4a4c148186b814d), seafile-seahub (=4.0.6-739b32b02c4803448d5cb75b3e22ec0073930aed)
-endef
-
-define Package/seafile-server/description
-   Open source cloud storage with advanced features on privacy protection and teamwork.
-endef
-
-CONFIGURE_ARGS += --disable-riak \
-		    --disable-client \
-		    --disable-fuse \
-		    --enable-server \
-		    --enable-python \
-		    --disable-static-build \
-		    --disable-server-pkg \
-		    --disable-console
-
-PKG_BUILD_DEPENDS:=vala/host \
-		    libsearpc/host
-
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv \
-		    -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
-
-define Package/seafile-server/install
-	$(INSTALL_DIR) $(1)/usr/{bin,lib}
-	$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
-	$(INSTALL_DIR) $(1)/usr/share/seafile/seafile-server/runtime
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seafile/ $(1)/usr/lib/python2.7/site-packages/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/seaserv/ $(1)/usr/lib/python2.7/site-packages/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libseafile.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/scripts/seaf-gc.sh $(1)/usr/share/seafile/seafile-server/
-	$(CP) $(PKG_BUILD_DIR)/scripts/setup-seafile-mysql.py $(1)/usr/share/seafile/seafile-server/
-	$(CP) $(PKG_BUILD_DIR)/scripts/setup-seafile-mysql.sh $(1)/usr/share/seafile/seafile-server/
-	$(CP) $(PKG_BUILD_DIR)/scripts/sqlite2mysql.py $(1)/usr/share/seafile/seafile-server/
-	$(CP) $(PKG_BUILD_DIR)/scripts/sqlite2mysql.sh $(1)/usr/share/seafile/seafile-server/
-	$(CP) $(PKG_BUILD_DIR)/scripts/upgrade/ $(1)/usr/share/seafile/seafile-server/
-	$(INSTALL_BIN) ./files/seafile.init $(1)/etc/init.d/seafile
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/seafile/ $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libseafile.pc $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libseafile.so* $(1)/usr/lib/
-endef
-
-define Package/seafile-server/postinst
-#!/bin/sh
-
-if ! id -u seafile >/dev/null 2>&1; then
-    useradd seafile -d "/usr/share/seafile" -s /bin/sh; fi
-
-chown -R seafile:seafile /usr/share/seafile/
-chmod -R o-rwx /usr/share/seafile/
-
-if [ ! -d "/usr/share/seafile/seafile-data" ]
-then
-   echo "*** Installation completed, running configuration script..."
-   /etc/init.d/seafile setup
-
-   if [ $$? -ne 0 ]
-   then
-      echo
-      echo "*** ERROR: Configuration failed. Please fix the issues if any and re-run the script using the command below:"
-      echo "*** \"/etc/init.d/seafile setup\""
-   fi
-
-   echo
-   echo "*** NOTE: you need to create an admin account before using Seafile."
-   echo "*** Please run \"/etc/init.d/seafile create_admin\" to do so."
-else
-   echo "*** WARNING: it seems you are upgrading from an older version."
-   echo "*** If so, please run the appropriate upgrade script before using the new version of Seafile."
-   echo "*** Upgrade scripts are located at \"/usr/share/seafile/seafile-server/upgrade\""
-   echo
-   echo "*** For more information, please read http://manual.seafile.com/deploy/upgrade.html"
-   exit
-fi
-
-/etc/init.d/seafile enable
-/etc/init.d/seafile restart
-endef
-
-define Package/seafile-server/prerm
-#!/bin/sh
-/etc/init.d/seafile stop
-endef
-
-$(eval $(call BuildPackage,seafile-server))
diff --git a/trunk/package/feeds/packages/seafile-server/files/seafile.init b/trunk/package/feeds/packages/seafile-server/files/seafile.init
deleted file mode 100755
index e9d3b03d..00000000
--- a/trunk/package/feeds/packages/seafile-server/files/seafile.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-APP=seafile
-EXTRA_HELP="	setup	Runs the setup script
-	create_admin	Creates the administrative login
-	reset_admin	Alias to create_admin"
-EXTRA_COMMANDS="setup create_admin reset_admin"
-
-export PATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PATH"
-export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
-
-start() {
-	if [ ! -d /var/run/seafile ]
-	then
-	    mkdir /var/run/seafile
-	    chown seafile:seafile /var/run/seafile
-	    chmod o-rwx /var/run/seafile
-	fi
-
-	# append parameter "--fastcgi" here to start seahub in fastcgi mode
-	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
-	    "/usr/bin/seafile-admin" start
-}
-
-stop() {
-	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
-	    "/usr/bin/seafile-admin" stop
-}
-
-setup() {
-	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
-	    "/usr/bin/seafile-admin" setup
-}
-
-create_admin() {
-	cd "/usr/share/seafile" && \
-	    sudo PYTHONPATH="$PYTHONPATH" -u seafile -E \
-	    "/usr/bin/seafile-admin" create-admin
-}
-
-reset_admin() {
-	create_admin
-}
diff --git a/trunk/package/feeds/packages/seafile-server/patches/020-script-patches.patch b/trunk/package/feeds/packages/seafile-server/patches/020-script-patches.patch
deleted file mode 100644
index 8bb7ae70..00000000
--- a/trunk/package/feeds/packages/seafile-server/patches/020-script-patches.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -rupN seafile-3.1.7-server.orig/scripts/seaf-gc.sh seafile-3.1.7-server/scripts/seaf-gc.sh
---- seafile-3.1.7-server.orig/scripts/seaf-gc.sh	2014-10-16 05:30:04.000000000 +0200
-+++ seafile-3.1.7-server/scripts/seaf-gc.sh	2014-12-13 00:51:12.919136978 +0100
-@@ -6,11 +6,10 @@ SCRIPT=$(readlink -f "$0")
- INSTALLPATH=$(dirname "${SCRIPT}")
- TOPDIR=$(dirname "${INSTALLPATH}")
- default_ccnet_conf_dir=${TOPDIR}/ccnet
--seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc
-+seaf_gc=/usr/bin/seafserv-gc
- seaf_gc_opts=""
- 
--export PATH=${INSTALLPATH}/seafile/bin:$PATH
--export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
-+export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
- 
- script_name=$0
- function usage () {
-@@ -78,9 +77,7 @@ function run_seaf_gc () {
- 
-     echo "Starting seafserv-gc, please wait ..."
- 
--    LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_gc} \
--        -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" \
--        ${seaf_gc_opts}
-+    ${seaf_gc} -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" ${seaf_gc_opts}
- 
-     echo "seafserv-gc run done"
-     echo
-diff -rupN seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh seafile-3.1.7-server/scripts/setup-seafile-mysql.sh
---- seafile-3.1.7-server.orig/scripts/setup-seafile-mysql.sh	2014-10-16 05:30:04.000000000 +0200
-+++ seafile-3.1.7-server/scripts/setup-seafile-mysql.sh	2014-12-13 00:51:49.242172631 +0100
-@@ -9,6 +9,8 @@ set -e
- SCRIPT=$(readlink -f "$0")
- INSTALLPATH=$(dirname "${SCRIPT}")
- 
-+export PYTHONPATH="/usr/share/seafile/seafile-server/seahub/thirdpart:$PYTHONPATH"
-+
- cd "$INSTALLPATH"
- 
- python_script=setup-seafile-mysql.py
diff --git a/trunk/package/feeds/packages/seafile-server/patches/030-pidfiles-in-same-directory.patch b/trunk/package/feeds/packages/seafile-server/patches/030-pidfiles-in-same-directory.patch
deleted file mode 100644
index 4338f179..00000000
--- a/trunk/package/feeds/packages/seafile-server/patches/030-pidfiles-in-same-directory.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN seafile-3.1.7-server.orig/controller/seafile-controller.c seafile-3.1.7-server/controller/seafile-controller.c
---- seafile-3.1.7-server.orig/controller/seafile-controller.c	2014-10-16 05:30:04.000000000 +0200
-+++ seafile-3.1.7-server/controller/seafile-controller.c	2014-11-28 16:50:24.053674057 +0100
-@@ -21,7 +21,7 @@
- 
- SeafileController *ctl;
- 
--static char *controller_pidfile = NULL;
-+static char *controller_pidfile = "/var/run/seafile/seafile-controller.pid";
- 
- char *bin_dir = NULL;
- char *installpath = NULL;
-@@ -614,9 +614,9 @@ stop_ccnet_server ()
- static void
- init_pidfile_path (SeafileController *ctl)
- {
--    char *pid_dir = g_build_filename (topdir, "pids", NULL);
-+    char *pid_dir = g_path_get_dirname (controller_pidfile);
-     if (!g_file_test(pid_dir, G_FILE_TEST_EXISTS)) {
--        if (g_mkdir(pid_dir, 0777) < 0) {
-+        if (g_mkdir(pid_dir, 0755) < 0) {
-             seaf_warning("failed to create pid dir %s: %s", pid_dir, strerror(errno));
-             controller_exit(1);
-         }
diff --git a/trunk/package/feeds/packages/seafile-server/patches/040-seafile-admin.patch b/trunk/package/feeds/packages/seafile-server/patches/040-seafile-admin.patch
deleted file mode 100644
index 1948c738..00000000
--- a/trunk/package/feeds/packages/seafile-server/patches/040-seafile-admin.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -rupN seafile-3.1.7-server.orig/tools/seafile-admin seafile-3.1.7-server/tools/seafile-admin
---- seafile-3.1.7-server.orig/tools/seafile-admin	2014-10-16 05:30:04.000000000 +0200
-+++ seafile-3.1.7-server/tools/seafile-admin	2014-12-22 21:52:25.929781054 +0100
-@@ -416,13 +416,13 @@ def create_gunicorn_conf():
-     content = '''\
- import os
- daemon = True
--workers = 3
-+workers = 1
-+threads = 3
- 
- # Logging
- runtime_dir = os.path.dirname(__file__)
--pidfile = os.path.join(runtime_dir, 'seahub.pid')
-+pidfile = '/var/run/seafile/seahub.pid'
- errorlog = os.path.join(runtime_dir, 'error.log')
--accesslog = os.path.join(runtime_dir, 'access.log')
- '''
-     try:
-         with open(confpath, 'w') as fp:
-@@ -607,6 +607,7 @@ def start_seahub_gunicorn():
-         'gunicorn_django',
-         '-c', conf[CONF_SEAHUB_CONF],
-         '-b', '0.0.0.0:%s' % conf[CONF_SEAHUB_PORT],
-+        '-t', '120',
-     ]
- 
-     info('Starting seahub...')
-@@ -625,6 +626,7 @@ def start_seahub_fastcgi():
-         'pidfile=%(pidfile)s',
-         'outlog=%(outlog)s',
-         'errlog=%(errlog)s',
-+        'method=threaded',
-     ]
- 
-     cmdline = ' '.join(argv) % \
-@@ -693,7 +695,7 @@ def check_layout(args):
-     conf[CONF_SEAFILE_DIR]      = seafile_data_dir
-     conf[CONF_SEAHUB_DIR]       = seahub_dir
-     conf[CONF_SEAHUB_CONF]      = seahub_conf
--    conf[CONF_SEAHUB_PIDFILE]   = os.path.join(runtime_dir, 'seahub.pid')
-+    conf[CONF_SEAHUB_PIDFILE]   = '/var/run/seafile/seahub.pid'
-     conf[CONF_SEAHUB_OUTLOG]    = os.path.join(runtime_dir, 'access.log')
-     conf[CONF_SEAHUB_ERRLOG]    = os.path.join(runtime_dir, 'error.log')
- 
-@@ -738,10 +740,9 @@ def setup_seafile(args):
-     print '-----------------------------------------------------------------'
-     print '-----------------------------------------------------------------'
-     print
--    print 'To start/stop seafile server:'
-+    print 'To start, stop or restart seafile server, please run as root:'
-     print
--    print highlight('         $ cd %s' % cwd)
--    print highlight('         $ %s { start | stop }' % SCRIPT_NAME)
-+    print highlight('         # /etc/init.d/seafile { start | stop | restart }')
-     print
-     print 'If you have any problem, refer to\n'
-     print
-@@ -802,8 +803,7 @@ def start_seafile(args):
- def stop_seafile(dummy):
-     info('Stopping seafile server')
-     pkill('seafile-controller')
--    runtime_dir = os.path.join(cwd, 'seafile-server', 'runtime')
--    pidfile = os.path.join(runtime_dir, 'seahub.pid')
-+    pidfile = '/var/run/seafile/seahub.pid'
-     try:
-         with open(pidfile, 'r') as fp:
-             pid = fp.read().strip('\n ')
diff --git a/trunk/package/feeds/packages/ser2net/Makefile b/trunk/package/feeds/packages/ser2net/Makefile
deleted file mode 100644
index ec0b5731..00000000
--- a/trunk/package/feeds/packages/ser2net/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ser2net
-PKG_VERSION:=2.10.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/ser2net
-PKG_MD5SUM:=cd937041144de83d41d811521e72158c
-
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ser2net
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Serial to Network Proxy
-  URL:=http://sourceforge.net/projects/ser2net/
-endef
-
-define Package/ser2net/description
-  This project provides a proxy that allows telnet/tcp connections to be made to
-  serial ports on a machine.
-endef
-
-define Package/ser2net/conffiles
-/etc/ser2net.conf
-endef
-
-define Package/ser2net/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/
-endef
-
-$(eval $(call BuildPackage,ser2net))
diff --git a/trunk/package/feeds/packages/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch b/trunk/package/feeds/packages/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch
deleted file mode 100644
index 370d0b9b..00000000
--- a/trunk/package/feeds/packages/ser2net/patches/001-fix_TIOCSRS485_undeclared_error.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-ser2net: Fix compilation failures due to missing TIOCSRS485 macro
-
-Patch sent upstream:
-	https://sourceforge.net/p/ser2net/mailman/message/32905302/
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-From: Yegor Yefremov <yegorslists@googlemail.com>
-
-include <asm-generic/ioctls.h> fixes compilations for systems,
-where <asm-generic/ioctls.h> won't be included automatically.
-
-Move special Linux includes to dataxfer.h.
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- dataxfer.h | 5 +++--
- devcfg.c   | 2 --
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
---- a/dataxfer.h
-+++ b/dataxfer.h
-@@ -20,8 +20,6 @@
- #ifndef DATAXFER
- #define DATAXFER
- 
--#include <linux/serial.h>
--
- #include "controller.h"
- 
- #ifdef USE_UUCP_LOCKING
-@@ -30,6 +28,9 @@ extern int uucp_locking_enabled;
- 
- #ifdef linux
- 
-+#include <linux/serial.h>
-+#include <asm-generic/ioctls.h>
-+
- #define USE_RS485_FEATURE
- 
- /* Check, if the toolchain provides serial_rs485 structure and macros */
---- a/devcfg.c
-+++ b/devcfg.c
-@@ -18,7 +18,6 @@
-  */
- 
- /* This code handles generating the configuration for the serial port. */
--
- #include <unistd.h>
- #include <termios.h>
- #include <sys/ioctl.h>
-@@ -31,7 +30,6 @@
- #include <signal.h>
- #include <errno.h>
- #include <syslog.h>
--#include <linux/serial.h>
- 
- #include "ser2net.h"
- #include "selector.h"
diff --git a/trunk/package/feeds/packages/serialconsole/Makefile b/trunk/package/feeds/packages/serialconsole/Makefile
deleted file mode 100644
index fa336ac6..00000000
--- a/trunk/package/feeds/packages/serialconsole/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sc
-PKG_VERSION:=0.95
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/serialconsole/sc
-PKG_MD5SUM:=4fe58576a5bddb9f1fb3dcfc6410b885
-PKG_MAINTAINER:=Stefan Bethke <stb@lassitu.de>
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/serialconsole
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Serial Console - minimal terminal program
-  URL:=http://sourceforge.net/projects/serialconsole/
-endef
-
-define Package/serialconsole/description
-serialconsole (sc) is a minimal terminal program allowing to use one machine
-to access the serial console of another machine.
-endef
-
-define Package/serialconsole/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sc $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,serialconsole))
diff --git a/trunk/package/feeds/packages/shadow/Makefile b/trunk/package/feeds/packages/shadow/Makefile
deleted file mode 100644
index ad9bb115..00000000
--- a/trunk/package/feeds/packages/shadow/Makefile
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shadow
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases
-PKG_MD5SUM:=2bfafe7d4962682d31b5eba65dba4fc8
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-SHADOW_APPLETS := \
-	chage groupadd groupdel groupmod groups passwd su \
-	useradd userdel usermod
-
-CONFIGURE_ARGS += \
-	--without-audit \
-	--without-libpam \
-	--without-selinux \
-	--without-acl \
-	--without-attr \
-	--without-tcb \
-	--without-nscd \
-	--disable-subordinate-ids \
-
-define Package/shadow/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The PLD Linux shadow utilities
-  URL:=http://pkg-shadow.alioth.debian.org/
-endef
-
-define Package/shadow
-  $(call Package/shadow/Default)
-  TITLE+= (all)
-  DEPENDS:=$(foreach u,$(SHADOW_APPLETS),+shadow-$(u))
-  HIDDEN:=1
-endef
-
-define Package/shadow/description
-  Full versions of standard shadow utilities. Normally, you would not
-  use this package, since the functionality in BusyBox is more than
-  sufficient and much smaller.
-endef
-
-define Package/shadow/install
-	true
-endef
-
-define Package/shadow-utils
-  $(call Package/shadow/Default)
-endef
-
-define Package/shadow-utils/config
-    menu "Select shadow utilities"
-      depends on PACKAGE_shadow-utils
-
-    config shadow-all
-      bool "Include all PLD shadow utilities"
-      select PACKAGE_shadow
-      default y
-
-    comment "Utilities"
-
-  $(foreach u,$(SHADOW_APPLETS), \
-    config PACKAGE_shadow-$(u)
-      prompt "Full PLD version of $(u) utility"
-
-   )
-
-  endmenu
-
-endef
-
-Package/shadow-utils/description = $(Package/shadow/description)
-
-define Package/shadow-common
-  $(call Package/shadow/Default)
-  TITLE:=Shared definitions for the PLD Linux shadow utilities
-  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
-  HIDDEN:=1
-endef
-
-define GenPlugin
-  define Package/shadow-$(1)
-    $(call Package/shadow/Default)
-    TITLE:=Utility $(1) from the PLD Linux shadow utilities
-    DEPENDS:=+shadow-common
-    HIDDEN:=1
-  endef
-
-  define Package/shadow-$(1)/description
-    Full version of standard $(1) utility. Normally, you would not use this
-    package, since the functionality in BusyBox is more than sufficient.
-  endef
-endef
-
-$(foreach u,$(SHADOW_APPLETS),$(eval $(call GenPlugin,$(u))))
-
-define Package/shadow-common/conffiles
-/etc/login.defs
-endef
-
-define Package/shadow-common/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/login.defs $(1)/etc/
-endef
-
-define Package/shadow-utils/install
-	true
-endef
-
-define BuildPlugin
-  define Package/shadow-$(1)/install
-	[ -x "$(PKG_INSTALL_DIR)/usr/sbin/$(1)" ] && { \
-		$(INSTALL_DIR) $$(1)/usr/sbin; \
-		$(CP) $(PKG_INSTALL_DIR)/usr/sbin/$(1) $$(1)/usr/sbin/; \
-	} || { \
-		$(INSTALL_DIR) $$(1)/usr/bin; \
-		$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/; \
-	}
-  endef
-
-  $$(eval $$(call BuildPackage,shadow-$(1)))
-endef
-
-$(foreach u,$(SHADOW_APPLETS),$(eval $(call BuildPlugin,$(u))))
-
-$(eval $(call BuildPackage,shadow-utils))
-$(eval $(call BuildPackage,shadow-common))
-$(eval $(call BuildPackage,shadow))
diff --git a/trunk/package/feeds/packages/shadow/patches/001-busybox_ash.patch b/trunk/package/feeds/packages/shadow/patches/001-busybox_ash.patch
deleted file mode 100644
index a16dad26..00000000
--- a/trunk/package/feeds/packages/shadow/patches/001-busybox_ash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/login.defs
-+++ b/etc/login.defs
-@@ -111,7 +111,7 @@ NOLOGINS_FILE	/etc/nologin
- # command as "-su".  If not defined, then ps(1) will display the
- # name of the shell actually being run, e.g. something like "-sh".
- #
--SU_NAME		su
-+#SU_NAME		su
- 
- #
- # *REQUIRED*
diff --git a/trunk/package/feeds/packages/shadow/patches/002-disable-ruser-lookup.patch b/trunk/package/feeds/packages/shadow/patches/002-disable-ruser-lookup.patch
deleted file mode 100644
index a7ef1f74..00000000
--- a/trunk/package/feeds/packages/shadow/patches/002-disable-ruser-lookup.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -197,7 +197,6 @@ dnl XXX - quick hack, should disappear b
- AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
- if test "$ac_cv_func_ruserok" = "yes"; then
- 	AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
--	AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
- fi
- 
- AC_ARG_ENABLE(shadowgrp,
diff --git a/trunk/package/feeds/packages/shadow/patches/003-fix-disabling-subids.patch b/trunk/package/feeds/packages/shadow/patches/003-fix-disabling-subids.patch
deleted file mode 100644
index bbc65c7d..00000000
--- a/trunk/package/feeds/packages/shadow/patches/003-fix-disabling-subids.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/usermod.c
-+++ b/src/usermod.c
-@@ -1361,6 +1361,7 @@ static void process_flags (int argc, cha
- 		exit (E_UID_IN_USE);
- 	}
- 
-+#ifdef ENABLE_SUBIDS
- 	if (   (vflg || Vflg)
- 	    && !is_sub_uid) {
- 		fprintf (stderr,
-@@ -1376,6 +1377,7 @@ static void process_flags (int argc, cha
- 		         Prog, sub_gid_dbname (), "-w", "-W");
- 		exit (E_USAGE);
- 	}
-+#endif
- }
- 
- /*
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -52,7 +52,10 @@ usbin_PROGRAMS = \
- noinst_PROGRAMS = id sulogin
- 
- suidbins       = su
--suidubins      = chage chfn chsh expiry gpasswd newgrp passwd newuidmap newgidmap
-+suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
-+if ENABLE_SUBIDS
-+	suidubins += newuidmap newgidmap
-+endif
- if ACCT_TOOLS_SETUID
- 	suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
- endif
diff --git a/trunk/package/feeds/packages/shadowsocks-client/Makefile b/trunk/package/feeds/packages/shadowsocks-client/Makefile
deleted file mode 100644
index e4344d6e..00000000
--- a/trunk/package/feeds/packages/shadowsocks-client/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shadowsocks-client
-PKG_VERSION:=0.5
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://github.com/zhao-gang/shadowsocks-tiny.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d8ef02715f40de0fb7ba0f7267d3f8260f38ba80
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Zhao, Gang <gang.zhao.42@gmail.com>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shadowsocks-client
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=shadowsocks client for router
-  URL:=https://github.com/zhao-gang/shadowsocks-tiny
-  DEPENDS:=+libopenssl
-endef
-
-define Package/shadowsocks-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sslocal $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/sslocal.config $(1)/etc/config/sslocal
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sslocal.init $(1)/etc/init.d/sslocal
-endef
-
-$(eval $(call BuildPackage,shadowsocks-client))
diff --git a/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.config b/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.config
deleted file mode 100644
index 28dc261a..00000000
--- a/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.config
+++ /dev/null
@@ -1,7 +0,0 @@
-config sslocal
-       option server_addr ''
-       option server_port ''
-       option local_addr ''
-       option local_port ''
-       option password ''
-       option method ''
diff --git a/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.init b/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.init
deleted file mode 100755
index ac845e5f..00000000
--- a/trunk/package/feeds/packages/shadowsocks-client/files/sslocal.init
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2012 OpenWrt.org
-# Copyright (C) 2014 Zhao, Gang <gang.zhao.42@gmail.com>
-
-START=99
-
-USE_PROCD=1
-PROG=/usr/bin/sslocal
-
-validate_section_sslocal() {
-	uci_validate_section sslocal sslocal "${1}" \
-		'server_addr:host' \
-		'server_port:port' \
-		'local_addr:host' \
-		'local_port:port' \
-		'password:string' \
-		'method:string' \
-		'log_level:range(0,7):5'
-
-	return $?
-}
-
-sslocal_instance() {
-	local server_addr server_port local_addr local_port
-	local password method log_level
-
-	validate_section_sslocal "${1}" || {
-		echo "validation failed"
-		return 1
-	}
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_append_param command -s "${server_addr}" -p "${server_port}"
-	procd_append_param command -u "${local_addr}" -b "${local_port}"
-	procd_append_param command -k "${password}" -m "${method}"
-	procd_append_param command -l "${log_level}"
-	procd_set_param respawn
-	procd_close_instance
-}
-
-start_service() {
-	config_load sslocal
-
-	config_foreach sslocal_instance sslocal
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "sslocal"
-	procd_add_validation validate_section_sslocal
-}
diff --git a/trunk/package/feeds/packages/shairplay/Makefile b/trunk/package/feeds/packages/shairplay/Makefile
deleted file mode 100644
index 74a3fd78..00000000
--- a/trunk/package/feeds/packages/shairplay/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shairplay
-PKG_VERSION:=2014-10-27
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/juhovh/shairplay.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=64d59e3087f829006d091fa0d114efb50972a2bf
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shairplay
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libao +libavahi-compat-libdnssd +libltdl +libpthread
-  TITLE:=Shairplay
-endef
-
-define Package/shairplay/description
-  Free portable AirPlay server implementation similar to ShairPort.
-endef
-
-define Package/shairplay/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/shairplay $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/shairplay
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/airport.key $(1)/usr/share/shairplay/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) files/shairplay.init $(1)/etc/init.d/shairplay
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/shairplay.config $(1)/etc/config/shairplay
-endef
-
-$(eval $(call BuildPackage,shairplay))
diff --git a/trunk/package/feeds/packages/shairplay/files/shairplay.config b/trunk/package/feeds/packages/shairplay/files/shairplay.config
deleted file mode 100644
index 6e1f9393..00000000
--- a/trunk/package/feeds/packages/shairplay/files/shairplay.config
+++ /dev/null
@@ -1,10 +0,0 @@
-config shairplay main
-	option disabled '1'
-	option respawn '1'
-	option apname 'AirPlay'
-	option port '5000'
-	option password ''
-	option hwaddr ''
-	option ao_driver 'oss'
-	option ao_devicename ''
-	option ao_deviceid ''
diff --git a/trunk/package/feeds/packages/shairplay/files/shairplay.init b/trunk/package/feeds/packages/shairplay/files/shairplay.init
deleted file mode 100644
index 093a1680..00000000
--- a/trunk/package/feeds/packages/shairplay/files/shairplay.init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=90
-USE_PROCD=1
-
-append_arg() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get val "$cfg" "$var"
-	[ -n "$val" -o -n "$def" ] && procd_append_param command $opt="${val:-$def}"
-}
-
-start_instance() {
-	local cfg="$1"
-	local aux
-
-	config_get_bool aux "$cfg" 'disabled' '0'
-	[ "$aux" = 1 ] && return 1
-
-	procd_open_instance
-
-	procd_set_param command /usr/bin/shairplay
-
-	append_arg "$cfg" apname "--apname" "AirPlay"
-	append_arg "$cfg" port "--server_port"
-	append_arg "$cfg" password "--password"
-	append_arg "$cfg" hwaddr "--hwaddr"
-
-	append_arg "$cfg" ao_driver "--ao_driver"
-	append_arg "$cfg" ao_devicename "--ao_devicename"
-	append_arg "$cfg" ao_deviceid "--ao_deviceid"
-
-	config_get_bool aux "$cfg" 'respawn' '0'
-	[ "$aux" = 1 ] && procd_set_param respawn
-
-	procd_close_instance
-}
-
-service_triggers() { 
-	procd_add_reload_trigger "shairplay" 
-}
-
-start_service() {
-	config_load shairplay
-	config_foreach start_instance shairplay
-}
diff --git a/trunk/package/feeds/packages/shairplay/patches/001-key_file_dir.patch b/trunk/package/feeds/packages/shairplay/patches/001-key_file_dir.patch
deleted file mode 100644
index 3c5e3a59..00000000
--- a/trunk/package/feeds/packages/shairplay/patches/001-key_file_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/shairplay.c
-+++ b/src/shairplay.c
-@@ -346,7 +346,7 @@ main(int argc, char *argv[])
- 	raop_cbs.audio_destroy = audio_destroy;
- 	raop_cbs.audio_set_volume = audio_set_volume;
- 
--	raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL);
-+	raop = raop_init_from_keyfile(10, &raop_cbs, "/usr/share/shairplay/airport.key", NULL);
- 	if (raop == NULL) {
- 		fprintf(stderr, "Could not initialize the RAOP service\n");
- 		fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n");
diff --git a/trunk/package/feeds/packages/shairplay/patches/002-libavahi-compat-dnssd.patch b/trunk/package/feeds/packages/shairplay/patches/002-libavahi-compat-dnssd.patch
deleted file mode 100644
index ff70e24a..00000000
--- a/trunk/package/feeds/packages/shairplay/patches/002-libavahi-compat-dnssd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/dnssd.c
-+++ b/src/lib/dnssd.c
-@@ -167,7 +167,7 @@ dnssd_init(int *error)
- 		return NULL;
- 	}
- #elif USE_LIBDL
--	dnssd->module = dlopen("libdns_sd.so", RTLD_LAZY);
-+	dnssd->module = dlopen("libdns_sd.so.1", RTLD_LAZY);
- 	if (!dnssd->module) {
- 		if (error) *error = DNSSD_ERROR_LIBNOTFOUND;
- 		free(dnssd);
diff --git a/trunk/package/feeds/packages/shairplay/patches/003-fix_big-endian.patch b/trunk/package/feeds/packages/shairplay/patches/003-fix_big-endian.patch
deleted file mode 100644
index 7764aabc..00000000
--- a/trunk/package/feeds/packages/shairplay/patches/003-fix_big-endian.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/lib/alac/alac.c
-+++ b/src/lib/alac/alac.c
-@@ -29,11 +29,7 @@
-  *
-  */
- 
--#ifdef __BIG_ENDIAN__
--static const int host_bigendian = 1;
--#else
--static const int host_bigendian = 0;
--#endif
-+static int host_bigendian = 0;
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1181,6 +1177,8 @@ alac_file *create_alac(int samplesize, i
- {
-     alac_file *newfile = malloc(sizeof(alac_file));
- 
-+    host_bigendian = (htonl(42) == 42);
-+
-     newfile->samplesize = samplesize;
-     newfile->numchannels = numchannels;
-     newfile->bytespersample = (samplesize / 8) * numchannels;
diff --git a/trunk/package/feeds/packages/shairport-sync/Makefile b/trunk/package/feeds/packages/shairport-sync/Makefile
deleted file mode 100644
index cd60f97d..00000000
--- a/trunk/package/feeds/packages/shairport-sync/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# updated to work with latest source from abrasive
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shairport-sync
-PKG_VERSION:=2.1.15
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/mikebrady/shairport-sync.git
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING LICENSES shairport.c
-
-PKG_BUILD_PARALLEL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS+= \
-	--with-alsa \
-	--with-avahi \
-	--with-soxr \
-	--with-ssl=openssl
-
-
-define Package/shairport-sync
-  SECTION:=sound
-  CATEGORY:=Sound
-  TITLE:=iPhone/iTunes compatible audio player
-  DEPENDS:= +libpthread +libopenssl +libavahi-client +alsa-lib +libdaemon +libsoxr +libpopt
-  MAINTAINER:=Mike Brady <mikebrady@eircom.net>
-endef
-
-define Package/shairport-sync/description
-  Shairport Sync is server software that implements the Apple-originated RAOP protocol for
-  playback of audio from a compatible remote client such as the iPhone, iTunes, Apple TV, Quicktime Player or forked-daapd.
-  Shairport Sync implements audio synchronisation, supporting multi-room use.
-  Shairport Sync supports audio only.
-endef
-
-define Package/shairport-sync/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/shairport-sync $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/shairport-sync.init $(1)/etc/init.d/shairport-sync
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/shairport-sync.config $(1)/etc/config/shairport-sync
-endef
-
-$(eval $(call BuildPackage,shairport-sync))
diff --git a/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.config b/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.config
deleted file mode 100644
index f72c7854..00000000
--- a/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.config
+++ /dev/null
@@ -1,35 +0,0 @@
-# Uncomment the stanza you want, and make sure to comment out the others, especially duplicate options.
-
-#Arguments and defaults are as follows
-config shairport-sync main
-#       option name 'Shairport Sync' 		#default name, "Shairport Sync on %d"
-#       option device default        		#default soundcard, volume control by software
-						#(Troubleshooting hint: make sure the soundcard's volume is turned up fully -- use alsamixer or amixer)
-#       option airplaylatency 88200
-#       option ituneslatency 99400
-#       option port 5000
-#       option stuffing basic 			#options are 'basic' or 'soxr' if shairport-sync was compiled with soxr support
-#       option awaitactioncompletion false 	#[don't] wait until beforeaction or afteraction completes
-#       option beforeaction <action> 		#action must be a fully qualified program with no arguments. Default no action.
-#       option afteraction <action> 		#action must be a fully qualified program with no arguments. Default no action.
-#       option devicetype <devicetype>
-#       option volumecontrolname <name>
-
-#Here are some sample stanzas:
-
-#For Raspberry Pi using the built-in soundcard for the headphone jack
-#       option device 'hw:0'
-#       option devicetype hardware
-#       option volumecontrolname Master
-
-#For Raspberry Pi with the "3D Sound" USB Soundcard
-#        option name 'Pi'
-#        option device 'hw:1'
-#        option devicetype hardware
-#        option volumecontrolname Speaker
-
-#For Raspberry Pi with the first generation iMic or the Topping TP30 Class T Digital Mini Amplifier
-#        option name 'Kitchen'
-#        option device 'hw:1'
-#        option devicetype hardware
-#        option volumecontrolname PCM
diff --git a/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.init b/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.init
deleted file mode 100755
index f49e1e3c..00000000
--- a/trunk/package/feeds/packages/shairport-sync/files/shairport-sync.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-NAME='shairport-sync'
-START=99
-
-USE_PROCD=1
-
-append_arg() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get val "$cfg" "$var"
-	[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
-}
-
-append_bool() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get_bool val "$cfg" "$var" "$def"
-	[ "$val" = 1 ] && procd_append_param command "$opt"
-}
-
-start_shairport_service() {
-	local cfg=$1
-	local stuffing
-        local device
-
-	procd_open_instance
-
-	procd_set_param command /usr/bin/$NAME
-
-	append_arg "$cfg" name "-a"
-	append_arg "$cfg" port "-p"
-	append_arg "$cfg" airplaylatency "-A"
-	append_arg "$cfg" ituneslatency "-i"
-
-        config_get stuffing "$cfg" stuffing ""
-
-	if [ -n "$stuffing" ] ; then
-                case "x$stuffing" in
-                        ( "xbasic" ) procd_append_param command -S basic ;;
-                        ( "xsoxr" ) procd_append_param command -S soxr ;;
-                        ( * ) logger "bad argument for -S option -- should be \"basic\" or \"soxr\"" ;;
-                esac
-        fi
-
-	append_arg "$cfg" beforeaction "-B"
-	append_arg "$cfg" afteraction "-E"
-	append_bool "$cfg" awaitactioncompletion "-w"
-
-        config_get device "$cfg" device ""
-	if [ -n "$device" ] ; then
-		procd_append_param command "--"
-		append_arg "$cfg" device "-d"
-		append_arg "$cfg" devicetype "-t"
-		append_arg "$cfg" volumecontrolname "-c"
-	fi
-
-	procd_close_instance
-}
-
-service_triggers() { 
-        procd_add_reload_trigger $NAME
-} 
-
-start_service() {
-        config_load $NAME
-	# Just a single instance
-        start_shairport_service "main"
-}
diff --git a/trunk/package/feeds/packages/shairport/Makefile b/trunk/package/feeds/packages/shairport/Makefile
deleted file mode 100644
index aeb63f79..00000000
--- a/trunk/package/feeds/packages/shairport/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shairport
-PKG_VERSION:=2014-10-28
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/abrasive/shairport.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d679d19a4bd66cc220dabfd23ad748c34e95995c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSES
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shairport
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libpthread +libopenssl +libavahi-client +alsa-lib
-  TITLE:=ShairPort AirPort Express emulator (un-maintained)
-endef
-
-define Package/shairport/description
-  This program emulates an AirPort Express for the purpose of streaming
-  music from iTunes and compatible iPods. It implements a server for the
-  Apple RAOP protocol.
-  ShairPort does not support AirPlay v2 (video and photo streaming).
-
-  It supports multiple simultaneous streams, if your audio output chain
-  (as detected by libao) does so.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-LIBS:=-lm -lcrypto -lpthread -lavahi-common -lavahi-client -lasound
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS) $(LIBS)"
-
-define Package/shairport/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/shairport $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/shairport.init $(1)/etc/init.d/shairport
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/shairport.config $(1)/etc/config/shairport
-endef
-
-$(eval $(call BuildPackage,shairport))
diff --git a/trunk/package/feeds/packages/shairport/files/shairport.config b/trunk/package/feeds/packages/shairport/files/shairport.config
deleted file mode 100644
index 9b2165a9..00000000
--- a/trunk/package/feeds/packages/shairport/files/shairport.config
+++ /dev/null
@@ -1,36 +0,0 @@
-config shairport main
-	option disabled '1'
-	option respawn '1'
-	option bname 'AirPort'
-	option password ''
-	option port '5002'
-	option buffer ''
-	option log_file ''
-	option err_file ''
-	option meta_dir ''
-	option cmd_start ''
-	option cmd_stop ''
-	option cmd_wait '0'
-	option audio_output 'alsa'
-	option mdns 'avahi'
-
-	# options for alsa output
-	option output_dev ''
-	option mixer_dev ''
-	option mixer_type ''
-	option mixer_control ''
-	option mixer_index ''
-
-	# options for ao output
-	option ao_driver ''
-	option ao_name ''
-	option ao_id ''
-	option ao_options ''
-
-	# options for pipe output
-	option output_fifo ''
-
-	# options for pulse output
-	option pulse_server ''
-	option pulse_sink ''
-	option pulse_appname ''
diff --git a/trunk/package/feeds/packages/shairport/files/shairport.init b/trunk/package/feeds/packages/shairport/files/shairport.init
deleted file mode 100644
index 341ff6fe..00000000
--- a/trunk/package/feeds/packages/shairport/files/shairport.init
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013-2014 OpenWrt.org
-
-START=94
-USE_PROCD=1
-
-append_arg() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get val "$cfg" "$var"
-	[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
-}
-
-append_bool() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get_bool val "$cfg" "$var" "$def"
-	[ "$val" = 1 ] && procd_append_param command "$opt"
-}
-
-start_instance() {
-	local cfg="$1"
-	local ao dev aux
-
-	config_get_bool aux "$cfg" 'disabled' '0'
-	[ "$aux" = 1 ] && return 1
-
-	procd_open_instance
-
-	procd_set_param command /usr/bin/shairport
-
-	append_arg "$cfg" bname "-a" "AirPort"
-	append_arg "$cfg" log_file "-l"
-	append_arg "$cfg" err_file "-e"
-	append_arg "$cfg" meta_dir "-M"
-	append_arg "$cfg" buffer "-b"
-	append_arg "$cfg" port "-p"
-	append_arg "$cfg" password "-k"
-	append_arg "$cfg" mdns "-m"
-
-	append_arg "$cfg" cmd_start "-B"
-	append_arg "$cfg" cmd_stop "-E"
-	append_bool "$cfg" cmd_wait "-w"
-
-	append_arg "$cfg" audio_output "-o"
-
-	config_get ao "$cfg" audio_output ""
-	if [ "$ao" = "alsa" ]; then
-		config_get dev "$cfg" output_dev ""
-		if [ -n "$dev" ]; then
-			procd_append_param command "--"
-			append_arg "$cfg" output_dev "-d"
-			append_arg "$cfg" mixer_dev "-m"
-			append_arg "$cfg" mixer_type "-t"
-			append_arg "$cfg" mixer_control "-c"
-			append_arg "$cfg" mixer_index "-i"
-		fi
-	elif [ "$ao" = "ao" ]; then
-		config_get dev "$cfg" ao_driver ""
-		if [ -n "$dev" ]; then
-			procd_append_param command "--"
-			append_arg "$cfg" ao_driver "-d"
-			append_arg "$cfg" ao_id "-i"
-			append_arg "$cfg" ao_name "-n"
-			append_arg "$cfg" ao_options "-o"
-		fi
-	elif [ "$ao" = "pipe" ]; then
-		config_get dev "$cfg" output_fifo ""
-		if [ -n "$dev" ]; then
-			procd_append_param command "--"
-			append_arg "$cfg" output_fifo ""
-		fi
-	elif [ "$ao" = "pulse" ]; then
-		config_get dev "$cfg" pulse_server ""
-		if [ -n "$dev" ]; then
-			procd_append_param command "--"
-			append_arg "$cfg" pulse_server "-a"
-			append_arg "$cfg" pulse_sink "-s"
-			append_arg "$cfg" pulse_appname "-n"
-		fi
-	fi
-
-	config_get_bool aux "$cfg" 'respawn' '0'
-	[ "$aux" = 1 ] && procd_set_param respawn
-
-	procd_close_instance
-}
-
-service_triggers() { 
-	procd_add_reload_trigger "shairport" 
-} 
-
-start_service() {
-	config_load shairport
-	config_foreach start_instance shairport
-}
diff --git a/trunk/package/feeds/packages/shairport/patches/001-disable_pulseaudio.patch b/trunk/package/feeds/packages/shairport/patches/001-disable_pulseaudio.patch
deleted file mode 100644
index 7f0407e2..00000000
--- a/trunk/package/feeds/packages/shairport/patches/001-disable_pulseaudio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -59,7 +59,7 @@ do_pkg_config()
- 
- do_pkg_config OpenSSL       openssl
--do_pkg_config libao         ao              CONFIG_AO
--do_pkg_config PulseAudio    libpulse-simple CONFIG_PULSE
-+#do_pkg_config libao         ao              CONFIG_AO
-+#do_pkg_config PulseAudio    libpulse-simple CONFIG_PULSE
- do_pkg_config ALSA          alsa            CONFIG_ALSA
- do_pkg_config Avahi\ client avahi-client    CONFIG_AVAHI
- 
diff --git a/trunk/package/feeds/packages/shine/Makefile b/trunk/package/feeds/packages/shine/Makefile
deleted file mode 100644
index d13cff6e..00000000
--- a/trunk/package/feeds/packages/shine/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shine
-PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/savonet/shine/releases/download/$(PKG_VERSION)/
-PKG_MD5SUM:=fcad8108335f4b051b303fbdf3fca3fe
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shine
-  SECTION:=sound
-  CATEGORY:=Sound
-  TITLE:=Super fast fixed-point MP3 encoder
-  URL:=https://github.com/savonet/shine
-endef
-
-define Package/shine/description
- savonet/shine is a blazing fast mp3 encoding library implemented in fixed-point
- arithmetic. The library can thus be used to perform super fast mp3 encoding on
- architectures without a FPU, such as armel, etc.. It is also, however, also
- super fast on architectures with a FPU!
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/shine \
-		$(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libshine.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shine.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/shine/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/shineenc $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshine.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,shine))
diff --git a/trunk/package/feeds/packages/simplejson/Makefile b/trunk/package/feeds/packages/simplejson/Makefile
deleted file mode 100644
index 89da1b2a..00000000
--- a/trunk/package/feeds/packages/simplejson/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=simplejson
-PKG_VERSION:=3.6.5
-PKG_RELEASE:=1
-PKG_LICENSE:=MIT
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/
-PKG_MD5SUM:=b65dc21c7aaad14c6b4ad0d9179e437d
-PKG_BUILD_DEPENDS:=python python-setuptools
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/simplejson
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-  TITLE:=Simple, fast, extensible JSON encoder/decoder for Python
-  URL:=http://simplejson.readthedocs.org/
-  DEPENDS:=+python
-endef
-
-define Package/simplejson/description
-  Simple, fast, extensible JSON encoder/decoder for Python
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
-endef
-
-define Package/simplejson/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) \
-	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-	    $(1)$(PYTHON_PKG_DIR)
-endef
-
-$(eval $(call BuildPackage,simplejson))
diff --git a/trunk/package/feeds/packages/sispmctl/Makefile b/trunk/package/feeds/packages/sispmctl/Makefile
deleted file mode 100644
index ad6c1e35..00000000
--- a/trunk/package/feeds/packages/sispmctl/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sispmctl
-PKG_VERSION:=3.1+20120206
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5ff4a05a5bcb6a64a9d6f77fed47014512f66b11
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://git.code.sf.net/p/sispmctl/git
-PKG_MAINTAINER:=Richard Kunze <richard.kunze@web.de>
-PKG_LICENSE:=GPL-2.0+
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sispmctl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Silver Shield PM Control for Linux
-  URL:=http://sispmctl.sourceforge.net/
-  DEPENDS:=+libusb-compat
-endef
-
-define Package/sispmctl/description
- The sispmctl tool can control Gembird SIS-PM Silver Shield
- programmable power outlet strips (also known under the name
- Revolt Intelli-Plug) from the command line.
- .
- It can be used to switch on or off any of the programmable
- power sockets of the SIS-PM via USB. It can also show the
- current status of each power socket, and it can handle
- multiple SIS-PM devices, too.
-endef
-
-TARGET_CFLAGS += -D_GNU_SOURCE
-CONFIGURE_ARGS += \
-	--enable-webless \
-	--disable-dependency-tracking
-
-define Package/sispmctl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,sispmctl))
diff --git a/trunk/package/feeds/packages/sispmctl/patches/001-fix-includes.patch b/trunk/package/feeds/packages/sispmctl/patches/001-fix-includes.patch
deleted file mode 100644
index 218e22e1..00000000
--- a/trunk/package/feeds/packages/sispmctl/patches/001-fix-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/sispm_ctl.c
-+++ b/src/sispm_ctl.c
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <time.h>
-+#include <sys/types.h>
- #include <usb.h>
- #include <assert.h>
- #include "sispm_ctl.h"
---- a/src/main.c
-+++ b/src/main.c
-@@ -34,11 +34,11 @@
- #define __USE_XOPEN
- #include <time.h>
- #include <signal.h>
--#include <usb.h>
- #include <assert.h>
- #include <getopt.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <usb.h>
- 
- #include <fcntl.h>
- 
diff --git a/trunk/package/feeds/packages/smartmontools/Makefile b/trunk/package/feeds/packages/smartmontools/Makefile
deleted file mode 100644
index b09165a0..00000000
--- a/trunk/package/feeds/packages/smartmontools/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
-
-PKG_NAME:=smartmontools
-PKG_VERSION:=6.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/smartmontools
-PKG_MD5SUM:=2ea0c62206e110192a97b59291b17f54
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/smartmontools/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=$(CXX_DEPENDS)
-  TITLE:=S.M.A.R.T Monitoring
-  URL:=http://smartmontools.sourceforge.net/
-endef
-
-define Package/smartmontools
-  $(call Package/smartmontools/Default)
-  TITLE+= Tool
-endef
-
-define Package/smartmontools/description
-  smartmontools contains utility programs (smartctl) to
-  control/monitor storage systems using the Self-Monitoring, Analysis
-  and Reporting Technology System (S.M.A.R.T.) built into most modern
-  ATA and SCSI disks. It is derived from smartsuite.
-endef
-
-define Package/smartd
-  $(call Package/smartmontools/Default)
-  TITLE+= Daemon
-endef
-
-define Package/smartd/description
-  smartmontools contains utility programs (smartd) to
-  control/monitor storage systems using the Self-Monitoring, Analysis
-  and Reporting Technology System (S.M.A.R.T.) built into most modern
-  ATA and SCSI disks. It is derived from smartsuite.
-endef
-
-# uses GNU configure
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S) -lc" \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		BUILD_INFO='"(localbuild)"' \
-		LD="$(TARGET_CXX)"
-endef
-
-define Package/smartmontools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartctl $(1)/usr/sbin/
-endef
-
-define Package/smartd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/smartd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/smartd.init $(1)/etc/init.d/smartd
-endef
-
-define Package/smartd/conffiles
-/etc/smartd.conf
-endef
-
-$(eval $(call BuildPackage,smartmontools))
-$(eval $(call BuildPackage,smartd))
diff --git a/trunk/package/feeds/packages/smartmontools/files/smartd.conf b/trunk/package/feeds/packages/smartmontools/files/smartd.conf
deleted file mode 100644
index 0740fcf9..00000000
--- a/trunk/package/feeds/packages/smartmontools/files/smartd.conf
+++ /dev/null
@@ -1 +0,0 @@
-/dev/hdb -H
diff --git a/trunk/package/feeds/packages/smartmontools/files/smartd.init b/trunk/package/feeds/packages/smartmontools/files/smartd.init
deleted file mode 100644
index f1453f25..00000000
--- a/trunk/package/feeds/packages/smartmontools/files/smartd.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=95
-
-start() {
-	service_start /usr/sbin/smartd -q never
-}
-
-stop() {
-	service_stop /usr/sbin/smartd
-}
-
-reload() {
-	service_reload /usr/sbin/smartd
-}
diff --git a/trunk/package/feeds/packages/smartsnmpd/Makefile b/trunk/package/feeds/packages/smartsnmpd/Makefile
deleted file mode 100644
index 9be39cba..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=smartsnmpd
-PKG_VERSION:=2014-08-13
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/credosemi/smartsnmp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fb93473d895f058b2d8975d3cfa280ae2a8ae98d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=
-
-
-PKG_MAINTAINER:=Xiongfei Guo <xfguo@credosemi.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/scons.mk
-
-define Package/smartsnmpd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS+=+lua +liblua +libubox +libuci-lua +libubus-lua
-  TITLE:=Smart-SNMP (Agent)
-  URL:=https://github.com/credosemi/smartsnmp
-endef
-
-define Package/smartsnmpd/description
-smartsnmpd is an implementation of SNMP Agent. Its goal is "Easily
-writing boring SNMP MIB with Lua". This package add native support
-for OpenWrt. Include using ubus and uci to get system info/status. 
-And, it use libubox/uloop as low level event-driven library.
-endef
-
-SCONS_OPTIONS += --transport=uloop
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		$(SCONS_VARS) \
-		scons \
-			prefix=/usr \
-			$(SCONS_OPTIONS) \
-	)
-endef
-
-define Package/smartsnmpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/smartsnmpd $(1)/usr/sbin/smartsnmpd
-
-	$(INSTALL_DIR) $(1)/usr/lib/lua/smartsnmp
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/smartsnmp/core.so $(1)/usr/lib/lua/smartsnmp/core.so
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lualib/smartsnmp/*.lua $(1)/usr/lib/lua/smartsnmp/
-
-	$(INSTALL_DIR) $(1)/usr/lib/lua/smartsnmp/mibs
-	$(INSTALL_BIN) ./files/mibs/*.lua $(1)/usr/lib/lua/smartsnmp/mibs/
-	
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/smartsnmpd.conf $(1)/etc/config/smartsnmpd
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/smartsnmpd.init $(1)/etc/init.d/smartsnmpd
-endef
-
-$(eval $(call BuildPackage,smartsnmpd))
-
diff --git a/trunk/package/feeds/packages/smartsnmpd/files/mibs/dummy.lua b/trunk/package/feeds/packages/smartsnmpd/files/mibs/dummy.lua
deleted file mode 100644
index e49ca683..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/files/mibs/dummy.lua
+++ /dev/null
@@ -1,24 +0,0 @@
--- 
--- This file is part of SmartSNMP
--- Copyright (C) 2014, Credo Semiconductor Inc.
--- 
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License along
--- with this program; if not, write to the Free Software Foundation, Inc.,
--- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- 
-
-local mib = require "smartsnmp"
-
-local dummy = {}
-
-return dummy
diff --git a/trunk/package/feeds/packages/smartsnmpd/files/mibs/interfaces.lua b/trunk/package/feeds/packages/smartsnmpd/files/mibs/interfaces.lua
deleted file mode 100644
index 01cea6ae..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/files/mibs/interfaces.lua
+++ /dev/null
@@ -1,125 +0,0 @@
--- 
--- This file is part of SmartSNMP
--- Copyright (C) 2014, Credo Semiconductor Inc.
--- 
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License along
--- with this program; if not, write to the Free Software Foundation, Inc.,
--- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- 
-
-local mib = require "smartsnmp"
-require "ubus"
-require "uloop"
-
-uloop.init()
-
-local conn = ubus.connect()
-if not conn then
-    error("Failed to connect to ubusd")
-end
-
-local if_cache = {}
-local if_status_cache = {}
-local if_index_cache = {}
-
-local last_load_time = os.time()
-local function need_to_reload()
-    if os.time() - last_load_time >= 3 then
-        last_load_time = os.time()
-        return true
-    else
-        return false
-    end
-end
-
-local function load_config()
-    if need_to_reload() == true then
-        if_cache = {}
-        if_status_cache = {}
-        if_index_cache = {}
-
-        -- if description
-        for k, v in pairs(conn:call("network.device", "status", {})) do
-            if_status_cache[k] = {}
-        end
-
-        for name_ in pairs(if_status_cache) do
-            for k, v in pairs(conn:call("network.device", "status", { name = name_ })) do
-                if k == 'mtu' then
-                    if_status_cache[name_].mtu = v
-                elseif k == 'macaddr' then
-                    if_status_cache[name_].macaddr = v
-                elseif k == 'up' then
-                    if v == true then            
-                        if_status_cache[name_].up = 1
-                    else
-                        if_status_cache[name_].up = 2
-                    end
-                elseif k == 'statistics' then
-                    for item, stat in pairs(v) do
-                        if item == 'rx_bytes' then
-                            if_status_cache[name_].in_octet = stat
-                        elseif item == 'tx_bytes' then
-                            if_status_cache[name_].out_octet = stat
-                        elseif item == 'rx_errors' then
-                            if_status_cache[name_].in_errors = stat
-                        elseif item == 'tx_errors' then
-                            if_status_cache[name_].out_errors = stat
-                        elseif item == 'rx_dropped' then
-                            if_status_cache[name_].in_discards = stat
-                        elseif item == 'tx_dropped' then
-                            if_status_cache[name_].out_discards = stat
-                        end
-                    end
-                end
-            end
-        end
-
-        if_cache['desc'] = {}
-        for name, status in pairs(if_status_cache) do
-            table.insert(if_cache['desc'], name)
-            for k, v in pairs(status) do
-                if if_cache[k] == nil then if_cache[k] = {} end
-                table.insert(if_cache[k], v)
-            end
-        end
-
-        -- if index
-        for i in ipairs(if_cache['desc']) do
-            table.insert(if_index_cache, i)
-        end
-    end
-end
-
-mib.module_methods.or_table_reg("1.3.6.1.2.1.2", "The MIB module for managing Interfaces implementations")
-
-local ifGroup = {
-    [1]  = mib.ConstInt(function () load_config() return #if_index_cache end),
-    [2] = {
-        [1] = {
-            [1] = mib.ConstIndex(function () load_config() return if_index_cache end),
-            [2] = mib.ConstString(function (i) load_config() return if_cache['desc'][i] end),
-            [4] = mib.ConstInt(function (i) load_config() return if_cache['mtu'][i] end),
-            [6] = mib.ConstString(function (i) load_config() return if_cache['macaddr'][i] end),
-            [8] = mib.ConstInt(function (i) load_config() return if_cache['up'][i] end),
-            [10] = mib.ConstCount(function (i) load_config() return if_cache['in_octet'][i] end),
-            [13] = mib.ConstCount(function (i) load_config() return if_cache['in_discards'][i] end),
-            [14] = mib.ConstCount(function (i) load_config() return if_cache['in_errors'][i] end),
-            [16] = mib.ConstCount(function (i) load_config() return if_cache['out_octet'][i] end),
-            [19] = mib.ConstCount(function (i) load_config() return if_cache['out_discards'][i] end),
-            [20] = mib.ConstCount(function (i) load_config() return if_cache['out_errors'][i] end),
-        }
-    }
-}
-
-return ifGroup
diff --git a/trunk/package/feeds/packages/smartsnmpd/files/mibs/system.lua b/trunk/package/feeds/packages/smartsnmpd/files/mibs/system.lua
deleted file mode 100644
index 5b0a4af9..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/files/mibs/system.lua
+++ /dev/null
@@ -1,176 +0,0 @@
--- 
--- This file is part of SmartSNMP
--- Copyright (C) 2014, Credo Semiconductor Inc.
--- 
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License along
--- with this program; if not, write to the Free Software Foundation, Inc.,
--- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- 
-
-local mib = require "smartsnmp"
-local uci = require "uci"
-
--- System config
-local context = uci.cursor("/etc/config", "/tmp/.uci")
-
--- scalar index
-local sysDesc             = 1
-local sysObjectID         = 2
-local sysUpTime           = 3
-local sysContact          = 4
-local sysName             = 5
-local sysLocation         = 6
-local sysServices         = 7
-local sysORLastChange     = 8
-
--- table index
-local sysORTable          = 9
-
--- entry index
-local sysOREntry          = 1
-
--- list index
-local sysORIndex          = 1
-local sysORID             = 2
-local sysORDesc           = 3
-local sysORUpTime         = 4
-
-local startup_time = 0
-local or_last_changed_time = 0
-
-local function mib_system_startup(time)
-    startup_time = time
-    or_last_changed_time = time
-end
-
-mib_system_startup(os.time())
-
-local sysGroup = {}
-local or_oid_cache = {}
-local or_index_cache = {}
-local or_table_cache = {}
-
-local or_table_reg = function (oid, desc)
-    local row = {}
-    row['oid'] = {}
-    for i in string.gmatch(oid, "%d") do
-        table.insert(row['oid'], tonumber(i))
-    end
-    row['desc'] = desc
-    row['uptime'] = os.time()
-    table.insert(or_table_cache, row)
-    
-    or_last_changed_time = os.time()
-
-    or_oid_cache[oid] = #or_table_cache
-
-    or_index_cache = {}
-    for i in ipairs(or_table_cache) do
-        table.insert(or_index_cache, i)
-    end
-end
-
-local or_table_unreg = function (oid)
-    local or_idx = or_oid_cache[oid]
-
-    if or_table_cache[or_idx] ~= nil then
-        table.remove(or_table_cache, or_idx)
-        or_last_changed_time = os.time()
-
-        or_index_cache = {}
-        for i in ipairs(or_table_cache) do
-            table.insert(or_index_cache, i)
-        end
-    end
-end
-
-local last_load_time = os.time()
-local function need_to_reload()
-    if os.difftime(os.time(), last_load_time) < 3 then
-        return false
-    else
-        last_load_time = os.time()
-        return true
-    end
-end
-
-local function load_config()
-    if need_to_reload() == true then
-        context:load("smartsnmpd")
-    end
-end
-
-context:load("smartsnmpd")
-
-local sysMethods = {
-    ["or_table_reg"] = or_table_reg, 
-    ["or_table_unreg"] = or_table_unreg
-}
-mib.module_method_register(sysMethods)
-
-sysGroup = {
-    rocommunity = 'public',
-    [sysDesc]         = mib.ConstString(function () load_config() return mib.sh_call("uname -a") end),
-    [sysObjectID]     = mib.ConstOid(function ()
-                                         load_config()
-                                         local oid
-                                         local objectid
-                                         context:foreach("smartsnmpd", "smartsnmpd", function (s)
-                                             objectid = s.objectid
-                                         end)
-                                         if objectid ~= nil then
-                                            oid = {}
-                                            for i in string.gmatch(objectid, "%d+") do
-                                                table.insert(oid, tonumber(i))
-                                            end
-                                         end
-                                         return oid
-                                     end),
-    [sysUpTime]       = mib.ConstTimeticks(function () load_config() return os.difftime(os.time(), startup_time) * 100 end),
-    [sysContact]      = mib.ConstString(function () 
-                                            load_config()
-                                            local contact
-                                            context:foreach("smartsnmpd", "smartsnmpd", function (s)
-                                                contact = s.contact
-                                            end)
-                                            return contact
-                                        end),
-    [sysName]         = mib.ConstString(function () load_config() return mib.sh_call("uname -n") end),
-    [sysLocation]     = mib.ConstString(function ()
-                                            load_config()
-                                            local location
-                                            context:foreach("smartsnmpd", "smartsnmpd", function (s)
-                                                location = s.location
-                                            end)
-                                            return location
-                                        end),
-    [sysServices]     = mib.ConstInt(function ()
-                                         load_config()
-                                         local services
-                                         context:foreach("smartsnmpd", "smartsnmpd", function (s)
-                                             services = tonumber(s.services)
-                                         end)
-                                         return services
-                                     end),
-    [sysORLastChange] = mib.ConstTimeticks(function () load_config() return os.difftime(os.time(), or_last_changed_time) * 100 end),
-    [sysORTable]      = {
-        [sysOREntry]  = {
-            [sysORIndex]  = mib.UnaIndex(function () load_config() return or_index_cache end),
-            [sysORID]     = mib.ConstOid(function (i) load_config() return or_table_cache[i].oid end),
-            [sysORDesc]   = mib.ConstString(function (i) load_config() return or_table_cache[i].desc end),
-            [sysORUpTime] = mib.ConstTimeticks(function (i) load_config() return os.difftime(os.time(), or_table_cache[i].uptime) * 100 end),
-        }
-    }
-}
-
-return sysGroup
diff --git a/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.conf b/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.conf
deleted file mode 100644
index aace5a6a..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-config smartsnmpd
-	option port '161'
-	option ro_community 'public'
-	option rw_community 'private'
-	option mib_module_path 'mibs'
-	option objectid '1.2.3.4'
-	option contact 'Me <me@example.org>'
-	option location 'Shanghai'
-	option services '72'
-
-config smartsnmpd_module
-	option oid    "1.3.6.1.2.1.1" 
-	option module 'system'
-
-config smartsnmpd_module
-	option oid    "1.3.6.1.2.1.2" 
-	option module 'interfaces'
-
-config smartsnmpd_module
-	option oid    "1.3.6.1.1"     
-	option module 'dummy'
diff --git a/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.init b/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.init
deleted file mode 100755
index dbe3af85..00000000
--- a/trunk/package/feeds/packages/smartsnmpd/files/smartsnmpd.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=97
-
-USE_PROCD=1
-PROG=/usr/sbin/smartsnmpd
-CONFIGFILE=/etc/smartsnmpd.conf
-
-smartsnmpd_mib_module() {
-	local cfg="$1"
-	config_get OID "$cfg" oid
-	config_get MODULE "$cfg" module
-	echo "    ['$OID'] = '$MODULE'," >> $CONFIGFILE
-}
-
-start_service() {
-	include /lib/functions
-
-	config_load smartsnmpd
-
-	procd_open_instance
-	procd_set_param command $PROG -c $CONFIGFILE
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-	
-	# before we can call xappend
-	mkdir -p $(dirname $CONFIGFILE)
-
-	echo "-- auto-generated config file from /etc/config/smartsnmpd" > $CONFIGFILE
-	
-	config_get PORT smartsnmpd port 161
-	echo "port = $PORT" >> $CONFIGFILE
-	
-	config_get RO_COMMUNITY smartsnmpd ro_community 'public'
-	config_get RW_COMMUNITY smartsnmpd rw_community 'private'
-	echo "ro_community = '$RO_COMMUNITY'" >> $CONFIGFILE
-	echo "rw_community = '$RW_COMMUNITY'" >> $CONFIGFILE
-
-	config_get MIB_MODULE_PATH smartsnmpd mib_module_path '/usr/lib/lua/smartsnmp/mibs/'
-	echo "mib_module_path = '$MIB_MODULE_PATH'" >> $CONFIGFILE
-
-	echo "mib_modules = {" >> $CONFIGFILE
-	config_foreach smartsnmpd_mib_module smartsnmpd_module 
-	echo "}" >> $CONFIGFILE
-}
diff --git a/trunk/package/feeds/packages/smstools3/Makefile b/trunk/package/feeds/packages/smstools3/Makefile
deleted file mode 100644
index 12d4ecf8..00000000
--- a/trunk/package/feeds/packages/smstools3/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=smstools3
-PKG_VERSION:=3.1.15
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Gérald Kerma <dreagle@doukki.net>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://smstools3.kekekasvi.com/packages/
-PKG_MD5SUM:=0241ef60e646fac1a06254a848e61ed7
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_DEPENDS:=libiconv-full iconv socket nsl
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/smstools3
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=SMS Server Tools 3
-  DEPENDS:=+libiconv-full +iconv
-  URL:=http://smstools3.kekekasvi.com/
-endef
-
-define Package/smstools3/description
- The SMS Server Tools 3 is a SMS Gateway software which can send and receive
- short messages through GSM modems and mobile phones.
-endef
-
-TARGET_CFLAGS = -D NUMBER_OF_MODEMS=1
-TARGET_CFLAGS += -D USE_ICONV
-TARGET_CFLAGS += -D DISABLE_INET_SOCKET
-TARGET_CFLAGS += -W -Wall
-TARGET_CFLAGS += -D_FILE_OFFSET_BITS=64
-
-TARGET_LDFLAGS += -liconv
-
-BINDIR=/usr/local/bin
-
-define Build/Compile
-	$(MAKE) -C "$(PKG_BUILD_DIR)"/src \
-		CC="$(TARGET_CC)" \
-		USER_CFLAGS='$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) \
-		-I"$(STAGING_DIR)/usr/lib/libiconv-full/include"' \
-		USER_LDFLAGS='$(TARGET_LFLAGS) $(EXTRA_LDFLAGS) -L"$(STAGING_DIR)/usr/lib/libiconv-full/lib"' \
-		all
-endef
-
-define Package/smstools3/install
-	$(INSTALL_DIR) $(1)/$(BINDIR)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smsd $(1)/$(BINDIR)/smsd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sendsms $(1)/$(BINDIR)/sendsms
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sms2html $(1)/$(BINDIR)/sms2html
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sms2unicode $(1)/$(BINDIR)/sms2unicode
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/unicode2sms $(1)/$(BINDIR)/unicode2sms
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DATA) -m 0755 ./files/smstools3.init $(1)/etc/init.d/smstools3
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) -m 0755 ./files/smstools3.conf $(1)/etc/smsd.conf
-endef
-
-$(eval $(call BuildPackage,smstools3))
diff --git a/trunk/package/feeds/packages/smstools3/files/smstools3.conf b/trunk/package/feeds/packages/smstools3/files/smstools3.conf
deleted file mode 100644
index c8732e35..00000000
--- a/trunk/package/feeds/packages/smstools3/files/smstools3.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Description: Main configuration file for the smsd
-#
-
-devices = GSM1
-incoming = /var/spool/sms/incoming
-outgoing = /var/spool/sms/outgoing
-checked = /var/spool/sms/checked
-failed = /var/spool/sms/failed
-sent = /var/spool/sms/sent
-receive_before_send = no
-autosplit = 3
-
-[GSM1]
-init = AT+CPMS="ME","ME","ME"
-device = /dev/ttyUSB0
-incoming = yes
-pin = 0000
-baudrate = 9600
-
diff --git a/trunk/package/feeds/packages/smstools3/files/smstools3.init b/trunk/package/feeds/packages/smstools3/files/smstools3.init
deleted file mode 100644
index 1638c60c..00000000
--- a/trunk/package/feeds/packages/smstools3/files/smstools3.init
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-# smsd initscript openwrt mod
-
-START=99
-STOP=99
-
-EXTRA_COMMANDS="status"
-EXTRA_HELP="        status  View pid and service status "
-
-# Set USER and GROUP, if necessary:
-USER=""
-GROUP=""
-
-# If an unpriviledged user is selected, make sure that next two
-# files are writable by that user:
-PIDFILE="/var/run/smsd.pid"
-INFOFILE="/var/run/smsd.working"
-# Logfile can also be defined in here:
-LOGFILE="/var/log/smsd.log"
-
-DAEMON=/usr/local/bin/smsd
-# A program which turns power off for couple of seconds:
-RESETMODEMS=/usr/local/bin/smsd_resetmodems
-NAME=smsd
-PSOPT=""
-
-# Set/edit this before starting service !!!!!
-WRT_SPOOL=/var/spool
-
-# Maximum time to stop smsd, after that it gets killed hardly:
-MAXWAIT=45
-
-boot() {
-	start
-}
-
-start() {
-	test -x $DAEMON || exit 0
-
-	echo "Creating minimum spool directories"
-	mkdir -p $WRT_SPOOL
-	mkdir -p $WRT_SPOOL/sms
-	mkdir -p $WRT_SPOOL/sms/incoming
-	mkdir -p $WRT_SPOOL/sms/outgoing
-	mkdir -p $WRT_SPOOL/sms/checked
-	mkdir -p $WRT_SPOOL/sms/failed
-	mkdir -p $WRT_SPOOL/sms/sent
-
-	echo -n "Starting SMS Daemon: "
-	MSG="."
-	ARGS="-n MAINPROCESS -p$PIDFILE -i$INFOFILE"
-	[ "x$USER" != x ] && ARGS="$ARGS -u$USER"
-	[ "x$GROUP" != x ] && ARGS="$ARGS -g$GROUP"
-	[ "x$LOGFILE" != x ] && ARGS="$ARGS -l$LOGFILE"
-	PID=`cat $PIDFILE 2>/dev/null`
-	if [ "x$PID" != x ]; then
-	  if kill -0 $PID 2>/dev/null; then
-	    MSG=" already running ($PID)."
-	  else
-	    PID=""
-	  fi
-	fi
-	if [ "x$PID" = x ]; then
-	  if ps $PSOPT | grep $NAME | grep -v grep >/dev/null; then
-	    MSG=" already running."
-	  else
-	    $DAEMON $ARGS
-	    sleep 1
-	    PIDS=`ps $PSOPT | grep $NAME | grep -v grep`
-	    [ "x$PIDS" = x ] && MSG=" failed."
-	  fi
-	fi
-	echo "$NAME$MSG"
-}
-
-stop() {
-	if ps $PSOPT | grep $NAME | grep -v grep >/dev/null; then
-	  PID=`cat $PIDFILE 2>/dev/null`
-	  if [ "x$PID" != x ]; then
-	    P=`kill -0 $PID 2>/dev/null`
-	    [ "x$P" != x ] && PID=""
-	  fi
-	  if [ "x$PID" != x ]; then
-	    kill $PID
-	  else
-	    kill `ps $PSOPT | grep $NAME | grep -v grep | awk '{print $1}'` >/dev/null 2>&1
-	  fi
-	  sleep 1
-	  if ps $PSOPT | grep $NAME | grep -v grep >/dev/null; then
-	    echo "Allowing $NAME to terminate gracefully within $MAXWAIT seconds"
-	    infofound=0
-	    dots=0
-	    seconds=0
-	    while ps $PSOPT | grep $NAME | grep -v grep >/dev/null; do
-	      if [ $infofound -lt 1 ]; then
-	        if [ -f $INFOFILE ]; then
-	          infofound=1
-	          if [ $dots -gt 0 ]; then
-	            echo ""
-	            dots=0
-	          fi
-	          $ECHO -n "$NAME is currently "
-	          cat $INFOFILE
-	          echo "Time counting is now disabled and we will wait until this job is complete."
-	        fi
-	      fi
-	      [ $infofound -lt 1 ] && seconds=`expr $seconds + 1`
-	      echo -n "."
-	      dots=`expr $dots + 1`
-	      if [ "$seconds" -ge $MAXWAIT ]; then
-	        if [ $dots -gt 0 ]; then
-	          echo ""
-	          dots=0
-	        fi
-	        echo "Timeout occured, killing $NAME hardly."
-	        kill -9 `ps $PSOPT | grep $NAME | grep -v grep | awk '{print $1}'` >/dev/null 2>&1
-	        [ -f $PIDFILE ] && rm $PIDFILE
-	        seconds=0
-	      fi
-	      sleep 1
-	    done
-	    [ $dots -gt 0 ] && echo ""
-	    #echo "$NAME is stopped."
-	  fi
-	fi
-}
-
-restart() {
-	stop
-	start
-}
-
-
-status() {
-	PID=$(cat $PIDFILE)
-
-	test -e $PIDFILE
-	if [ $? == 0 ]; then
-		echo $NAME " running! pid $PID"
-	else
-		echo $NAME " not running !!!"
-	fi
-}
-
-reset() {
-	$0 stop
-	[ -f "$RESETMODEMS" ] && "$RESETMODEMS"
-	sleep 30
-	$0 start
-}
-
diff --git a/trunk/package/feeds/packages/smstools3/patches/001-smsd.patch b/trunk/package/feeds/packages/smstools3/patches/001-smsd.patch
deleted file mode 100644
index 6761661c..00000000
--- a/trunk/package/feeds/packages/smstools3/patches/001-smsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/smsd.c	2010-09-21 13:47:48.000000000 +0300
-+++ b/src/smsd.c	2013-03-05 05:26:26.000000000 +0300
-@@ -5200,8 +5200,8 @@
- 	int result = 1;
- 	char *cmd;
- 	char *p;
--	char answer[500];
--	char buffer[600];
-+	char answer[1024];
-+	char buffer[1024];
- 	int fd;
- 	int log_retry = 3;
- 	int i;
diff --git a/trunk/package/feeds/packages/smstools3/patches/002-Makefile.patch b/trunk/package/feeds/packages/smstools3/patches/002-Makefile.patch
deleted file mode 100644
index a8445ef3..00000000
--- a/trunk/package/feeds/packages/smstools3/patches/002-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Makefile	2014-12-20 18:33:55.654252867 +0100
-+++ b/src/Makefile	2014-12-20 18:31:10.241359741 +0100
-@@ -43,7 +43,7 @@
- 
- ifneq (,$(findstring SOLARIS,$(CFLAGS)))
- ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
--override LFLAGS += -lsocket -lnsl
-+	override LFLAGS += -lsocket -lnsl
- endif
- endif
- 
-
diff --git a/trunk/package/feeds/packages/snort/Makefile b/trunk/package/feeds/packages/snort/Makefile
deleted file mode 100644
index 06b69060..00000000
--- a/trunk/package/feeds/packages/snort/Makefile
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=snort
-PKG_VERSION:=2.9.7.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.snort.org/downloads/snort/
-PKG_MD5SUM:=b01e9964827394c39194a0147bc15705
-
-PKG_BUILD_DEPENDS:=librpc
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/snort/Default
-  SUBMENU:=Firewall
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libdaq +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib
-  TITLE:=Lightweight Network Intrusion Detection System
-  URL:=http://www.snort.org/
-endef
-
-define Package/snort/Default/description
-  Snort is an open source network intrusion detection and prevention system.
-  It is capable of performing real-time traffic analysis, alerting, blocking
-  and packet logging on IP networks.  It utilizes a combination of protocol
-  analysis and pattern matching in order to detect anomalies, misuse and
-  attacks.
-endef
-
-define Package/snort
-  $(call Package/snort/Default)
-  VARIANT:=basic
-endef
-
-define Package/snort/description
-  $(call Package/snort/Default/description)
-endef
-
-define Package/snort-mysql
-  $(call Package/snort/Default)
-  DEPENDS+= +libmysqlclient
-  TITLE+= (MySQL)
-  VARIANT:=mysql
-endef
-
-define Package/snort-mysql/description
-  $(call Package/snort/Default/description)
-  This package contains snort with support for logging to a MySQL database.
-endef
-
-define Package/snort-pgsql
-  $(call Package/snort/Default)
-  DEPENDS+= +libpq +libuuid
-  TITLE+= (PostgreSQL)
-  VARIANT:=pgsql
-endef
-
-define Package/snort-pgsql/description
-  $(call Package/snort/Default/description)
-  This package contains snort with support for logging to a PostgreSQL database.
-endef
-
-CONFIGURE_ARGS += \
-	--prefix="/usr" \
-	--enable-flexresp \
-	--with-dnet-includes="$(STAGING_DIR)/usr/include" \
-	--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-libpcap-includes="$(STAGING_DIR)/usr/include" \
-	--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-libpcre-includes="$(STAGING_DIR)/usr/include" \
-	--with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-daq-includes="$(STAGING_DIR)/usr/include" \
-	--with-daq-libraries="$(STAGING_DIR)/usr/lib" \
-	--disable-static-daq
-
-CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/mysql" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/mysql" \
-	PATH="$(STAGING_DIR)/usr/lib/libnet-1.0.x/bin:$$$$PATH"
-
-MAKE_FLAGS += \
-	extra_incl=""
-
-ifeq ($(BUILD_VARIANT),basic)
-  CONFIGURE_ARGS += \
-	--without-mysql \
-	--without-postgresql
-endif
-ifeq ($(BUILD_VARIANT),mysql)
-  CONFIGURE_VARS += \
-	mysql_has_reconnect=yes
-  CONFIGURE_ARGS += \
-	--with-mysql="$(STAGING_DIR)/usr" \
-	--without-postgresql
-endif
-ifeq ($(BUILD_VARIANT),pgsql)
-  CONFIGURE_ARGS += \
-	--without-mysql \
-	--with-postgresql="$(STAGING_DIR)/usr"
-endif
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/snort/dynamic_preproc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/snort/dynamic_preproc/* \
-		$(STAGING_DIR)/usr/include/snort/dynamic_preproc/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort/dynamic_preproc
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/snort/dynamic_preproc/* \
-		$(STAGING_DIR)/usr/lib/snort/dynamic_preproc/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort_dynamicengine
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicengine/* \
-		$(STAGING_DIR)/usr/lib/snort_dynamicengine/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort_dynamicpreprocessor
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicpreprocessor/* \
-		$(STAGING_DIR)/usr/lib/snort_dynamicpreprocessor/
-endef
-
-define Package/snort/conffiles
-/etc/config/snort
-/etc/snort/snort.conf
-endef
-
-Package/snort-mysql/conffiles = $(Package/snort/conffiles)
-Package/snort-mysql/install = $(Package/snort/install)
-
-Package/snort-pgsql/conffiles = $(Package/snort/conffiles)
-Package/snort-pgsql/install = $(Package/snort/install)
-
-define Package/snort/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/snort  \
-		$(1)/usr/bin/snort
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/u2{boat,spewfoo} \
-		$(1)/usr/bin
-
-	$(INSTALL_DIR) $(1)/usr/lib/snort_dynamicengine
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicengine/libsf_engine.so* \
-		$(1)/usr/lib/snort_dynamicengine/
-
-	$(INSTALL_DIR) $(1)/usr/lib/snort_dynamicpreprocessor
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicpreprocessor/libsf*.so* \
-		$(1)/usr/lib/snort_dynamicpreprocessor/
-
-	$(INSTALL_DIR) $(1)/etc/snort
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/etc/snort.conf \
-		$(1)/etc/snort/
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/etc/attribute_table.dtd \
-		$(1)/etc/snort/
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/etc/classification.config \
-		$(1)/etc/snort/
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/etc/gen-msg.map \
-		$(1)/etc/snort/
-	$(INSTALL_CONF) \
-			$(PKG_BUILD_DIR)/etc/reference.config \
-			$(1)/etc/snort/
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/etc/unicode.map \
-		$(1)/etc/snort/
-
-	$(INSTALL_DIR) $(1)/etc/snort/preproc_rules
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/preproc_rules/*.rules \
-		$(1)/etc/snort/preproc_rules/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) \
-		./files/snort.init \
-		$(1)/etc/init.d/snort
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) \
-		./files/snort.config \
-		$(1)/etc/config/snort
-endef
-
-$(eval $(call BuildPackage,snort))
-$(eval $(call BuildPackage,snort-mysql))
-$(eval $(call BuildPackage,snort-pgsql))
diff --git a/trunk/package/feeds/packages/snort/files/snort.config b/trunk/package/feeds/packages/snort/files/snort.config
deleted file mode 100644
index cda74418..00000000
--- a/trunk/package/feeds/packages/snort/files/snort.config
+++ /dev/null
@@ -1,3 +0,0 @@
-config snort 'snort'
-	option config_file '/etc/snort/snort.conf'
-	option interface 'lo'
diff --git a/trunk/package/feeds/packages/snort/files/snort.init b/trunk/package/feeds/packages/snort/files/snort.init
deleted file mode 100644
index fcdb0901..00000000
--- a/trunk/package/feeds/packages/snort/files/snort.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/bin/snort
-
-validate_snort_section() {
-	uci_validate_section snort snort "${1}" \
-		'config_file:string' \
-		'interface:string'
-}
-
-start_service() {
-	local config_file interface
-
-	validate_snort_section snort || {
-		echo "validation failed"
-		return 1
-	}
-
-	procd_open_instance
-	procd_set_param command $PROG "-q" "--daq-dir" "/usr/lib/daq/" "-i" "$interface" "-s" "-N"
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-	service_stop ${PROG}
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "snort"
-	procd_add_validation validate_snort_section
-}
diff --git a/trunk/package/feeds/packages/snort/patches/001-compile.patch b/trunk/package/feeds/packages/snort/patches/001-compile.patch
deleted file mode 100644
index 06d283af..00000000
--- a/trunk/package/feeds/packages/snort/patches/001-compile.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- /dev/null
-+++ b/acinclude.m4
-@@ -0,0 +1 @@
-+sinclude(m4/libprelude.m4)
---- a/configure.in
-+++ b/configure.in
-@@ -285,21 +285,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i
- AC_CHECK_TYPES([boolean])
- 
- # In case INADDR_NONE is not defined (like on Solaris)
--have_inaddr_none="no"
--AC_MSG_CHECKING([for INADDR_NONE])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--]],
--[[
--	if (inet_addr("10,5,2") == INADDR_NONE);
--    return 0;
--]])],
--[have_inaddr_none="yes"],
--[have_inaddr_none="no"])
-+have_inaddr_none="yes"
- AC_MSG_RESULT($have_inaddr_none)
- if test "x$have_inaddr_none" = "xno"; then
- 	AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])
-@@ -433,16 +419,7 @@ if test "x$LPCAP" = "xno"; then
- fi
- 
- AC_MSG_CHECKING([for pcap_lex_destroy])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include <pcap.h>
--]],
--[[
--   pcap_lex_destroy();
--]])],
--[have_pcap_lex_destroy="yes"],
--[have_pcap_lex_destroy="no"])
-+have_pcap_lex_destroy="yes"
- AC_MSG_RESULT($have_pcap_lex_destroy)
- if test "x$have_pcap_lex_destroy" = "xyes"; then
-     AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter])
-@@ -727,54 +704,21 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "
- 
- fi
- 
--AC_MSG_CHECKING([for daq address space ID])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include <daq.h>
--]],
--[[
--   DAQ_PktHdr_t hdr;
--   hdr.address_space_id = 0;
--]])],
--[have_daq_address_space_id="yes"],
--[have_daq_address_space_id="no"])
-+have_daq_address_space_id="yes"
- AC_MSG_RESULT($have_daq_address_space_id)
- if test "x$have_daq_address_space_id" = "xyes"; then
-     AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
-         [DAQ version supports address space ID in header.])
- fi
- 
--AC_MSG_CHECKING([for daq flow ID])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include <daq.h>
--]],
--[[
--   DAQ_PktHdr_t hdr;
--   hdr.flow_id = 0;
--]])],
--[have_daq_flow_id="yes"],
--[have_daq_flow_id="no"])
-+have_daq_flow_id="yes"
- AC_MSG_RESULT($have_daq_flow_id)
- if test "x$have_daq_flow_id" = "xyes"; then
-     AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
-         [DAQ version supports flow ID in header.])
- fi
- 
--AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include <daq.h>
--]],
--[[
--   DAQ_Verdict verdict;
--   verdict = DAQ_VERDICT_RETRY;
--]])],
--[have_daq_verdict_retry="yes"],
--[have_daq_verdict_retry="no"])
-+have_daq_verdict_retry="yes"
- AC_MSG_RESULT($have_daq_verdict_retry)
- if test "x$have_daq_verdict_retry" = "xyes"; then
-     AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
diff --git a/trunk/package/feeds/packages/socat/Makefile b/trunk/package/feeds/packages/socat/Makefile
deleted file mode 100644
index 361a4d5c..00000000
--- a/trunk/package/feeds/packages/socat/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=socat
-PKG_VERSION:=1.7.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
-PKG_MD5SUM:=b607edb65bc6c57f4a43f06247504274
-
-PKG_MAINTAINER:= Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-2.0 OpenSSL
-PKG_LICENSE_FILES:=COPYING COPYING.OpenSSL
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/socat
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +librt +SOCAT_SSL:libopenssl
-  TITLE:=A multipurpose relay (SOcket CAT)
-  URL:=http://www.dest-unreach.org/socat/
-endef
-
-define Package/socat/description
-	SoCat (for SOcket CAT) establishes two bidirectional byte streams and
-	transfers data between them.
-	Data channels may be files, pipes, devices (terminal or modem, etc.), or
-	sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,
-	logging and tracing, different modes for interprocess communication and
-	many more options.
-endef
-
-define Package/socat/config
-config SOCAT_SSL
-        bool "SSL support"
-        depends on PACKAGE_socat
-        default n
-        help
-          Implements SSL support in socat (using libopenssl).
-endef
-
-define Package/socat/conffiles
-/etc/config/socat
-endef
-
-CONFIGURE_ARGS += \
-	--disable-libwrap \
-	--disable-readline \
-	--enable-termios
-
-ifneq ($(CONFIG_SOCAT_SSL),y)
-  CONFIGURE_ARGS+= --disable-openssl
-endif
-
-CONFIGURE_VARS += \
-	sc_cv_termios_ispeed="no" \
-	sc_cv_sys_crdly_shift=9 \
-	sc_cv_sys_tabdly_shift=11 \
-	sc_cv_sys_csize_shift=4
-
-define Package/socat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/socat.config $(1)/etc/config/socat
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/socat.init $(1)/etc/init.d/socat
-endef
-
-$(eval $(call BuildPackage,socat))
diff --git a/trunk/package/feeds/packages/socat/files/socat.config b/trunk/package/feeds/packages/socat/files/socat.config
deleted file mode 100644
index 7df6358b..00000000
--- a/trunk/package/feeds/packages/socat/files/socat.config
+++ /dev/null
@@ -1,5 +0,0 @@
-# forward port 8000 on IPv6 to IPv4 host port 80
-# change enable to '1' to use this example
-config socat 'http'
-	option enable '0'
-	option SocatOptions '-d -d TCP6-LISTEN:8000,fork TCP4:192.168.1.20:80'
diff --git a/trunk/package/feeds/packages/socat/files/socat.init b/trunk/package/feeds/packages/socat/files/socat.init
deleted file mode 100644
index 379dc070..00000000
--- a/trunk/package/feeds/packages/socat/files/socat.init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2014 OpenWrt.org
-
-START=99
-STOP=99
-
-USE_PROCD=1
-PROG=/usr/bin/socat
-NAME=socat
-
-validate_section_socat()
-{
-	uci_validate_section socat socat "${1}" \
-		'enable:bool:1' \
-		'SocatOptions:string'
-	return $?
-}
-
-socat_instance()
-{
-	local SocatOptions enable
-
-	validate_section_socat "${1}" || {
-		echo "validation failed"
-		return 1
-	}
-
-	[ "${enable}" = "0" ] && return 1
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_append_param command ${SocatOptions}
-	procd_close_instance
-}
-
-start_service () {
-	config_load "${NAME}"
-	config_foreach socat_instance socat
-}
diff --git a/trunk/package/feeds/packages/sockread/Makefile b/trunk/package/feeds/packages/sockread/Makefile
deleted file mode 100644
index d3c15d46..00000000
--- a/trunk/package/feeds/packages/sockread/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This software is licensed under the CC0-1.0 license.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sockread
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-PKG_LICENSE:=CC0-1.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sockread
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=sockread
-	MAINTAINER:=Moritz Warning <moritzwarning@web.de>
-endef
-
-define Package/sockread/description
-	sockread writes and reads data from a Unix domain socket
-	represented as a special file on the file system.
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/sockread/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sockread $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,sockread))
diff --git a/trunk/package/feeds/packages/sockread/src/Makefile b/trunk/package/feeds/packages/sockread/src/Makefile
deleted file mode 100644
index fe4f8a7c..00000000
--- a/trunk/package/feeds/packages/sockread/src/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CC ?= gcc
-CFLAGS ?= -O2 -Wall -pedantic
-CFLAGS += -std=gnu99
-
-.PHONY: clean
-
-sockread:
-	$(CC) $(CFLAGS) main.c -o sockread
-
-clean:
-	rm -f sockread
diff --git a/trunk/package/feeds/packages/sockread/src/main.c b/trunk/package/feeds/packages/sockread/src/main.c
deleted file mode 100644
index 06c21def..00000000
--- a/trunk/package/feeds/packages/sockread/src/main.c
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-int main(int argc, char *argv[]) {
-	char buf[1024];
-	ssize_t r;
-
-	if (argc != 2) {
-		fprintf(stderr, "Write to and read from a Unix domain socket.\n\nUsage: %s <socket>\n", argv[0]);
-		return 1;
-	}
-
-	size_t addrlen = strlen(argv[1]);
-
-	/* Allocate enough space for arbitrary-length paths */
-	char addrbuf[offsetof(struct sockaddr_un, sun_path) + addrlen + 1];
-	memset(addrbuf, 0, sizeof(addrbuf));
-
-	struct sockaddr_un *addr = (struct sockaddr_un *)addrbuf;
-	addr->sun_family = AF_UNIX;
-	memcpy(addr->sun_path, argv[1], addrlen+1);
-
-	int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0) {
-		fprintf(stderr, "Failed to create socket: %s\n", strerror(errno));
-		return 1;
-	}
-
-	if (connect(fd, (struct sockaddr*)addr, sizeof(addrbuf)) < 0) {
-		fprintf(stderr, "Can't connect to `%s': %s\n", argv[1], strerror(errno));
-		return 1;
-	}
-
-	/* Check if stdin refers to a terminal */
-	if (!isatty(fileno(stdin))) {
-		/* Read from stdin and write to socket */
-		while (0 < (r = fread(buf, 1, sizeof(buf), stdin))) {
-			send(fd, buf, r, 0);
-		}
-	}
-
-	/* Read from socket and write to stdout */
-	while (1) {
-		r = recv(fd, buf, sizeof(buf), 0);
-		if (r < 0) {
-			fprintf(stderr, "read: %s\n", strerror(errno));
-			return 1;
-		}
-
-		if (r == 0)
-			return 0;
-
-		fwrite(buf, r, 1, stdout);
-	}
-
-	return 0;
-}
diff --git a/trunk/package/feeds/packages/softflowd/Makefile b/trunk/package/feeds/packages/softflowd/Makefile
deleted file mode 100644
index a908d315..00000000
--- a/trunk/package/feeds/packages/softflowd/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=softflowd
-PKG_VERSION:=0.9.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://softflowd.googlecode.com/files/
-PKG_MD5SUM:=ba83e2715e6250e6645ebcaa9ae1009d
-PKG_MAINTAINER:=Ross Vandegrift <ross@kallisti.us>
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/softflowd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcap
-  TITLE:=softflowd
-  URL:=http://code.google.com/p/softflowd/
-endef
-
-define Package/softflowd/description
-	Software netflow exporter
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" softflowd softflowctl
-endef
-
-define Package/softflowd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/softflowd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/softflowctl $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-define Package/softflowd/conffiles
-/etc/config/softflowd
-endef
-
-$(eval $(call BuildPackage,softflowd))
diff --git a/trunk/package/feeds/packages/softflowd/files/softflowd.config b/trunk/package/feeds/packages/softflowd/files/softflowd.config
deleted file mode 100644
index 61a2ee46..00000000
--- a/trunk/package/feeds/packages/softflowd/files/softflowd.config
+++ /dev/null
@@ -1,14 +0,0 @@
-config softflowd
-	option enabled        '0'
-	option interface      'br-lan'
-	option pcap_file      ''
-	option timeout        ''
-	option max_flows      '8192'
-	option host_port      ''
-	option pid_file       '/var/run/softflowd.pid'
-	option control_socket '/var/run/softflowd.ctl'
-	option export_version '5'
-	option hoplimit       ''
-	option tracking_level 'full'
-	option track_ipv6     '0'
-	option sampling_rate  '100'
diff --git a/trunk/package/feeds/packages/softflowd/files/softflowd.init b/trunk/package/feeds/packages/softflowd/files/softflowd.init
deleted file mode 100755
index a4956c35..00000000
--- a/trunk/package/feeds/packages/softflowd/files/softflowd.init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2011 OpenWrt.org
-
-START=50
-
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get_bool _val "$section" "$option" '0'
-	[ "$_val" -gt 0 ] && append args "$3"
-}
-
-append_string() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _val
-	config_get _val "$section" "$option"
-	[ -n "$_val" ] && append args "$3 $_val"
-}
-
-start_instance() {
-	local section="$1"
-
-	config_get_bool enabled "$section" 'enabled' '0'
-	[ $enabled -gt 0 ] || return 1
-
-	config_get pid_file "$section" 'pid_file'
-
-	args=""
-	append_string "$section" 'interface' '-i'
-	append_string "$section" 'pcap_file' '-r'
-	append_string "$section" 'timeout' '-t'
-	append_string "$section" 'max_flows' '-m'
-	append_string "$section" 'host_port' '-n'
-	append_string "$section" 'pid_file' '-p'
-	append_string "$section" 'control_socket' '-c'
-	append_string "$section" 'export_version' '-v'
-	append_string "$section" 'hoplimit' '-L'
-	append_string "$section" 'tracking_level' '-T'
-	append_string "$section" 'sampling_rate' '-s'
-	append_bool "$section" track_ipv6 '-6'
-
-	SERVICE_PID_FILE="$pid_file" \
-	service_start /usr/sbin/softflowd $args${pid_file:+ -p $pid_file}
-}
-
-stop_instance() {
-	local section="$1"
-
-	config_get_bool enabled "$section" 'enabled' '0'
-	[ $enabled -gt 0 ] || return 1
-
-	config_get control_socket "$section" 'control_socket'
-
-	[ -n "control_socket" -a -S $control_socket ] && {
-		/usr/sbin/softflowctl -c $control_socket exit
-	}
-}
-
-start() {
-	mkdir -m 0755 -p /var/empty
-
-	config_load 'softflowd'
-	config_foreach start_instance 'softflowd'
-}
-
-stop() {
-	config_load 'softflowd'
-	config_foreach stop_instance 'softflowd'
-	service_stop /usr/sbin/softflowd
-}
diff --git a/trunk/package/feeds/packages/spawn-fcgi/Makefile b/trunk/package/feeds/packages/spawn-fcgi/Makefile
deleted file mode 100644
index 54c9ab76..00000000
--- a/trunk/package/feeds/packages/spawn-fcgi/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=spawn-fcgi
-PKG_VERSION:=1.6.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/
-PKG_MD5SUM:=a67c098a50cd625fd12adf61b5dd4c32
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/spawn-fcgi
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tool to spawn fastcgi applications
-  URL:=http://redmine.lighttpd.net/projects/spawn-fcgi
-endef
-
-define Package/spawn-fcgi/description
-	spawn-fcgi is used to spawn fastcgi applications
-endef
-
-define Package/spawn-fcgi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/spawn-fcgi $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,spawn-fcgi))
diff --git a/trunk/package/feeds/packages/speex/Makefile b/trunk/package/feeds/packages/speex/Makefile
deleted file mode 100644
index 48522a5e..00000000
--- a/trunk/package/feeds/packages/speex/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=speex
-PKG_VERSION:=1.2rc1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
-PKG_MD5SUM:=c4438b22c08e5811ff10e2b06ee9b9ae
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libspeex
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Open source speech compression codec library
-  URL:=http://www.speex.org/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/libspeexdsp
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Open source speech compression codec library output to DSP
-  URL:=http://www.speex.org/
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-define Package/libspeex/description
-	Open source patent-free speech compression codec library.
-	Speex is an Open Source/Free Software patent-free audio compression
-	format designed for speech. The Speex Project aims to lower the
-	barrier of entry for voice applications by providing a free
-	alternative to expensive proprietary speech codecs. Moreover, Speex
-	is well-adapted to Internet applications and provides useful features
-	that are not present in most other codecs.
-
-	This package contains the shared codec library, needed by other programs.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/libspeexdsp/description
-	Open source patent-free speech compression codec library.
-	Speex is an Open Source/Free Software patent-free audio compression
-	format designed for speech. The Speex Project aims to lower the
-	barrier of entry for voice applications by providing a free
-	alternative to expensive proprietary speech codecs. Moreover, Speex
-	is well-adapted to Internet applications and provides useful features
-	that are not present in most other codecs.
-
-	This package contains the shared dsp library, needed by other programs.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--enable-fixed-point \
-		--disable-oggtest \
-		--disable-float-api \
-		--disable-vbr \
-		--with-ogg=$(STAGING_DIR)/usr \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		bin_PROGRAMS="" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libspeex/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
-endef
-
-define Package/libspeexdsp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libspeex))
-$(eval $(call BuildPackage,libspeexdsp))
diff --git a/trunk/package/feeds/packages/sqlite3/Makefile b/trunk/package/feeds/packages/sqlite3/Makefile
deleted file mode 100644
index 8eda862f..00000000
--- a/trunk/package/feeds/packages/sqlite3/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sqlite
-PKG_VERSION:=3080803
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.sqlite.org/2015/
-PKG_MD5SUM:=51272e875879ee893e51070b07c33888
-
-PKG_LICENSE:=PUBLICDOMAIN
-PKG_LICENSE_FILES:=
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-autoconf-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=libncurses libreadline
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sqlite3/Default
-  SUBMENU:=database
-  TITLE:=SQLite (v3.x) database engine
-  URL:=http://www.sqlite.org/
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-endef
-
-define Package/sqlite3/Default/description
- SQLite is a small C library that implements a self-contained, embeddable,
- zero-configuration SQL database engine.
-endef
-
-define Package/libsqlite3
-  $(call Package/sqlite3/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libpthread
-  TITLE+= (library)
-endef
-
-define Package/libsqlite3/description
-$(call Package/sqlite3/Default/description)
- This package contains the SQLite (v3.x) shared library, used by other
- programs.
-endef
-
-define Package/sqlite3-cli
-  $(call Package/sqlite3/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libsqlite3 +libncurses +libreadline
-  TITLE+= (cli)
-endef
-
-define Package/sqlite3-cli/description
-$(call Package/sqlite3/Default/description)
- This package contains a terminal-based front-end to the SQLite (v3.x) library
- that can evaluate queries interactively and display the results in multiple
- formats.
-endef
-
-TARGET_CFLAGS += $(FPIC) \
-	-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-
-CONFIGURE_VARS += \
-	config_BUILD_CC="$(HOSTCC)" \
-	config_BUILD_CFLAGS="-O2" \
-	config_TARGET_CC="$(TARGET_CC)" \
-	config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-	config_TARGET_READLINE_INC="$(TARGET_CPPFLAGS)" \
-	config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libsqlite3/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(1)/usr/lib/
-endef
-
-define Package/sqlite3-cli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libsqlite3))
-$(eval $(call BuildPackage,sqlite3-cli))
diff --git a/trunk/package/feeds/packages/sqm-scripts/Makefile b/trunk/package/feeds/packages/sqm-scripts/Makefile
deleted file mode 100644
index 79112227..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sqm-scripts
-PKG_VERSION:=8
-PKG_RELEASE:=2
-PKG_LICENSE:=GPLv2
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sqm-scripts
-  SECTION:=net
-  CATEGORY:=Base system
-  DEPENDS:=+tc +kmod-sched +kmod-ifb iptables +ip \
-	+iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra
-  TITLE:=SQM Scripts (QoS)
-  PKGARCH:=all
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-endef
-
-define Package/sqm-scripts/description
- A set of scripts that does simple SQM configuration.
-endef
-
-define Package/sqm-scripts/conffiles
-/etc/config/sqm
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/sqm-scripts/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/sqm $(1)/etc/init.d/sqm
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/11-sqm $(1)/etc/hotplug.d/iface/11-sqm
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/etc/config/sqm $(1)/etc/config/sqm
-	$(INSTALL_DIR) $(1)/usr/lib/sqm
-	$(INSTALL_BIN) ./files/usr/lib/sqm/*.sh $(1)/usr/lib/sqm/
-	$(INSTALL_BIN) ./files/usr/lib/sqm/*.qos $(1)/usr/lib/sqm/
-	$(INSTALL_DATA) ./files/usr/lib/sqm/*.help $(1)/usr/lib/sqm/
-endef
-
-$(eval $(call BuildPackage,sqm-scripts))
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/etc/config/sqm b/trunk/package/feeds/packages/sqm-scripts/files/etc/config/sqm
deleted file mode 100644
index d0398085..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/etc/config/sqm
+++ /dev/null
@@ -1,16 +0,0 @@
-
-config queue 'eth1'
-        option enabled '0'
-        option interface 'eth1'
-        option download '85000'
-        option upload '10000'
-        option qdisc 'fq_codel'
-        option script 'simple.qos'
-        option qdisc_advanced '0'
-        option ingress_ecn 'ECN'
-        option egress_ecn 'NOECN'
-        option qdisc_really_really_advanced '0'
-        option itarget 'auto'
-        option etarget 'auto'
-        option linklayer 'none'
-
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/etc/hotplug.d/iface/11-sqm b/trunk/package/feeds/packages/sqm-scripts/files/etc/hotplug.d/iface/11-sqm
deleted file mode 100755
index 439307e3..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/etc/hotplug.d/iface/11-sqm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = ifup ] && /usr/lib/sqm/run.sh start ${DEVICE}
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/etc/init.d/sqm b/trunk/package/feeds/packages/sqm-scripts/files/etc/init.d/sqm
deleted file mode 100755
index 2a40afb5..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/etc/init.d/sqm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-
-reload()
-{
-/usr/lib/sqm/run.sh start
-}
-
-restart()
-{
-reload
-}
-
-start()
-{
-reload
-}
-
-stop()
-{
-/usr/lib/sqm/run.sh stop
-}
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/functions.sh b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/functions.sh
deleted file mode 100644
index a0b2c6ff..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/functions.sh
+++ /dev/null
@@ -1,486 +0,0 @@
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-#improve the logread output
-sqm_logger() {
-    logger -t SQM -s ${1}
-}
-
-insmod() {
-  lsmod | grep -q ^$1 || $INSMOD $1
-}
-
-ipt() {
-  d=`echo $* | sed s/-A/-D/g`
-  [ "$d" != "$*" ] && {
-	iptables $d > /dev/null 2>&1
-	ip6tables $d > /dev/null 2>&1
-  }
-  d=`echo $* | sed s/-I/-D/g`
-  [ "$d" != "$*" ] && {
-	iptables $d > /dev/null 2>&1
-	ip6tables $d > /dev/null 2>&1
-  }
-  iptables $* > /dev/null 2>&1
-  ip6tables $* > /dev/null 2>&1
-}
-
-do_modules() {
-#sm TODO: check first whether the modules exist and only load then
-	insmod act_ipt
-	insmod sch_$QDISC
-	insmod sch_ingress
-	insmod act_mirred
-	insmod cls_fw
-	insmod sch_htb
-}
-
-
-# You need to jiggle these parameters. Note limits are tuned towards a <10Mbit uplink <60Mbup down
-
-[ -z "$UPLINK" ] && UPLINK=2302
-[ -z "$DOWNLINK" ] && DOWNLINK=14698
-[ -z "$IFACE" ] && IFACE=ge00
-[ -z "$QDISC" ] && QDISC=fq_codel
-[ -z "$LLAM" ] && LLAM="tc_stab"
-[ -z "$LINKLAYER" ] && LINKLAYER="none"
-[ -z "$OVERHEAD" ] && OVERHEAD=0
-[ -z "$STAB_MTU" ] && STAB_MTU=2047
-[ -z "$STAB_MPU" ] && STAB_MPU=0
-[ -z "$STAB_TSIZE" ] && STAB_TSIZE=512
-[ -z "$AUTOFLOW" ] && AUTOFLOW=0
-[ -z "$LIMIT" ] && LIMIT=1001	# sane global default for *LIMIT for fq_codel on a small memory device
-[ -z "$ILIMIT" ] && ILIMIT=
-[ -z "$ELIMIT" ] && ELIMIT=
-[ -z "$ITARGET" ] && ITARGET=
-[ -z "$ETARGET" ] && ETARGET=
-[ -z "$IECN" ] && IECN="ECN"
-[ -z "$EECN" ] && EECN="NOECN"
-[ -z "$SQUASH_DSCP" ] && SQUASH_DSCP="1"
-[ -z "$SQUASH_INGRESS" ] && SQUASH_INGRESS="1"
-[ -z "$IQDISC_OPTS" ] && IQDISC_OPTS=""
-[ -z "$EQDISC_OPTS" ] && EQDISC_OPTS=""
-[ -z "$TC" ] && TC=`which tc`
-#[ -z "$TC" ] && TC="sqm_logger tc"# this redirects all tc calls into the log
-[ -z "$IP" ] && IP=$( which ip )
-[ -z "$INSMOD" ] && INSMOD=`which insmod`
-[ -z "$TARGET" ] && TARGET="5ms"
-[ -z "$IPT_MASK" ] && IPT_MASK="0xff"
-[ -z "$IPT_MASK_STRING" ] && IPT_MASK_STRING="/${IPT_MASK}"	# for set-mark
-
-#sqm_logger "${0} IPT_MASK: ${IPT_MASK_STRING}"
-
-
-
-# find the ifb device associated with a specific interface, return nothing of no ifb is associated with IF
-get_ifb_associated_with_if() {
-    CUR_IF=$1
-    # CUR_IFB=$( tc -p filter show parent ffff: dev ${CUR_IF} | grep -o -e ifb'[[:digit:]]\+' )
-    CUR_IFB=$( tc -p filter show parent ffff: dev ${CUR_IF} | grep -o -e ifb'[^)]\+' )	# my editor's syntax coloration is limitied so I need a single quote in this line (between eiditor and s)
-    sqm_logger "ifb associated with interface ${CUR_IF}: ${CUR_IFB}"
-    echo ${CUR_IFB}
-}
-
-# ATTENTION, IFB names can only be 15 chararcters, so we chop of excessive characters at the start of the interface name 
-# if required
-create_new_ifb_for_if() {
-    CUR_IF=$1
-    MAX_IF_NAME_LENGTH=15
-    IFB_PREFIX="ifb4"
-    NEW_IFB="${IFB_PREFIX}${CUR_IF}"
-    IFB_NAME_LENGTH=${#NEW_IFB}
-    if [ ${IFB_NAME_LENGTH} -gt ${MAX_IF_NAME_LENGTH} ]; 
-    then
-	sqm_logger "The requsted IFB name ${NEW_IFB} is longer than the allowed 15 characters, trying to make it shorter"
-	OVERLIMIT=$(( ${#NEW_IFB} - ${MAX_IF_NAME_LENGTH} ))
-	NEW_IFB=${IFB_PREFIX}${CUR_IF:${OVERLIMIT}:$(( ${MAX_IF_NAME_LENGTH} - ${#IFB_PREFIX} ))}
-    fi
-    sqm_logger "trying to create new IFB: ${NEW_IFB}"
-    $IP link add name ${NEW_IFB} type ifb #>/dev/null 2>&1	# better be verbose
-    echo ${NEW_IFB}
-}
-
-# the best match is either the IFB already associated with the current interface or a new named IFB
-get_ifb_for_if() {
-    CUR_IF=$1
-    # if an ifb is already associated return that
-    CUR_IFB=$( get_ifb_associated_with_if ${CUR_IF} )
-    [ -z "$CUR_IFB" ] && CUR_IFB=$( create_new_ifb_for_if ${CUR_IF} )
-    [ -z "$CUR_IFB" ] && sqm_logger "Could not find existing IFB for ${CUR_IF}, nor create a new IFB instead..."
-    echo ${CUR_IFB}
-}
-
-#sm: we need the functions above before trying to set the ingress IFB device
-[ -z "$DEV" ] && DEV=$( get_ifb_for_if ${IFACE} )      # automagically get the right IFB device for the IFACE"
-
-
-get_htb_adsll_string() {
-	ADSLL=""
-	if [ "$LLAM" = "htb_private" -a "$LINKLAYER" != "none" ]; 
-	then
-		# HTB defaults to MTU 1600 and an implicit fixed TSIZE of 256, but HTB as of around 3.10.0
-		# does not actually use a table in the kernel
-		ADSLL="mpu ${STAB_MPU} linklayer ${LINKLAYER} overhead ${OVERHEAD} mtu ${STAB_MTU}"
-		sqm_logger "ADSLL: ${ADSLL}"
-	fi
-	echo ${ADSLL}
-}
-
-get_stab_string() {
-	STABSTRING=""
-	if [ "${LLAM}" = "tc_stab" -a "$LINKLAYER" != "none" ]; 
-	then
-		STABSTRING="stab mtu ${STAB_MTU} tsize ${STAB_TSIZE} mpu ${STAB_MPU} overhead ${OVERHEAD} linklayer ${LINKLAYER}"
-		sqm_logger "STAB: ${STABSTRING}"
-	fi
-	echo ${STABSTRING}
-}
-
-sqm_stop() {
-	$TC qdisc del dev $IFACE ingress
-	$TC qdisc del dev $IFACE root
-	$TC qdisc del dev $DEV root
-}
-
-# Note this has side effects on the prio variable
-# and depends on the interface global too
-
-fc() {
-	$TC filter add dev $interface protocol ip parent $1 prio $prio u32 match ip tos $2 0xfc classid $3
-	prio=$(($prio + 1))
-	$TC filter add dev $interface protocol ipv6 parent $1 prio $prio u32 match ip6 priority $2 0xfc classid $3
-	prio=$(($prio + 1))
-}
-
-fc_pppoe() {
-	PPPOE_SESSION_ETHERTYPE="0x8864"
-	PPPOE_DISCOVERY_ETHERTYPE="0x8863"
-	PPP_PROTO_IP4="0x0021"
-	PPP_PROTO_IP6="0x0057"
-	ARP_PROTO_IP4="0x0806"
-	$TC filter add dev $interface protocol ip parent $1 prio $prio u32 match ip tos $2 0xfc classid $3
-	$TC filter add dev $interface parent $1 protocol ${PPPOE_SESSION_ETHERTYPE} prio $(( 400 + ${prio}  )) u32 \
-	    match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	    match u8 $2 0xfc at 9 \
-	    flowid $3
-
-	prio=$(($prio + 1))
-	$TC filter add dev $interface protocol ipv6 parent $1 prio $prio u32 match ip6 priority $2 0xfc classid $3
-	$TC filter add dev $interface parent $1 protocol ${PPPOE_SESSION_ETHERTYPE} prio $(( 600 + ${prio} )) u32 \
-	    match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	    match u16 0x0${2:2:2}0 0x0fc0 at 8 \
-	    flowid $3
-	
-
-
-
-	prio=$(($prio + 1))
-
-
-}
-# FIXME: actually you need to get the underlying MTU on PPOE thing
-
-get_mtu() {
-	BW=$2
-	F=`cat /sys/class/net/$1/mtu`
-	if [ -z "$F" ]
-	then
-	F=1500
-	fi
-	if [ $BW -gt 20000 ]
-	then
-		F=$(($F * 2))
-	fi
-	if [ $BW -gt 30000 ]
-	then
-		F=$(($F * 2))
-	fi
-	if [ $BW -gt 40000 ]
-	then
-		F=$(($F * 2))
-	fi
-	if [ $BW -gt 50000 ]
-	then
-		F=$(($F * 2))
-	fi
-	if [ $BW -gt 60000 ]
-	then
-		F=$(($F * 2))
-	fi
-	if [ $BW -gt 80000 ]
-	then
-		F=$(($F * 2))
-	fi
-	echo $F
-}
-
-# FIXME should also calculate the limit
-# Frankly I think Xfq_codel can pretty much always run with high numbers of flows
-# now that it does fate sharing
-# But right now I'm trying to match the ns2 model behavior better
-# So SET the autoflow variable to 1 if you want the cablelabs behavior
-
-get_flows() {
-	if [ "$AUTOFLOW" -eq "1" ] 
-	then
-		FLOWS=8
-		[ $1 -gt 999 ] && FLOWS=16
-		[ $1 -gt 2999 ] && FLOWS=32
-		[ $1 -gt 7999 ] && FLOWS=48
-		[ $1 -gt 9999 ] && FLOWS=64
-		[ $1 -gt 19999 ] && FLOWS=128
-		[ $1 -gt 39999 ] && FLOWS=256
-		[ $1 -gt 69999 ] && FLOWS=512
-		[ $1 -gt 99999 ] && FLOWS=1024
-		case $QDISC in
-			codel|ns2_codel|pie|*fifo|pfifo_fast) ;;
-			fq_codel|*fq_codel|sfq) echo flows $FLOWS ;;
-		esac
-	fi
-}	
-
-# set the target parameter, also try to only take well formed inputs
-# Note, the link bandwidth in the current direction (ingress or egress) 
-# is required to adjust the target for slow links
-get_target() {
-	local CUR_TARGET=${1}
-	local CUR_LINK_KBPS=${2}
-	[ ! -z "$CUR_TARGET" ] && sqm_logger "cur_target: ${CUR_TARGET} cur_bandwidth: ${CUR_LINK_KBPS}"
-	CUR_TARGET_STRING=
-	# either e.g. 100ms or auto
-	CUR_TARGET_VALUE=$( echo ${CUR_TARGET} | grep -o -e \^'[[:digit:]]\+' )
-	CUR_TARGET_UNIT=$( echo ${CUR_TARGET} | grep -o -e '[[:alpha:]]\+'\$ )
-	#[ ! -z "$CUR_TARGET" ] && sqm_logger "CUR_TARGET_VALUE: $CUR_TARGET_VALUE"
-	#[ ! -z "$CUR_TARGET" ] && sqm_logger "CUR_TARGET_UNIT: $CUR_TARGET_UNIT"
-	
-	AUTO_TARGET=
-	UNIT_VALID=
-	
-	case $QDISC in
-		*codel|*pie) 
-			if [ ! -z "${CUR_TARGET_VALUE}" -a ! -z "${CUR_TARGET_UNIT}" ];
-    			then
-    			    case ${CUR_TARGET_UNIT} in
-    				    # permissible units taken from: tc_util.c get_time()
-				    s|sec|secs|ms|msec|msecs|us|usec|usecs) 
-					CUR_TARGET_STRING="target ${CUR_TARGET_VALUE}${CUR_TARGET_UNIT}" 
-					UNIT_VALID="1"
-					;;
-			    esac
-			fi
-			# empty field in GUI or undefined GUI variable now defaults to auto
-			if [ -z "${CUR_TARGET_VALUE}" -a -z "${CUR_TARGET_UNIT}" ];
-    			then			
-				if [ ! -z "${CUR_LINK_KBPS}" ];
-				then
-				    TMP_TARGET_US=$( adapt_target_to_slow_link $CUR_LINK_KBPS )
-				    TMP_INTERVAL_STRING=$( adapt_interval_to_slow_link $TMP_TARGET_US )
-				    CUR_TARGET_STRING="target ${TMP_TARGET_US}us ${TMP_INTERVAL_STRING}"
-				    AUTO_TARGET="1"
-				    sqm_logger "get_target defaulting to auto." 
-			    	else
-				    sqm_logger "required link bandwidth in kbps not passed to get_target()." 
-				fi
-			fi
-			# but still allow explicit use of the keyword auto for backward compatibility
-                        case ${CUR_TARGET_UNIT} in
-                            auto|Auto|AUTO)
-                                if [ ! -z "${CUR_LINK_KBPS}" ];
-                                then
-                                    TMP_TARGET_US=$( adapt_target_to_slow_link $CUR_LINK_KBPS )
-                                    TMP_INTERVAL_STRING=$( adapt_interval_to_slow_link $TMP_TARGET_US )
-                                    CUR_TARGET_STRING="target ${TMP_TARGET_US}us ${TMP_INTERVAL_STRING}"
-                                    AUTO_TARGET="1"
-                                else
-                                    sqm_logger "required link bandwidth in kbps not passed to get_target()."
-                                fi
-                            ;;
-                        esac
-			
-			case ${CUR_TARGET_UNIT} in
-			    default|Default|DEFAULT) 
-				if [ ! -z "${CUR_LINK_KBPS}" ];
-				then
-				    CUR_TARGET_STRING=""	# return nothing so the default target is not over-ridden...
-				    AUTO_TARGET="1"
-				    #sqm_logger "get_target using qdisc default, no explicit target string passed."
-			    	else
-			    	    sqm_logger "required link bandwidth in kbps not passed to get_target()." 
-			        fi
-			    ;;
-			esac
-			if [ ! -z "${CUR_TARGET}" ];
-			    then
-			    if [ -z "${CUR_TARGET_VALUE}" -o -z "${UNIT_VALID}" ];
-			    then 
-				[ -z "$AUTO_TARGET" ] && sqm_logger "${CUR_TARGET} is not a well formed tc target specifier; e.g.: 5ms (or s, us), or one of the strings auto or default."
-			    fi
-			fi
-		    ;;
-	esac
-#	sqm_logger "target: ${CUR_TARGET_STRING}"
-	echo $CUR_TARGET_STRING
-}	
-
-# for low bandwidth links fq_codels default target of 5ms does not work too well
-# so increase target for slow links (note below roughly 2500kbps a single packet will \
-# take more than 5 ms to be tansfered over the wire)
-adapt_target_to_slow_link() {
-    CUR_LINK_KBPS=$1
-    CUR_EXTENDED_TARGET_US=
-    MAX_PAKET_DELAY_IN_US_AT_1KBPS=$(( 1000 * 1000 *1540 * 8 / 1000 ))
-    CUR_EXTENDED_TARGET_US=$(( ${MAX_PAKET_DELAY_IN_US_AT_1KBPS} / ${CUR_LINK_KBPS} ))	# note this truncates the decimals
-    # do not change anything for fast links
-    [ "$CUR_EXTENDED_TARGET_US" -lt 5000 ] && CUR_EXTENDED_TARGET_US=5000
-    case ${QDISC} in
-        *codel|pie)
-	    echo "${CUR_EXTENDED_TARGET_US}"
-	    ;;
-    esac
-}
-
-# codel looks at a whole interval to figure out wether observed latency stayed below target
-# if target >= interval that will not work well, so increase interval by the same amonut that target got increased
-adapt_interval_to_slow_link() {
-    CUR_TARGET_US=$1
-    case ${QDISC} in
-        *codel)
-            CUR_EXTENDED_INTERVAL_US=$(( (100 - 5) * 1000 + ${CUR_TARGET_US} ))
-	    echo "interval ${CUR_EXTENDED_INTERVAL_US}us"
-	    ;;
-	pie)
-	    ## not sure if pie needs this, probably not
-	    #CUR_EXTENDED_TUPDATE_US=$(( (30 - 20) * 1000 + ${CUR_TARGET_US} ))
-	    #echo "tupdate ${CUR_EXTENDED_TUPDATE_US}us"
-	    ;;
-    esac
-}
-
-
-# set quantum parameter if available for this qdisc
-get_quantum() {
-    case $QDISC in
-	*fq_codel|fq_pie|drr) echo quantum $1 ;;
-	*) ;;
-    esac
-}
-
-# only show limits to qdiscs that can handle them...
-# Note that $LIMIT contains the default limit
-get_limit() {
-    CURLIMIT=$1
-    case $QDISC in
-    *codel|*pie|pfifo_fast|sfq|pfifo) [ -z ${CURLIMIT} ] && CURLIMIT=${LIMIT}	# use the global default limit
-        ;;
-    bfifo) [ -z "$CURLIMIT" ] && [ ! -z "$LIMIT" ] && CURLIMIT=$(( ${LIMIT} * $( cat /sys/class/net/${IFACE}/mtu ) ))	# bfifo defaults to txquelength * MTU, 
-        ;;
-    *) sqm_logger "${QDISC} does not support a limit"
-        ;;
-    esac
-    sqm_logger "get_limit: $1 CURLIMIT: ${CURLIMIT}"
-    
-    if [ ! -z "$CURLIMIT" ]
-    then
-    echo "limit ${CURLIMIT}"
-    fi
-}
-
-get_ecn() {
-    CURECN=$1
-    #sqm_logger CURECN: $CURECN
-	case ${CURECN} in
-		ECN)
-			case $QDISC in
-				*codel|*pie|*red)
-				    CURECN=ecn 
-				    ;;
-				*) 
-				    CURECN="" 
-				    ;;
-			esac
-			;;
-		NOECN)
-			case $QDISC in
-				*codel|*pie|*red) 
-				    CURECN=noecn 
-				    ;;
-				*) 
-				    CURECN="" 
-				    ;;
-			esac
-			;;
-		*)
-		    sqm_logger "ecn value $1 not handled"
-		    ;;
-	esac
-	#sqm_logger "get_ECN: $1 CURECN: ${CURECN} IECN: ${IECN} EECN: ${EECN}"
-	echo ${CURECN}
-
-}
-
-# This could be a complete diffserv implementation
-
-diffserv() {
-
-interface=$1
-prio=1
-
-# Catchall
-
-$TC filter add dev $interface parent 1:0 protocol all prio 999 u32 \
-        match ip protocol 0 0x00 flowid 1:12
-
-# Find the most common matches fast
-#fc_pppoe() instead of fc() with effectice ingress classification for pppoe is very expensive and destroys LUL
-
-fc 1:0 0x00 1:12 # BE
-fc 1:0 0x20 1:13 # CS1
-fc 1:0 0x10 1:11 # IMM
-fc 1:0 0xb8 1:11 # EF
-fc 1:0 0xc0 1:11 # CS3
-fc 1:0 0xe0 1:11 # CS6
-fc 1:0 0x90 1:11 # AF42 (mosh)
-
-# Arp traffic
-$TC filter add dev $interface protocol arp parent 1:0 prio $prio handle 500 fw flowid 1:11
-
-
-prio=$(($prio + 1))
-
-
-}
-
-diffserv_pppoe() {
-
-interface=$1
-prio=1
-
-# Catchall
-
-$TC filter add dev $interface parent 1:0 protocol all prio 999 u32 \
-        match ip protocol 0 0x00 flowid 1:12
-
-# Find the most common matches fast
-#fc_pppoe() instead of fc() with effectice ingress classification for pppoe is very expensive and destroys LUL
-
-fc_pppoe 1:0 0x00 1:12 # BE
-fc_pppoe 1:0 0x20 1:13 # CS1
-fc_pppoe 1:0 0x10 1:11 # IMM
-fc_pppoe 1:0 0xb8 1:11 # EF
-fc_pppoe 1:0 0xc0 1:11 # CS3
-fc_pppoe 1:0 0xe0 1:11 # CS6
-fc_pppoe 1:0 0x90 1:11 # AF42 (mosh)
-
-# Arp traffic
-$TC filter add dev $interface protocol arp parent 1:0 prio $prio handle 500 fw flowid 1:11
-
-
-prio=$(($prio + 1))
-
-
-}
-
-
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/run.sh b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/run.sh
deleted file mode 100755
index 7aa20ddb..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/run.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-
-. /lib/functions.sh
-
-STOP=
-ACTIVE_STATE_PREFIX="SQM_active_on_"
-ACTIVE_STATE_FILE_DIR="/var/run/SQM"
-mkdir -p ${ACTIVE_STATE_FILE_DIR}
-
-
-START_ON_IF=$2	# only process this interface
-# TODO if $2 is empty select all interfaces with running sqm instance
-if [ -z ${START_ON_IF} ] ;
-then
-    # find all interfaces with active sqm instance
-    logger -t SQM -s "Trying to start/stop SQM on all interfaces."
-    PROTO_STATE_FILE_LIST=$( ls ${ACTIVE_STATE_FILE_DIR}/${ACTIVE_STATE_PREFIX}* 2> /dev/null )
-else
-    # only try to restart the just hotplugged interface, so reduce the list of interfaces to stop to the specified one
-    logger -t SQM -s "Trying to start/stop SQM on interface ${START_ON_IF}"
-    PROTO_STATE_FILE_LIST=${ACTIVE_STATE_FILE_DIR}/${ACTIVE_STATE_PREFIX}${START_ON_IF}
-fi
-
-
-
-
-case ${1} in
-    start)
-	# just run through, same as passing no argument
-	;;
-    stop)
-        logger -t SQM -s "run.sh stop"
-	STOP=$1
-        ;;
-esac
-
-
-
-
-
-
-# the current uci config file does not necessarily contain sections for all interfaces with active
-# SQM instances, so use the ACTIVE_STATE_FILES to detect the interfaces on which to stop SQM.
-# Currently the .qos scripts start with stopping any existing traffic shaping so this should not
-# effectively change anything...
-for STATE_FILE in ${PROTO_STATE_FILE_LIST} ; do
-    if [ -f ${STATE_FILE} ] ;
-    then
-	STATE_FILE_BASE_NAME=$( basename ${STATE_FILE} )
-	CURRENT_INTERFACE=${STATE_FILE_BASE_NAME:${#ACTIVE_STATE_PREFIX}:$(( ${#STATE_FILE_BASE_NAME} - ${#ACTIVE_STATE_PREFIX} ))}        
-	logger -t SQM -s "${0} Stopping SQM on interface: ${CURRENT_INTERFACE}"
-	/usr/lib/sqm/stop.sh ${CURRENT_INTERFACE}
-	rm ${STATE_FILE}	# well, we stop it so it is not running anymore and hence no active state file needed...
-    fi
-done
-
-config_load sqm
-
-run_simple_qos() {
-	local section="$1"
-	export IFACE=$(config_get "$section" interface)
-
-	# If called explicitly for one interface only , so ignore anything else
-	[ -n "${START_ON_IF}" -a "$START_ON_IF" != "$IFACE" ] && return
-	#logger -t SQM -s "marching on..."
-
-	ACTIVE_STATE_FILE_FQN="${ACTIVE_STATE_FILE_DIR}/${ACTIVE_STATE_PREFIX}${IFACE}"	# this marks interfaces as active with SQM
-	[ -f "${ACTIVE_STATE_FILE_FQN}" ] && logger -t SQM -s "Uh, oh, ${ACTIVE_STATE_FILE_FQN} should already be stopped."	# Not supposed to happen
-
-	if [ $(config_get "$section" enabled) -ne 1 ];
-	then
-	    if [ -f "${ACTIVE_STATE_FILE_FQN}" ];
-	    then
-		# this should not be possible, delete after testing
-		local SECTION_STOP="stop"	# it seems the user just de-selected enable, so stop the active SQM
-	    else
-		logger -t SQM -s "${0} SQM for interface ${IFACE} is not enabled, skipping over..."
-		return 0	# since SQM is not active on the current interface nothing to do here
-	    fi
-	fi
-
-	export UPLINK=$(config_get "$section" upload)
-	export DOWNLINK=$(config_get "$section" download)
-	export LLAM=$(config_get "$section" linklayer_adaptation_mechanism)
-	export LINKLAYER=$(config_get "$section" linklayer)
-	export OVERHEAD=$(config_get "$section" overhead)
-	export STAB_MTU=$(config_get "$section" tcMTU)
-	export STAB_TSIZE=$(config_get "$section" tcTSIZE)
-	export STAB_MPU=$(config_get "$section" tcMPU)
-	export ILIMIT=$(config_get "$section" ilimit)
-	export ELIMIT=$(config_get "$section" elimit)
-	export ITARGET=$(config_get "$section" itarget)
-	export ETARGET=$(config_get "$section" etarget)
-	export IECN=$(config_get "$section" ingress_ecn)
-	export EECN=$(config_get "$section" egress_ecn)
-	export IQDISC_OPTS=$(config_get "$section" iqdisc_opts)
-	export EQDISC_OPTS=$(config_get "$section" eqdisc_opts)
-	export TARGET=$(config_get "$section" target)
-	export SQUASH_DSCP=$(config_get "$section" squash_dscp)
-	export SQUASH_INGRESS=$(config_get "$section" squash_ingress)
-
-	export QDISC=$(config_get "$section" qdisc)
-	export SCRIPT=/usr/lib/sqm/$(config_get "$section" script)
-
-#	# there should be nothing left to stop, so just avoid calling the script
-	if [ "$STOP" == "stop" -o "$SECTION_STOP" == "stop" ];
-	then 
-#	     /usr/lib/sqm/stop.sh
-#	     [ -f ${ACTIVE_STATE_FILE_FQN} ] && rm ${ACTIVE_STATE_FILE_FQN}	# conditional to avoid errors ACTIVE_STATE_FILE_FQN does not exist anymore
-#	     $(config_set "$section" enabled 0)	# this does not save to the config file only to the loaded memory representation
-	     logger -t SQM -s "${0} SQM qdiscs on ${IFACE} removed"
-	     return 0
-	fi
-	# in case of spurious hotplug events, try double check whether the interface is really up
-	if [ ! -d /sys/class/net/${IFACE} ] ;
-	then
-	    echo "${IFACE} does currently not exist, not even trying to start SQM on nothing." > /dev/kmsg
-	    logger -t SQM -s "${IFACE} does currently not exist, not even trying to start SQM on nothing."
-	    return 0
-	fi
-
-	logger -t SQM -s "${0} Queue Setup Script: ${SCRIPT}"
-	[ -x "$SCRIPT" ] && { $SCRIPT ; touch ${ACTIVE_STATE_FILE_FQN}; }
-}
-
-config_foreach run_simple_qos
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos
deleted file mode 100755
index 6e5af4a9..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/bin/sh
-# Cero3 Shaper
-# A 3 bin tc_codel and ipv6 enabled shaping script for
-# ethernet gateways
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-# Compared to the complexity that debloat had become
-# this cleanly shows a means of going from diffserv marking
-# to prioritization using the current tools (ip(6)tables
-# and tc. I note that the complexity of debloat exists for
-# a reason, and it is expected that script is run first
-# to setup various other parameters such as BQL and ethtool.
-# (And that the debloat script has setup the other interfaces)
-
-# You need to jiggle these parameters. Note limits are tuned towards a <10Mbit uplink <60Mbup down
-
-. /usr/lib/sqm/functions.sh
-
-ipt_setup() {
-
-ipt -t mangle -N QOS_MARK_${IFACE}
-
-ipt -t mangle -A QOS_MARK_${IFACE} -j MARK --set-mark 0x2${IPT_MASK_STRING}
-# You can go further with classification but...
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS1 -j MARK --set-mark 0x3${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS6 -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class EF -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class AF42 -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m tos  --tos Minimize-Delay -j MARK --set-mark 0x1${IPT_MASK_STRING}
-
-# and it might be a good idea to do it for udp tunnels too
-
-# Turn it on. Preserve classification if already performed
-
-#sm: is it correct to do this in $IFACE? Should ingress not be on $DEV? since HTB acts on $DEV?
-#	SQUASH also does not work on $DEV (that is the IFB will still see the incoming ToS bits whether we squash or not)
-#	SQUASH is still useful to protect internal machines...
-if [ "$SQUASH_DSCP" = "1" ]
-then
-sqm_logger "Squashing differentiated services code points (DSCP) from ingress."
-ipt -t mangle -I PREROUTING -i $IFACE -m dscp ! --dscp 0 -j DSCP --set-dscp-class be
-else
-sqm_logger "Keeping differentiated services code points (DSCP) from ingress."
-ipt -t mangle -A PREROUTING -i $IFACE -m mark --mark 0x00${IPT_MASK_STRING} -g QOS_MARK_${IFACE} 
-fi
-
-ipt -t mangle -A POSTROUTING -o $IFACE -m mark --mark 0x00${IPT_MASK_STRING} -g QOS_MARK_${IFACE} 
-
-# The Syn optimization was nice but fq_codel does it for us
-# ipt -t mangle -A PREROUTING -i s+ -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -j MARK --set-mark 0x01
-# Not sure if this will work. Encapsulation is a problem period
-
-ipt -t mangle -I PREROUTING -i vtun+ -p tcp -j MARK --set-mark 0x2${IPT_MASK_STRING} # tcp tunnels need ordering
-
-# Emanating from router, do a little more optimization
-# but don't bother with it too much. 
-
-ipt -t mangle -A OUTPUT -p udp -m multiport --ports 123,53 -j DSCP --set-dscp-class AF42
-
-#Not clear if the second line is needed
-#ipt -t mangle -A OUTPUT -o $IFACE -g QOS_MARK_${IFACE}
-
-}
-
-
-# TC rules
-
-egress() {
-
-CEIL=${UPLINK}
-PRIO_RATE=`expr $CEIL / 3` # Ceiling for prioirty
-BE_RATE=`expr $CEIL / 6`   # Min for best effort
-BK_RATE=`expr $CEIL / 6`   # Min for background
-BE_CEIL=`expr $CEIL - 16`  # A little slop at the top
-
-LQ="quantum `get_mtu $IFACE $CEIL`"
-
-$TC qdisc del dev $IFACE root 2> /dev/null
-$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12
-$TC class add dev $IFACE parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:11 htb $LQ rate 128kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:12 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:13 htb $LQ rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`
-
-$TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${PRIO_RATE}` ${EQDISC_OPTS}
-$TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${EQDISC_OPTS}
-$TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}
-
-
-# Need a catchall rule
-
-$TC filter add dev $IFACE parent 1:0 protocol all prio 999 u32 \
-        match ip protocol 0 0x00 flowid 1:12  
-
-# FIXME should probably change the filter here to do pre-nat
-        
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 1 handle 1 fw classid 1:11
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 2 handle 2 fw classid 1:12
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 3 handle 3 fw classid 1:13
-
-# ipv6 support. Note that the handle indicates the fw mark bucket that is looked for
-
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 4 handle 1 fw classid 1:11
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 5 handle 2 fw classid 1:12
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 6 handle 3 fw classid 1:13
-
-# Arp traffic
-
-$TC filter add dev $IFACE parent 1:0 protocol arp prio 7 handle 1 fw classid 1:11
-
-# ICMP traffic - Don't impress your friends. Deoptimize to manage ping floods
-# better instead
-
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 8 \
-	 u32 match ip protocol 1 0xff flowid 1:13
-
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 9 \
-	 u32 match ip protocol 1 0xff flowid 1:13
-
-#diffserv $IFACE
-
-}
-
-ingress() {
-
-CEIL=$DOWNLINK
-PRIO_RATE=`expr $CEIL / 3` # Ceiling for prioirty
-BE_RATE=`expr $CEIL / 6`   # Min for best effort
-BK_RATE=`expr $CEIL / 6`   # Min for background
-BE_CEIL=`expr $CEIL - 16`  # A little slop at the top
-
-LQ="quantum `get_mtu $IFACE $CEIL`"
-
-$TC qdisc del dev $IFACE handle ffff: ingress 2> /dev/null
-$TC qdisc add dev $IFACE handle ffff: ingress
-
-$TC qdisc del dev $DEV root  2> /dev/null
-
-if [ "$SQUASH_INGRESS" = "1" ]
-then
-sqm_logger "Do not perform DSCP based filtering on ingress. (1-tier classification)"
-# Revert to no dscp based filtering
-$TC qdisc del dev $DEV root 2>/dev/null
-$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
-$TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit prio 0 `get_htb_adsll_string`
-$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
-
-else
-sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)"
-$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 12
-$TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:11 htb $LQ rate 32kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:12 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:13 htb $LQ rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`
-
-# I'd prefer to use a pre-nat filter but that causes permutation...
-
-$TC qdisc add dev $DEV parent 1:11 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 500` `get_flows ${PRIO_RATE}` ${IQDISC_OPTS}
-$TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 1500` `get_flows ${BE_RATE}` ${IQDISC_OPTS}
-$TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}
-
-diffserv $DEV
-
-fi
-
-ifconfig $DEV up
-
-# redirect all IP packets arriving in $IFACE to ifb0 
-
-$TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
-  match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-do_modules
-ipt_setup
-
-if [ "$UPLINK" -ne 0 ];
-then
-	egress
-	sqm_logger "egress shaping activated"
-else
-	sqm_logger "egress shaping deactivated"
-	tc qdisc del dev $IFACE root 2> /dev/null
-fi
-if [ "$DOWNLINK" -ne 0 ];
-then
-	ingress
-	sqm_logger "ingress shaping activated"
-else
-	sqm_logger "ingress shaping deactivated"
-	tc qdisc del dev $DEV root 2> /dev/null
-	tc qdisc del dev $IFACE ingress 2> /dev/null
-fi
-
-
-
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-
-# Comments
-# This does the right thing with ipv6 traffic.
-# It also tries to leverage diffserv to some sane extent. In particular,
-# the 'priority' queue is limited to 33% of the total, so EF, and IMM traffic
-# cannot starve other types. The rfc suggested 30%. 30% is probably
-# a lot in today's world.
-
-# Flaws
-# Many!
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos.help b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos.help
deleted file mode 100644
index b0596010..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple.qos.help
+++ /dev/null
@@ -1 +0,0 @@
-BW-limited three-tier prioritisation scheme with fq_codel on each queue. (default)
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos
deleted file mode 100755
index d40d1bb8..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos
+++ /dev/null
@@ -1,398 +0,0 @@
-#!/bin/sh
-# Cero3 Shaper
-# A 3 bin tc_codel and ipv6 enabled shaping script for
-# ethernet gateways
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-# Compared to the complexity that debloat had become
-# this cleanly shows a means of going from diffserv marking
-# to prioritization using the current tools (ip(6)tables
-# and tc. I note that the complexity of debloat exists for
-# a reason, and it is expected that script is run first
-# to setup various other parameters such as BQL and ethtool.
-# (And that the debloat script has setup the other interfaces)
-
-# You need to jiggle these parameters. Note limits are tuned towards a <10Mbit uplink <60Mbup down
-
-#sm: Goal to create a set of tc filters that also apply on pppoe encapsulated packets
-#	but having multiple filters run in succession is slow, so look at tc filter hashing 
-#	(this should help cut down the number of OPs per packet considerably)
-
-
-. /usr/lib/sqm/functions.sh
-#sqm_logger IPT_MASK: ${IPT_MASK_STRING}
-ipt_setup() {
-
-ipt -t mangle -N QOS_MARK_${IFACE}
-
-ipt -t mangle -A QOS_MARK_${IFACE} -j MARK --set-mark 0x2${IPT_MASK_STRING}
-# You can go further with classification but...
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS1 -j MARK --set-mark 0x3${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS6 -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class EF -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class AF42 -j MARK --set-mark 0x1${IPT_MASK_STRING}
-ipt -t mangle -A QOS_MARK_${IFACE} -m tos  --tos Minimize-Delay -j MARK --set-mark 0x1${IPT_MASK_STRING}
-
-# and it might be a good idea to do it for udp tunnels too
-
-# Turn it on. Preserve classification if already performed
-
-if [ "$SQUASH_DSCP" = "1" ]
-then
-sqm_logger "Squashing differentiated services code points (DSCP) from ingress."
-ipt -t mangle -I PREROUTING -i $IFACE -m dscp ! --dscp 0 -j DSCP --set-dscp-class be
-else
-sqm_logger "Keeping differentiad services code points (DSCP) from ingress."
-ipt -t mangle -A PREROUTING -i $IFACE -m mark --mark 0x00${IPT_MASK_STRING} -g QOS_MARK_${IFACE} 
-fi
-
-ipt -t mangle -A POSTROUTING -o $IFACE -m mark --mark 0x00${IPT_MASK_STRING} -g QOS_MARK_${IFACE} 
-
-# The Syn optimization was nice but fq_codel does it for us
-# ipt -t mangle -A PREROUTING -i s+ -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -j MARK --set-mark 0x01
-# Not sure if this will work. Encapsulation is a problem period
-
-ipt -t mangle -I PREROUTING -i vtun+ -p tcp -j MARK --set-mark 0x2${IPT_MASK_STRING} # tcp tunnels need ordering
-
-# Emanating from router, do a little more optimization
-# but don't bother with it too much. 
-
-ipt -t mangle -A OUTPUT -p udp -m multiport --ports 123,53 -j DSCP --set-dscp-class AF42
-
-#Not clear if the second line is needed
-#ipt -t mangle -A OUTPUT -o $IFACE -g QOS_MARK_${IFACE}
-
-}
-
-
-MYBURST=1600	#sm: make burst and cburst as well as quantum configurable for ingress and egress in the GUI
-# TC rules
-
-egress() {
-
-CEIL=${UPLINK}
-PRIO_RATE=`expr $CEIL / 3` # Ceiling for priority
-BE_RATE=`expr $CEIL / 6`   # Min for best effort
-BK_RATE=`expr $CEIL / 6`   # Min for background
-BE_CEIL=`expr $CEIL - 16`  # A little slop at the top
-
-LQ="quantum `get_mtu $IFACE $CEIL`"
-HTB_BURSTS="burst ${MYBURST} cburst ${MYBURST}"
-
-$TC qdisc del dev $IFACE root 2> /dev/null
-$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12
-$TC class add dev $IFACE parent 1: classid 1:1 htb $LQ ${HTB_BURSTS} rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ ${HTB_BURSTS} rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:11 htb $LQ ${HTB_BURSTS} rate 128kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:12 htb $LQ ${HTB_BURSTS} rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:13 htb $LQ ${HTB_BURSTS} rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`
-
-$TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${PRIO_RATE}` ${EQDISC_OPTS}
-$TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${EQDISC_OPTS}
-$TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}
-
-
-#sm: for testing we need a band to collect PPPOEd packets
-$TC class add dev $IFACE parent 1:1 classid 1:14 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
-$TC qdisc add dev $IFACE parent 1:14 handle 140: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}
-
-
-# Need a catchall rule (should also match VLANs and PPPoE packets)
-
-$TC filter add dev $IFACE parent 1:0 protocol all prio 999 u32 \
-        match ip protocol 0 0x00 flowid 1:12  
-
-# FIXME should probably change the filter here to do pre-nat
-        
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 1 handle 1 fw classid 1:11
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 2 handle 2 fw classid 1:12
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 3 handle 3 fw classid 1:13
-
-# ipv6 support. Note that the handle indicates the fw mark bucket that is looked for
-
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 4 handle 1 fw classid 1:11
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 5 handle 2 fw classid 1:12
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 6 handle 3 fw classid 1:13
-
-# Arp traffic
-
-$TC filter add dev $IFACE parent 1:0 protocol arp prio 7 handle 1 fw classid 1:11
-
-# ICMP traffic - Don't impress your friends. Deoptimize to manage ping floods
-# better instead
-
-$TC filter add dev $IFACE parent 1:0 protocol ip prio 8 \
-	 u32 match ip protocol 1 0xff flowid 1:13
-
-$TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 9 \
-	 u32 match ip protocol 1 0xff flowid 1:13
-
-
-
-
-# PPPoE encapsulated packets traversing the router (e.g.: the router does PPPoE termination but we shape 
-# on the underlaying ethernet interface instead of the pppoe device)
-
-PPPOE_SESSION_ETHERTYPE="0x8864"
-PPPOE_DISCOVERY_ETHERTYPE="0x8863"
-PPP_PROTO_IP4="0x0021"
-PPP_PROTO_IP6="0x0057"
-ARP_PROTO_IP4="0x0806"
-
-# NOTE it seems prio can not be reused?
-#$TC filter add dev $IFACE protocol 0x8863 parent 1:0 prio 1 u32 flowid 1:14
-# PPPoE can be selected for by ether_type, the encapsulated IP version from the PPP (0x0021 IPv4, 0x0057 IPv6)
-#U32_PREFIX="$TC filter add dev $IFACE" parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE}"
-
-#BE: 1:12 is the default anyway, but this will catch all non marked packets
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 400 u32 \
-#	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-#	match u8 0x00 0xfb at 9 \
-#	flowid 1:12
-
-#AF42
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 401 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0x90 0xfc at 9 \
-	flowid 1:11
-#EF
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 402 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0xb8 0xfc at 9 \
-	flowid 1:11
-#CS1
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 403 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0x20 0xf0 at 9 \
-	flowid 1:13
-#IMM
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 404 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0x10 0xf0 at 9 \
-	flowid 1:11
-#CS3
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 405 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0xc0 0xf0 at 9 \
-	flowid 1:11
-#CS6
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 406 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0xe0 0xf0 at 9 \
-	flowid 1:11
-
-
-## Arp traffic
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 409 u32 \
-#	match u16 ${ARP_PROTO_IP4} 0xffff at 6 \
-#	flowid 1:14
-
-# ICMP traffic - Don't impress your friends. Deoptimize to manage ping floods
-# better instead; sm: really only deprio echo requestst and echo replies instead?
-# ECHO request, the rest stays in best effort
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 410 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0x01 0xff at 17 \
-	match u8 0x08 0xff at 28 \
-	flowid 1:13
-# ECHO reply
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 410 u32 \
-	match u16 ${PPP_PROTO_IP4} 0xffff at 6 \
-	match u8 0x01 0xff at 17 \
-	match u8 0x00 0xff at 28 \
-	flowid 1:13
-
-## ICMPv6 133-137 (NDP) is equivalent to IPv4 ARP, so only push echo request and reply into the bulk class
-## 133
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u8 0x85 0xff at 48 \
-#	match u8 0x3a 0xff at 14 \
-#	flowid 1:14
-## 134
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u8 0x86 0xff at 48 \
-#	match u8 0x3a 0xff at 14 \
-#	flowid 1:14
-## 135
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u8 0x87 0xff at 48 \
-#	match u8 0x3a 0xff at 14 \
-#	flowid 1:14
-## 136
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u8 0x88 0xff at 48 \
-#	match u8 0x3a 0xff at 14 \
-#	flowid 1:14
-## 137
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u8 0x89 0xff at 48 \
-#	match u8 0x3a 0xff at 14 \
-#	flowid 1:14
-
-# ICMPv6 echo request
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u8 0x3a 0xff at 14 \
-	match u8 0x80 0xff at 48 \
-	flowid 1:13
-# ICMPv6 echo reply
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 610 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u8 0x3a 0xff at 14 \
-	match u8 0x81 0xff at 48 \
-	flowid 1:13
-
-
-
-
-#IPV6
-#BE: careful, will override ICMP
-#$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 600 u32 \
-#	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-#	match u16 0x0000 0x0fb0 at 8 \
-#	flowid 1:12
-#AF42
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 601 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0900 0x0fc0 at 8 \
-	flowid 1:11
-#EF
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 602 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0b80 0x0fc0 at 8 \
-	flowid 1:11
-#CS1
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 603 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0200 0x0fc0 at 8 \
-	flowid 1:13
-#IMM
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 604 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0100 0x0fc0 at 8 \
-	flowid 1:11
-#CS3
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 605 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0c00 0x0fc0 at 8 \
-	flowid 1:11
-#CS6
-$TC filter add dev $IFACE parent 1:0 protocol ${PPPOE_SESSION_ETHERTYPE} prio 606 u32 \
-	match u16 ${PPP_PROTO_IP6} 0xffff at 6 \
-	match u16 0x0e00 0x0fc0 at 8 \
-	flowid 1:11
-
-
-
-
-#diffserv $IFACE
-
-}
-
-ingress() {
-
-CEIL=$DOWNLINK
-PRIO_RATE=`expr $CEIL / 3` # Ceiling for prioirty
-BE_RATE=`expr $CEIL / 6`   # Min for best effort
-BK_RATE=`expr $CEIL / 6`   # Min for background
-BE_CEIL=`expr $CEIL - 16`  # A little slop at the top
-
-LQ="quantum `get_mtu $IFACE $CEIL`"
-HTB_BURSTS="burst ${MYBURST} cburst ${MYBURST}"
-
-$TC qdisc del dev $IFACE handle ffff: ingress 2> /dev/null
-$TC qdisc add dev $IFACE handle ffff: ingress
-
-$TC qdisc del dev $DEV root  2> /dev/null
-
-if [ "$SQUASH_INGRESS" = "1" ]
-then
-sqm_logger "Do not perform DSCP based filtering on ingress. (1-tier classification)"
-# Revert to no dscp based filtering
-$TC qdisc del dev $DEV root 2>/dev/null
-$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
-$TC class add dev $DEV parent 1: classid 1:1 htb $LQ ${HTB_BURSTS} rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ ${HTB_BURSTS} rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit prio 0 `get_htb_adsll_string`
-$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
-
-else
-sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)"
-$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 12
-$TC class add dev $DEV parent 1: classid 1:1 htb $LQ ${HTB_BURSTS} rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ ${HTB_BURSTS} rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:11 htb $LQ ${HTB_BURSTS} rate 32kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:12 htb $LQ ${HTB_BURSTS} rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:13 htb $LQ ${HTB_BURSTS} rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`
-
-# I'd prefer to use a pre-nat filter but that causes permutation...
-
-$TC qdisc add dev $DEV parent 1:11 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 500` `get_flows ${PRIO_RATE}` ${IQDISC_OPTS}
-$TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 1500` `get_flows ${BE_RATE}` ${IQDISC_OPTS}
-$TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}
-
-#sm: for PPPoE packet testing
-$TC class add dev $DEV parent 1:1 classid 1:14 htb $LQ rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`
-$TC qdisc add dev $DEV parent 1:14 handle 140: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}
-
-
-
-#diffserv $DEV
-diffserv_pppoe $DEV
-
-fi
-
-ifconfig $DEV up
-
-# redirect all IP packets arriving in $IFACE to ifb0 
-
-$TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
-  match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-do_modules
-ipt_setup
-
-if [ "$UPLINK" -ne 0 ];
-then
-	egress
-	sqm_logger "egress shaping activated"
-else
-	sqm_logger "egress shaping deactivated"
-	tc qdisc del dev $IFACE root 2> /dev/null
-fi
-if [ "$DOWNLINK" -ne 0 ];
-then
-	ingress
-	sqm_logger "ingress shaping activated"
-else
-	sqm_logger "ingress shaping deactivated"
-	tc qdisc del dev $DEV root 2> /dev/null
-	tc qdisc del dev $IFACE ingress 2> /dev/null
-fi
-
-
-
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-
-# Comments
-# This does the right thing with ipv6 traffic.
-# It also tries to leverage diffserv to some sane extent. In particular,
-# the 'priority' queue is limited to 33% of the total, so EF, and IMM traffic
-# cannot starve other types. The rfc suggested 30%. 30% is probably
-# a lot in today's world.
-
-# Flaws
-# Many!
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos.help b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos.help
deleted file mode 100644
index cc9af9d6..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simple_pppoe.qos.help
+++ /dev/null
@@ -1,2 +0,0 @@
-BW-limited three-tier prioritisation scheme with fq_codel on each queue. Temporary version to implement shaping
-of pass through PPPOE encapsulated packets.
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos
deleted file mode 100755
index f06c2521..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-# Cero3 Simple Shaper
-# A 1 bin tc_codel and ipv6 enabled shaping script for
-# ethernet gateways. This is nearly the simplest possible
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-. /usr/lib/sqm/functions.sh
-sqm_logger "Starting simplest.qos"
-
-egress() {
-
-LQ="quantum `get_mtu $IFACE ${UPLINK}`"
-
-$TC qdisc del dev $IFACE root 2>/dev/null
-$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 10
-$TC class add dev $IFACE parent 1: classid 1:1 htb $LQ rate ${UPLINK}kbit ceil ${UPLINK}kbit `get_htb_adsll_string`
-$TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ rate ${UPLINK}kbit ceil ${UPLINK}kbit prio 0 `get_htb_adsll_string`
-$TC qdisc add dev $IFACE parent 1:10 handle 110: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_flows ${UPLINK}` ${EQDISC_OPTS}
-
-}
-
-
-ingress() {
-sqm_logger "ingress"
-$TC qdisc del dev $IFACE handle ffff: ingress 2>/dev/null
-$TC qdisc add dev $IFACE handle ffff: ingress
-
-LQ="quantum `get_mtu $IFACE ${DOWNLINK}`"
- 
-$TC qdisc del dev $DEV root 2>/dev/null
-$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
-$TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit `get_htb_adsll_string`
-$TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit prio 0 `get_htb_adsll_string`
-
-# FIXME: I'd prefer to use a pre-nat filter but we need to detect if nat is on this interface
-# AND we need to permute by a random number which we can't do from userspace filters
-
-# Most high rate flows are REALLY close. This stomps on those harder, but hurts on high rate long distance
-#$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC limit $LIMIT $ECN interval 20ms target 3ms `get_flows ${DOWNLINK}`
-$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
-
-ifconfig $DEV up
-
-# redirect all IP packets arriving in $IFACE to ifb0 
-
-$TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
-  match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-do_modules
-
-if [ "$UPLINK" -ne 0 ];
-then
-	egress
-	sqm_logger "egress shaping activated"
-else
-	sqm_logger "egress shaping deactivated"
-	tc qdisc del dev $IFACE root 2> /dev/null
-fi
-if [ "$DOWNLINK" -ne 0 ];
-then
-	ingress
-	sqm_logger "ingress shaping activated"
-else
-	sqm_logger "ingress shaping deactivated"
-	tc qdisc del dev $DEV root 2> /dev/null
-	tc qdisc del dev $IFACE ingress 2> /dev/null
-fi
-
-
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-
-# Comments
-# This does the right thing with ipv6 traffic.
-# Flaws
-# Many!
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos.help b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos.help
deleted file mode 100644
index c3592562..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/simplest.qos.help
+++ /dev/null
@@ -1 +0,0 @@
-Simplest possible configuration: HTB rate limiter with your qdisc attached.
diff --git a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/stop.sh b/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/stop.sh
deleted file mode 100755
index 29e213b6..00000000
--- a/trunk/package/feeds/packages/sqm-scripts/files/usr/lib/sqm/stop.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-#       Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-# allow passing in the IFACE as first command line argument
-[ ! -z ${1} ] && IFACE=${1}
-# now IFACE is defined so we can source functions.sh without creating a spurious ifb4ge00
-. /usr/lib/sqm/functions.sh
-# sqm_logger is defined in functions.sh...
-sqm_logger "${0}: Stopping ${IFACE}"
-
-# make sure to only delete the ifb associated with the current interface
-CUR_IFB=$( get_ifb_associated_with_if ${IFACE} )
-
-sqm_stop() {
-	tc qdisc del dev $IFACE ingress 2> /dev/null
-	tc qdisc del dev $IFACE root 2> /dev/null
-	[ ! -z "$CUR_IFB" ] && tc qdisc del dev $CUR_IFB root 2> /dev/null
-        [ ! -z "$CUR_IFB" ] && sqm_logger "${0}: ${CUR_IFB} shaper deleted"
-}
-
-ipt_stop() {
-	[ ! -z "$CUR_IFB" ] && ipt -t mangle -D POSTROUTING -o $CUR_IFB -m mark --mark 0x00 -g QOS_MARK_${IFACE} 
-	ipt -t mangle -D POSTROUTING -o $IFACE -m mark --mark 0x00 -g QOS_MARK_${IFACE} 
-	ipt -t mangle -D PREROUTING -i vtun+ -p tcp -j MARK --set-mark 0x2
-	ipt -t mangle -D OUTPUT -p udp -m multiport --ports 123,53 -j DSCP --set-dscp-class AF42
-	ipt -t mangle -F QOS_MARK_${IFACE}
-	ipt -t mangle -X QOS_MARK_${IFACE}
-}
-
-
-sqm_stop
-ipt_stop
-[ ! -z "$CUR_IFB" ] && ifconfig ${CUR_IFB} down
-[ ! -z "$CUR_IFB" ] && ip link delete ${CUR_IFB} type ifb
-[ ! -z "$CUR_IFB" ] && sqm_logger "${0}: ${CUR_IFB} interface deleted"
-
-exit 0
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/squid/Makefile b/trunk/package/feeds/packages/squid/Makefile
deleted file mode 100644
index aeab7657..00000000
--- a/trunk/package/feeds/packages/squid/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=squid
-PKG_VERSION:=3.5.2
-PKG_RELEASE:=2
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v3/3.5/
-PKG_MD5SUM:=0330ec9f69e333c2a81fa4502ba96a22
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/squid/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  URL:=http://www.squid-cache.org/
-endef
-
-define Package/squid
-  $(call Package/squid/Default)
-  MENU:=1
-  DEPENDS:=+libopenssl +libpthread +librt +libltdl +libstdcpp +libgnutls
-  TITLE:=full-featured Web proxy cache
-endef
-
-define Package/squid/description
-  Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
-  It reduces bandwidth and improves response times by caching and reusing
-  frequently-requested web pages.
-endef
-
-define Package/squid-mod-cachemgr
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Web based proxy manager and reporting tool
-endef
-
-CONFIGURE_ARGS += \
-	--config-cache \
-	--datadir=/usr/share/squid \
-	--libexecdir=/usr/lib/squid \
-	--sysconfdir=/etc/squid \
-	--enable-shared \
-	--disable-static \
-	--enable-icmp \
-	--enable-delay-pools \
-	--enable-icap-client \
-	--enable-kill-parent-hack \
-	--disable-snmp \
-	--enable-ssl \
-	--enable-cache-digests \
-	--enable-auth \
-	--enable-auth-basic \
-	--enable-auth-ntlm \
-	--enable-auth-negotiate \
-	--enable-auth-digest \
-	--enable-linux-netfilter \
-	--disable-unlinkd \
-	--enable-x-accelerator-vary \
-	--disable-translation \
-	--disable-auto-locale \
-	--with-dl \
-	--with-pthreads \
-	--without-expat \
-	--without-libxml2 \
-	--without-nettle \
-	--with-openssl=$(STAGING_DIR)/usr \
-	--enable-epoll \
-	--with-maxfd=4096 \
-	--disable-external-acl-helpers \
-	--disable-auth-negotiate \
-	--disable-auth-ntlm \
-	--disable-auth-digest \
-	--disable-auth-basic \
-	--disable-arch-native \
-	--with-krb5-config=no \
-	--without-libcap \
-	--without-netfilter-conntrack \
-
-CONFIGURE_VARS += \
-	ac_cv_header_linux_netfilter_ipv4_h=yes \
-	ac_cv_epoll_works=yes \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Package/squid/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/squid.config $(1)/etc/config/squid
-
-	$(INSTALL_DIR) $(1)/etc/squid
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/squid/mime.conf $(1)/etc/squid/
-	$(INSTALL_CONF) ./files/squid.conf $(1)/etc/squid/
-
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/squid.init $(1)/etc/init.d/squid
-
-	$(INSTALL_DIR) $(1)/usr/share/squid/icons/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/squid/icons/* $(1)/usr/share/squid/icons/
-
-	$(INSTALL_DIR) $(1)/usr/share/squid/errors/templates/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/squid/errors/templates/* $(1)/usr/share/squid/errors/templates/
-endef
-
-define Package/squid-mod-cachemgr/install
-	$(INSTALL_DIR) $(1)/www/cgi-bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/cachemgr.cgi $(1)/www/cgi-bin/
-endef
-
-$(eval $(call BuildPackage,squid))
-$(eval $(call BuildPackage,squid-mod-cachemgr))
diff --git a/trunk/package/feeds/packages/squid/files/squid.conf b/trunk/package/feeds/packages/squid/files/squid.conf
deleted file mode 100644
index 96333ad7..00000000
--- a/trunk/package/feeds/packages/squid/files/squid.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-acl localnet src 10.0.0.0/8
-acl localnet src 172.16.0.0/12
-acl localnet src 192.168.0.0/16
-acl localnet src fc00::/7
-acl localnet src fe80::/10
-
-acl ssl_ports port 443
-
-acl safe_ports port 80
-acl safe_ports port 21
-acl safe_ports port 443
-acl safe_ports port 70
-acl safe_ports port 210
-acl safe_ports port 1025-65535
-acl safe_ports port 280
-acl safe_ports port 488
-acl safe_ports port 591
-acl safe_ports port 777
-acl connect method connect
-
-http_access deny !safe_ports
-http_access deny connect !ssl_ports
-
-http_access allow localhost manager
-http_access deny manager
-
-http_access deny to_localhost
-
-http_access allow localnet
-http_access allow localhost
-
-http_access deny all
-
-refresh_pattern ^ftp: 1440 20% 10080
-refresh_pattern ^gopher: 1440 0% 1440
-refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
-refresh_pattern . 0 20% 4320
-
-access_log none
-cache_log /dev/null
-cache_store_log /dev/null
-logfile_rotate 0
-
-logfile_daemon /dev/null
diff --git a/trunk/package/feeds/packages/squid/files/squid.config b/trunk/package/feeds/packages/squid/files/squid.config
deleted file mode 100644
index 4c0daae9..00000000
--- a/trunk/package/feeds/packages/squid/files/squid.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config squid 'squid'
-	option config_file '/etc/squid/squid.conf'
-	option http_port '3128'
-	option coredump_dir '/tmp/squid'
-	option visible_hostname 'OpenWrt'
diff --git a/trunk/package/feeds/packages/squid/files/squid.init b/trunk/package/feeds/packages/squid/files/squid.init
deleted file mode 100644
index 8b309484..00000000
--- a/trunk/package/feeds/packages/squid/files/squid.init
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/squid
-CONFIGFILE="/tmp/squid/squid.conf"
-
-validate_squid_section() {
-	uci_validate_section squid squid "${1}" \
-		'config_file:string' \
-		'http_port:port:3128' \
-		'coredump_dir:string' \
-		'visible_hostname:string:OpenWrt' \
-		'pinger_enable:string:off'
-}
-
-start_service() {
-	local config_file http_port coredump_dir visible_hostname pinger_enable
-
-	validate_squid_section squid || {
-		echo "validation failed"
-		return 1
-	}
-
-	mkdir -p $(dirname $CONFIGFILE)
-
-	cat $config_file > $CONFIGFILE
-	echo http_port $http_port >> $CONFIGFILE
-	echo coredump_dir $coredump_dir >> $CONFIGFILE
-	echo visible_hostname $visible_hostname >> $CONFIGFILE
-	echo pinger_enable $pinger_enable >> $CONFIGFILE
-
-	procd_open_instance
-	procd_set_param command $PROG -s -f $CONFIGFILE -N
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-        ${PROG} -f $CONFIGFILE -N -k shutdown 2>/dev/null
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "squid"
-	procd_add_validation validate_squid_section
-}
diff --git a/trunk/package/feeds/packages/squid/patches/001-cross_compile.patch b/trunk/package/feeds/packages/squid/patches/001-cross_compile.patch
deleted file mode 100644
index a6cc6e23..00000000
--- a/trunk/package/feeds/packages/squid/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -7759,7 +7759,7 @@ cache_cf.o: cf_parser.cci
- 
- # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
--	$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
-+	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
- 
- # squid.conf.default is built by cf_gen when making cf_parser.cci
- squid.conf.default squid.conf.documented: cf_parser.cci
---- a/configure
-+++ b/configure
-@@ -22935,7 +22935,7 @@ $as_echo_n "checking whether the SSL_get
-   if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
-+_as_fn_error $? "cannot run test program while cross compiling
- See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22983,7 +22983,7 @@ $as_echo_n "checking whether the workaro
-   if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
-+_as_fn_error $? "cannot run test program while cross compiling
- See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -28201,7 +28201,7 @@ else
-     if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
-+_as_fn_error $? "cannot run test program while cross compiling
- See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -28226,7 +28226,7 @@ else
-     if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
-+_as_fn_error $? "cannot run test program while cross compiling
- See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/trunk/package/feeds/packages/squid/patches/100-mime.patch b/trunk/package/feeds/packages/squid/patches/100-mime.patch
deleted file mode 100644
index 1138a413..00000000
--- a/trunk/package/feeds/packages/squid/patches/100-mime.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/mime.conf.default
-+++ b/src/mime.conf.default
-@@ -1,20 +1,3 @@
--## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
--##
--## Squid software is distributed under GPLv2+ license and includes
--## contributions from numerous individuals and organizations.
--## Please see the COPYING and CONTRIBUTORS files for details.
--##
--#
--# This file associates URL patterns for servers or services
--# that don't automatically include Content-Type (like ftp) with a mime type
--# and a graphical icon.
--#
--# Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1)
--#
--# This file has the format :
--#
--# regexp	content-type			icon				encoding mode	actions
--#--------------------------------------------------------------------------------------------------------
- \.gif$			image/gif		silk/image.png			-	image	+download
- \.mime$			www/mime		silk/page_white_text.png	-	ascii	+download
- ^internal-dirup$	-			silk/arrow_up.png		-	-
-@@ -191,6 +174,4 @@ README		text/plain			silk/information.pn
- \.xml$		text/xml			silk/page_world.png		-	ascii	+download
- \.xsl$		text/xml			silk/layout.png			-	ascii	+download
- \.xyz$		chemical/x-xyz			silk/chart_line.png		-	image	+download
--#
--# the default
- .		text/plain			silk/bullet_red.png		-	image	+download +view
diff --git a/trunk/package/feeds/packages/sshfs/Makefile b/trunk/package/feeds/packages/sshfs/Makefile
deleted file mode 100644
index d99dd927..00000000
--- a/trunk/package/feeds/packages/sshfs/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sshfs
-PKG_VERSION:=2.5
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-
-PKG_SOURCE:=$(PKG_NAME)-fuse-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/fuse
-PKG_MD5SUM:=17494910db8383a366b1301e5f5148a9
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/sshfs
-  TITLE:=SSHFS
-  DEPENDS:=+libfuse +fuse-utils +glib2 +libpthread
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  URL:=http://fuse.sourceforge.net/
-endef
-
-define Package/sshfs/description
-	Mount remote system over sftp.
-endef
-
-CONFIGURE_VARS += \
-	SSHFS_CFLAGS=" \
-		-D_FILE_OFFSET_BITS=64 \
-		-I$(STAGING_DIR)/usr/include/glib-2.0 \
-		-I$(STAGING_DIR)/usr/lib/glib-2.0/include \
-		-I$(STAGING_DIR)/usr/include/fuse" \
-	SSHFS_LIBS=" \
-		-lglib-2.0 -liconv $(if $(INTL_FULL),-lintl) -lfuse -pthread -lgthread-2.0 \
-		-L$(STAGING_DIR)/usr/lib"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/sshfs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sshfs $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,sshfs))
diff --git a/trunk/package/feeds/packages/sshtunnel/Makefile b/trunk/package/feeds/packages/sshtunnel/Makefile
deleted file mode 100644
index 48cdb79d..00000000
--- a/trunk/package/feeds/packages/sshtunnel/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-# Copyright (C) 2010 segal.di.ubi.pt
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sshtunnel
-PKG_VERSION:=3
-PKG_RELEASE:=3
-PKG_LICENSE:=GPL-2.0+
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sshtunnel
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=SSH
-  TITLE:=Manages Local and Remote openssh ssh(1) tunnels
-  DEPENDS:=+openssh-client
-endef
-
-define Package/sshtunnel/description
-Creates openssh ssh(1) Local and Remote tunnels configured in UCI file. Can be used to allow remote connections, possibly over NATed connections or without public IP/DNS
-endef
-
-define Package/sshtunnel/conffiles
-/etc/config/sshtunnel
-endef
-
-define Build/Compile
-endef
-
-define Package/sshtunnel/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sshtunnel.init $(1)/etc/init.d/sshtunnel
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/sshtunnel.sh $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/uci_sshtunnel $(1)/etc/config/sshtunnel
-endef
-
-$(eval $(call BuildPackage,sshtunnel))
diff --git a/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.init b/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.init
deleted file mode 100644
index 4ca491f6..00000000
--- a/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.init
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-PIDFILE="/tmp/run/sshtunnel"
-
-
-append_params() {
-	local p; local v; local args;
-	for p in $*; do
-		eval "v=\$$p"
-		[ -n "$v" ] && args="$args -o $p=$v"
-	done
-	
-	ARGS_options="${args# *}"
-}
-
-append_string() {
-	local varname="$1"; local add="$2"; local separator="${3:- }"; local actual
-	eval "actual=\$$varname"
-
-	new="${actual:+$actual$separator}$add"
-	eval "$varname=\$new"
-}
-
-load_tunnelR() {
-	config_get section_server $1 server
-	[ "$server" = "$section_server" ] || return 0 # continue to read next section if this is not for the current server
-	let count++ # count nr of valid sections to make sure there are at least one
-
-	config_get remoteaddress $1 remoteaddress "*"
-	config_get remoteport 	$1 remoteport
-	config_get localaddress $1 localaddress
-	config_get localport	$1 localport
-	
-        [ "$remoteport" -gt 0 ] || append_string "error" "[tunnelR: $1]remoteport must be a positive integer" "; "
-        [ "$localport" -gt 0 ] 	|| append_string "error" "[tunnelR: $1]localport must be a positive integer" "; "
-	[ -n "$error" ] && return 1
-
-	append_string "ARGS_tunnels" "-R $remoteaddress:$remoteport:$localaddress:$localport"
-}
-
-load_tunnelL() {
-	config_get section_server $1 server
-	[ "$server" = "$section_server" ] || return 0 # continue to read next section if this is not for the current server
-	let count++ # count nr of valid sections to make sure there are at least one
-
-	config_get localaddress $1 localaddress "*"	
-	config_get localport	$1 localport
-	config_get remoteaddress $1 remoteaddress
-	config_get remoteport 	$1 remoteport
-
-        [ "$remoteport" -gt 0 ] || append_string "error" "[tunnelL: $1]remoteport must be a positive integer" "; "
-        [ "$localport" -gt 0 ] 	|| append_string "error" "[tunnelL: $1]localport must be a positive integer" "; "
-	[ -n "$error" ] && return 1
-
-	append_string "ARGS_tunnels" "-L $localaddress:$localport:$remoteaddress:$remoteport"
-}
-
-load_tunnelD() {
-	config_get section_server $1 server
-	[ "$server" = "$section_server" ] || return 0 # continue to read next section if this is not for the current server
-	let count++ # count nr of valid sections to make sure there are at least one
-
-	config_get localaddress $1 localaddress "*"
-	config_get localport	$1 localport
-
-        [ "$remoteport" -gt 0 ] || append_string "error" "[tunnelD: $1]remoteport must be a positive integer" "; "
-        [ "$localport" -gt 0 ] 	|| append_string "error" "[tunnelD: $1]localport must be a positive integer" "; "
-	[ -n "$error" ] && return 1
-
-	append_string "ARGS_tunnels" "-D $localaddress:$localport"
-}
-
-load_tunnelW() {
-        config_get section_server $1 server
-        [ "$server" = "$section_server" ] || return 0 # continue to read next section if this is not for the current server
-        let count++ # count nr of valid sections to make sure there are at least one
-
-        config_get localdev     $1 localdev "*"
-        config_get remotedev    $1 remotedev "*"
-        config_get vpntype      $1 vpntype "*"
-
-        [ "$vpntype" == "ethernet" ] || [ "$vpntype" == "point-to-point" ] || append_string "error" "[tunnelW: $1] vpntype must be \"ethernet\" (tap) or \"pointopoint\" (tun)" "; "
-        [ "$localdev" == "any" ] || [ "$localdev" -ge 0 ] || append_string "error" "[tunnelW: $1] localdev must be an integer or \"any\"" "; "
-        [ "$remotedev" == "any" ] || [ "$remotedev" -ge 0 ] || append_string "error" "[tunnelW: $1] remotedev must be an integer or \"any\"" "; "
-        [ "$user" == "root" ] || logger -p user.warn -t "sshtunnel" "warning: root is required unless the tunnel device has been created manually"
-        [ -n "$error" ] && return 1
-
-        append_string "ARGS_tunnels" "-w $localdev:$remotedev -o Tunnel=$vpntype"
-}
-
-load_server() {
-	server="$1"
-
-	config_get user 	$1 user
-	config_get hostname 	$1 hostname
-	config_get port		$1 port		"22"
-	config_get retrydelay 	$1 retrydelay	"60"
-	config_get PKCS11Provider	$1 PKCS11Provider
-	config_get CheckHostIP		$1 CheckHostIP
-	config_get Compression		$1 Compression
-	config_get CompressionLevel 	$1 CompressionLevel
-	config_get IdentityFile		$1 IdentityFile
-	config_get LogLevel 		$1 LogLevel
-	config_get ServerAliveCountMax 	$1 ServerAliveCountMax
-	config_get ServerAliveInterval 	$1 ServerAliveInterval
-	config_get StrictHostKeyChecking $1 StrictHostKeyChecking
-	config_get TCPKeepAlive		$1 TCPKeepAlive
-	config_get VerifyHostKeyDNS 	$1 VerifyHostKeyDNS
-		
-	error=""
-        [ -n "$user" ] \
-		|| append_string "error" "user is not set" "; "
-        [ -n "$hostname" ] \
-		|| append_string "error" "hostname is not set" "; "
-        [ "$retrydelay" -ge 1 ] \
-		|| append_string "error" "retrydelay must be a positive integer" "; "
-	[ -z "$PKCS11Provider" -o -f "$PKCS11Provider" ] \
-		|| append_string "error" "PKCS11Provider must be a pkcs11 shared library accessible" "; "
-	[ -z "$CheckHostIP" -o "$CheckHostIP"="yes" -o "$CheckHostIP"="no" ] \
-		|| append_string "error" "CheckHostIP must be 'yes' or 'no'" "; "
-	[ -z "$Compression" -o "$Compression"="yes" -o "$Compression"="no" ] \
-		|| append_string "error" "Compression must be 'yes' or 'no'" "; "
-	[ -z "$CompressionLevel" ] || [ "$CompressionLevel" -ge 1 -a "$CompressionLevel" -le 9 ] \
-		|| append_string "error" "CompressionLevel must be between 1 and 9" "; "
-	[ -z "$IdentityFile" -o -f "$IdentityFile" ] \
-		|| append_string "error" "IdentityFile $IdentityFile not accessible" "; "	
-	[ -z "$LogLevel" -o "$LogLevel" = "QUIET" -o "$LogLevel" = "FATAL" -o "$LogLevel" = "ERROR" -o \
-	 	"$LogLevel" = "INFO" -o "$LogLevel" = "VERBOSE" -o "$LogLevel" = "DEBUG" -o \
-		"$LogLevel" = "DEBUG1" -o "$LogLevel" = "DEBUG2" -o "$LogLevel" = "DEBUG3" ] \
-		|| append_string "error" "LogLevel is invalid" "; "
-	[ -z "$ServerAliveCountMax" ] || [ "$ServerAliveCountMax" -ge 1 ] \
-		|| append_string "error" "ServerAliveCountMax must be greater or equal than 1" "; "
-	[ -z "$ServerAliveInterval" ] || [ "$ServerAliveInterval" -ge 0 ] \
-		|| append_string "error" "ServerAliveInterval must be greater or equal than 0" "; "
-	[ -z "$StrictHostKeyChecking" -o "$StrictHostKeyChecking" = "yes" -o "$StrictHostKeyChecking" = "ask" -o "$StrictHostKeyChecking" = "no" ] \
-		|| append_string "error" "StrictHostKeyChecking must be 'yes', 'ask' or 'no'" "; "
-	[ -z "$TCPKeepAlive" -o "$TCPKeepAlive" = "yes" -o "$TCPKeepAlive" = "no" ] \
-		|| append_string "error" "TCPKeepAlive must be 'yes' or 'no'" "; "
-	[ -z "$VerifyHostKeyDNS" -o "$VerifyHostKeyDNS" = "yes" -o "$VerifyHostKeyDNS" = "no" ] \
-		|| append_string "error" "VerifyHostKeyDNS must be 'yes' or 'no'" "; "
-
-	[ -n "$error" ] && { logger -p user.err -t "sshtunnel" "tunnels to $server not started - $error"; return; }
-        
-
-	ARGS=""
-	ARGS_options=""
-        ARGS_tunnels=""
-
-	count=0
-        config_foreach load_tunnelR tunnelR && config_foreach load_tunnelL tunnelL && config_foreach load_tunnelD tunnelD
-	[ -n "$error" ] 	&& { logger -p user.err -t "sshtunnel" "tunnels to $server not started - $error"; return; }
-	[ "$count" -eq 0 ] 	&& { logger -p user.err -t "sshtunnel" "tunnels to $server not started - no tunnels defined"; return; }
-
-	append_params CheckHostIP Compression CompressionLevel IdentityFile LogLevel PKCS11Provider ServerAliveCountMax ServerAliveInterval StrictHostKeyChecking TCPKeepAlive VerifyHostKeyDNS
-	ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels -p $port $user@$hostname"
-
-	/usr/bin/sshtunnel.sh "$ARGS" "$retrydelay" "$server" &
-	echo $! >> "${PIDFILE}.pids"
-	logger -p user.info -t "sshtunnel" "started tunnels to $server (pid=$!;retrydelay=$retrydelay)" 
-}
-
-stop() {
-        if [ -f "$PIDFILE".pids ]
-        then
-                logger -p user.info -t "sshtunnel" "stopping all tunnels"
-                
-                while read pid
-                do
-			kill "$pid"	# kill mother process first
-
-			[ -f "${PIDFILE}_${pid}.pid" ] && { # if ssh was running, kill it also (mother process could be in retry wait)
-				start-stop-daemon -K -p "${PIDFILE}_${pid}.pid"
-				rm "${PIDFILE}_${pid}.pid"
-			}
-			
-			logger -p daemon.info -t "sshtunnel[$pid]" "tunnel stopped"
-			
-		done < "${PIDFILE}.pids"
-
-		rm "${PIDFILE}.pids"
-
-                logger -p user.info -t "sshtunnel" "all tunnels stopped"
-        else
-                logger -p user.info -t "sshtunnel" "no tunnels running"
-        fi
-}
-
-start() {
-        [ -f "${PIDFILE}.pids" ] && stop
-        
-	config_load sshtunnel
-	if [ -n "$(uci show sshtunnel.@server[0])" ] # at least one server section exists
-	then        
-		logger -p user.info -t "sshtunnel" "starting all tunnels"
-		config_foreach load_server server       
-		logger -p user.info -t "sshtunnel" "all tunnels started"	
-	else
-		logger -p user.info -t "sshtunnel" "no servers defined"
-	fi
-}
diff --git a/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.sh b/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.sh
deleted file mode 100644
index 0ff18a6a..00000000
--- a/trunk/package/feeds/packages/sshtunnel/files/sshtunnel.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh 
-
-PIDFILE="/tmp/run/sshtunnel"
-
-args="$1"
-retrydelay="$2"
-server="$3"
-
-while true
-do
-	logger -p daemon.info -t "sshtunnel[$$][$server]" "connection started"
-	
-	start-stop-daemon -S -p "${PIDFILE}_${$}.pid" -mx ssh -- $args &>/tmp/log/sshtunnel_$$ 
-	
-	logger -p daemon.err -t "sshtunnel[$$][$server]" < /tmp/log/sshtunnel_$$
-	rm /tmp/log/sshtunnel_$$
-	logger -p daemon.info -t "sshtunnel[$$][$server]" "ssh exited with code $?, retrying in $retrydelay seconds"
-	rm "${PIDFILE}_${$}.pid"
-
-	sleep "$retrydelay" & wait
-done
diff --git a/trunk/package/feeds/packages/sshtunnel/files/uci_sshtunnel b/trunk/package/feeds/packages/sshtunnel/files/uci_sshtunnel
deleted file mode 100644
index 52e68819..00000000
--- a/trunk/package/feeds/packages/sshtunnel/files/uci_sshtunnel
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# password authentication is not possible, public key authentication must be used.
-# set "option IdentityFile" to he file from which the identity (private key) for RSA or DSA authentication is read.  
-# The default is ~/.ssh/identity for protocol version 1, and ~/.ssh/id_rsa and ~/.ssh/id_dsa for protocol version 2.
-# ssh will also try to load certificate information from the filename obtained by appending -cert.pub to identity filenames.
-#
-
-#config server disney
-#	option user			mourinho
-#	option hostname			server.disney.com
-#	option port			22
-#	option retrydelay		1	
-#	option CheckHostIP		yes
-#	option Compression		no
-#	option CompressionLevel		6
-#	option IdentityFile		~/.ssh/id_rsa
-#	option LogLevel			INFO
-#	option PKCS11Provider		/lib/pteidpkcs11.so
-#	option ServerAliveCountMax	3
-#	option ServerAliveInterval	0
-#	option StrictHostKeyChecking	ask
-#	option TCPKeepAlive		yes
-#	option VerifyHostKeyDNS		yes
-
-# tunnelR(emote) - when the connection will be initiated to the R(emote) endpoint at
-# remoteaddress:remoteport and then forwarded to localaddress:localport
-#
-#config tunnelR http
-#	option server		disney
-#	option remoteaddress	*
-#	option remoteport	9009
-#	option localaddress	192.168.1.13
-#	option localport	80
-
-# tunnelL(ocal) - when the connection will be initiated to the L(ocal) endpoint at
-# localaddress:localport and then forwarded to remoteaddress:remoteport 
-#
-#config tunnelL test
-#	option server		disney
-#	option localaddress	*
-#	option localport	1022
-#	option remoteaddress	secretserver.disney.com
-#	option remoteport	22
-
-# tunnelD(ynamic) - when the connection will be initiated with the SOCKS4 or SOCKS5 protocol
-# to the local endpoint at localaddress:localport and then forwarded over the remote host
-#
-#config tunnelD proxy
-#	option server		disney
-#	option localaddress	*
-#	option localport	4055
-
-# tunnelW - creates TUN/TAP devices on client and server to establish a VPN tunnel between them
-# vpntypes:
-#  point-to-point = TUN
-#  ethernet = TAP
-#
-#config tunnelW proxy
-#	option server           disney
-#	option vpntype		point-to-point|ethernet
-#	option localdev		any|0|1|2|...
-#	option remotedev	any|0|1|2|...
-
diff --git a/trunk/package/feeds/packages/sslh/Makefile b/trunk/package/feeds/packages/sslh/Makefile
deleted file mode 100644
index e7f1c0e6..00000000
--- a/trunk/package/feeds/packages/sslh/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sslh
-PKG_VERSION:=v1.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://rutschle.net/tech/
-PKG_MD5SUM:=1fc3ada4bafaca5a9786cc1431f48ed4
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sslh
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=SSL/SSH multiplexer
-  URL:=http://rutschle.net/tech/sslh.shtml
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-endef
-
-define Package/sslh/conffiles
-/etc/config/sslh
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		USELIBCONFIG= \
-		USELIBWRAP= \
-		all
-endef
-
-define Package/sslh/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sslh-fork $(1)/usr/sbin/sslh
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,sslh))
diff --git a/trunk/package/feeds/packages/sslh/files/sslh.config b/trunk/package/feeds/packages/sslh/files/sslh.config
deleted file mode 100644
index 07ed02b4..00000000
--- a/trunk/package/feeds/packages/sslh/files/sslh.config
+++ /dev/null
@@ -1,30 +0,0 @@
-package 'sslh'
-
-config 'sslh' 'default'
-	# disable or enable
-	option 'enable' '1'
-	# listen defaults to '0.0.0.0:443' (all interfaces)
-	# multiple -p arguments may be supplied using a uci list
-	# -p <listenaddr>:<listenport>
-	option 'listen' ''
-	# ssh defaults to 'localhost:22'
-	# --ssh <sshhost>:<sshport>
-	option 'ssh' ''
-	# ssl defaults to 'localhost:443'
-	# --ssl <sslhost>:<sslport>
-	option 'ssl' ''
-	# openvpn defaults to 'localhost:1194'
-	# --openvpn <openvpnhost>:<openvpnport>
-	option 'openvpn' ''
-	# tinc defaults to 'localhost:655'
-	# --tinc <tinchost>:<tincport>
-	option 'tinc' ''
-	# xmpp defaults to 'localhost:5222'
-	# --xmpp <xmpphost>:<xmppport>
-	option 'xmpp' ''
-	# timeout (for ssh, then ssl is assumed) defaults to 2
-	# -t
-	option 'timeout' ''
-	# verbose defaults to off
-	# -v
-	option 'verbose' '0'
diff --git a/trunk/package/feeds/packages/sslh/files/sslh.init b/trunk/package/feeds/packages/sslh/files/sslh.init
deleted file mode 100644
index cc146864..00000000
--- a/trunk/package/feeds/packages/sslh/files/sslh.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
-
-START=95
-
-# XXX: pid-files are useless because sslh forks after creating them
-SERVICE_USE_PID=
-
-start_instance() {
-	local section="$1"
-
-	# check if section is enabled (default)
-	local enable
-	config_get_bool enable "${section}" 'enable' '0'
-	[ ${enable} -gt 0 ] || return 1
-
-	local args=""
-	local val
-	# A) listen parameter
-	config_get vals "${section}" listen
-	[ -n "${vals}" ] && for val in $vals; do append args "-p ${val}"; done
-	# B) ssh parameter
-	config_get val "${section}" ssh
-	[ -n "${val}" ] && append args "--ssh ${val}"
-	# C) ssl parameter
-	config_get val "${section}" ssl
-	[ -n "${val}" ] && append args "--ssl ${val}"
-	# D) openvpn parameter
-        config_get val "${section}" openvpn
-        [ -n "${val}" ] && append args "--openvpn ${val}"
-	# E) tinc parameter
-        config_get val "${section}" tinc
-        [ -n "${val}" ] && append args "--tinc ${val}"
-	# F) xmpp parameter
-	config_get val "${section}" xmpp
-	[ -n "${val}" ] && append args "--xmpp ${val}"
-	# G) timeout (before a connection is considered to be SSH)
-	config_get val "${section}" timeout
-	[ -n "${val}" ] && append args "-t ${val}"
-	# H) verbose parameter
-	local verbosed
-	config_get_bool verbosed "${section}" verbose 0
-	[ "${verbosed}" -ne 0 ] && append args "-v"
-
-	# Defaults were removed for --user and --pidfile options
-	# in sslh 1.11; Define them here instead.
-	append args "--user nobody"
-	append args "--pidfile /var/run/sslh.pid"
-
-	# XXX: allow more that one instance to run simultaneously
-	SERVICE_MATCH_NAME=1 SERVICE_NAME="sslh-dummy-$$" \
-	service_start /usr/sbin/sslh ${args}
-}
-
-start() {
-	config_load 'sslh'
-	config_foreach start_instance 'sslh'
-}
-
-stop() {
-	service_stop /usr/sbin/sslh
-}
diff --git a/trunk/package/feeds/packages/sslh/patches/001-no_sslh_select.patch b/trunk/package/feeds/packages/sslh/patches/001-no_sslh_select.patch
deleted file mode 100644
index 2b461f67..00000000
--- a/trunk/package/feeds/packages/sslh/patches/001-no_sslh_select.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -45,16 +45,12 @@ all: sslh $(MAN) echosrv
- version.h:
- 	./genver.sh >version.h
- 
--sslh: sslh-fork sslh-select
-+sslh: sslh-fork
- 
- sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS)
- 	#strip sslh-fork
- 
--sslh-select: version.h $(OBJS) sslh-select.o Makefile common.h
--	$(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS)
--	#strip sslh-select
--
- echosrv: $(OBJS) echosrv.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS)
- 
-@@ -85,7 +81,7 @@ distclean: clean
- 	rm -f tags cscope.*
- 
- clean:
--	rm -f sslh-fork sslh-select echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
-+	rm -f sslh-fork echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info
- 
- tags:
- 	ctags --globals -T *.[ch]
diff --git a/trunk/package/feeds/packages/ssmtp/Makefile b/trunk/package/feeds/packages/ssmtp/Makefile
deleted file mode 100644
index 3d243947..00000000
--- a/trunk/package/feeds/packages/ssmtp/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ssmtp
-PKG_VERSION:=2.64
-PKG_RELEASE:=1.1
-PKG_MAINTAINER:=Dirk Brenken <dibdot@gmail.com>
-PKG_LICENSE:=GPL-2.0+
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp
-PKG_MD5SUM:=65b4e0df4934a6cd08c506cabcbe584f
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(TARGET_CPPFLAGS)
-
-define Package/ssmtp
-  SECTION:=mail
-  CATEGORY:=Mail
-  DEPENDS:=+libopenssl
-  TITLE:=A minimal and secure mail sender with ssl support
-  URL:=http://packages.debian.org/ssmtp
-endef
-
-define Package/ssmtp/description
- A secure, effective and simple way of getting mail off a system to your
- mail hub. It contains no suid-binaries or other dangerous things - no
- mail spool to poke around in, and no daemons running in the background.
- Mail is simply forwarded to the configured mailhost. Extremely easy
- configuration.
-endef
-
-define Package/ssmtp/conffiles
-/etc/ssmtp/ssmtp.conf
-/etc/ssmtp/revaliases
-endef
-
-CONFIGURE_VARS += \
-	LIBS="$(TARGET_LDFLAGS) -lcrypto -lssl"
-
-CONFIGURE_ARGS += \
-	--enable-ssl
-
-define Package/ssmtp/install
-	$(INSTALL_DIR) $(1)/etc/ssmtp
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/
-endef
-
-define Package/ssmtp/postinst
-#!/bin/sh
-ln -sf ssmtp $${IPKG_INSTROOT}/usr/sbin/sendmail
-endef
-
-$(eval $(call BuildPackage,ssmtp))
diff --git a/trunk/package/feeds/packages/ssmtp/patches/002-fix_pointer.patch b/trunk/package/feeds/packages/ssmtp/patches/002-fix_pointer.patch
deleted file mode 100644
index f22e3d61..00000000
--- a/trunk/package/feeds/packages/ssmtp/patches/002-fix_pointer.patch
+++ /dev/null
@@ -1,466 +0,0 @@
---- a/ssmtp.c
-+++ b/ssmtp.c
-@@ -55,21 +55,21 @@ bool_t use_oldauth = False;		/* use old
- 
- #define ARPADATE_LENGTH 32		/* Current date in RFC format */
- char arpadate[ARPADATE_LENGTH];
--char *auth_user = (char)NULL;
--char *auth_pass = (char)NULL;
--char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
--char *mail_domain = (char)NULL;
--char *from = (char)NULL;		/* Use this as the From: address */
-+char *auth_user = NULL;
-+char *auth_pass = NULL;
-+char *auth_method = NULL;		/* Mechanism for SMTP authentication */
-+char *mail_domain = NULL;
-+char *from = NULL;		/* Use this as the From: address */
- char *hostname;
- char *mailhost = "mailhub";
--char *minus_f = (char)NULL;
--char *minus_F = (char)NULL;
-+char *minus_f = NULL;
-+char *minus_F = NULL;
- char *gecos;
--char *prog = (char)NULL;
-+char *prog = NULL;
- char *root = NULL;
- char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
--char *uad = (char)NULL;
--char *config_file = (char)NULL;		/* alternate configuration file */
-+char *uad = NULL;
-+char *config_file = NULL;		/* alternate configuration file */
- 
- headers_t headers, *ht;
- 
-@@ -261,7 +261,7 @@ char *strip_post_ws(char *str)
- 
- 	p = (str + strlen(str));
- 	while(isspace(*--p)) {
--		*p = (char)NULL;
-+		*p = '\0';
- 	}
- 
- 	return(p);
-@@ -279,7 +279,7 @@ char *addr_parse(char *str)
- #endif
- 
- 	/* Simple case with email address enclosed in <> */
--	if((p = strdup(str)) == (char *)NULL) {
-+	if((p = strdup(str)) == NULL) {
- 		die("addr_parse(): strdup()");
- 	}
- 
-@@ -287,7 +287,7 @@ char *addr_parse(char *str)
- 		q++;
- 
- 		if((p = strchr(q, '>'))) {
--			*p = (char)NULL;
-+			*p = '\0';
- 		}
- 
- #if 0
-@@ -310,7 +310,7 @@ char *addr_parse(char *str)
- 	q = strip_post_ws(p);
- 	if(*q == ')') {
- 		while((*--q != '('));
--		*q = (char)NULL;
-+		*q = '\0';
- 	}
- 	(void)strip_post_ws(p);
- 
-@@ -349,7 +349,6 @@ standardise() -- Trim off '\n's and doub
- */
- bool_t standardise(char *str, bool_t *linestart)
- {
--	size_t sl;
- 	char *p;
- 	bool_t leadingdot = False;
- 
-@@ -363,7 +362,7 @@ bool_t standardise(char *str, bool_t *li
- 	*linestart = False;
- 
- 	if((p = strchr(str, '\n'))) {
--		*p = (char)NULL;
-+		*p = '\0';
- 		*linestart = True;
- 	}
- 	return(leadingdot);
-@@ -384,7 +383,7 @@ void revaliases(struct passwd *pw)
- 		while(fgets(buf, sizeof(buf), fp)) {
- 			/* Make comments invisible */
- 			if((p = strchr(buf, '#'))) {
--				*p = (char)NULL;
-+				*p = '\0';
- 			}
- 
- 			/* Ignore malformed lines and comments */
-@@ -519,11 +518,11 @@ void rcpt_save(char *str)
- #endif
- 
- 	/* Ignore missing usernames */
--	if(*str == (char)NULL) {
-+	if(*str == '\0') {
- 		return;
- 	}
- 
--	if((rt->string = strdup(str)) == (char *)NULL) {
-+	if((rt->string = strdup(str)) == NULL) {
- 		die("rcpt_save() -- strdup() failed");
- 	}
- 
-@@ -548,7 +547,7 @@ void rcpt_parse(char *str)
- 	(void)fprintf(stderr, "*** rcpt_parse(): str = [%s]\n", str);
- #endif
- 
--	if((p = strdup(str)) == (char *)NULL) {
-+	if((p = strdup(str)) == NULL) {
- 		die("rcpt_parse(): strdup() failed");
- 	}
- 	q = p;
-@@ -576,7 +575,7 @@ void rcpt_parse(char *str)
- 		}
- 
- 		/* End of string? */
--		if(*(q + 1) == (char)NULL) {
-+		if(*(q + 1) == '\0') {
- 			got_addr = True;
- 		}
- 
-@@ -584,7 +583,7 @@ void rcpt_parse(char *str)
- 		if((*q == ',') && (in_quotes == False)) {
- 			got_addr = True;
- 
--			*q = (char)NULL;
-+			*q = '\0';
- 		}
- 
- 		if(got_addr) {
-@@ -668,7 +667,7 @@ void header_save(char *str)
- 	(void)fprintf(stderr, "header_save(): str = [%s]\n", str);
- #endif
- 
--	if((p = strdup(str)) == (char *)NULL) {
-+	if((p = strdup(str)) == NULL) {
- 		die("header_save() -- strdup() failed");
- 	}
- 	ht->string = p;
-@@ -676,7 +675,7 @@ void header_save(char *str)
- 	if(strncasecmp(ht->string, "From:", 5) == 0) {
- #if 1
- 		/* Hack check for NULL From: line */
--		if(*(p + 6) == (char)NULL) {
-+		if(*(p + 6) == '\0') {
- 			return;
- 		}
- #endif
-@@ -739,19 +738,19 @@ header_parse() -- Break headers into sep
- void header_parse(FILE *stream)
- {
- 	size_t size = BUF_SZ, len = 0;
--	char *p = (char *)NULL, *q;
-+	char *p = NULL, *q;
- 	bool_t in_header = True;
--	char l = (char)NULL;
-+	char l = '\0';
- 	int c;
- 
- 	while(in_header && ((c = fgetc(stream)) != EOF)) {
- 		/* Must have space for up to two more characters, since we
- 			may need to insert a '\r' */
--		if((p == (char *)NULL) || (len >= (size - 1))) {
-+		if((p == NULL) || (len >= (size - 1))) {
- 			size += BUF_SZ;
- 
- 			p = (char *)realloc(p, (size * sizeof(char)));
--			if(p == (char *)NULL) {
-+			if(p == NULL) {
- 				die("header_parse() -- realloc() failed");
- 			}
- 			q = (p + len);
-@@ -776,9 +775,9 @@ void header_parse(FILE *stream)
- 						in_header = False;
- 
- 				default:
--						*q = (char)NULL;
-+						*q = '\0';
- 						if((q = strrchr(p, '\n'))) {
--							*q = (char)NULL;
-+							*q = '\0';
- 						}
- 						header_save(p);
- 
-@@ -809,9 +808,9 @@ void header_parse(FILE *stream)
- 						in_header = False;
- 
- 				default:
--						*q = (char)NULL;
-+						*q = '\0';
- 						if((q = strrchr(p, '\n'))) {
--							*q = (char)NULL;
-+							*q = '\0';
- 						}
- 						header_save(p);
- 
-@@ -876,11 +875,11 @@ bool_t read_config()
- 		char *rightside;
- 		/* Make comments invisible */
- 		if((p = strchr(buf, '#'))) {
--			*p = (char)NULL;
-+			*p = '\0';
- 		}
- 
- 		/* Ignore malformed lines and comments */
--		if(strchr(buf, '=') == (char *)NULL) continue;
-+		if(strchr(buf, '=') == NULL) continue;
- 
- 		/* Parse out keywords */
- 		p=firsttok(&begin, "= \t\n");
-@@ -890,7 +889,7 @@ bool_t read_config()
- 		}
- 		if(p && q) {
- 			if(strcasecmp(p, "Root") == 0) {
--				if((root = strdup(q)) == (char *)NULL) {
-+				if((root = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -904,7 +903,7 @@ bool_t read_config()
- 					port = atoi(r);
- 				}
- 
--				if((mailhost = strdup(q)) == (char *)NULL) {
-+				if((mailhost = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -949,7 +948,7 @@ bool_t read_config()
- 					mail_domain = strdup(q);
- 				}
- 
--				if(mail_domain == (char *)NULL) {
-+				if(mail_domain == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 				rewrite_domain = True;
-@@ -1025,7 +1024,7 @@ bool_t read_config()
- 				}
- 			}
- 			else if(strcasecmp(p, "TLSCert") == 0) {
--				if((tls_cert = strdup(q)) == (char *)NULL) {
-+				if((tls_cert = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -1036,7 +1035,7 @@ bool_t read_config()
- #endif
- 			/* Command-line overrides these */
- 			else if(strcasecmp(p, "AuthUser") == 0 && !auth_user) {
--				if((auth_user = strdup(q)) == (char *)NULL) {
-+				if((auth_user = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -1045,7 +1044,7 @@ bool_t read_config()
- 				}
- 			}
- 			else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
--				if((auth_pass = strdup(q)) == (char *)NULL) {
-+				if((auth_pass = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -1054,7 +1053,7 @@ bool_t read_config()
- 				}
- 			}
- 			else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) {
--				if((auth_method = strdup(q)) == (char *)NULL) {
-+				if((auth_method = strdup(q)) == NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
-@@ -1119,14 +1118,11 @@ int smtp_open(char *host, int port)
- 	char buf[(BUF_SZ + 1)];
- 
- 	/* Init SSL stuff */
--	SSL_CTX *ctx;
--	SSL_METHOD *meth;
-+	SSL_CTX *ctx = NULL;
- 	X509 *server_cert;
--
- 	SSL_load_error_strings();
- 	SSLeay_add_ssl_algorithms();
--	meth=SSLv23_client_method();
--	ctx = SSL_CTX_new(meth);
-+	ctx = SSL_CTX_new(SSLv23_client_method());
- 	if(!ctx) {
- 		log_event(LOG_ERR, "No SSL support initiated\n");
- 		return(-1);
-@@ -1310,7 +1306,7 @@ char *fd_gets(char *buf, int size, int f
- 			buf[i++] = c;
- 		}
- 	}
--	buf[i] = (char)NULL;
-+	buf[i] = '\0';
- 
- 	return(buf);
- }
-@@ -1434,14 +1430,14 @@ int ssmtp(char *argv[])
- 	}
- 
- 	if((p = strtok(pw->pw_gecos, ";,"))) {
--		if((gecos = strdup(p)) == (char *)NULL) {
-+		if((gecos = strdup(p)) == NULL) {
- 			die("ssmtp() -- strdup() failed");
- 		}
- 	}
- 	revaliases(pw);
- 
- 	/* revaliases() may have defined this */
--	if(uad == (char *)NULL) {
-+	if(uad == NULL) {
- 		uad = append_domain(pw->pw_name);
- 	}
- 
-@@ -1489,7 +1485,7 @@ int ssmtp(char *argv[])
- 	/* Try to log in if username was supplied */
- 	if(auth_user) {
- #ifdef MD5AUTH
--		if(auth_pass == (char *)NULL) {
-+		if(auth_pass == NULL) {
- 			auth_pass = strdup("");
- 		}
- 
-@@ -1508,7 +1504,7 @@ int ssmtp(char *argv[])
- 		else {
- #endif
- 		memset(buf, 0, bufsize);
--		to64frombits(buf, auth_user, strlen(auth_user));
-+		to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
- 		if (use_oldauth) {
- 			outbytes += smtp_write(sock, "AUTH LOGIN %s", buf);
- 		}
-@@ -1520,7 +1516,7 @@ int ssmtp(char *argv[])
- 			}
- 			/* we assume server asked us for Username */
- 			memset(buf, 0, bufsize);
--			to64frombits(buf, auth_user, strlen(auth_user));
-+			to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
- 			outbytes += smtp_write(sock, buf);
- 		}
- 
-@@ -1530,7 +1526,7 @@ int ssmtp(char *argv[])
- 		}
- 		memset(buf, 0, bufsize);
- 
--		to64frombits(buf, auth_pass, strlen(auth_pass));
-+		to64frombits(buf, (unsigned char *)auth_pass, strlen(auth_pass));
- #ifdef MD5AUTH
- 		}
- #endif
-@@ -1737,7 +1733,7 @@ char **parse_options(int argc, char *arg
- 		j = 0;
- 
- 		add = 1;
--		while(argv[i][++j] != (char)NULL) {
-+		while(argv[i][++j] != '\0') {
- 			switch(argv[i][j]) {
- #ifdef INET6
- 			case '6':
-@@ -1755,14 +1751,14 @@ char **parse_options(int argc, char *arg
- 					if((!argv[i][(j + 1)])
- 						&& argv[(i + 1)]) {
- 						auth_user = strdup(argv[i+1]);
--						if(auth_user == (char *)NULL) {
-+						if(auth_user == NULL) {
- 							die("parse_options() -- strdup() failed");
- 						}
- 						add++;
- 					}
- 					else {
- 						auth_user = strdup(argv[i]+j+1);
--						if(auth_user == (char *)NULL) {
-+						if(auth_user == NULL) {
- 							die("parse_options() -- strdup() failed");
- 						}
- 					}
-@@ -1772,14 +1768,14 @@ char **parse_options(int argc, char *arg
- 					if((!argv[i][(j + 1)])
- 						&& argv[(i + 1)]) {
- 						auth_pass = strdup(argv[i+1]);
--						if(auth_pass == (char *)NULL) {
-+						if(auth_pass == NULL) {
- 							die("parse_options() -- strdup() failed");
- 						}
- 						add++;
- 					}
- 					else {
- 						auth_pass = strdup(argv[i]+j+1);
--						if(auth_pass == (char *)NULL) {
-+						if(auth_pass == NULL) {
- 							die("parse_options() -- strdup() failed");
- 						}
- 					}
-@@ -1870,14 +1866,14 @@ char **parse_options(int argc, char *arg
- 			case 'F':
- 				if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
- 					minus_F = strdup(argv[(i + 1)]);
--					if(minus_F == (char *)NULL) {
-+					if(minus_F == NULL) {
- 						die("parse_options() -- strdup() failed");
- 					}
- 					add++;
- 				}
- 				else {
- 					minus_F = strdup(argv[i]+j+1);
--					if(minus_F == (char *)NULL) {
-+					if(minus_F == NULL) {
- 						die("parse_options() -- strdup() failed");
- 					}
- 				}
-@@ -1889,14 +1885,14 @@ char **parse_options(int argc, char *arg
- 			case 'r':
- 				if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
- 					minus_f = strdup(argv[(i + 1)]);
--					if(minus_f == (char *)NULL) {
-+					if(minus_f == NULL) {
- 						die("parse_options() -- strdup() failed");
- 					}
- 					add++;
- 				}
- 				else {
- 					minus_f = strdup(argv[i]+j+1);
--					if(minus_f == (char *)NULL) {
-+					if(minus_f == NULL) {
- 						die("parse_options() -- strdup() failed");
- 					}
- 				}
---- a/base64.c
-+++ b/base64.c
-@@ -31,7 +31,7 @@ static const char base64val[] = {
- };
- #define DECODE64(c)  (isascii(c) ? base64val[c] : BAD)
- 
--void to64frombits(unsigned char *out, const unsigned char *in, int inlen)
-+void to64frombits(char *out, const unsigned char *in, int inlen)
- /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
- {
-     for (; inlen >= 3; inlen -= 3)
-@@ -57,7 +57,7 @@ void to64frombits(unsigned char *out, co
-     *out = '\0';
- }
- 
--int from64tobits(char *out, const char *in)
-+int from64tobits(unsigned char *out, const char *in)
- /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
- {
-     int len = 0;
---- a/ssmtp.h
-+++ b/ssmtp.h
-@@ -41,5 +41,5 @@ typedef struct string_list rcpt_t;
- void get_arpadate(char *);
- 
- /* base64.c */
--void to64frombits(unsigned char *, const unsigned char *, int);
--int from64tobits(char *, const char *);
-+void to64frombits(char *, const unsigned char *, int);
-+int from64tobits(unsigned char *, const char *);
diff --git a/trunk/package/feeds/packages/sstp-client/Makefile b/trunk/package/feeds/packages/sstp-client/Makefile
deleted file mode 100644
index 185e6c06..00000000
--- a/trunk/package/feeds/packages/sstp-client/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sstp-client
-PKG_VERSION:=1.0.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION)
-PKG_MD5SUM:=40f1d1b1596b4f1817ec903f58b2780c
-PKG_LICENSE=GPLv2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sstp-client
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS=+libevent2 +libopenssl +ppp
-  TITLE:=SSTP is Microsofts Remote Access Solution for PPP over SSL
-  URL:=http://sstp-client.sourceforge.net/
-  MAINTAINER:=Federico Di Marco <fededim@gmail.com>
-endef
-
-define Package/sstp-client/description
- It can be used instead of PPTP or L2TP, and is only available with Windows Vista/7 connecting to a Windows 2008 Server. The advantage of SSTP  compared to PPTP and L2TP is that it cannot be easily blocked by firewalls since the traffic is transmitted over HTTPS on port 443.
- Windows Vista/7 uses SSTP whenever PPTP or L2TP cannot be established. For further information on SSTP check out wikipedia's article on Secure Socket Tunneling Protocol.
-endef
-
-define Package/sstp-client/conffiles
-	/etc/ppp/chap-secrets
-	/etc/ppp/peers/peer-sstp-example-nopty.txt
-	/etc/ppp/peers/peer-sstp-example.txt
-endef
-
-define Package/sstp-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/sstpc $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libsstp-api/.libs/*.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/pppd-plugin/.libs/*.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/ppp
-	$(INSTALL_DIR) $(1)/etc/peers
-endef
-
-$(eval $(call BuildPackage,sstp-client))
diff --git a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/chap-secrets b/trunk/package/feeds/packages/sstp-client/files/etc/ppp/chap-secrets
deleted file mode 100644
index 3b937685..00000000
--- a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/chap-secrets
+++ /dev/null
@@ -1,4 +0,0 @@
-# Secrets for authentication using CHAP
-# client (domain\\username)	server		secret (password)	acceptable local IP addresses
-# SSTP-TEST\\JonDoe		sstp-test	'testme1234!'		*
-
diff --git a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example-nopty.txt b/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example-nopty.txt
deleted file mode 100644
index 0149220d..00000000
--- a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example-nopty.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-remotename 	sstp-test
-linkname 	sstp-test
-ipparam 	sstp-test
-name 		SSTP-TEST\\jdoe
-plugin      sstp-pppd-plugin.so
-sstp-sock   /tmp/sstp-uds-sock
-usepeerdns
-require-mppe
-noauth
-refuse-eap
-debug
-
-# adopt defaults from the pptp-linux package
-file /etc/ppp/options.pptp
diff --git a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example.txt b/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example.txt
deleted file mode 100644
index e96e1887..00000000
--- a/trunk/package/feeds/packages/sstp-client/files/etc/ppp/peers/peer-sstp-example.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-remotename 	sstp-test
-linkname 	sstp-test
-ipparam 	sstp-test
-pty 		"sstpc --server n3zz-dc1.sstp-test.net --nolaunchpppd "
-name 		SSTP-TEST\\jdoe
-plugin		sstp-pppd-plugin.so
-sstp-sock	/tmp/sstpc-uds-sock
-usepeerdns
-require-mppe
-refuse-eap
-noauth
-debug
-
-# adopt defaults from the pptp-linux package
-file /etc/ppp/options.pptp
diff --git a/trunk/package/feeds/packages/stm32flash/Makefile b/trunk/package/feeds/packages/stm32flash/Makefile
deleted file mode 100644
index c1f6b9b7..00000000
--- a/trunk/package/feeds/packages/stm32flash/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=stm32flash
-PKG_VERSION:=0.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://releases.stm32flash.googlecode.com/git
-PKG_MD5SUM:=ec9b5c8bae67f9a489786546d088bd14
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=gpl-2.0.txt
-include $(INCLUDE_DIR)/package.mk
-
-define Package/stm32flash
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://code.google.com/p/stm32flash/
-  TITLE:=Firmware flash tool for STM32's serial bootloader
-endef
-
-define Package/stm32flash/description
-  This tool can be used to burn firmware images to STM32 ARM processors
-  using the built-in serial bootloader.
-endef
-
-define Package/stm32flash/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stm32flash $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,stm32flash))
diff --git a/trunk/package/feeds/packages/stoken/Makefile b/trunk/package/feeds/packages/stoken/Makefile
deleted file mode 100644
index 7fcbdad7..00000000
--- a/trunk/package/feeds/packages/stoken/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=stoken
-PKG_VERSION:=0.8
-PKG_REV:=c4d79ffbf5053e44be4b64da22b1b7fb6a51daf2
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cernekee/stoken.git
-
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-PKG_LICENSE:=LGPL-2.1
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/stoken/Default
-  TITLE:=stoken is a tokencode generator compatible with RSA SecurID 128-bit (AES)
-  URL:=http://sourceforge.net/p/stoken/
-  DEPENDS:= +libxml2 +libnettle
-endef
-
-define Package/stoken
-  $(call Package/stoken/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libstoken
-  MENU:=1
-endef
-
-define Package/stoken/description
-  stoken is a tokencode generator compatible with RSA SecurID 128-bit (AES). This package contains the cli
-endef
-
-define Package/libstoken
-  $(call Package/stoken/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-endef
-
-CONFIGURE_ARGS += \
-	--with-nettle
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libstoken*.{la,a,so*} $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/stoken.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/stoken/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stoken $(1)/usr/bin/
-endef
-
-define Package/libstoken/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libstoken*.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,stoken))
-$(eval $(call BuildPackage,libstoken))
diff --git a/trunk/package/feeds/packages/strongswan/Config.in b/trunk/package/feeds/packages/strongswan/Config.in
deleted file mode 100644
index 5bb78aeb..00000000
--- a/trunk/package/feeds/packages/strongswan/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_strongswan
-
-# --with-routing-table
-config STRONGSWAN_ROUTING_TABLE
-	string
-	prompt "Set the IPsec routing table ID"
-	default "220"
-
-#  --with-routing-table-prio
-config STRONGSWAN_ROUTING_TABLE_PRIO
-	string
-	prompt "Set the IPsec routing table priority"
-	default "220"
-
-endmenu
diff --git a/trunk/package/feeds/packages/strongswan/Makefile b/trunk/package/feeds/packages/strongswan/Makefile
deleted file mode 100644
index 5a2e0fac..00000000
--- a/trunk/package/feeds/packages/strongswan/Makefile
+++ /dev/null
@@ -1,497 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=strongswan
-PKG_VERSION:=5.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/
-PKG_MD5SUM:=c52d4228231c2025d9c320d0e9990327
-PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_MOD_AVAILABLE:= \
-	addrblock \
-	aes \
-	af-alg \
-	agent \
-	attr \
-	attr-sql \
-	blowfish \
-	ccm \
-	cmac \
-	constraints \
-	coupling \
-	ctr \
-	curl \
-	des \
-	dhcp \
-	dnskey \
-	duplicheck \
-	eap-identity \
-	eap-md5 \
-	eap-mschapv2 \
-	eap-radius \
-	farp \
-	fips-prf \
-	gcm \
-	gcrypt \
-	gmp \
-	ha \
-	hmac \
-	kernel-libipsec \
-	kernel-netlink \
-	ldap \
-	led \
-	load-tester \
-	nonce \
-	md4 \
-	md5 \
-	mysql \
-	openssl \
-	padlock \
-	pem \
-	pgp \
-	pkcs1 \
-	pkcs8 \
-	pkcs11 \
-	pubkey \
-	random \
-	resolve \
-	revocation \
-	sha1 \
-	sha2 \
-	smp \
-	socket-default \
-	socket-dynamic \
-	sql \
-	sqlite \
-	stroke \
-	test-vectors \
-	unity \
-	uci \
-	updown \
-	whitelist \
-	x509 \
-	xauth-eap \
-	xauth-generic \
-	xcbc
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_STRONGSWAN_ROUTING_TABLE \
-	CONFIG_STRONGSWAN_ROUTING_TABLE_PRIO \
-	$(patsubst %,CONFIG_PACKAGE_strongswan-mod-%,$(PKG_MOD_AVAILABLE)) \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/strongswan/Default
-  SUBMENU:=VPN
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=StrongSwan
-  URL:=http://www.strongswan.org/
-endef
-
-define Package/strongswan/description/Default
- StrongSwan is an OpenSource IPsec implementation for the Linux operating system.
-endef
-
-define Package/strongswan
-$(call Package/strongswan/Default)
-  DEPENDS:= +libpthread +ip \
-	+kmod-crypto-authenc \
-	+kmod-ipsec +kmod-ipsec4 +kmod-ipsec6 \
-	+kmod-ipt-ipsec +iptables-mod-ipsec
-endef
-
-define Package/strongswan/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/strongswan/description
-$(call Package/strongswan/description/Default)
- This package contains shared libraries and scripts.
-endef
-
-define Package/strongswan-full
-$(call Package/strongswan/Default)
-  TITLE+= (full)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-mod-addrblock \
-	+strongswan-mod-aes \
-	+strongswan-mod-af-alg \
-	+strongswan-mod-agent \
-	+strongswan-mod-attr \
-	+strongswan-mod-attr-sql \
-	+strongswan-mod-blowfish \
-	+strongswan-mod-ccm \
-	+strongswan-mod-cmac \
-	+strongswan-mod-constraints \
-	+strongswan-mod-coupling \
-	+strongswan-mod-ctr \
-	+strongswan-mod-curl \
-	+strongswan-mod-des \
-	+strongswan-mod-dhcp \
-	+strongswan-mod-dnskey \
-	+strongswan-mod-duplicheck \
-	+strongswan-mod-eap-identity \
-	+strongswan-mod-eap-md5 \
-	+strongswan-mod-eap-mschapv2 \
-	+strongswan-mod-eap-radius \
-	+strongswan-mod-farp \
-	+strongswan-mod-fips-prf \
-	+strongswan-mod-gcm \
-	+strongswan-mod-gcrypt \
-	+strongswan-mod-gmp \
-	+strongswan-mod-ha \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-ldap \
-	+strongswan-mod-led \
-	+strongswan-mod-load-tester \
-	+strongswan-mod-nonce \
-	+strongswan-mod-md4 \
-	+strongswan-mod-md5 \
-	+strongswan-mod-mysql \
-	+strongswan-mod-openssl \
-	+TARGET_x86:strongswan-mod-padlock \
-	+strongswan-mod-pem \
-	+strongswan-mod-pgp \
-	+strongswan-mod-pkcs1 \
-	+strongswan-mod-pkcs8 \
-	+strongswan-mod-pkcs11 \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-resolve \
-	+strongswan-mod-revocation \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-sha2 \
-	+strongswan-mod-smp \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-sql \
-	+strongswan-mod-sqlite \
-	+strongswan-mod-stroke \
-	+strongswan-mod-test-vectors \
-	+strongswan-mod-uci \
-	+strongswan-mod-unity \
-	+strongswan-mod-updown \
-	+strongswan-mod-whitelist \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xauth-eap \
-	+strongswan-mod-xauth-generic \
-	+strongswan-mod-xcbc \
-	+strongswan-utils \
-	@DEVEL
-endef
-
-define Package/strongswan-full/description
-$(call Package/strongswan/description/Default)
- This meta-package contains dependencies for all of the strongswan plugins
- except kernel-libipsec,
- socket-dynamic and which are ommitted in favor of the kernel-netlink and
- socket-default plugins.
-endef
-
-
-define Package/strongswan-default
-$(call Package/strongswan/Default)
-  TITLE+= (default)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-mod-aes \
-	+strongswan-mod-attr \
-	+strongswan-mod-constraints \
-	+strongswan-mod-des \
-	+strongswan-mod-dnskey \
-	+strongswan-mod-fips-prf \
-	+strongswan-mod-gmp \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-md5 \
-	+strongswan-mod-nonce \
-	+strongswan-mod-pem \
-	+strongswan-mod-pgp \
-	+strongswan-mod-pkcs1 \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-resolve \
-	+strongswan-mod-revocation \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-sha2 \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-stroke \
-	+strongswan-mod-updown \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xauth-generic \
-	+strongswan-mod-xcbc \
-	+strongswan-utils
-endef
-
-define Package/strongswan-default/description
-$(call Package/strongswan/description/Default)
- This meta-package contains only dependencies to match upstream defaults.
-endef
-
-define Package/strongswan-minimal
-$(call Package/strongswan/Default)
-  TITLE+= (minimal)
-  DEPENDS:= +strongswan \
-	+strongswan-charon \
-	+strongswan-mod-aes \
-	+strongswan-mod-gmp \
-	+strongswan-mod-hmac \
-	+strongswan-mod-kernel-netlink \
-	+strongswan-mod-nonce \
-	+strongswan-mod-pubkey \
-	+strongswan-mod-random \
-	+strongswan-mod-sha1 \
-	+strongswan-mod-socket-default \
-	+strongswan-mod-stroke \
-	+strongswan-mod-updown \
-	+strongswan-mod-x509 \
-	+strongswan-mod-xcbc
-endef
-
-define Package/strongswan-minimal/description
-$(call Package/strongswan/description/Default)
- This meta-package contains only dependencies for a minimal IKEv2 setup.
-endef
-
-define Package/strongswan-charon
-$(call Package/strongswan/Default)
-  TITLE+= IKEv1/IKEv2 keying daemon
-  DEPENDS:= +strongswan
-endef
-
-define Package/strongswan-charon/description
-$(call Package/strongswan/description/Default)
- This package contains charon, an IKEv2 keying daemon.
-endef
-
-define Package/strongswan-utils
-$(call Package/strongswan/Default)
-  TITLE+= utilities
-  DEPENDS:= +strongswan
-endef
-
-define Package/strongswan-utils/description
-$(call Package/strongswan/description/Default)
- This package contains the pki & scepclient utilities.
-endef
-
-define BuildPlugin
-  define Package/strongswan-mod-$(1)
-    $$(call Package/strongswan/Default)
-    TITLE:= StrongSwan $(2) plugin
-    DEPENDS:= +strongswan $(3)
-  endef
-
-  define Package/strongswan-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/etc/strongswan.d/charon
-	if [ -f $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf ]; then \
-		$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf $$(1)/etc/strongswan.d/charon/; fi
-	$(INSTALL_DIR) $$(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-$(1).so \
-		$$(1)/usr/lib/ipsec/plugins/
-	$(call Plugin/$(1)/install,$$(1))
-  endef
-
-  $$(eval $$(call BuildPackage,strongswan-mod-$(1)))
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-scripts \
-	--disable-static \
-	--disable-fast \
-	--with-systemdsystemunitdir=no \
-	$(if $(CONFIG_PACKAGE_strongswan-utils),--enable-pki --enable-scepclient,--disable-pki --disable-scepclient) \
-	--with-random-device=/dev/random \
-	--with-urandom-device=/dev/urandom \
-	--with-routing-table="$(call qstrip,$(CONFIG_STRONGSWAN_ROUTING_TABLE))" \
-	--with-routing-table-prio="$(call qstrip,$(CONFIG_STRONGSWAN_ROUTING_TABLE_PRIO))" \
-	$(foreach m,$(PKG_MOD_AVAILABLE), \
-	  $(if $(CONFIG_PACKAGE_strongswan-mod-$(m)),--enable-$(m),--disable-$(m)) \
-	)
-
-EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-define Package/strongswan/conffiles
-/etc/ipsec.conf
-/etc/ipsec.secrets
-/etc/ipsec.user
-/etc/strongswan.conf
-endef
-
-define Package/strongswan/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/
-	$(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec
-endef
-
-define Package/strongswan-default/install
-	true
-endef
-
-define Package/strongswan-full/install
-	true
-endef
-
-define Package/strongswan-minimal/install
-	true
-endef
-
-define Package/strongswan-charon/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/charon $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libcharon.so.* $(1)/usr/lib/ipsec/
-endef
-
-define Package/strongswan-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pki $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/scepclient $(1)/usr/lib/ipsec/
-endef
-
-define Plugin/duplicheck/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/duplicheck $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-duplicheck.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/eap-radius/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libradius.so.* $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-eap-radius.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/attr-sql/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/pool $(1)/usr/lib/ipsec/
-endef
-
-define Plugin/stroke/install
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/aacerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/acerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/cacerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/certs
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/crls
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/ocspcerts
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/private
-	$(INSTALL_DIR) $(1)/etc/ipsec.d/reqs
-
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/ipsec.conf $(1)/etc/
-
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{starter,stroke} $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-stroke.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/updown/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/_updown $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-updown.so $(1)/usr/lib/ipsec/plugins/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/ipsec.user $(1)/etc/
-endef
-
-define Plugin/whitelist/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/whitelist $(1)/usr/lib/ipsec/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-whitelist.so $(1)/usr/lib/ipsec/plugins/
-endef
-
-define Plugin/kernel-libipsec/install
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libipsec.so.* $(1)/usr/lib/ipsec/
-endef
-
-$(eval $(call BuildPackage,strongswan))
-$(eval $(call BuildPackage,strongswan-default))
-$(eval $(call BuildPackage,strongswan-full))
-$(eval $(call BuildPackage,strongswan-minimal))
-$(eval $(call BuildPackage,strongswan-charon))
-$(eval $(call BuildPackage,strongswan-utils))
-$(eval $(call BuildPlugin,addrblock,RFC 3779 address block constraint support,))
-$(eval $(call BuildPlugin,aes,AES crypto,))
-$(eval $(call BuildPlugin,af-alg,AF_ALG crypto interface to Linux Crypto API,+kmod-crypto-user))
-$(eval $(call BuildPlugin,agent,SSH agent signing,))
-$(eval $(call BuildPlugin,attr,file based config,))
-$(eval $(call BuildPlugin,attr-sql,SQL based config,+strongswan-mod-sql +strongswan-charon))
-$(eval $(call BuildPlugin,blowfish,Blowfish crypto,))
-$(eval $(call BuildPlugin,ccm,CCM AEAD wrapper crypto,))
-$(eval $(call BuildPlugin,cmac,CMAC crypto,))
-$(eval $(call BuildPlugin,constraints,advanced X509 constraint checking,))
-$(eval $(call BuildPlugin,coupling,IKEv2 plugin to couple peer certificates permanently to authentication,))
-$(eval $(call BuildPlugin,ctr,Counter Mode wrapper crypto,))
-$(eval $(call BuildPlugin,curl,cURL fetcher plugin,+PACKAGE_strongswan-mod-curl:libcurl))
-$(eval $(call BuildPlugin,des,DES crypto,))
-$(eval $(call BuildPlugin,dhcp,DHCP based attribute provider,))
-$(eval $(call BuildPlugin,dnskey,DNS RR key decoding,))
-$(eval $(call BuildPlugin,duplicheck,advanced duplicate checking,))
-$(eval $(call BuildPlugin,eap-identity,EAP identity helper,))
-$(eval $(call BuildPlugin,eap-md5,EAP MD5 (CHAP) EAP auth,))
-$(eval $(call BuildPlugin,eap-mschapv2,EAP MS-CHAPv2 EAP auth,+strongswan-mod-md4 +strongswan-mod-des))
-$(eval $(call BuildPlugin,eap-radius,EAP RADIUS auth,))
-$(eval $(call BuildPlugin,farp,fake arp respsonses,))
-$(eval $(call BuildPlugin,fips-prf,FIPS PRF crypto,+strongswan-mod-sha1))
-$(eval $(call BuildPlugin,gcm,GCM AEAD wrapper crypto,))
-$(eval $(call BuildPlugin,gcrypt,libgcrypt,+PACKAGE_strongswan-mod-gcrypt:libgcrypt))
-$(eval $(call BuildPlugin,gmp,libgmp,+PACKAGE_strongswan-mod-gmp:libgmp))
-$(eval $(call BuildPlugin,ha,high availability cluster,))
-$(eval $(call BuildPlugin,hmac,HMAC crypto,))
-$(eval $(call BuildPlugin,kernel-libipsec,libipsec kernel interface,))
-$(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,))
-$(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap))
-$(eval $(call BuildPlugin,led,LED blink on IKE activity,))
-$(eval $(call BuildPlugin,load-tester,load testing,))
-$(eval $(call BuildPlugin,nonce,nonce genereation,))
-$(eval $(call BuildPlugin,md4,MD4 crypto,))
-$(eval $(call BuildPlugin,md5,MD5 crypto,))
-$(eval $(call BuildPlugin,mysql,MySQL database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-mysql:libmysqlclient-r))
-$(eval $(call BuildPlugin,openssl,OpenSSL crypto,+PACKAGE_strongswan-mod-openssl:libopenssl))
-$(eval $(call BuildPlugin,padlock,VIA PadLock crypto,@TARGET_x86))
-$(eval $(call BuildPlugin,pem,PEM decoding,))
-$(eval $(call BuildPlugin,pgp,PGP key decoding,))
-$(eval $(call BuildPlugin,pkcs1,PKCS1 key decoding,))
-$(eval $(call BuildPlugin,pkcs8,PKCS8 key decoding,))
-$(eval $(call BuildPlugin,pkcs11,PKCS11 key decoding,))
-$(eval $(call BuildPlugin,pubkey,raw public key,))
-$(eval $(call BuildPlugin,random,RNG,))
-$(eval $(call BuildPlugin,resolve,DNS resolver,))
-$(eval $(call BuildPlugin,revocation,X509 CRL/OCSP revocation,))
-$(eval $(call BuildPlugin,sha1,SHA1 crypto,))
-$(eval $(call BuildPlugin,sha2,SHA2 crypto,))
-$(eval $(call BuildPlugin,smp,SMP configuration and control interface,+PACKAGE_strongswan-mod-smp:libxml2))
-$(eval $(call BuildPlugin,socket-default,default socket implementation for charon,))
-$(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charon,))
-$(eval $(call BuildPlugin,sql,SQL database interface,))
-$(eval $(call BuildPlugin,sqlite,SQLite database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-sqlite:libsqlite3))
-$(eval $(call BuildPlugin,stroke,Stroke,+strongswan-utils))
-$(eval $(call BuildPlugin,test-vectors,crypto test vectors,))
-$(eval $(call BuildPlugin,uci,UCI config interface,+PACKAGE_strongswan-mod-uci:libuci))
-$(eval $(call BuildPlugin,unity,Cisco Unity extension,))
-$(eval $(call BuildPlugin,updown,updown firewall,))
-$(eval $(call BuildPlugin,whitelist,peer identity whitelisting,))
-$(eval $(call BuildPlugin,x509,x509 certificate,))
-$(eval $(call BuildPlugin,xauth-eap,EAP XAuth backend,))
-$(eval $(call BuildPlugin,xauth-generic,generic XAuth backend,))
-$(eval $(call BuildPlugin,xcbc,xcbc crypto,))
diff --git a/trunk/package/feeds/packages/strongswan/files/ipsec.init b/trunk/package/feeds/packages/strongswan/files/ipsec.init
deleted file mode 100644
index 391a2ae8..00000000
--- a/trunk/package/feeds/packages/strongswan/files/ipsec.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-STOP=10
-
-start() {
-	ipsec start
-}
-
-stop() {
-	ipsec stop
-}
-
-restart() {
-	ipsec restart
-}
-
-reload() {
-	ipsec update
-}
diff --git a/trunk/package/feeds/packages/strongswan/files/ipsec.secrets b/trunk/package/feeds/packages/strongswan/files/ipsec.secrets
deleted file mode 100644
index ddd49569..00000000
--- a/trunk/package/feeds/packages/strongswan/files/ipsec.secrets
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/ipsec.secrets - strongSwan IPsec secrets file
diff --git a/trunk/package/feeds/packages/strongswan/files/ipsec.user b/trunk/package/feeds/packages/strongswan/files/ipsec.user
deleted file mode 100644
index 4351ace3..00000000
--- a/trunk/package/feeds/packages/strongswan/files/ipsec.user
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is interpreted as shell script.
-# Put your custom ip rules here, they will
-# be executed with each call to the script
-# /usr/lib/ipsec/_updown which by default
-# strongswan executes.
-
diff --git a/trunk/package/feeds/packages/strongswan/patches/201-kmodloader.patch b/trunk/package/feeds/packages/strongswan/patches/201-kmodloader.patch
deleted file mode 100644
index 7d461563..00000000
--- a/trunk/package/feeds/packages/strongswan/patches/201-kmodloader.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/starter/netkey.c
-+++ b/src/starter/netkey.c
-@@ -31,7 +31,7 @@ bool starter_netkey_init(void)
- 		/* af_key module makes the netkey proc interface visible */
- 		if (stat(PROC_MODULES, &stb) == 0)
- 		{
--			ignore_result(system("modprobe -qv af_key"));
-+			ignore_result(system("modprobe af_key 2>&1 >/dev/null"));
- 		}
- 
- 		/* now test again */
-@@ -45,11 +45,11 @@ bool starter_netkey_init(void)
- 	/* make sure that all required IPsec modules are loaded */
- 	if (stat(PROC_MODULES, &stb) == 0)
- 	{
--		ignore_result(system("modprobe -qv ah4"));
--		ignore_result(system("modprobe -qv esp4"));
--		ignore_result(system("modprobe -qv ipcomp"));
--		ignore_result(system("modprobe -qv xfrm4_tunnel"));
--		ignore_result(system("modprobe -qv xfrm_user"));
-+		ignore_result(system("modprobe ah4 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe esp4 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe ipcomp 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe xfrm4_tunnel 2>&1 >/dev/null"));
-+		ignore_result(system("modprobe xfrm_user 2>&1 >/dev/null"));
- 	}
- 
- 	DBG2(DBG_APP, "found netkey IPsec stack");
diff --git a/trunk/package/feeds/packages/strongswan/patches/203-uci.patch b/trunk/package/feeds/packages/strongswan/patches/203-uci.patch
deleted file mode 100644
index 274ea869..00000000
--- a/trunk/package/feeds/packages/strongswan/patches/203-uci.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libcharon/plugins/uci/uci_parser.c
-+++ b/src/libcharon/plugins/uci/uci_parser.c
-@@ -78,7 +78,7 @@ METHOD(enumerator_t, section_enumerator_
- 		if (uci_lookup(this->ctx, &element, this->package,
- 					   this->current->name, "name") == UCI_OK)
- 		{	/* use "name" attribute as config name if available ... */
--			*value = uci_to_option(element)->value;
-+			*value = uci_to_option(element)->v.string;
- 		}
- 		else
- 		{	/* ... or the section name becomes config name */
-@@ -93,7 +93,7 @@ METHOD(enumerator_t, section_enumerator_
- 		if (value && uci_lookup(this->ctx, &element, this->package,
- 						  this->current->name, this->keywords[i]) == UCI_OK)
- 		{
--			*value = uci_to_option(element)->value;
-+			*value = uci_to_option(element)->v.string;
- 		}
- 	}
- 	va_end(args);
diff --git a/trunk/package/feeds/packages/strongswan/patches/300-include-ipsec-user-script.patch b/trunk/package/feeds/packages/strongswan/patches/300-include-ipsec-user-script.patch
deleted file mode 100644
index 6835e02f..00000000
--- a/trunk/package/feeds/packages/strongswan/patches/300-include-ipsec-user-script.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/_updown/_updown.in
-+++ b/src/_updown/_updown.in
-@@ -16,11 +16,9 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- 
--# CAUTION:  Installing a new version of strongSwan will install a new
--# copy of this script, wiping out any custom changes you make.  If
--# you need changes, make a copy of this under another name, and customize
--# that, and use the (left/right)updown parameters in ipsec.conf to make
--# strongSwan use yours instead of this default one.
-+# Add your custom ip rules to the /etc/ipsec.user file if you need that functionality.
-+
-+[ -e /etc/ipsec.user ] && . /etc/ipsec.user "$1"
- 
- #      PLUTO_VERSION
- #              indicates  what  version of this interface is being
diff --git a/trunk/package/feeds/packages/stunnel/Makefile b/trunk/package/feeds/packages/stunnel/Makefile
deleted file mode 100644
index 0b928b7f..00000000
--- a/trunk/package/feeds/packages/stunnel/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=stunnel
-PKG_VERSION:=5.14
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Michael Haas <haas@computerlinguist.org>
-PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL
-
-PKG_SOURCE_URL:=http://stunnel.cybermirror.org/archive/5.x/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=e716501960dc6856d80f92547298f724
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/stunnel
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl
-  TITLE:=SSL TCP Wrapper
-  URL:=http://www.stunnel.org/
-endef
-
-define Package/stunnel/description
-	Stunnel is a program that allows you to encrypt arbitrary TCP
-	connections inside SSL (Secure Sockets Layer) available on both Unix
-	and Windows. Stunnel can allow you to secure non-SSL aware daemons and
-	protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
-	encryption, requiring no changes to the daemon's code.
-endef
-
-define Package/stunnel/conffiles
-/etc/stunnel/stunnel.conf
-endef
-
-
-CONFIGURE_ARGS+= \
-	--with-random=/dev/urandom \
-	--with-threads=fork \
-	--with-ssl=$(STAGING_DIR)/usr \
-	--disable-libwrap \
-	--disable-systemd
-
-ifeq ($(CONFIG_IPV6),n)
-CONFIGURE_ARGS+= \
-	--disable-ipv6
-endif
-
-define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)/etc/stunnel
-	echo '#dummy' > $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.pem
-	$(call Build/Compile/Default)
-endef
-
-define Package/stunnel/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stunnel $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/stunnel
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/stunnel/libstunnel.so $(1)/usr/lib/stunnel/
-	$(INSTALL_DIR) $(1)/etc/stunnel
-	$(INSTALL_CONF) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/stunnel.init $(1)/etc/init.d/stunnel
-endef
-
-$(eval $(call BuildPackage,stunnel))
diff --git a/trunk/package/feeds/packages/stunnel/files/stunnel.conf b/trunk/package/feeds/packages/stunnel/files/stunnel.conf
deleted file mode 100644
index 2f10800b..00000000
--- a/trunk/package/feeds/packages/stunnel/files/stunnel.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-; Drop privileges
-setuid = nobody 
-setgid = nogroup
-
-; When running under procd, stay in foreground
-foreground = yes
-
-; Don't log to stderr, use syslog
-syslog = yes
-
-; 1-7. Use 7 for greatest verbosity
-;debug = 5
-
-; Starting here, enter your services or uncomment the examples
-
-; Example:
-; If your local httpd does not support HTTPS, use stunnel in remote
-; mode to forward TLS connections coming in on port 443 to non-TLS
-; on port 80.
-; Make sure that the cert is available.
-;[httpd]
-;accept = 443
-;connect = 127.0.0.1:80
-;cert = /etc/stunnel/stunnel.pem
-
-; Example:
-; If your local email client does not support TLS,
-; use stunnel in client mode to forward non-TLS connections on
-; port 143 to TLS-enabled servername:993.
-;[imap]
-;client = yes
-;accept = 143
-;connect = servername:993
-; Disable peer verification - be sure to understand the limitations of peer
-; verification in stunnel when enabling.
-;verify = 0
-
-; Default client section:
-; stunnel requires at least one section to start successfully.
-; You can safely remove this section once you have configured
-; your own. We use client mode here as server requires a certificate.
-[dummy]
-client = yes
-accept = localhost:6000
-connect = localhost:6001
diff --git a/trunk/package/feeds/packages/stunnel/files/stunnel.init b/trunk/package/feeds/packages/stunnel/files/stunnel.init
deleted file mode 100644
index e622205b..00000000
--- a/trunk/package/feeds/packages/stunnel/files/stunnel.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
-
-START=90
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command /usr/bin/stunnel /etc/stunnel/stunnel.conf
-	procd_set_param respawn # respawn automatically if something died
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/stunnel/patches/010_fix_getnameinfo.patch b/trunk/package/feeds/packages/stunnel/patches/010_fix_getnameinfo.patch
deleted file mode 100644
index 03acfafa..00000000
--- a/trunk/package/feeds/packages/stunnel/patches/010_fix_getnameinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/prototypes.h
-+++ b/src/prototypes.h
-@@ -590,7 +590,7 @@ extern GETNAMEINFO s_getnameinfo;
- 
- #endif /* USE_WIN32 */
- 
--int getnameinfo(const struct sockaddr *, int, char *, int, char *, int, int);
-+int getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, unsigned int);
- 
- #endif /* !defined HAVE_GETNAMEINFO */
- 
---- a/src/resolver.c
-+++ b/src/resolver.c
-@@ -538,8 +538,9 @@ const char *s_gai_strerror(int err) {
- /* implementation is limited to functionality needed by stunnel */
- 
- #ifndef HAVE_GETNAMEINFO
--int getnameinfo(const struct sockaddr *sa, int salen,
--    char *host, int hostlen, char *serv, int servlen, int flags) {
-+int getnameinfo(const struct sockaddr *sa, socklen_t salen,
-+    char *host, socklen_t hostlen, char *serv, socklen_t servlen,
-+    unsigned int flags) {
- 
- #if defined(USE_WIN32) && !defined(_WIN32_WCE)
-     if(s_getnameinfo)
diff --git a/trunk/package/feeds/packages/stunnel/patches/011_disable_ssp_linking.patch b/trunk/package/feeds/packages/stunnel/patches/011_disable_ssp_linking.patch
deleted file mode 100644
index 459c016d..00000000
--- a/trunk/package/feeds/packages/stunnel/patches/011_disable_ssp_linking.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5646,66 +5646,66 @@ done
- 
- 
- 
--for flag in -fstack-protector; do
--  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
--$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
--if eval \${$as_CACHEVAR+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--
--  ax_check_save_flags=$CFLAGS
--  CFLAGS="$CFLAGS  $flag"
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  eval "$as_CACHEVAR=yes"
--else
--  eval "$as_CACHEVAR=no"
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  CFLAGS=$ax_check_save_flags
--fi
--eval ac_res=\$$as_CACHEVAR
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
--  if ${CFLAGS+:} false; then :
--  case " $CFLAGS " in
--    *" $flag "*)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
--  (: CFLAGS already contains $flag) 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      ;;
--    *)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
--  (: CFLAGS="$CFLAGS $flag") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      CFLAGS="$CFLAGS $flag"
--      ;;
--   esac
--else
--  CFLAGS="$flag"
--fi
--
--else
--  :
--fi
--
--done
-+#for flag in -fstack-protector; do
-+#  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
-+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
-+#$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
-+#if eval \${$as_CACHEVAR+:} false; then :
-+#  $as_echo_n "(cached) " >&6
-+#else
-+#
-+#  ax_check_save_flags=$CFLAGS
-+#  CFLAGS="$CFLAGS  $flag"
-+#  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+#/* end confdefs.h.  */
-+
-+#int
-+#main ()
-+#{
-+#
-+#  ;
-+#  return 0;
-+#}
-+#_ACEOF
-+#if ac_fn_c_try_compile "$LINENO"; then :
-+#  eval "$as_CACHEVAR=yes"
-+#else
-+#  eval "$as_CACHEVAR=no"
-+#fi
-+#rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+#  CFLAGS=$ax_check_save_flags
-+#fi
-+#eval ac_res=\$$as_CACHEVAR
-+#	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+#$as_echo "$ac_res" >&6; }
-+#if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-+#  if ${CFLAGS+:} false; then :
-+#  case " $CFLAGS " in
-+#    *" $flag "*)
-+#      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
-+#  (: CFLAGS already contains $flag) 2>&5
-+#  ac_status=$?
-+#  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+#  test $ac_status = 0; }
-+#      ;;
-+#    *)
-+#      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-+#  (: CFLAGS="$CFLAGS $flag") 2>&5
-+#  ac_status=$?
-+#  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+#  test $ac_status = 0; }
-+#      CFLAGS="$CFLAGS $flag"
-+#      ;;
-+#   esac
-+#else
-+#  CFLAGS="$flag"
-+#fi
-+#
-+#else
-+#  :
-+#fi
-+#
-+#done
- 
- 
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
- AX_APPEND_COMPILE_FLAGS([-Wconversion])
- AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
- AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
--AX_APPEND_COMPILE_FLAGS([-fstack-protector])
-+#AX_APPEND_COMPILE_FLAGS([-fstack-protector])
- AX_APPEND_COMPILE_FLAGS([-fPIE])
- AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
- AX_APPEND_LINK_FLAGS([-fPIE -pie])
diff --git a/trunk/package/feeds/packages/sudo/Makefile b/trunk/package/feeds/packages/sudo/Makefile
deleted file mode 100644
index 69ace606..00000000
--- a/trunk/package/feeds/packages/sudo/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sudo
-PKG_VERSION:=1.8.13
-PKG_RELEASE:=1
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=doc/LICENSE
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist
-PKG_MD5SUM:=f61577ec330ad1bd504c0e2eec6ea2d8
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:=sudo/host
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sudo
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Delegate authority to run commands
-  URL:=http://www.sudo.ws/
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-endef
-
-define Package/sudo/description
- Sudo (su "do") allows a system administrator to delegate authority to
- give certain users (or groups of users) the ability to run some (or
- all) commands as root or another user while providing an audit trail of
- the commands and their arguments.
-endef
-
-define Package/sudo/conffiles
-/etc/sudoers
-endef
-
-CONFIGURE_ARGS+= \
-	--without-pam \
-	--disable-pam-session \
-	--with-editor=/bin/vi \
-	--without-lecture \
-	--disable-zlib \
-	--with-rundir=/var/lib/sudo \
-	--with-vardir=/var/lib/sudo
-
-CONFIGURE_VARS+= \
-	sudo_cv_uid_t_len=10 \
-	sudo_cv_func_unsetenv_void=no
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Compile
-	cd $(HOST_BUILD_DIR)/lib/util; \
-	    $(MAKE) mksiglist; $(MAKE) mksigname
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
-define Package/sudo/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/
-	chmod 4755 $(1)/usr/bin/sudo
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/
-	chmod 0440 $(1)/etc/sudoers
-	$(INSTALL_DIR) $(1)/etc/sudoers.d
-	$(INSTALL_DIR) $(1)/usr/lib/sudo
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo/*.so* $(1)/usr/lib/sudo/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo
-endef
-
-define Package/sudo/postinst
-#!/bin/sh
-
-[ -n "$$IPKG_INSTROOT" ] || {
-	/etc/init.d/sudo enable
-	/etc/init.d/sudo start
-}
-endef
-
-$(eval $(call BuildPackage,sudo))
diff --git a/trunk/package/feeds/packages/sudo/files/sudo.init b/trunk/package/feeds/packages/sudo/files/sudo.init
deleted file mode 100755
index 705fe841..00000000
--- a/trunk/package/feeds/packages/sudo/files/sudo.init
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=99
-
-start() {
-	[ -d /var/lib/sudo ] || {
-		mkdir -m 0755 -p /var/lib/sudo
-		chmod 0700 /var/lib/sudo
-	}
-}
diff --git a/trunk/package/feeds/packages/sudo/patches/010-cross-compile-fixes.patch b/trunk/package/feeds/packages/sudo/patches/010-cross-compile-fixes.patch
deleted file mode 100644
index 4e80d4d4..00000000
--- a/trunk/package/feeds/packages/sudo/patches/010-cross-compile-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in
---- sudo-1.8.11p2.orig/lib/util/Makefile.in	2014-10-07 22:26:20.000000000 +0200
-+++ sudo-1.8.11p2/lib/util/Makefile.in	2014-12-09 21:44:35.610041162 +0100
-@@ -17,6 +17,8 @@
- # @configure_input@
- #
- 
-+include $(TOPDIR)/rules.mk
-+
- #### Start of system configuration section. ####
- 
- srcdir = @srcdir@
-@@ -142,10 +144,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
- 	esac
- 
- siglist.c: mksiglist
--	./mksiglist > $@
-+	$(STAGING_DIR_HOST)/bin/mksiglist > $@
- 
- signame.c: mksigname
--	./mksigname > $@
-+	$(STAGING_DIR_HOST)/bin/mksigname > $@
- 
- mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
diff --git a/trunk/package/feeds/packages/sudo/patches/020-no-owner-change.patch b/trunk/package/feeds/packages/sudo/patches/020-no-owner-change.patch
deleted file mode 100644
index 417e95de..00000000
--- a/trunk/package/feeds/packages/sudo/patches/020-no-owner-change.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN sudo-1.8.11p2.orig/Makefile.in sudo-1.8.11p2/Makefile.in
---- sudo-1.8.11p2.orig/Makefile.in	2014-10-07 22:26:20.000000000 +0200
-+++ sudo-1.8.11p2/Makefile.in	2014-12-09 22:00:27.256934143 +0100
-@@ -62,7 +62,7 @@ SHELL = @SHELL@
- SED = @SED@
- 
- INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
--INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
-+INSTALL_OWNER =
- 
- ECHO_N = @ECHO_N@
- ECHO_C = @ECHO_C@
diff --git a/trunk/package/feeds/packages/sumo/Makefile b/trunk/package/feeds/packages/sumo/Makefile
deleted file mode 100644
index 83aa40d4..00000000
--- a/trunk/package/feeds/packages/sumo/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sumo
-PKG_VERSION:=0.23.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/sumo
-PKG_MD5SUM:=0df95a449d44808b8d3677af086e1af1
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += \
-	--with-xerces=$(STAGING_DIR)/usr \
-	--disable-debug \
-	--disable-dependency-tracking \
-	--disable-silent-rules
-
-define Package/sumo
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=SUMO - Simulation of Urban MObility
-  URL:=http://sumo-sim.org/
-  DEPENDS:=+libstdcpp +libxerces-c
-endef
-
-define Package/sumo/description
-  SUMO is a free and open traffic simulation suite which is available since 2001.
-  SUMO allows modelling of intermodal traffic systems including road vehicles,
-  public transport and pedestrians. Included with SUMO is a wealth of supporting
-  tools which handle tasks such as route finding, visualization, network import
-  and emission calculation. SUMO can be enhanced with custom models and provides
-  various APIs to remotely control the simulation.
-endef
-
-define Package/sumo/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{activitygen,dfrouter,duarouter,emissionsDrivingCycle,emissionsMap,jtrrouter,marouter,netconvert,netgenerate,od2trips,polyconvert,TraCITestClient} $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sumo $(1)/usr/bin/sumo-bin
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) files/sumo.sh $(1)/usr/sbin/sumo
-	$(INSTALL_DIR) $(1)/usr/share/sumo
-	$(CP) $(PKG_BUILD_DIR)/data $(1)/usr/share/sumo/
-endef
-
-$(eval $(call BuildPackage,sumo))
diff --git a/trunk/package/feeds/packages/sumo/files/sumo.sh b/trunk/package/feeds/packages/sumo/files/sumo.sh
deleted file mode 100644
index 0f0af4db..00000000
--- a/trunk/package/feeds/packages/sumo/files/sumo.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015 OpenWrt.org
-
-SUMO_HOME=/usr/share/sumo sumo-bin $@
-
-exit $?
diff --git a/trunk/package/feeds/packages/sumo/patches/100-configure_fix.patch b/trunk/package/feeds/packages/sumo/patches/100-configure_fix.patch
deleted file mode 100644
index 6fff18ca..00000000
--- a/trunk/package/feeds/packages/sumo/patches/100-configure_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,11 +13,6 @@ AC_LANG([C++])
- 
- dnl the debug check has to be made before the program checks
- dnl because it modifies CXXFLAGS
--if test x$CXX = xclang++; then
--    CXXFLAGS="-msse2 $CXXFLAGS"
--else
--    CXXFLAGS="-msse2 -mfpmath=sse $CXXFLAGS"
--fi
- AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[enable sumo debugging code [default=no].])])
- if test x$enable_debug = xyes; then
-     AC_DEFINE(_DEBUG, 1, [Define to 1 in order to enable sumo debugging code.])
diff --git a/trunk/package/feeds/packages/svox/Makefile b/trunk/package/feeds/packages/svox/Makefile
deleted file mode 100644
index 43c2b13c..00000000
--- a/trunk/package/feeds/packages/svox/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=svox
-PKG_VERSION:=1.0+git20130326
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/s/svox
-PKG_MD5SUM:=df4bf610ff4273b420e80ff64af93130
-
-PKG_MAINTAINER:=Alessandro Di Marco <dmr@ethzero.com>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/svox
-  TITLE:=SVOX PicoTTS text-to-speech engine
-  SECTION:=sound
-  CATEGORY:=Sound
-  URL:=https://android.googlesource.com/platform/external/svox/
-  DEPENDS:=+libpopt
-endef
-
-define Package/svox/description
-  SVOX is an embedded speech technology company founded in 2000 and
-  headquartered in Zurich, Switzerland. SVOX was acquired by Nuance
-  Communications in 2011. Company's products included Automated Speech
-  Recognition (ASR), Text-to-Speech (TTS) and Speech Dialog systems,
-  with customers mostly being manufacturers and system integrators in
-  automotive and mobile device industries.
-  SVOX TTS technology is characterized by natural and clear sound as well
-  as unique polyglot capability - the same voice can speak multiple
-  languages like a native speaker.
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	mv $(PKG_BUILD_DIR)/pico/* $(PKG_BUILD_DIR)
-endef
-
-define Package/svox/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pico2wave $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libttspico.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share/pico/lang
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pico/lang/* $(1)/usr/share/pico/lang/
-endef
-
-$(eval $(call BuildPackage,svox))
diff --git a/trunk/package/feeds/packages/svox/patches/0001-autoconf-building-of-library-using-libtool.patch b/trunk/package/feeds/packages/svox/patches/0001-autoconf-building-of-library-using-libtool.patch
deleted file mode 100644
index 73c76bbd..00000000
--- a/trunk/package/feeds/packages/svox/patches/0001-autoconf-building-of-library-using-libtool.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 9fe1aa475b2667446b081623abc5c6f6083a76e6 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Sat, 24 Oct 2009 17:03:37 +0200
-Subject: [PATCH 1/7] autoconf building of library (using libtool)
-
----
- pico/Makefile.am  |   36 ++++++++++++++++++++++++++++++++++++
- pico/autogen.sh   |   36 ++++++++++++++++++++++++++++++++++++
- pico/configure.in |   16 ++++++++++++++++
- 3 files changed, 88 insertions(+), 0 deletions(-)
- create mode 100644 pico/Makefile.am
- create mode 100755 pico/autogen.sh
- create mode 100644 pico/configure.in
-
---- /dev/null
-+++ b/pico/Makefile.am
-@@ -0,0 +1,36 @@
-+## Makefile.am -- Process this file with automake to produce Makefile.in
-+
-+ACLOCAL_AMFLAGS = -I m4
-+
-+lib_LTLIBRARIES = libttspico.la
-+libttspico_la_SOURCES = \
-+	lib/picoacph.c \
-+	lib/picoapi.c \
-+	lib/picobase.c \
-+	lib/picocep.c \
-+	lib/picoctrl.c \
-+	lib/picodata.c \
-+	lib/picodbg.c \
-+	lib/picoextapi.c \
-+	lib/picofftsg.c \
-+	lib/picokdbg.c \
-+	lib/picokdt.c \
-+	lib/picokfst.c \
-+	lib/picoklex.c \
-+	lib/picoknow.c \
-+	lib/picokpdf.c \
-+	lib/picokpr.c \
-+	lib/picoktab.c \
-+	lib/picoos.c \
-+	lib/picopal.c \
-+	lib/picopam.c \
-+	lib/picopr.c \
-+	lib/picorsrc.c \
-+	lib/picosa.c \
-+	lib/picosig.c \
-+	lib/picosig2.c \
-+	lib/picospho.c \
-+	lib/picotok.c \
-+	lib/picotrns.c \
-+	lib/picowa.c
-+
---- /dev/null
-+++ b/pico/autogen.sh
-@@ -0,0 +1,38 @@
-+#!/bin/sh
-+
-+#created by aclocal
-+rm -rf autom4te.cache
-+rm -f aclocal.m4
-+
-+#created by libtoolize
-+rm -rf m4
-+mkdir m4
-+rm -f ltmain.sh
-+
-+#created by autoconf
-+rm -f configure
-+
-+#created by automake
-+rm -f install-sh missing depcomp Makefile.in config.guess config.sub
-+rm -f INSTALL COPYING compile
-+
-+#created by ./configure
-+rm -rf .deps
-+rm -f Makefile config.log config.status libtool
-+
-+if [ "$1" = "clean" ]; then
-+    exit
-+fi
-+
-+IPATHS="-I lib"
-+
-+libtoolize
-+aclocal $IPATHS
-+automake --add-missing
-+autoconf $IPATHS
-+
-+rm -rf autom4te.cache
-+
-+echo "Now run ./configure and then make."
-+exit 0
-+
---- /dev/null
-+++ b/pico/configure.in
-@@ -0,0 +1,16 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ(2.59)
-+
-+AC_INIT([svox], [1.0], [math.parent@gmail.com])
-+
-+AM_INIT_AUTOMAKE([1.9 foreign])
-+
-+AC_PROG_CC
-+LT_INIT
-+AC_PROG_LIBTOOL
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
-+
-+AC_CONFIG_MACRO_DIR([m4])
diff --git a/trunk/package/feeds/packages/svox/patches/0002-gitignore-for-autotools-files.patch b/trunk/package/feeds/packages/svox/patches/0002-gitignore-for-autotools-files.patch
deleted file mode 100644
index df57df7f..00000000
--- a/trunk/package/feeds/packages/svox/patches/0002-gitignore-for-autotools-files.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b56b0a4bdf3e11271caab744f532cb055c517b51 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Sat, 24 Oct 2009 17:12:42 +0200
-Subject: [PATCH 2/7] gitignore for autotools files
-
----
- pico/.gitignore |   32 ++++++++++++++++++++++++++++++++
- 1 files changed, 32 insertions(+), 0 deletions(-)
- create mode 100644 pico/.gitignore
-
-diff --git a/pico/.gitignore b/pico/.gitignore
-new file mode 100644
-index 0000000..4235569
---- /dev/null
-+++ b/pico/.gitignore
-@@ -0,0 +1,32 @@
-+#created by aclocal
-+autom4te.cache
-+aclocal.m4
-+
-+#created by libtoolize
-+m4
-+ltmain.sh
-+
-+#created by autoconf
-+configure
-+
-+#created by automake
-+install-sh
-+missing
-+depcomp
-+Makefile.in
-+config.guess
-+config.sub
-+
-+#created by ./configure
-+.deps
-+Makefile
-+config.log
-+config.status
-+libtool
-+
-+#created by make
-+*.o
-+*.lo
-+.libs
-+libttspico.la
-+
--- 
-1.7.1
-
diff --git a/trunk/package/feeds/packages/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch b/trunk/package/feeds/packages/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
deleted file mode 100644
index 8ef4757e..00000000
--- a/trunk/package/feeds/packages/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 8bec80dccc9f4fe147a500486813f4e89a0d56d8 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Sun, 25 Oct 2009 15:19:01 +0100
-Subject: [PATCH 3/7] pico2wave: Convert text to .wav using svox text-to-speech system.
-
----
- pico/.gitignore      |    1 +
- pico/Makefile.am     |    7 +
- pico/bin/pico2wave.c |  341 ++++++++++++++++++++++++++++++++++++++++++++++++++
- pico/configure.in    |    3 +
- 4 files changed, 352 insertions(+), 0 deletions(-)
- create mode 100644 pico/bin/pico2wave.c
-
-diff --git a/pico/.gitignore b/pico/.gitignore
-index 4235569..a110298 100644
---- a/pico/.gitignore
-+++ b/pico/.gitignore
-@@ -29,4 +29,5 @@ libtool
- *.lo
- .libs
- libttspico.la
-+pico2wave
- 
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 6d8a10c..0d9472d 100644
---- a/pico/Makefile.am
-+++ b/pico/Makefile.am
-@@ -34,3 +34,10 @@ libttspico_la_SOURCES = \
- 	lib/picotrns.c \
- 	lib/picowa.c
- 
-+bin_PROGRAMS = pico2wave
-+pico2wave_SOURCES = \
-+	bin/pico2wave.c
-+pico2wave_LDADD = \
-+	libttspico.la -lm -lpopt
-+pico2wave_CFLAGS = -Wall -I lib
-+
-diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c
-new file mode 100644
-index 0000000..0c035a7
---- /dev/null
-+++ b/pico/bin/pico2wave.c
-@@ -0,0 +1,341 @@
-+/* pico2wave.c
-+
-+ * Copyright (C) 2009 Mathieu Parent <math.parent@gmail.com>
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ *
-+ *   Convert text to .wav using svox text-to-speech system.
-+ *
-+ */
-+
-+
-+#include <popt.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <picoapi.h>
-+#include <picoapid.h>
-+#include <picoos.h>
-+
-+
-+/* adaptation layer defines */
-+#define PICO_MEM_SIZE       2500000
-+#define DummyLen 100000000
-+
-+/* string constants */
-+#define MAX_OUTBUF_SIZE     128
-+const char * PICO_LINGWARE_PATH             = "./lang/";
-+const char * PICO_VOICE_NAME                = "PicoVoice";
-+
-+/* supported voices
-+   Pico does not seperately specify the voice and locale.   */
-+const char * picoSupportedLangIso3[]        = { "eng",              "eng",              "deu",              "spa",              "fra",              "ita" };
-+const char * picoSupportedCountryIso3[]     = { "USA",              "GBR",              "DEU",              "ESP",              "FRA",              "ITA" };
-+const char * picoSupportedLang[]            = { "en-US",            "en-GB",            "de-DE",            "es-ES",            "fr-FR",            "it-IT" };
-+const char * picoInternalLang[]             = { "en-US",            "en-GB",            "de-DE",            "es-ES",            "fr-FR",            "it-IT" };
-+const char * picoInternalTaLingware[]       = { "en-US_ta.bin",     "en-GB_ta.bin",     "de-DE_ta.bin",     "es-ES_ta.bin",     "fr-FR_ta.bin",     "it-IT_ta.bin" };
-+const char * picoInternalSgLingware[]       = { "en-US_lh0_sg.bin", "en-GB_kh0_sg.bin", "de-DE_gl0_sg.bin", "es-ES_zl0_sg.bin", "fr-FR_nk0_sg.bin", "it-IT_cm0_sg.bin" };
-+const char * picoInternalUtppLingware[]     = { "en-US_utpp.bin",   "en-GB_utpp.bin",   "de-DE_utpp.bin",   "es-ES_utpp.bin",   "fr-FR_utpp.bin",   "it-IT_utpp.bin" };
-+const int picoNumSupportedVocs              = 6;
-+
-+/* adapation layer global variables */
-+void *          picoMemArea         = NULL;
-+pico_System     picoSystem          = NULL;
-+pico_Resource   picoTaResource      = NULL;
-+pico_Resource   picoSgResource      = NULL;
-+pico_Resource   picoUtppResource    = NULL;
-+pico_Engine     picoEngine          = NULL;
-+pico_Char *     picoTaFileName      = NULL;
-+pico_Char *     picoSgFileName      = NULL;
-+pico_Char *     picoUtppFileName    = NULL;
-+pico_Char *     picoTaResourceName  = NULL;
-+pico_Char *     picoSgResourceName  = NULL;
-+pico_Char *     picoUtppResourceName = NULL;
-+int     picoSynthAbort = 0;
-+
-+
-+int main(int argc, const char *argv[]) {
-+    char * wavefile = NULL;
-+    char * lang = "en-US";
-+    int langIndex = -1, langIndexTmp = -1;
-+    char * text;
-+    int8_t * buffer;
-+    size_t bufferSize = 256;
-+    
-+    /* Parsing options */
-+	poptContext optCon; /* context for parsing command-line options */
-+	int opt; /* used for argument parsing */
-+
-+	struct poptOption optionsTable[] = {
-+		{ "wave", 'w', POPT_ARG_STRING, &wavefile, 0,
-+		  "Write output to this WAV file (extension SHOULD be .wav)", "filename.wav" },
-+		{ "lang", 'l', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &lang, 0,
-+		  "Language", "lang" },
-+		POPT_AUTOHELP
-+		POPT_TABLEEND
-+	};
-+	optCon = poptGetContext(NULL, argc, argv, optionsTable, POPT_CONTEXT_POSIXMEHARDER);
-+    poptSetOtherOptionHelp(optCon, "<words>");
-+
-+    /* Reporting about invalid extra options */
-+	while ((opt = poptGetNextOpt(optCon)) != -1) {
-+		switch (opt) {
-+		default:
-+			fprintf(stderr, "Invalid option %s: %s\n", 
-+				poptBadOption(optCon, 0), poptStrerror(opt));
-+			poptPrintHelp(optCon, stderr, 0);
-+			exit(1);
-+		}
-+	}
-+
-+    /* Mandatory option: --wave */
-+	if(!wavefile) {
-+		fprintf(stderr, "Mandatory option: %s\n\n", 
-+			"--wave=filename.wav");
-+		poptPrintHelp(optCon, stderr, 0);
-+		exit(1);
-+	}
-+	/* option: --lang */
-+	for(langIndexTmp =0; langIndexTmp<picoNumSupportedVocs; langIndexTmp++) {
-+	    if(!strcmp(picoSupportedLang[langIndexTmp], lang)) {
-+	        langIndex = langIndexTmp;
-+	        break;
-+	    }
-+	}
-+	if(langIndex == -1) {
-+		fprintf(stderr, "Unknown language: %s\nValid languages:\n", 
-+			lang);
-+	    for(langIndexTmp =0; langIndexTmp<picoNumSupportedVocs; langIndexTmp++) {
-+	        fprintf(stderr, "%s\n", picoSupportedLang[langIndexTmp]);
-+	    }
-+	    lang = "en-US";
-+		fprintf(stderr, "\n");
-+		poptPrintHelp(optCon, stderr, 0);
-+		exit(1);
-+	}
-+
-+	/* Remaining argument is <words> */
-+	const char **extra_argv;
-+	extra_argv = poptGetArgs(optCon);
-+    if(extra_argv) {
-+		text = (char *) &(*extra_argv)[0];
-+    } else {
-+        //TODO: stdin not supported yet.
-+		fprintf(stderr, "Missing argument: %s\n\n", 
-+			"<words>");
-+		poptPrintHelp(optCon, stderr, 0);
-+		exit(1);
-+    }
-+
-+    poptFreeContext(optCon);
-+    
-+    buffer = malloc( bufferSize );
-+    
-+    int ret, getstatus;
-+    pico_Char * inp = NULL;
-+    pico_Char * local_text = NULL;
-+    short       outbuf[MAX_OUTBUF_SIZE/2];
-+    pico_Int16  bytes_sent, bytes_recv, text_remaining, out_data_type;
-+    pico_Retstring outMessage;
-+    
-+    picoSynthAbort = 0;
-+
-+    picoMemArea = malloc( PICO_MEM_SIZE );
-+    if((ret = pico_initialize( picoMemArea, PICO_MEM_SIZE, &picoSystem ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot initialize pico (%i): %s\n", ret, outMessage);
-+        goto terminate;
-+    }
-+    
-+    /* Load the text analysis Lingware resource file.   */
-+    picoTaFileName      = (pico_Char *) malloc( PICO_MAX_DATAPATH_NAME_SIZE + PICO_MAX_FILE_NAME_SIZE );
-+    strcpy((char *) picoTaFileName,   PICO_LINGWARE_PATH);
-+    strcat((char *) picoTaFileName,   (const char *) picoInternalTaLingware[langIndex]);
-+    if((ret = pico_loadResource( picoSystem, picoTaFileName, &picoTaResource ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot load text analysis resource file (%i): %s\n", ret, outMessage);
-+        goto unloadTaResource;
-+    }
-+    
-+    /* Load the signal generation Lingware resource file.   */
-+    picoSgFileName      = (pico_Char *) malloc( PICO_MAX_DATAPATH_NAME_SIZE + PICO_MAX_FILE_NAME_SIZE );
-+    strcpy((char *) picoSgFileName,   PICO_LINGWARE_PATH);
-+    strcat((char *) picoSgFileName,   (const char *) picoInternalSgLingware[langIndex]);
-+    if((ret = pico_loadResource( picoSystem, picoSgFileName, &picoSgResource ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot load signal generation Lingware resource file (%i): %s\n", ret, outMessage);
-+        goto unloadSgResource;
-+    }
-+ 
-+    /* Load the utpp Lingware resource file if exists - NOTE: this file is optional
-+       and is currently not used. Loading is only attempted for future compatibility.
-+       If this file is not present the loading will still succeed.                      //
-+    picoUtppFileName      = (pico_Char *) malloc( PICO_MAX_DATAPATH_NAME_SIZE + PICO_MAX_FILE_NAME_SIZE );
-+    strcpy((char *) picoUtppFileName,   PICO_LINGWARE_PATH);
-+    strcat((char *) picoUtppFileName,   (const char *) picoInternalUtppLingware[langIndex]);
-+    ret = pico_loadResource( picoSystem, picoUtppFileName, &picoUtppResource );
-+    pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+    printf("pico_loadResource: %i: %s\n", ret, outMessage);
-+    */
-+    
-+    /* Get the text analysis resource name.     */
-+    picoTaResourceName  = (pico_Char *) malloc( PICO_MAX_RESOURCE_NAME_SIZE );
-+    if((ret = pico_getResourceName( picoSystem, picoTaResource, (char *) picoTaResourceName ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot get the text analysis resource name (%i): %s\n", ret, outMessage);
-+        goto unloadUtppResource;
-+    }
-+
-+    /* Get the signal generation resource name. */
-+    picoSgResourceName  = (pico_Char *) malloc( PICO_MAX_RESOURCE_NAME_SIZE );
-+    if((ret = pico_getResourceName( picoSystem, picoSgResource, (char *) picoSgResourceName ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot get the signal generation resource name (%i): %s\n", ret, outMessage);
-+        goto unloadUtppResource;
-+    }
-+
-+
-+    /* Create a voice definition.   */
-+    if((ret = pico_createVoiceDefinition( picoSystem, (const pico_Char *) PICO_VOICE_NAME ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot create voice definition (%i): %s\n", ret, outMessage);
-+        goto unloadUtppResource;
-+    }
-+
-+    /* Add the text analysis resource to the voice. */
-+    if((ret = pico_addResourceToVoiceDefinition( picoSystem, (const pico_Char *) PICO_VOICE_NAME, picoTaResourceName ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot add the text analysis resource to the voice (%i): %s\n", ret, outMessage);
-+        goto unloadUtppResource;
-+    }
-+    
-+    /* Add the signal generation resource to the voice. */
-+    if((ret = pico_addResourceToVoiceDefinition( picoSystem, (const pico_Char *) PICO_VOICE_NAME, picoSgResourceName ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot add the signal generation resource to the voice (%i): %s\n", ret, outMessage);
-+        goto unloadUtppResource;
-+    }
-+
-+    /* Create a new Pico engine. */
-+    if((ret = pico_newEngine( picoSystem, (const pico_Char *) PICO_VOICE_NAME, &picoEngine ))) {
-+        pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+        fprintf(stderr, "Cannot create a new pico engine (%i): %s\n", ret, outMessage);
-+        goto disposeEngine;
-+    }
-+    
-+    local_text = (pico_Char *) text ;
-+    text_remaining = strlen((const char *) local_text) + 1;
-+
-+    inp = (pico_Char *) local_text;
-+    
-+    size_t bufused = 0;
-+    
-+    picoos_Common common = (picoos_Common) pico_sysGetCommon(picoSystem);
-+
-+    picoos_SDFile sdOutFile = NULL;
-+
-+    picoos_bool done = TRUE;
-+    if(TRUE != (done = picoos_sdfOpenOut(common, &sdOutFile,
-+        (picoos_char *) wavefile, SAMPLE_FREQ_16KHZ, PICOOS_ENC_LIN)))
-+    {
-+        fprintf(stderr, "Cannot open output wave file\n");
-+        ret = 1;
-+        goto disposeEngine;
-+    }
-+    
-+    /* synthesis loop   */
-+    while (text_remaining) {
-+        /* Feed the text into the engine.   */
-+        if((ret = pico_putTextUtf8( picoEngine, inp, text_remaining, &bytes_sent ))) {
-+            pico_getSystemStatusMessage(picoSystem, ret, outMessage);
-+            fprintf(stderr, "Cannot put Text (%i): %s\n", ret, outMessage);
-+            goto disposeEngine;
-+        }
-+    
-+        text_remaining -= bytes_sent;
-+        inp += bytes_sent;
-+
-+        do {
-+            if (picoSynthAbort) {
-+                goto disposeEngine;
-+            }
-+            /* Retrieve the samples and add them to the buffer. */
-+            getstatus = pico_getData( picoEngine, (void *) outbuf,
-+                      MAX_OUTBUF_SIZE, &bytes_recv, &out_data_type );
-+            if((getstatus !=PICO_STEP_BUSY) && (getstatus !=PICO_STEP_IDLE)){
-+                pico_getSystemStatusMessage(picoSystem, getstatus, outMessage);
-+                fprintf(stderr, "Cannot get Data (%i): %s\n", getstatus, outMessage);
-+                goto disposeEngine;
-+            }
-+            if (bytes_recv) {
-+                if ((bufused + bytes_recv) <= bufferSize) {
-+                    memcpy(buffer+bufused, (int8_t *) outbuf, bytes_recv);
-+                    bufused += bytes_recv;
-+                } else {
-+                    done = picoos_sdfPutSamples(
-+                                        sdOutFile,
-+                                        bufused / 2,
-+                                        (picoos_int16*) (buffer));
-+                    bufused = 0;
-+                    memcpy(buffer, (int8_t *) outbuf, bytes_recv);
-+                    bufused += bytes_recv;
-+                }
-+            }
-+        } while (PICO_STEP_BUSY == getstatus);
-+        /* This chunk of synthesis is finished; pass the remaining samples. */
-+        if (!picoSynthAbort) {
-+                    done = picoos_sdfPutSamples(
-+                                        sdOutFile,
-+                                        bufused / 2,
-+                                        (picoos_int16*) (buffer));
-+        }
-+        picoSynthAbort = 0;
-+    }
-+    
-+    if(TRUE != (done = picoos_sdfCloseOut(common, &sdOutFile)))
-+    {
-+        fprintf(stderr, "Cannot close output wave file\n");
-+        ret = 1;
-+        goto disposeEngine;
-+    }
-+
-+disposeEngine:
-+    if (picoEngine) {
-+        pico_disposeEngine( picoSystem, &picoEngine );
-+        pico_releaseVoiceDefinition( picoSystem, (pico_Char *) PICO_VOICE_NAME );
-+        picoEngine = NULL;
-+    }
-+unloadUtppResource:
-+    if (picoUtppResource) {
-+        pico_unloadResource( picoSystem, &picoUtppResource );
-+        picoUtppResource = NULL;
-+    }
-+unloadSgResource:
-+    if (picoSgResource) {
-+        pico_unloadResource( picoSystem, &picoSgResource );
-+        picoSgResource = NULL;
-+    }
-+unloadTaResource:
-+    if (picoTaResource) {
-+        pico_unloadResource( picoSystem, &picoTaResource );
-+        picoTaResource = NULL;
-+    }
-+terminate:
-+    if (picoSystem) {
-+        pico_terminate(&picoSystem);
-+        picoSystem = NULL;
-+    }
-+    exit(ret);
-+}
-+
-diff --git a/pico/configure.in b/pico/configure.in
-index 0afb56d..349eb1d 100644
---- a/pico/configure.in
-+++ b/pico/configure.in
-@@ -14,3 +14,6 @@ AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
- 
- AC_CONFIG_MACRO_DIR([m4])
-+
-+AC_CHECK_LIB(popt, poptGetContext)
-+
--- 
-1.7.1
-
diff --git a/trunk/package/feeds/packages/svox/patches/0004-add-header-files.patch b/trunk/package/feeds/packages/svox/patches/0004-add-header-files.patch
deleted file mode 100644
index f0573082..00000000
--- a/trunk/package/feeds/packages/svox/patches/0004-add-header-files.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0866cb3f7cfe4b8bae1edc8d0dbf18c85e9ca74f Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Tue, 27 Oct 2009 18:29:45 +0100
-Subject: [PATCH 4/7] add header files
-
----
- pico/Makefile.am |   36 ++++++++++++++++++++++++++++++++++++
- 1 files changed, 36 insertions(+), 0 deletions(-)
-
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 0d9472d..9151042 100644
---- a/pico/Makefile.am
-+++ b/pico/Makefile.am
-@@ -34,6 +34,42 @@ libttspico_la_SOURCES = \
- 	lib/picotrns.c \
- 	lib/picowa.c
- 
-+libttspico_ladir = $(includedir)
-+libttspico_la_HEADERS = \
-+    lib/picoacph.h \
-+    lib/picoapid.h \
-+    lib/picoapi.h \
-+    lib/picobase.h \
-+    lib/picocep.h \
-+    lib/picoctrl.h \
-+    lib/picodata.h \
-+    lib/picodbg.h \
-+    lib/picodefs.h \
-+    lib/picodsp.h \
-+    lib/picoextapi.h \
-+    lib/picofftsg.h \
-+    lib/picokdbg.h \
-+    lib/picokdt.h \
-+    lib/picokfst.h \
-+    lib/picoklex.h \
-+    lib/picoknow.h \
-+    lib/picokpdf.h \
-+    lib/picokpr.h \
-+    lib/picoktab.h \
-+    lib/picoos.h \
-+    lib/picopal.h \
-+    lib/picopam.h \
-+    lib/picopltf.h \
-+    lib/picopr.h \
-+    lib/picorsrc.h \
-+    lib/picosa.h \
-+    lib/picosig2.h \
-+    lib/picosig.h \
-+    lib/picospho.h \
-+    lib/picotok.h \
-+    lib/picotrns.h \
-+    lib/picowa.h
-+
- bin_PROGRAMS = pico2wave
- pico2wave_SOURCES = \
- 	bin/pico2wave.c
--- 
-1.7.1
-
diff --git a/trunk/package/feeds/packages/svox/patches/0005-Install-lang-files.patch b/trunk/package/feeds/packages/svox/patches/0005-Install-lang-files.patch
deleted file mode 100644
index 95344e31..00000000
--- a/trunk/package/feeds/packages/svox/patches/0005-Install-lang-files.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 486b9f924bdf38f5f213feed2631060b44024c11 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Tue, 27 Oct 2009 23:06:46 +0100
-Subject: [PATCH 5/7] Install lang files
-
----
- pico/Makefile.am |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 9151042..8898050 100644
---- a/pico/Makefile.am
-+++ b/pico/Makefile.am
-@@ -70,6 +70,15 @@ libttspico_la_HEADERS = \
-     lib/picotrns.h \
-     lib/picowa.h
- 
-+picolangdir = $(datadir)/pico/lang
-+picolang_DATA = \
-+    lang/de-DE*.bin \
-+    lang/en-GB*.bin \
-+    lang/en-US*.bin \
-+    lang/es-ES*.bin \
-+    lang/fr-FR*.bin \
-+    lang/it-IT*.bin
-+
- bin_PROGRAMS = pico2wave
- pico2wave_SOURCES = \
- 	bin/pico2wave.c
--- 
-1.7.1
-
diff --git a/trunk/package/feeds/packages/svox/patches/0006-Set-picolangdir.patch b/trunk/package/feeds/packages/svox/patches/0006-Set-picolangdir.patch
deleted file mode 100644
index 1ec646d7..00000000
--- a/trunk/package/feeds/packages/svox/patches/0006-Set-picolangdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0102d423b79de7af982c8d4619d816f95a9b9278 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-Date: Thu, 29 Oct 2009 23:55:19 +0100
-Subject: [PATCH 6/7] Set picolangdir
-
----
- pico/Makefile.am     |    2 +-
- pico/bin/pico2wave.c |    4 ++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 8898050..a19c42a 100644
---- a/pico/Makefile.am
-+++ b/pico/Makefile.am
-@@ -84,5 +84,5 @@ pico2wave_SOURCES = \
- 	bin/pico2wave.c
- pico2wave_LDADD = \
- 	libttspico.la -lm -lpopt
--pico2wave_CFLAGS = -Wall -I lib
-+pico2wave_CFLAGS = -Wall -Dpicolangdir=\"$(picolangdir)\" -I lib
- 
-diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c
-index 0c035a7..ec7ab79 100644
---- a/pico/bin/pico2wave.c
-+++ b/pico/bin/pico2wave.c
-@@ -35,7 +35,11 @@
- 
- /* string constants */
- #define MAX_OUTBUF_SIZE     128
-+#ifdef picolangdir
-+const char * PICO_LINGWARE_PATH             = picolangdir "/";
-+#else
- const char * PICO_LINGWARE_PATH             = "./lang/";
-+#endif
- const char * PICO_VOICE_NAME                = "PicoVoice";
- 
- /* supported voices
--- 
-1.7.1
-
diff --git a/trunk/package/feeds/packages/svox/patches/0008-64bits.patch b/trunk/package/feeds/packages/svox/patches/0008-64bits.patch
deleted file mode 100644
index 883a42e6..00000000
--- a/trunk/package/feeds/packages/svox/patches/0008-64bits.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: fix execution on 64bit archs
-Bug: http://code.google.com/p/android/issues/detail?id=12224
-Author: Samuel Thibault <sthibault@debian.org>
-
---- svox/pico/lib/picoapi.c.original	2010-10-25 19:06:57.000000000 +0200
-+++ svox/pico/lib/picoapi.c	2010-10-25 19:07:18.000000000 +0200
-@@ -90,7 +90,7 @@
-         status = PICO_ERR_NULLPTR_ACCESS;
-     } else {
-         byte_ptr_t rest_mem;
--        picoos_uint32 rest_mem_size;
-+        picoos_objsize_t rest_mem_size;
-         pico_System sys;
-         picoos_MemoryManager sysMM;
-         picoos_ExceptionManager sysEM;
---- svox/pico/lib/picosig2.c.original	2010-10-26 00:17:18.000000000 +0200
-+++ svox/pico/lib/picosig2.c	2010-10-26 00:17:19.000000000 +0200
-@@ -568,7 +568,7 @@
-     for (nI = 1; nI < m1; nI++) {
-         XXr[nI] = c1[nI] << shift;
-     }
--    i = sizeof(picoos_int32) * (PICODSP_FFTSIZE + 1 - m1);
-+    i = sizeof(picoos_int32) * (PICODSP_FFTSIZE - m1);
-     picoos_mem_set(XXr + m1, 0, i);
-     dfct_nmf(m4, XXr); /* DFCT directly in fixed point */
- 
diff --git a/trunk/package/feeds/packages/svox/patches/0009-Fix-link-order.patch b/trunk/package/feeds/packages/svox/patches/0009-Fix-link-order.patch
deleted file mode 100644
index bcf3870f..00000000
--- a/trunk/package/feeds/packages/svox/patches/0009-Fix-link-order.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: svox-1.0+git20130326/pico/Makefile.am
-===================================================================
---- svox-1.0+git20130326.orig/pico/Makefile.am	2013-11-12 12:37:05.939979854 -0500
-+++ svox-1.0+git20130326/pico/Makefile.am	2013-11-12 13:00:52.336945041 -0500
-@@ -70,6 +70,8 @@
-     lib/picotrns.h \
-     lib/picowa.h
- 
-+libttspico_la_LIBADD = -lm
-+
- picolangdir = $(datadir)/pico/lang
- picolang_DATA = \
-     lang/de-DE*.bin \
-@@ -83,6 +85,6 @@
- pico2wave_SOURCES = \
- 	bin/pico2wave.c
- pico2wave_LDADD = \
--	libttspico.la -lm -lpopt
-+	libttspico.la -lpopt
- pico2wave_CFLAGS = -Wall -Dpicolangdir=\"$(picolangdir)\" -I lib
- 
diff --git a/trunk/package/feeds/packages/svox/patches/0010-platform.patch b/trunk/package/feeds/packages/svox/patches/0010-platform.patch
deleted file mode 100644
index ff76f752..00000000
--- a/trunk/package/feeds/packages/svox/patches/0010-platform.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/pico/lib/picopltf.h
-+++ b/pico/lib/picopltf.h
-@@ -39,6 +39,8 @@
- #define PICO_MacOSX     5   /* Macintosh OS X */
- #define PICO_Linux      7   /* Linux */
- 
-+#define PICO_GENERIC    99  /* Generic */
-+
- /* * definition of current platform ***/
- #if !defined(PICO_PLATFORM)
- #if defined(_WIN32)
-@@ -48,7 +50,7 @@
- #elif defined(linux) || defined(__linux__) || defined(__linux)
- #define PICO_PLATFORM    PICO_Linux
- #else
--#error PICO_PLATFORM not defined
-+#define PICO_PLATFORM    PICO_GENERIC
- #endif
- #endif /* !defined(PICO_PLATFORM) */
- 
-@@ -64,7 +66,8 @@
- #define PICO_PLATFORM_STRING "UnknownPlatform"
- #endif
- 
--#if (PICO_PLATFORM == PICO_MacOSX)
-+#include <endian.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
- #define PICO_ENDIANNESS ENDIANNESS_BIG
- #else
- #define PICO_ENDIANNESS ENDIANNESS_LITTLE
diff --git a/trunk/package/feeds/packages/svox/patches/0011-subdir.patch b/trunk/package/feeds/packages/svox/patches/0011-subdir.patch
deleted file mode 100644
index fa9e91ff..00000000
--- a/trunk/package/feeds/packages/svox/patches/0011-subdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/pico/configure.in b/pico/configure.in
---- a/pico/configure.in	2015-01-21 18:59:39.604452795 +0100
-+++ b/pico/configure.in	2015-01-21 19:00:53.288777298 +0100
-@@ -4,7 +4,7 @@
- 
- AC_INIT([svox], [1.0], [math.parent@gmail.com])
- 
--AM_INIT_AUTOMAKE([1.9 foreign])
-+AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
- 
- AC_PROG_CC
- LT_INIT
diff --git a/trunk/package/feeds/packages/svox/patches/0012-no-headers.patch b/trunk/package/feeds/packages/svox/patches/0012-no-headers.patch
deleted file mode 100644
index edf4d046..00000000
--- a/trunk/package/feeds/packages/svox/patches/0012-no-headers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -urN a/pico/Makefile.am b/pico/Makefile.am
---- a/pico/Makefile.am	2015-01-22 01:33:21.470895431 +0100
-+++ b/pico/Makefile.am	2015-01-22 01:36:03.042228475 +0100
-@@ -34,42 +34,6 @@
- 	lib/picotrns.c \
- 	lib/picowa.c
- 
--libttspico_ladir = $(includedir)
--libttspico_la_HEADERS = \
--    lib/picoacph.h \
--    lib/picoapid.h \
--    lib/picoapi.h \
--    lib/picobase.h \
--    lib/picocep.h \
--    lib/picoctrl.h \
--    lib/picodata.h \
--    lib/picodbg.h \
--    lib/picodefs.h \
--    lib/picodsp.h \
--    lib/picoextapi.h \
--    lib/picofftsg.h \
--    lib/picokdbg.h \
--    lib/picokdt.h \
--    lib/picokfst.h \
--    lib/picoklex.h \
--    lib/picoknow.h \
--    lib/picokpdf.h \
--    lib/picokpr.h \
--    lib/picoktab.h \
--    lib/picoos.h \
--    lib/picopal.h \
--    lib/picopam.h \
--    lib/picopltf.h \
--    lib/picopr.h \
--    lib/picorsrc.h \
--    lib/picosa.h \
--    lib/picosig2.h \
--    lib/picosig.h \
--    lib/picospho.h \
--    lib/picotok.h \
--    lib/picotrns.h \
--    lib/picowa.h
--
- libttspico_la_LIBADD = -lm
- 
- picolangdir = $(datadir)/pico/lang
diff --git a/trunk/package/feeds/packages/tar/Makefile b/trunk/package/feeds/packages/tar/Makefile
deleted file mode 100644
index 02d796b3..00000000
--- a/trunk/package/feeds/packages/tar/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tar
-PKG_VERSION:=1.28
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_MD5SUM:=8f32b2bc1ed7ddf4cf4e4a39711341b0
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tar
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+bzip2 +libacl +libattr
-  TITLE:=GNU tar
-  URL:=http://www.gnu.org/software/tar/
-endef
-
-define Package/tar/description
-	Tar is a program for packaging a set of files as a
-	single archive in tar format.
-endef
-
-define Package/tar/postinst
-#!/bin/sh
-if [ -e $${IPKG_INSTROOT}/bin/tar ]; then
-  rm -r $${IPKG_INSTROOT}/bin/tar;
-fi
-ln -sf /usr/bin/tar $${IPKG_INSTROOT}/bin/tar
-endef
-
-define Package/tar/postrm
-#!/bin/sh
-rm $${IPKG_INSTROOT}/bin/tar
-ln -s busybox $${IPKG_INSTROOT}/bin/tar
-$${IPKG_INSTROOT}/bin/tar 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/bin/tar
-exit 0
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDLAGS)"
-
-define Package/tar/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tar))
diff --git a/trunk/package/feeds/packages/taskwarrior/Makefile b/trunk/package/feeds/packages/taskwarrior/Makefile
deleted file mode 100644
index 0a2d62c0..00000000
--- a/trunk/package/feeds/packages/taskwarrior/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=taskwarrior
-PKG_VERSION:=2.4.1
-PKG_RELEASE:=1
-
-PKG_LICENSE:=MIT
-
-PKG_SOURCE:=task-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.taskwarrior.org/download/
-PKG_MD5SUM:=f250f3fb3922e4153c6ad1b1270dceb8
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/task-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/taskwarrior
-  TITLE:=taskwarrior
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libstdcpp +libuuid +libgnutls
-  URL:=http://taskwarrior.org/
-endef
-
-TARGET_LDFLAGS += -ldl
-
-define Package/taskwarrior/description
- taskwarrior is a command-line todo list manager
-endef
-
-define Package/taskwarrior/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/task $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,taskwarrior))
diff --git a/trunk/package/feeds/packages/tayga/Makefile b/trunk/package/feeds/packages/tayga/Makefile
deleted file mode 100644
index ba0d196c..00000000
--- a/trunk/package/feeds/packages/tayga/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tayga
-PKG_VERSION:=0.9.2
-PKG_RELEASE:=2
-
-PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.litech.org/tayga/
-PKG_MD5SUM:=7a7b24165ce008df772f398d86fa280e
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tayga
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+ip +kmod-ipv6 +kmod-tun
-  TITLE:=Out-of-kernel stateless NAT64 implementation for Linux
-  URL:=http://www.litech.org/tayga/
-  MAINTAINER:=Ondrej Caletka <ondrej@caletka.cz>
-endef
-
-define Package/tayga/description
-  TAYGA is an out-of-kernel stateless NAT64 implementation for
-  Linux.  It uses the TUN driver to exchange packets with the
-  kernel, which is the same driver used by OpenVPN and QEMU/KVM.
-endef
-
-ifdef CONFIG_PACKAGE_netifd
-  define Package/tayga/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/lib/netifd/proto
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tayga $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/tayga-proto.sh $(1)/lib/netifd/proto/tayga.sh
-  endef
-else
-  define Package/tayga/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/lib/network $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tayga $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/tayga.sh $(1)/lib/network/tayga.sh
-	$(INSTALL_DATA) ./files/tayga.hotplug $(1)/etc/hotplug.d/iface/95-tayga
-  endef
-endif
-
-$(eval $(call BuildPackage,tayga))
diff --git a/trunk/package/feeds/packages/tayga/files/tayga-proto.sh b/trunk/package/feeds/packages/tayga/files/tayga-proto.sh
deleted file mode 100755
index b92c2a66..00000000
--- a/trunk/package/feeds/packages/tayga/files/tayga-proto.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# tayga.sh - TAYGA proto
-# Copyright (c) 2014 OpenWrt.org
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_tayga_setup() {
-	local cfg="$1"
-	local iface="$2"
-	local link="tayga-$cfg"
-
-	local ipv4_addr ipv6_addr prefix dynamic_pool ipaddr ip6addr noroutes
-	json_get_vars ipv4_addr ipv6_addr prefix dynamic_pool ipaddr ip6addr noroutes
-	[ -z "$ipv4_addr" -o -z "$prefix" ] && {
-		proto_notify_error "$cfg" "REQUIRED_PARAMETERS_MISSING"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	local tmpconf="/var/etc/tayga-$cfg.conf"
-	mkdir -p /var/etc
-	mkdir -p /var/run/tayga/$cfg
-
-	echo "tun-device $link" >$tmpconf
-	echo "ipv4-addr $ipv4_addr" >>$tmpconf
-	[ -n "$ipv6_addr" ] &&
-		echo "ipv6-addr $ipv6_addr" >>$tmpconf
-	[ -n "$prefix" ] &&
-		echo "prefix $prefix" >>$tmpconf
-	[ -n "$dynamic_pool" ] &&
-		echo "dynamic-pool $dynamic_pool" >>$tmpconf
-	echo "data-dir /var/run/tayga/$cfg" >>$tmpconf
-	#TODO: Support static mapping of IPv4 <-> IPv6
-
-	# here we create TUN device and check configuration
-	tayga -c $tmpconf --mktun
-	[ "$?" -ne 0 ] && {
-		proto_notify_error "$cfg" "TAYGA_FAILED"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	proto_init_update "$link" 1
-
-	[ -n "$ipaddr" ]  && proto_add_ipv4_address "$ipaddr" "255.255.255.255"
-	[ -n "$ip6addr" ] && proto_add_ipv6_address "$ip6addr" "128"
-
-	[ "$noroutes" != 1 ] && {
-		[ -n "$ipv6_addr" ] && proto_add_ipv6_route "$ipv6_addr" "128"
-		[ -n "$dynamic_pool" ] && {
-			local pool="${dynamic_pool%%/*}"
-			local mask="${dynamic_pool##*/}"
-			proto_add_ipv4_route "$pool" "$mask"
-		}
-		[ -n "$prefix" ] && {
-			local prefix6="${prefix%%/*}"
-			local mask6="${prefix##*/}"
-			proto_add_ipv6_route "$prefix6" "$mask6"
-		}
-	}
-
-	proto_send_update "$cfg"
-
-	proto_run_command "$cfg" tayga -n -c $tmpconf \
-		-p /var/run/$link.pid
-
-}
-
-proto_tayga_teardown() {
-	local cfg="$1"
-	local tmpconf="/var/etc/tayga-$cfg.conf"
-	proto_kill_command "$cfg"
-	sleep 1
-	tayga -c $tmpconf --rmtun
-}
-
-proto_tayga_init_config() {
-	no_device=1
-	available=1
-	proto_config_add_string "ipv4_addr"
-	proto_config_add_string "ipv6_addr"
-	proto_config_add_string "prefix"
-	proto_config_add_string "dynamic_pool"
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "ip6addr:ip6addr"
-	proto_config_add_boolean "noroutes"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol tayga
-}
diff --git a/trunk/package/feeds/packages/tayga/files/tayga.hotplug b/trunk/package/feeds/packages/tayga/files/tayga.hotplug
deleted file mode 100644
index fb989bdb..00000000
--- a/trunk/package/feeds/packages/tayga/files/tayga.hotplug
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-if [ "$ACTION" = ifup ]; then
-	. /lib/functions.sh
-
-	include /lib/network
-	scan_interfaces
-
-	update_tunnel() {
-		local cfg="$1"
-
-		local proto
-		config_get proto "$cfg" proto
-		[ "$proto" = tayga ] || return 0
-
-		local wandev4
-		config_get wandev4 "$cfg" wan4_device "$(find_tayga_wanif4)"
-
-		local wandev6
-		config_get wandev6 "$cfg" wan6_device "$(find_tayga_wanif6)"
-
-		[ "$wandev4" = "$DEVICE" ] || [ "$wandev6" = "$DEVICE" ] || return 0
-
-		local wanip4=$(find_tayga_wanip4 "$wandev4")
-		local wanip6=$(find_tayga_wanip6 "$wandev6")
-
-		[ -n "$wanip4" ] && [ -n "$wanip6" ] && {
-			uci_set_state network "$cfg" ipv4addr "$wanip4"
-			uci_set_state network "$cfg" ipv6addr "$wanip6"
-
-			logger -t tayga-update "Re-establishing tayga NAT64 due to change on $INTERFACE ($DEVICE)"
-			ifup "$cfg" &
-		}
-	}
-
-	config_foreach update_tunnel interface
-fi
diff --git a/trunk/package/feeds/packages/tayga/files/tayga.sh b/trunk/package/feeds/packages/tayga/files/tayga.sh
deleted file mode 100644
index a9edb6d0..00000000
--- a/trunk/package/feeds/packages/tayga/files/tayga.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-# tayga.sh - NAT64 backend
-
-find_tayga_wanif4() {
-	local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"
-	[ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
-}
-
-find_tayga_wanip4() {
-	local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }"
-	echo "${ip%%[^0-9.]*}"
-}
-
-find_tayga_wanif6() {
-	local if=$(ip -6 r l e ::/0); if="${if#default* dev }"; if="${if%% *}"
-	[ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
-}
-
-find_tayga_wanip6() {
-	local ip=$(ip -6 a s dev "$1"); ip="${ip#*inet6 }"
-	echo "${ip%%[^0-9A-Fa-f:]*}"
-}
-
-# Hook into scan_interfaces() to synthesize a .device option
-# This is needed for /sbin/ifup to properly dispatch control
-# to setup_interface_tayga() even if no .ifname is set in
-# the configuration.
-scan_tayga() {
-	config_set "$1" device "tayga-$1"
-}
-
-coldplug_interface_tayga() {
-	setup_interface_tayga "tayga-$1" "$1"
-}
-
-tayga_add_static_mappings() {
-	local tmpconf="$1"
-
-	(
-		. /lib/functions.sh
-		config_load firewall
-
-		tayga_map_rule_add() {
-			local cfg="$1"
-			local tmpconf="$2"
-			local ipv4_addr ipv6_addr
-			config_get ipv4_addr "$cfg" ipv4_addr ""
-			config_get ipv6_addr "$cfg" ipv6_addr ""
-			[ -n "$ipv4_addr" ] && [ -n "$ipv6_addr" ] &&
-				echo "map $ipv4_addr $ipv6_addr" >>$tmpconf
-		}
-
-		config_foreach tayga_map_rule_add nat64 "$tmpconf"
-	)
-}
-
-setup_interface_tayga() {
-	local iface="$1"
-	local cfg="$2"
-	local link="tayga-$cfg"
-
-	local ipv4_addr ipv6_addr prefix dynamic_pool
-
-	config_get ipv4_addr "$cfg" ipv4_addr
-	config_get ipv6_addr "$cfg" ipv6_addr
-	config_get prefix "$cfg" prefix
-	config_get dynamic_pool "$cfg" dynamic_pool
-
-	local args
-
-	include /lib/network
-	scan_interfaces
-
-	local wanip4=$(uci_get network "$cfg" ipv4addr)
-	local wanip6=$(uci_get network "$cfg" ipv6addr)
-
-	local wanif4=$(find_tayga_wanif4)
-	local wanif6=$(find_tayga_wanif6)
-
-	[ -z "$wanip4" ] && {
-		[ -n "$wanif4" ] && {
-			wanip4=$(find_tayga_wanip4 "$wanif4")
-			uci_set_state network "$cfg" wan4_device "$wanif4"
-		}
-	}
-
-	[ -z "$wanip6" ] && {
-		[ -n "$wanif6" ] && {
-			wanip6=$(find_tayga_wanip6 "$wanif6")
-			uci_set_state network "$cfg" wan6_device "$wanif6"
-		}
-	}
-
-	[ -n "$wanip4" ] && [ -n "$wanip6" ] || {
-		echo "Cannot determine local IPv4 and IPv6 addressed for tayga NAT64 $cfg - skipping"
-		return 1
-	}
-
-	local tmpconf="/var/etc/tayga-$cfg.conf"
-	args="-c $tmpconf"
-	mkdir -p /var/etc
-	mkdir -p /var/run/tayga/$cfg
-
-	echo "tun-device $link" >$tmpconf
-	echo "ipv4-addr $ipv4_addr" >>$tmpconf
-	[ -n "$ipv6_addr" ] &&
-		echo "ipv6-addr $ipv6_addr" >>$tmpconf
-	[ -n "$prefix" ] &&
-		echo "prefix $prefix" >>$tmpconf
-
-	tayga_add_static_mappings "$tmpconf"
-
-	[ -n "$dynamic_pool" ] &&
-		echo "dynamic-pool $dynamic_pool" >>$tmpconf
-	echo "data-dir /var/run/tayga/$cfg" >>$tmpconf
-
-	# creating the tunnel below will trigger a net subsystem event
-	# prevent it from touching or iface by disabling .auto here
-	uci_set_state network "$cfg" ifname $link
-	uci_set_state network "$cfg" auto 0
-
-	# here we create TUN device and check configuration
-	tayga $args --mktun || return 1
-
-	ip link set "$link" up
-
-	ip addr add "$wanip4" dev "$link"
-	ip addr add "$wanip6" dev "$link"
-
-	[ -n "$dynamic_pool" ] &&
-		ip -4 route add "$dynamic_pool" dev "$link"
-	[ -n "$prefix" ] &&
-		ip -6 route add "$prefix" dev "$link"
-
-	start-stop-daemon -S -x tayga -- $args -p /var/run/$link.pid
-
-	env -i ACTION="ifup" DEVICE="$link" INTERFACE="$cfg" PROTO="tayga" \
-		/sbin/hotplug-call iface
-}
-
-stop_interface_tayga() {
-	local cfg="$1"
-	local link="tayga-$cfg"
-
-	env -i ACTION="ifdown" DEVICE="$link" INTERFACE="$cfg" PROTO="tayga" \
-		/sbin/hotplug-call iface
-
-	service_kill tayga "/var/run/$link.pid"
-
-	ip link set "$link" down
-	ip addr flush dev "$link"
-	ip route flush dev "$link"
-}
diff --git a/trunk/package/feeds/packages/tayga/patches/001-configure_unset_CFLAGS.patch b/trunk/package/feeds/packages/tayga/patches/001-configure_unset_CFLAGS.patch
deleted file mode 100644
index c56b5f21..00000000
--- a/trunk/package/feeds/packages/tayga/patches/001-configure_unset_CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,8 +5,6 @@ AC_CONFIG_HEADERS(config.h)
- 
- AC_PROG_CC
- 
--CFLAGS='-g -Wall'
--
- tayga_conf_path=${sysconfdir}/tayga.conf
- 
- AC_SUBST(tayga_conf_path)
diff --git a/trunk/package/feeds/packages/tayga/patches/002-bigendian_wrong_checksum.patch b/trunk/package/feeds/packages/tayga/patches/002-bigendian_wrong_checksum.patch
deleted file mode 100644
index d8deac3a..00000000
--- a/trunk/package/feeds/packages/tayga/patches/002-bigendian_wrong_checksum.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/nat64.c
-+++ b/nat64.c
-@@ -19,6 +19,11 @@
- 
- extern struct config *gcfg;
- 
-+static uint16_t checksum_extend_byte(uint8_t b)
-+{
-+	return htons(b << 8);
-+}
-+
- static uint16_t ip_checksum(void *d, int c)
- {
- 	uint32_t sum = 0xffff;
-@@ -30,7 +35,7 @@ static uint16_t ip_checksum(void *d, int
- 	}
- 
- 	if (c)
--		sum += htons(*((uint8_t *)p) << 8);
-+		sum += checksum_extend_byte(*((uint8_t *)p));
- 
- 	while (sum > 0xffff)
- 		sum = (sum & 0xffff) + (sum >> 16);
-@@ -180,10 +185,12 @@ static int xlate_payload_4to6(struct pkt
- 		cksum = ones_add(p->icmp->cksum, cksum);
- 		if (p->icmp->type == 8) {
- 			p->icmp->type = 128;
--			p->icmp->cksum = ones_add(cksum, ~(128 - 8));
-+			p->icmp->cksum = ones_add(cksum,
-+						~checksum_extend_byte(128 - 8));
- 		} else {
- 			p->icmp->type = 129;
--			p->icmp->cksum = ones_add(cksum, ~(129 - 0));
-+			p->icmp->cksum = ones_add(cksum,
-+						~checksum_extend_byte(129 - 0));
- 		}
- 		return 0;
- 	case 17:
-@@ -668,10 +675,12 @@ static int xlate_payload_6to4(struct pkt
- 		cksum = ones_add(p->icmp->cksum, cksum);
- 		if (p->icmp->type == 128) {
- 			p->icmp->type = 8;
--			p->icmp->cksum = ones_add(cksum, 128 - 8);
-+			p->icmp->cksum = ones_add(cksum,
-+						checksum_extend_byte(128 - 8));
- 		} else {
- 			p->icmp->type = 0;
--			p->icmp->cksum = ones_add(cksum, 129 - 0);
-+			p->icmp->cksum = ones_add(cksum,
-+						checksum_extend_byte(129 - 0));
- 		}
- 		return 0;
- 	case 17:
diff --git a/trunk/package/feeds/packages/tcp_wrappers/Makefile b/trunk/package/feeds/packages/tcp_wrappers/Makefile
deleted file mode 100644
index 1ea637f2..00000000
--- a/trunk/package/feeds/packages/tcp_wrappers/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tcp_wrappers
-PKG_VERSION:=7.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security
-PKG_MD5SUM:=e6fa25f71226d090f34de3f6b122fb5a
-
-PKG_LICENSE:=BSD
-PKG_LICENE_FILES:=DISCLAIMER
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libwrap
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Security wrapper library for TCP services
-  URL:=ftp://ftp.porcupine.org/pub/security/index.html
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPT_CFLAGS="$(TARGET_CFLAGS)" \
-		LIBS=-lnsl \
-		NETGROUP= \
-		VSYSLOG= \
-		BUGS= \
-		EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 \
-			-Dss_family=__ss_family -Dss_len=__ss_len" \
-		FACILITY=LOG_DAEMON \
-		SEVERITY=LOG_INFO \
-		REAL_DAEMON_DIR=/usr/sbin \
-		STYLE="-DPROCESS_OPTIONS" \
-		tidy all
-endef
-
-define Build/InstallDev	
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/tcpd.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwrap.a $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(1)/usr/lib/
-endef
-
-define Package/libwrap/install	
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(1)/usr/lib/
-endef
-	
-$(eval $(call BuildPackage,libwrap))
diff --git a/trunk/package/feeds/packages/tcp_wrappers/patches/001-debian_subset.patch b/trunk/package/feeds/packages/tcp_wrappers/patches/001-debian_subset.patch
deleted file mode 100644
index 0b3ad2ce..00000000
--- a/trunk/package/feeds/packages/tcp_wrappers/patches/001-debian_subset.patch
+++ /dev/null
@@ -1,936 +0,0 @@
---- a/hosts_access.c
-+++ b/hosts_access.c
-@@ -240,6 +240,26 @@ struct request_info *request;
-     }
- }
- 
-+/* hostfile_match - look up host patterns from file */
-+
-+static int hostfile_match(path, host)
-+char   *path;
-+struct hosts_info *host;
-+{
-+    char    tok[BUFSIZ];
-+    int     match = NO;
-+    FILE   *fp;
-+
-+    if ((fp = fopen(path, "r")) != 0) {
-+        while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host)))
-+            /* void */ ;
-+        fclose(fp);
-+    } else if (errno != ENOENT) {
-+        tcpd_warn("open %s: %m", path);
-+    }
-+    return (match);
-+}
-+
- /* host_match - match host name and/or address against pattern */
- 
- static int host_match(tok, host)
-@@ -267,6 +287,8 @@ struct host_info *host;
- 	tcpd_warn("netgroup support is disabled");	/* not tcpd_jump() */
- 	return (NO);
- #endif
-+    } else if (tok[0] == '/') {                         /* /file hack */
-+        return (hostfile_match(tok, host));
-     } else if (STR_EQ(tok, "KNOWN")) {		/* check address and name */
- 	char   *name = eval_hostname(host);
- 	return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
---- a/tcpd.h
-+++ b/tcpd.h
-@@ -4,6 +4,25 @@
-   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-   */
- 
-+#ifndef _TCPWRAPPERS_TCPD_H
-+#define _TCPWRAPPERS_TCPD_H
-+
-+/* someone else may have defined this */
-+#undef  __P
-+
-+/* use prototypes if we have an ANSI C compiler or are using C++ */
-+#if defined(__STDC__) || defined(__cplusplus)
-+#define __P(args)       args
-+#else
-+#define __P(args)       ()
-+#endif
-+
-+/* Need definitions of struct sockaddr_in and FILE. */
-+#include <netinet/in.h>
-+#include <stdio.h>
-+
-+__BEGIN_DECLS
-+
- /* Structure to describe one communications endpoint. */
- 
- #define STRING_LENGTH	128		/* hosts, users, processes */
-@@ -25,10 +44,10 @@ struct request_info {
-     char    pid[10];			/* access via eval_pid(request) */
-     struct host_info client[1];		/* client endpoint info */
-     struct host_info server[1];		/* server endpoint info */
--    void  (*sink) ();			/* datagram sink function or 0 */
--    void  (*hostname) ();		/* address to printable hostname */
--    void  (*hostaddr) ();		/* address to printable address */
--    void  (*cleanup) ();		/* cleanup function or 0 */
-+    void  (*sink) __P((int));		/* datagram sink function or 0 */
-+    void  (*hostname) __P((struct host_info *)); /* address to printable hostname */
-+    void  (*hostaddr) __P((struct host_info *)); /* address to printable address */
-+    void  (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
-     struct netconfig *config;		/* netdir handle */
- };
- 
-@@ -61,25 +80,30 @@ extern char paranoid[];
- /* Global functions. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void fromhost();			/* get/validate client host info */
-+extern void fromhost __P((struct request_info *));	/* get/validate client host info */
- #else
- #define fromhost sock_host		/* no TLI support needed */
- #endif
- 
--extern int hosts_access();		/* access control */
--extern void shell_cmd();		/* execute shell command */
--extern char *percent_x();		/* do %<char> expansion */
--extern void rfc931();			/* client name from RFC 931 daemon */
--extern void clean_exit();		/* clean up and exit */
--extern void refuse();			/* clean up and exit */
--extern char *xgets();			/* fgets() on steroids */
--extern char *split_at();		/* strchr() and split */
--extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
-+extern void shell_cmd __P((char *));	/* execute shell command */
-+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
-+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
-+extern void clean_exit __P((struct request_info *)); /* clean up and exit */
-+extern void refuse __P((struct request_info *));	/* clean up and exit */
-+extern char *xgets __P((char *, int, FILE *));	/* fgets() on steroids */
-+extern char *split_at __P((char *, int));	/* strchr() and split */
-+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
- 
- /* Global variables. */
- 
-+#ifdef HAVE_WEAKSYMS
-+extern int allow_severity __attribute__ ((weak)); /* for connection logging */
-+extern int deny_severity __attribute__ ((weak)); /* for connection logging */
-+#else
- extern int allow_severity;		/* for connection logging */
- extern int deny_severity;		/* for connection logging */
-+#endif
-+
- extern char *hosts_allow_table;		/* for verification mode redirection */
- extern char *hosts_deny_table;		/* for verification mode redirection */
- extern int hosts_access_verbose;	/* for verbose matching mode */
-@@ -92,9 +116,14 @@ extern int resident;			/* > 0 if residen
-   */
- 
- #ifdef __STDC__
-+extern int hosts_access(struct request_info *request);
-+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, 
-+                     char *client_user);
- extern struct request_info *request_init(struct request_info *,...);
- extern struct request_info *request_set(struct request_info *,...);
- #else
-+extern int hosts_access();
-+extern int hosts_ctl();
- extern struct request_info *request_init();	/* initialize request */
- extern struct request_info *request_set();	/* update request structure */
- #endif
-@@ -117,27 +146,31 @@ extern struct request_info *request_set(
-   * host_info structures serve as caches for the lookup results.
-   */
- 
--extern char *eval_user();		/* client user */
--extern char *eval_hostname();		/* printable hostname */
--extern char *eval_hostaddr();		/* printable host address */
--extern char *eval_hostinfo();		/* host name or address */
--extern char *eval_client();		/* whatever is available */
--extern char *eval_server();		/* whatever is available */
-+extern char *eval_user __P((struct request_info *));	/* client user */
-+extern char *eval_hostname __P((struct host_info *));	/* printable hostname */
-+extern char *eval_hostaddr __P((struct host_info *));	/* printable host address */
-+extern char *eval_hostinfo __P((struct host_info *));	/* host name or address */
-+extern char *eval_client __P((struct request_info *));	/* whatever is available */
-+extern char *eval_server __P((struct request_info *));	/* whatever is available */
- #define eval_daemon(r)	((r)->daemon)	/* daemon process name */
- #define eval_pid(r)	((r)->pid)	/* process id */
- 
- /* Socket-specific methods, including DNS hostname lookups. */
- 
--extern void sock_host();		/* look up endpoint addresses */
--extern void sock_hostname();		/* translate address to hostname */
--extern void sock_hostaddr();		/* address to printable address */
-+/* look up endpoint addresses */
-+extern void sock_host __P((struct request_info *));
-+/* translate address to hostname */
-+extern void sock_hostname __P((struct host_info *));
-+/* address to printable address */
-+extern void sock_hostaddr __P((struct host_info *));
-+
- #define sock_methods(r) \
- 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
- 
- /* The System V Transport-Level Interface (TLI) interface. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void tli_host();			/* look up endpoint addresses etc. */
-+extern void tli_host __P((struct request_info *));	/* look up endpoint addresses etc. */
- #endif
- 
-  /*
-@@ -178,7 +211,7 @@ extern struct tcpd_context tcpd_context;
-   * behavior.
-   */
- 
--extern void process_options();		/* execute options */
-+extern void process_options __P((char *, struct request_info *)); /* execute options */
- extern int dry_run;			/* verification flag */
- 
- /* Bug workarounds. */
-@@ -217,3 +250,7 @@ extern char *fix_strtok();
- #define strtok	my_strtok
- extern char *my_strtok();
- #endif
-+
-+__END_DECLS
-+
-+#endif /* tcpd.h */
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,10 @@
-+GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h)
-+
- # @(#) Makefile 1.23 97/03/21 19:27:20
- 
-+# unset the HOSTNAME environment variable
-+HOSTNAME =
-+
- what:
- 	@echo
- 	@echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:"
-@@ -19,7 +24,7 @@ what:
- 	@echo "	generic (most bsd-ish systems with sys5 compatibility)"
- 	@echo "	386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543"
- 	@echo "	dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix"
--	@echo "	linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
-+	@echo "	linux gnu machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
- 	@echo "	ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4"
- 	@echo "	sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
- 	@echo "	uts215 uxp"
-@@ -43,8 +48,8 @@ what:
- # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx
- #REAL_DAEMON_DIR=/usr/etc
- #
--# SysV.4 Solaris 2.x OSF AIX
--#REAL_DAEMON_DIR=/usr/sbin
-+# SysV.4 Solaris 2.x OSF AIX Linux
-+REAL_DAEMON_DIR=/usr/sbin
- #
- # BSD 4.4
- #REAL_DAEMON_DIR=/usr/libexec
-@@ -141,10 +146,21 @@ freebsd:
- 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
- 	EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
- 
-+ifneq ($(GLIBC),0)
-+MYLIB=-lnsl
-+endif
-+
- linux:
- 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
--	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
--	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
-+	LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
-+	NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
-+	EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT"
-+
-+gnu:
-+	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
-+	LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
-+	NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
-+	EXTRA_CFLAGS="-DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT"
- 
- # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
- hpux hpux8 hpux9 hpux10:
-@@ -391,7 +407,7 @@ AR	= ar
- # the ones provided with this source distribution. The environ.c module
- # implements setenv(), getenv(), and putenv().
- 
--AUX_OBJ= setenv.o
-+#AUX_OBJ= setenv.o
- #AUX_OBJ= environ.o
- #AUX_OBJ= environ.o strcasecmp.o
- 
-@@ -454,7 +470,8 @@ AUX_OBJ= setenv.o
- # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
- # around this. The workaround does no harm on other Solaris versions.
- 
--BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
-+BUGS =
-+#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
- #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
- #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
- 
-@@ -464,7 +481,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
- # If your system supports NIS or YP-style netgroups, enable the following
- # macro definition. Netgroups are used only for host access control.
- #
--#NETGROUP= -DNETGROUP
-+NETGROUP= -DNETGROUP
- 
- ###############################################################
- # System dependencies: whether or not your system has vsyslog()
-@@ -491,7 +508,7 @@ VSYSLOG	= -Dvsyslog=myvsyslog
- # Uncomment the next definition to turn on the language extensions
- # (examples: allow, deny, banners, twist and spawn).
- # 
--#STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
-+STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
- 
- ################################################################
- # Optional: Changing the default disposition of logfile records
-@@ -514,7 +531,7 @@ VSYSLOG	= -Dvsyslog=myvsyslog
- #
- # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
- 
--FACILITY= LOG_MAIL	# LOG_MAIL is what most sendmail daemons use
-+FACILITY= LOG_DAEMON	# LOG_MAIL is what most sendmail daemons use
- 
- # The syslog priority at which successful connections are logged.
- 
-@@ -610,7 +627,7 @@ TABLES	= -DHOSTS_DENY=\"/etc/hosts.deny\
- # Paranoid mode implies hostname lookup. In order to disable hostname
- # lookups altogether, see the next section.
- 
--PARANOID= -DPARANOID
-+#PARANOID= -DPARANOID
- 
- ########################################
- # Optional: turning off hostname lookups
-@@ -623,7 +640,7 @@ PARANOID= -DPARANOID
- # In order to perform selective hostname lookups, disable paranoid
- # mode (see previous section) and comment out the following definition.
- 
--HOSTNAME= -DALWAYS_HOSTNAME
-+#HOSTNAME= -DALWAYS_HOSTNAME
- 
- #############################################
- # Optional: Turning on host ADDRESS checking
-@@ -649,28 +666,46 @@ HOSTNAME= -DALWAYS_HOSTNAME
- # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
- # Solaris 2.x, and Linux. See your system documentation for details.
- #
--# KILL_OPT= -DKILL_IP_OPTIONS
-+KILL_OPT= -DKILL_IP_OPTIONS
- 
- ## End configuration options
- ############################
- 
- # Protection against weird shells or weird make programs.
- 
-+CC	= gcc
- SHELL	= /bin/sh
--.c.o:;	$(CC) $(CFLAGS) -c $*.c
-+.c.o:;	$(CC) $(CFLAGS) -o $*.o -c $*.c
-+
-+SOMAJOR = 0
-+SOMINOR = 7.6
-+
-+LIB	= libwrap.a
-+SHLIB	= shared/libwrap.so.$(SOMAJOR).$(SOMINOR)
-+SHLIBSOMAJ= shared/libwrap.so.$(SOMAJOR)
-+SHLIBSO	= shared/libwrap.so
-+SHLIBFLAGS = -Lshared -lwrap
- 
--CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-+shared/%.o: %.c
-+	$(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
-+
-+CFLAGS	= -O2 -g -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
- 	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
- 	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
- 	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
- 	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
- 	$(VSYSLOG) $(HOSTNAME)
- 
-+SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS)
-+SHCFLAGS = -fPIC -shared -D_REENTRANT
-+
- LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
- 	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
- 	$(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \
- 	update.o misc.o diag.o percent_m.o myvsyslog.o
- 
-+SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
-+
- FROM_OBJ= fromhost.o
- 
- KIT	= README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
-@@ -684,46 +719,78 @@ KIT	= README miscd.c tcpd.c fromhost.c h
- 	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
- 	scaffold.h tcpdmatch.8 README.NIS
- 
--LIB	= libwrap.a
--
--all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
-+all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
- 
- # Invalidate all object files when the compiler options (CFLAGS) have changed.
- 
- config-check:
- 	@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
--	@set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \
--	if cmp cflags /tmp/cflags.$$$$ ; \
--	then rm /tmp/cflags.$$$$ ; \
--	else mv /tmp/cflags.$$$$ cflags ; \
-+	@set +e; echo $(CFLAGS) >cflags.new ; \
-+	if cmp cflags cflags.new ; \
-+	then rm cflags.new ; \
-+	else mv cflags.new cflags ; \
- 	fi >/dev/null 2>/dev/null
-+	@if [ ! -d shared ]; then mkdir shared; fi
- 
- $(LIB):	$(LIB_OBJ)
- 	rm -f $(LIB)
- 	$(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
- 	-$(RANLIB) $(LIB)
- 
--tcpd:	tcpd.o $(LIB)
--	$(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
-+$(SHLIB): $(SHLIB_OBJ)
-+	rm -f $(SHLIB)
-+	$(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
-+	ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ)
-+	ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
-+
-+tcpd:	tcpd.o $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
- 
--miscd:	miscd.o $(LIB)
--	$(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
-+miscd:	miscd.o $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS)
- 
--safe_finger: safe_finger.o $(LIB)
--	$(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
-+safe_finger: safe_finger.o $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
- 
- TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
- 
--tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
--	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
-+tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
- 
--try-from: try-from.o fakelog.o $(LIB)
--	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
-+try-from: try-from.o fakelog.o $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
- 
- TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
- 
--tcpdchk: $(TCPDCHK_OBJ) $(LIB)
--	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
-+tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
-+	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
-+
-+install: install-lib install-bin install-dev
-+
-+install-lib:
-+	install -o root -g root -m 0644 $(SHLIB) ${DESTDIR}/lib/
-+	ln -s $(notdir $(SHLIB)) ${DESTDIR}/lib/$(notdir $(SHLIBSOMAJ))
-+
-+install-bin:
-+	install -o root -g root -m 0755 tcpd ${DESTDIR}/usr/sbin/
-+	install -o root -g root -m 0755 tcpdchk ${DESTDIR}/usr/sbin/
-+	install -o root -g root -m 0755 tcpdmatch ${DESTDIR}/usr/sbin/
-+	install -o root -g root -m 0755 try-from ${DESTDIR}/usr/sbin/
-+	install -o root -g root -m 0755 safe_finger ${DESTDIR}/usr/sbin/
-+	install -o root -g root -m 0644 tcpd.8 ${DESTDIR}/usr/share/man/man8/
-+	install -o root -g root -m 0644 tcpdchk.8 ${DESTDIR}/usr/share/man/man8/
-+	install -o root -g root -m 0644 tcpdmatch.8 ${DESTDIR}/usr/share/man/man8/
-+	install -o root -g root -m 0644 hosts_access.5 ${DESTDIR}/usr/share/man/man5/
-+	install -o root -g root -m 0644 hosts_options.5 ${DESTDIR}/usr/share/man/man5/
-+
-+install-dev:
-+	ln -s /lib/$(notdir $(SHLIBSOMAJ)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSO))
-+	install -o root -g root -m 0644 hosts_access.3 ${DESTDIR}/usr/share/man/man3/
-+	install -o root -g root -m 0644 tcpd.h ${DESTDIR}/usr/include/
-+	install -o root -g root -m 0644 $(LIB) ${DESTDIR}/usr/lib/
-+	ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/hosts_ctl.3
-+	ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_init.3
-+	ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_set.3
- 
- shar:	$(KIT)
- 	@shar $(KIT)
-@@ -739,7 +806,8 @@ archive:
- 
- clean:
- 	rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \
--	cflags
-+	cflags libwrap*.so*
-+	rm -rf shared
- 
- tidy:	clean
- 	chmod -R a+r .
-@@ -885,5 +953,6 @@ update.o: cflags
- update.o: mystdarg.h
- update.o: tcpd.h
- vfprintf.o: cflags
-+weak_symbols.o: tcpd.h
- workarounds.o: cflags
- workarounds.o: tcpd.h
---- a/hosts_access.5
-+++ b/hosts_access.5
-@@ -8,9 +8,9 @@ name, host name/address) patterns.  Exam
- impatient reader is encouraged to skip to the EXAMPLES section for a
- quick introduction.
- .PP
--An extended version of the access control language is described in the
--\fIhosts_options\fR(5) document. The extensions are turned on at
--program build time by building with -DPROCESS_OPTIONS.
-+The extended version of the access control language is described in the
-+\fIhosts_options\fR(5) document. \fBNote that this language supersedes
-+the meaning of \fIshell_command\fB as documented below.\fR
- .PP
- In the following text, \fIdaemon\fR is the the process name of a
- network daemon process, and \fIclient\fR is the name and/or address of
-@@ -40,7 +40,7 @@ A newline character is ignored when it i
- character. This permits you to break up long lines so that they are
- easier to edit.
- .IP \(bu
--Blank lines or lines that begin with a `#\' character are ignored.
-+Blank lines or lines that begin with a `#' character are ignored.
- This permits you to insert comments and whitespace so that the tables
- are easier to read.
- .IP \(bu
-@@ -69,26 +69,33 @@ checks are case insensitive.
- .SH PATTERNS
- The access control language implements the following patterns:
- .IP \(bu
--A string that begins with a `.\' character. A host name is matched if
-+A string that begins with a `.' character. A host name is matched if
- the last components of its name match the specified pattern.  For
--example, the pattern `.tue.nl\' matches the host name
--`wzv.win.tue.nl\'.
-+example, the pattern `.tue.nl' matches the host name
-+`wzv.win.tue.nl'.
- .IP \(bu
--A string that ends with a `.\' character. A host address is matched if
-+A string that ends with a `.' character. A host address is matched if
- its first numeric fields match the given string.  For example, the
--pattern `131.155.\' matches the address of (almost) every host on the
-+pattern `131.155.' matches the address of (almost) every host on the
- Eind\%hoven University network (131.155.x.x).
- .IP \(bu
--A string that begins with an `@\' character is treated as an NIS
-+A string that begins with an `@' character is treated as an NIS
- (formerly YP) netgroup name. A host name is matched if it is a host
- member of the specified netgroup. Netgroup matches are not supported
- for daemon process names or for client user names.
- .IP \(bu
--An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a
--`net/mask\' pair. A host address is matched if `net\' is equal to the
--bitwise AND of the address and the `mask\'. For example, the net/mask
--pattern `131.155.72.0/255.255.254.0\' matches every address in the
--range `131.155.72.0\' through `131.155.73.255\'.
-+An expression of the form `n.n.n.n/m.m.m.m' is interpreted as a
-+`net/mask' pair. A host address is matched if `net' is equal to the
-+bitwise AND of the address and the `mask'. For example, the net/mask
-+pattern `131.155.72.0/255.255.254.0' matches every address in the
-+range `131.155.72.0' through `131.155.73.255'.
-+.IP \(bu
-+A string that begins with a `/' character is treated as a file
-+name. A host name or address is matched if it matches any host name
-+or address pattern listed in the named file. The file format is
-+zero or more lines with zero or more host name or address patterns
-+separated by whitespace.  A file name pattern can be used anywhere
-+a host name or address pattern can be used.
- .SH WILDCARDS
- The access control language supports explicit wildcards:
- .IP ALL
-@@ -115,19 +122,19 @@ without -DPARANOID when you want more co
- .ne 6
- .SH OPERATORS
- .IP EXCEPT
--Intended use is of the form: `list_1 EXCEPT list_2\'; this construct
-+Intended use is of the form: `list_1 EXCEPT list_2'; this construct
- matches anything that matches \fIlist_1\fR unless it matches
- \fIlist_2\fR.  The EXCEPT operator can be used in daemon_lists and in
- client_lists. The EXCEPT operator can be nested: if the control
--language would permit the use of parentheses, `a EXCEPT b EXCEPT c\'
--would parse as `(a EXCEPT (b EXCEPT c))\'.
-+language would permit the use of parentheses, `a EXCEPT b EXCEPT c'
-+would parse as `(a EXCEPT (b EXCEPT c))'.
- .br
- .ne 6
- .SH SHELL COMMANDS
- If the first-matched access control rule contains a shell command, that
- command is subjected to %<letter> substitutions (see next section).
- The result is executed by a \fI/bin/sh\fR child process with standard
--input, output and error connected to \fI/dev/null\fR.  Specify an `&\'
-+input, output and error connected to \fI/dev/null\fR.  Specify an `&'
- at the end of the command if you do not want to wait until it has
- completed.
- .PP
-@@ -159,7 +166,7 @@ depending on how much information is ava
- .IP %u
- The client user name (or "unknown").
- .IP %%
--Expands to a single `%\' character.
-+Expands to a single `%' character.
- .PP
- Characters in % expansions that may confuse the shell are replaced by
- underscores.
-@@ -243,9 +250,9 @@ A positive IDENT lookup result (the clie
- less trustworthy. It is possible for an intruder to spoof both the
- client connection and the IDENT lookup, although doing so is much
- harder than spoofing just a client connection. It may also be that
--the client\'s IDENT server is lying.
-+the client's IDENT server is lying.
- .PP
--Note: IDENT lookups don\'t work with UDP services. 
-+Note: IDENT lookups don't work with UDP services. 
- .SH EXAMPLES
- The language is flexible enough that different types of access control
- policy can be expressed with a minimum of fuss. Although the language
-@@ -285,7 +292,7 @@ ALL: LOCAL @some_netgroup
- .br
- ALL: .foobar.edu EXCEPT terminalserver.foobar.edu
- .PP
--The first rule permits access from hosts in the local domain (no `.\'
-+The first rule permits access from hosts in the local domain (no `.'
- in the host name) and from members of the \fIsome_netgroup\fP
- netgroup.  The second rule permits access from all hosts in the
- \fIfoobar.edu\fP domain (notice the leading dot), with the exception of
-@@ -322,8 +329,8 @@ in.tftpd: LOCAL, .my.domain
- /etc/hosts.deny:
- .in +3
- .nf
--in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
--	/usr/ucb/mail -s %d-%h root) &
-+in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\
-+	/usr/bin/mail -s %d-%h root) &
- .fi
- .PP
- The safe_finger command comes with the tcpd wrapper and should be
-@@ -349,7 +356,7 @@ control rule; when the length of an acce
- capacity of an internal buffer; when an access control rule is not
- terminated by a newline character; when the result of %<letter>
- expansion would overflow an internal buffer; when a system call fails
--that shouldn\'t.  All problems are reported via the syslog daemon.
-+that shouldn't.  All problems are reported via the syslog daemon.
- .SH FILES
- .na
- .nf
---- a/rfc931.c
-+++ b/rfc931.c
-@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
- 
- int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
- 
--static jmp_buf timebuf;
-+static sigjmp_buf timebuf;
- 
- /* fsocket - open stdio stream on top of socket */
- 
-@@ -62,7 +62,7 @@ int     protocol;
- static void timeout(sig)
- int     sig;
- {
--    longjmp(timebuf, sig);
-+    siglongjmp(timebuf, sig);
- }
- 
- /* rfc931 - return remote user name, given socket structures */
-@@ -99,7 +99,7 @@ char   *dest;
- 	 * Set up a timer so we won't get stuck while waiting for the server.
- 	 */
- 
--	if (setjmp(timebuf) == 0) {
-+	if (sigsetjmp(timebuf,1) == 0) {
- 	    signal(SIGALRM, timeout);
- 	    alarm(rfc931_timeout);
- 
---- a/tcpd.8
-+++ b/tcpd.8
-@@ -94,7 +94,7 @@ configuration files.
- .PP
- The example assumes that the network daemons live in /usr/etc. On some
- systems, network daemons live in /usr/sbin or in /usr/libexec, or have
--no `in.\' prefix to their name.
-+no `in.' prefix to their name.
- .SH EXAMPLE 2
- This example applies when \fItcpd\fR expects that the network daemons
- are left in their original place.
-@@ -110,26 +110,26 @@ finger  stream  tcp  nowait  nobody  /us
- becomes:
- .sp
- .ti +5
--finger  stream  tcp  nowait  nobody  /some/where/tcpd     in.fingerd
-+finger  stream  tcp  nowait  nobody  /usr/sbin/tcpd       in.fingerd
- .sp
- .fi
- .PP
- The example assumes that the network daemons live in /usr/etc. On some
- systems, network daemons live in /usr/sbin or in /usr/libexec, the
--daemons have no `in.\' prefix to their name, or there is no userid
-+daemons have no `in.' prefix to their name, or there is no userid
- field in the inetd configuration file.
- .PP
- Similar changes will be needed for the other services that are to be
--covered by \fItcpd\fR.  Send a `kill -HUP\' to the \fIinetd\fR(8)
-+covered by \fItcpd\fR.  Send a `kill -HUP' to the \fIinetd\fR(8)
- process to make the changes effective. AIX users may also have to
--execute the `inetimp\' command.
-+execute the `inetimp' command.
- .SH EXAMPLE 3
- In the case of daemons that do not live in a common directory ("secret"
- or otherwise), edit the \fIinetd\fR configuration file so that it
- specifies an absolute path name for the process name field. For example:
- .nf
- .sp
--    ntalk  dgram  udp  wait  root  /some/where/tcpd  /usr/local/lib/ntalkd
-+    ntalk  dgram  udp  wait  root  /usr/sbin/tcpd  /usr/sbin/in.ntalkd
- .sp
- .fi
- .PP
---- a/hosts_access.3
-+++ b/hosts_access.3
-@@ -3,7 +3,7 @@
- hosts_access, hosts_ctl, request_init, request_set \- access control library
- .SH SYNOPSIS
- .nf
--#include "tcpd.h"
-+#include <tcpd.h>
- 
- extern int allow_severity;
- extern int deny_severity;
---- a/options.c
-+++ b/options.c
-@@ -473,6 +473,9 @@ static struct syslog_names log_fac[] = {
- #ifdef LOG_CRON
-     "cron", LOG_CRON,
- #endif
-+#ifdef LOG_FTP
-+    "ftp", LOG_FTP,
-+#endif
- #ifdef LOG_LOCAL0
-     "local0", LOG_LOCAL0,
- #endif
---- a/fix_options.c
-+++ b/fix_options.c
-@@ -35,7 +35,12 @@ struct request_info *request;
- #ifdef IP_OPTIONS
-     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
-     char    lbuf[BUFFER_SIZE], *lp;
-+#if !defined(__GLIBC__)
-     int     optsize = sizeof(optbuf), ipproto;
-+#else /* __GLIBC__ */
-+    size_t  optsize = sizeof(optbuf);
-+    int     ipproto;
-+#endif /* __GLIBC__ */
-     struct protoent *ip;
-     int     fd = request->fd;
-     unsigned int opt;
---- a/workarounds.c
-+++ b/workarounds.c
-@@ -163,7 +163,11 @@ int    *fromlen;
- int     fix_getpeername(sock, sa, len)
- int     sock;
- struct sockaddr *sa;
-+#if !defined(__GLIBC__)
- int    *len;
-+#else /* __GLIBC__ */
-+size_t *len;
-+#endif /* __GLIBC__ */
- {
-     int     ret;
-     struct sockaddr_in *sin = (struct sockaddr_in *) sa;
---- a/socket.c
-+++ b/socket.c
-@@ -76,7 +76,11 @@ struct request_info *request;
- {
-     static struct sockaddr_in client;
-     static struct sockaddr_in server;
-+#if !defined (__GLIBC__)
-     int     len;
-+#else /* __GLIBC__ */
-+    size_t  len;
-+#endif /* __GLIBC__ */
-     char    buf[BUFSIZ];
-     int     fd = request->fd;
- 
-@@ -224,7 +228,11 @@ int     fd;
- {
-     char    buf[BUFSIZ];
-     struct sockaddr_in sin;
-+#if !defined(__GLIBC__)
-     int     size = sizeof(sin);
-+#else /* __GLIBC__ */
-+    size_t  size = sizeof(sin);
-+#endif /* __GLIBC__ */
- 
-     /*
-      * Eat up the not-yet received datagram. Some systems insist on a
---- a/safe_finger.c
-+++ b/safe_finger.c
-@@ -26,21 +26,24 @@ static char sccsid[] = "@(#) safe_finger
- #include <stdio.h>
- #include <ctype.h>
- #include <pwd.h>
-+#include <syslog.h>
- 
- extern void exit();
- 
- /* Local stuff */
- 
--char    path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
-+char    path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin";
- 
- #define	TIME_LIMIT	60		/* Do not keep listinging forever */
- #define	INPUT_LENGTH	100000		/* Do not keep listinging forever */
- #define	LINE_LENGTH	128		/* Editors can choke on long lines */
- #define	FINGER_PROGRAM	"finger"	/* Most, if not all, UNIX systems */
- #define	UNPRIV_NAME	"nobody"	/* Preferred privilege level */
--#define	UNPRIV_UGID	32767		/* Default uid and gid */
-+#define	UNPRIV_UGID	65534		/* Default uid and gid */
- 
- int     finger_pid;
-+int	allow_severity = SEVERITY;
-+int	deny_severity = LOG_WARNING;
- 
- void    cleanup(sig)
- int     sig;
---- a/hosts_options.5
-+++ b/hosts_options.5
-@@ -58,12 +58,12 @@ Notice the leading dot on the domain nam
- Execute, in a child process, the specified shell command, after
- performing the %<letter> expansions described in the hosts_access(5)
- manual page.  The command is executed with stdin, stdout and stderr
--connected to the null device, so that it won\'t mess up the
-+connected to the null device, so that it won't mess up the
- conversation with the client host. Example:
- .sp
- .nf
- .ti +3
--spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
-+spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) &
- .fi
- .sp
- executes, in a background child process, the shell command "safe_finger
---- a/tcpdchk.c
-+++ b/tcpdchk.c
-@@ -350,6 +350,8 @@ char   *pat;
- {
-     if (pat[0] == '@') {
- 	tcpd_warn("%s: daemon name begins with \"@\"", pat);
-+    } else if (pat[0] == '/') {
-+        tcpd_warn("%s: daemon name begins with \"/\"", pat);
-     } else if (pat[0] == '.') {
- 	tcpd_warn("%s: daemon name begins with dot", pat);
-     } else if (pat[strlen(pat) - 1] == '.') {
-@@ -382,6 +384,8 @@ char   *pat;
- {
-     if (pat[0] == '@') {			/* @netgroup */
- 	tcpd_warn("%s: user name begins with \"@\"", pat);
-+    } else if (pat[0] == '/') {
-+        tcpd_warn("%s: user name begins with \"/\"", pat);
-     } else if (pat[0] == '.') {
- 	tcpd_warn("%s: user name begins with dot", pat);
-     } else if (pat[strlen(pat) - 1] == '.') {
-@@ -402,8 +406,13 @@ char   *pat;
- static int check_host(pat)
- char   *pat;
- {
-+    char    buf[BUFSIZ];
-     char   *mask;
-     int     addr_count = 1;
-+    FILE   *fp;
-+    struct tcpd_context saved_context;
-+    char   *cp;
-+    char   *wsp = " \t\r\n";
- 
-     if (pat[0] == '@') {			/* @netgroup */
- #ifdef NO_NETGRENT
-@@ -422,6 +431,21 @@ char   *pat;
- 	tcpd_warn("netgroup support disabled");
- #endif
- #endif
-+    } else if (pat[0] == '/') {                 /* /path/name */
-+        if ((fp = fopen(pat, "r")) != 0) {
-+            saved_context = tcpd_context;
-+            tcpd_context.file = pat;
-+            tcpd_context.line = 0;
-+            while (fgets(buf, sizeof(buf), fp)) {
-+                tcpd_context.line++;
-+                for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp))
-+                    check_host(cp);
-+            }
-+            tcpd_context = saved_context;
-+            fclose(fp);
-+        } else if (errno != ENOENT) {
-+            tcpd_warn("open %s: %m", pat);
-+        }
-     } else if (mask = split_at(pat, '/')) {	/* network/netmask */
- 	if (dot_quad_addr(pat) == INADDR_NONE
- 	    || dot_quad_addr(mask) == INADDR_NONE)
---- a/percent_m.c
-+++ b/percent_m.c
-@@ -13,7 +13,7 @@ static char sccsid[] = "@(#) percent_m.c
- #include <string.h>
- 
- extern int errno;
--#ifndef SYS_ERRLIST_DEFINED
-+#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR)
- extern char *sys_errlist[];
- extern int sys_nerr;
- #endif
-@@ -29,11 +29,15 @@ char   *ibuf;
- 
-     while (*bp = *cp)
- 	if (*cp == '%' && cp[1] == 'm') {
-+#ifdef HAVE_STRERROR
-+            strcpy(bp, strerror(errno));
-+#else
- 	    if (errno < sys_nerr && errno > 0) {
- 		strcpy(bp, sys_errlist[errno]);
- 	    } else {
- 		sprintf(bp, "Unknown error %d", errno);
- 	    }
-+#endif
- 	    bp += strlen(bp);
- 	    cp += 2;
- 	} else {
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -180,10 +180,12 @@ struct request_info *request;
- 
- /* ARGSUSED */
- 
--void    rfc931(request)
--struct request_info *request;
-+void    rfc931(rmt_sin, our_sin, dest)
-+struct sockaddr_in *rmt_sin;
-+struct sockaddr_in *our_sin;
-+char   *dest;
- {
--    strcpy(request->user, unknown);
-+    strcpy(dest, unknown);
- }
- 
- /* check_path - examine accessibility */
---- /dev/null
-+++ b/weak_symbols.c
-@@ -0,0 +1,11 @@
-+ /*
-+  * @(#) weak_symbols.h 1.5 99/12/29 23:50
-+  * 
-+  * Author: Anthony Towns <ajt@debian.org>
-+  */
-+
-+#ifdef HAVE_WEAKSYMS
-+#include <syslog.h>
-+int deny_severity = LOG_WARNING;
-+int allow_severity = SEVERITY; 
-+#endif
diff --git a/trunk/package/feeds/packages/tcp_wrappers/patches/002-opt_cflags.patch b/trunk/package/feeds/packages/tcp_wrappers/patches/002-opt_cflags.patch
deleted file mode 100644
index 1f38eb3f..00000000
--- a/trunk/package/feeds/packages/tcp_wrappers/patches/002-opt_cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -689,7 +689,8 @@ SHLIBFLAGS = -Lshared -lwrap
- shared/%.o: %.c
- 	$(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
- 
--CFLAGS	= -O2 -g -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-+OPT_CFLAGS = -O2 -g
-+CFLAGS	= $(OPT_CFLAGS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
- 	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
- 	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
- 	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
diff --git a/trunk/package/feeds/packages/tcp_wrappers/patches/003-scaffold_malloc.patch b/trunk/package/feeds/packages/tcp_wrappers/patches/003-scaffold_malloc.patch
deleted file mode 100644
index ecda5ae9..00000000
--- a/trunk/package/feeds/packages/tcp_wrappers/patches/003-scaffold_malloc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -20,13 +20,12 @@ static char sccs_id[] = "@(#) scaffold.c
- #include <syslog.h>
- #include <setjmp.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #ifndef INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
- #endif
- 
--extern char *malloc();
--
- /* Application-specific. */
- 
- #include "tcpd.h"
diff --git a/trunk/package/feeds/packages/tcp_wrappers/patches/004-ipv4_prefix.patch b/trunk/package/feeds/packages/tcp_wrappers/patches/004-ipv4_prefix.patch
deleted file mode 100644
index 29c9cefc..00000000
--- a/trunk/package/feeds/packages/tcp_wrappers/patches/004-ipv4_prefix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/hosts_access.5
-+++ b/hosts_access.5
-@@ -90,6 +90,9 @@ bitwise AND of the address and the `mask
- pattern `131.155.72.0/255.255.254.0' matches every address in the
- range `131.155.72.0' through `131.155.73.255'.
- .IP \(bu
-+An expression of the form `n.n.n.n/m\' is interpreted as a
-+`net/prefixlen\' pair, as below, for IPv4 addresses.
-+.IP \(bu
- A string that begins with a `/' character is treated as a file
- name. A host name or address is matched if it matches any host name
- or address pattern listed in the named file. The file format is
---- a/tcpd.h
-+++ b/tcpd.h
-@@ -93,6 +93,7 @@ extern void refuse __P((struct request_i
- extern char *xgets __P((char *, int, FILE *));	/* fgets() on steroids */
- extern char *split_at __P((char *, int));	/* strchr() and split */
- extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
-+extern unsigned long prefix_to_netmask __P((char *)); /* 0-32 prefix length */
- 
- /* Global variables. */
- 
---- a/misc.c
-+++ b/misc.c
-@@ -14,6 +14,8 @@ static char sccsic[] = "@(#) misc.c 1.2
- #include <arpa/inet.h>
- #include <stdio.h>
- #include <string.h>
-+#include <ctype.h>
-+#include <stdlib.h>
- 
- #include "tcpd.h"
- 
-@@ -85,3 +87,22 @@ char   *str;
-     }
-     return (runs == 4 ? inet_addr(str) : INADDR_NONE);
- }
-+
-+/* prefix_to_netmask - convert prefix (0-32) to netmask */
-+
-+unsigned long prefix_to_netmask(str)
-+char	*str;
-+{
-+    unsigned long prefix;
-+    char *endptr;
-+
-+    if (!isdigit(str[0]))
-+	return INADDR_NONE;
-+
-+    prefix = strtoul(str, &endptr, 10);
-+    if ((endptr == str) || (*endptr != '\0') || (prefix > 32))
-+	return INADDR_NONE;
-+
-+    return htonl(~0UL << (32 - prefix));
-+}
-+
---- a/hosts_access.c
-+++ b/hosts_access.c
-@@ -345,7 +345,12 @@ char   *string;
-     if ((addr = dot_quad_addr(string)) == INADDR_NONE)
- 	return (NO);
-     if ((net = dot_quad_addr(net_tok)) == INADDR_NONE
--	|| (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) {
-+	|| ((mask = dot_quad_addr(mask_tok)) == INADDR_NONE
-+	    && strcmp(mask_tok, "255.255.255.255")
-+	    && (mask = prefix_to_netmask(mask_tok)) == INADDR_NONE
-+	    && strcmp(mask_tok, "32"))) {
-+	/* 255.255.255.255 == INADDR_NONE, separate check needed. TJ. */
-+	/* 32 == INADDR_NONE, separate check needed. philipp */
- 	tcpd_warn("bad net/mask expression: %s/%s", net_tok, mask_tok);
- 	return (NO);				/* not tcpd_jump() */
-     }
diff --git a/trunk/package/feeds/packages/tcpproxy/Makefile b/trunk/package/feeds/packages/tcpproxy/Makefile
deleted file mode 100644
index 2f7cb4d0..00000000
--- a/trunk/package/feeds/packages/tcpproxy/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2010 Christian Pointner,
-#                    <equinox@spreadspace.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# This Makefile builds tcpproxy Package for OpenWRT
-#
-# $Id: $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tcpproxy
-PKG_VERSION:=1.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.spreadspace.org/tcpproxy/releases/
-PKG_MD5SUM:=55126473bcde635f9ee019c6caf19bb7
-PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=LICENSE
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/tcpproxy
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=IPv4/IPv6 tcp connection proxy
-  URL:=http://www.spreadspace.org/tcpproxy/
-endef
-
-define Package/tcpproxy/conffiles
-/etc/config/tcpproxy
-endef
-
-define Package/tcpproxy/description
-tcpproxy is a simple tcp connection proxy which combines the features of rinetd and 6tunnel.
- tcpproxy supports IPv4 and IPv6 and also supports connections from IPv6 to IPv4 endpoints and vice versa.
-endef
-
-define Package/tcpproxy/configure
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/src; \
-    touch include.mk; \
-    echo '#ifndef TCPPROXY_config_h_INCLUDED' > config.h; \
-    echo '#define TCPPROXY_config_h_INCLUDED' >> config.h; \
-    echo '' >> config.h; \
-    echo '#define VERSION_STRING_0 "tcpproxy version '`cat $(PKG_BUILD_DIR)/version`'"' >> config.h; \
-    echo '#define VERSION_STRING_1 "built on '`hostname`', '`date +"%d.%m.%Y %H:%M:%S %Z"`'"' >> config.h; \
-    echo '' >> config.h; \
-    echo '#define TARGET "linux"' >> config.h; \
-    echo '#define PREFIX "/usr"' >> config.h; \
-    echo '#define BINDIR "/usr/bin"' >> config.h; \
-    echo '#define ETCDIR "/etc"' >> config.h; \
-    echo '#define CONFFILE "/etc/tcpproxy.conf"' >> config.h; \
-    echo '' >> config.h; \
-    echo '#endif' >> config.h \
-  )
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-    $(TARGET_CONFIGURE_OPTS) \
-    TARGET=Linux \
-    CFLAGS="$(TARGET_CFLAGS)" \
-    LDFLAGS="$(TARGET_LDFLAGS)"
-	$(STRIP) $(PKG_BUILD_DIR)/src/tcpproxy
-endef
-
-define Package/tcpproxy/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/tcpproxy.config $(1)/etc/config/tcpproxy
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2)/src/tcpproxy $(1)/usr/bin/tcpproxy
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/tcpproxy.init $(1)/etc/init.d/tcpproxy
-endef
-
-$(eval $(call BuildPackage,tcpproxy))
diff --git a/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.config b/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.config
deleted file mode 100644
index cd3f67ca..00000000
--- a/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.config
+++ /dev/null
@@ -1,26 +0,0 @@
-config tcpproxy
-  option username 'nobody'
-  option groupname 'nogroup'
-#  option chroot "/var/run/tcpproxy"
-#  option log 'syslog:3,tcpproxy,daemon'
-
-config listen
-  option disabled 1
-
-  option local_port '8000'
-  option resolv 'ipv4'
-
-  option remote_addr 'www.google.at'
-  option remote_port '80'
-  option remote_resolv 'ipv6'
-  option source_addr '2a02:3e0:2002:1:215:58ff:fe31:2ce7'
-
-config listen
-  option disabled 1
-
-  option local_addr '2a02:3e0:2002:1:215:58ff:fe31:2ce7'
-  option local_port '1234'
-
-  option remote_addr 'www.google.at'
-  option remote_port '80'
-  option remote_resolv 'ipv4'
diff --git a/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.init b/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.init
deleted file mode 100644
index 4587a1c7..00000000
--- a/trunk/package/feeds/packages/tcpproxy/files/tcpproxy.init
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=50
-
-BIN=tcpproxy
-DAEMON=/usr/bin/$BIN
-DAEMON_ARGS=""
-DESC=$BIN
-RUN_D=/var/run
-CONFIG_DIR=/var/etc
-CONFIG_FILE=$CONFIG_DIR/$BIN.conf
-
-tcpproxy_write_config() {
-  local cfg="$1"
-
-  config_get_bool value "$cfg" disabled 0
-  [ "$value" -ne 0 ] && return
-
-  local local_addr=""
-  local resolv=""
-  local local_port=""
-  local remote_addr=""
-  local remote_resolv=""
-  local remote_port=""
-  local source_addr=""
-
-  config_get local_addr "$cfg" local_addr
-  config_get local_port "$cfg" local_port
-  config_get resolv "$cfg" resolv
-  config_get remote_addr "$cfg" remote_addr
-  config_get remote_port "$cfg" remote_port
-  config_get remote_resolv "$cfg" remote_resolv
-  config_get source_addr "$cfg" source_addr
-
-  if [ -z "$local_addr" ]; then
-    local_addr="*"
-  fi
-
-  echo "listen $local_addr $local_port" >> $CONFIG_FILE
-  echo "{" >> $CONFIG_FILE
-  if [ -n "$resolv" ]; then
-    echo "  resolv: $resolv;" >> $CONFIG_FILE
-  fi
-  echo "  remote: $remote_addr $remote_port;" >> $CONFIG_FILE
-  if [ -n "$remote_resolv" ]; then
-    echo "  remote-resolv: $remote_resolv;" >> $CONFIG_FILE
-  fi
-  if [ -n "$source_addr" ]; then
-    echo "  source: $source_addr;" >> $CONFIG_FILE
-  fi
-  echo "};" >> $CONFIG_FILE
-  echo "" >> $CONFIG_FILE
-}
-
-tcpproxy_generate_args() {
-  local cfg="$1"
-  local option
-  local value
-
-  for option in username groupname chroot log
-  do
-    config_get value "$cfg" "$option"
-    option=`echo $option | tr '_' '-'`
-    if [ -n "$value" ]; then
-      DAEMON_ARGS="$DAEMON_ARGS --$option $value"
-    fi
-  done
-}
-
-tcpproxy_rebuild_config() {
-  mkdir -p $CONFIG_DIR
-  rm -f $CONFIG_FILE
-  touch $CONFIG_FILE
-  config_load $BIN
-  config_foreach tcpproxy_write_config listen
-}
-
-start() {
-  echo -n "Starting $DESC "
-  tcpproxy_rebuild_config
-  config_foreach tcpproxy_generate_args $BIN
-  $DAEMON  $DAEMON_ARGS --config $CONFIG_FILE --write-pid "$RUN_D/$BIN.pid"
-  echo "."
-}
-
-reload() {
-  echo -n "Reloading $DESC "
-  tcpproxy_rebuild_config
-  kill -SIGHUP `cat "$RUN_D/$BIN.pid"`
-  echo "."
-}
-
-stop() {
-  echo -n "Stopping $DESC "
-  kill `cat $RUN_D/$BIN.pid` > /dev/null 2>&1
-  echo "."
-}
diff --git a/trunk/package/feeds/packages/tcpproxy/patches/001-ragel_generated.patch b/trunk/package/feeds/packages/tcpproxy/patches/001-ragel_generated.patch
deleted file mode 100644
index 38d6bc77..00000000
--- a/trunk/package/feeds/packages/tcpproxy/patches/001-ragel_generated.patch
+++ /dev/null
@@ -1,1378 +0,0 @@
-diff -Nur tcpproxy-1.1.orig/src/cfg_parser.c tcpproxy-1.1/src/cfg_parser.c
---- tcpproxy-1.1.orig/src/cfg_parser.c	1970-01-01 01:00:00.000000000 +0100
-+++ tcpproxy-1.1/src/cfg_parser.c	2014-02-24 04:05:11.087171984 +0100
-@@ -0,0 +1,1374 @@
-+
-+#line 1 "cfg_parser.rl"
-+/*
-+ *  tcpproxy
-+ *
-+ *  tcpproxy is a simple tcp connection proxy which combines the
-+ *  features of rinetd and 6tunnel. tcpproxy supports IPv4 and
-+ *  IPv6 and also supports connections from IPv6 to IPv4
-+ *  endpoints and vice versa.
-+ *
-+ *
-+ *  Copyright (C) 2010-2013 Christian Pointner <equinox@spreadspace.org>
-+ *
-+ *  This file is part of tcpproxy.
-+ *
-+ *  tcpproxy is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  any later version.
-+ *
-+ *  tcpproxy is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with tcpproxy. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/mman.h>
-+
-+#include "datatypes.h"
-+#include "log.h"
-+#include "options.h"
-+#include "tcp.h"
-+#include "listener.h"
-+
-+struct listener {
-+  char* la_;
-+  resolv_type_t lrt_;
-+  char* lp_;
-+  char* ra_;
-+  resolv_type_t rrt_;
-+  char* rp_;
-+  char* sa_;
-+};
-+
-+static void init_listener_struct(struct listener* l)
-+{
-+  if(!l) return;
-+
-+  l->la_ = NULL;
-+  l->lrt_ = ANY;
-+  l->lp_ = NULL;
-+  l->ra_ = NULL;
-+  l->rrt_ = ANY;
-+  l->rp_ = NULL;
-+  l->sa_ = NULL;
-+}
-+
-+static void clear_listener_struct(struct listener* l)
-+{
-+  if(!l) return;
-+
-+  if(l->la_)
-+    free(l->la_);
-+  if(l->lp_)
-+    free(l->lp_);
-+  if(l->ra_)
-+    free(l->ra_);
-+  if(l->rp_)
-+    free(l->rp_);
-+  if(l->sa_)
-+    free(l->sa_);
-+
-+  init_listener_struct(l);
-+}
-+
-+static int owrt_string(char** dest, char* start, char* end)
-+{
-+  if(!dest || start >= end)
-+    return -1;
-+
-+  if(*dest) free(*dest);
-+  int n = end - start;
-+  *dest = malloc(n+1);
-+  if(!(*dest))
-+    return -2;
-+
-+  memcpy(*dest, start, n);
-+  (*dest)[n] = 0;
-+
-+  return 0;
-+}
-+
-+
-+#line 162 "cfg_parser.rl"
-+
-+
-+
-+int parse_listener(char* p, char* pe, listeners_t* listener)
-+{
-+  int cs, ret = 0, cur_line = 1;
-+
-+
-+#line 114 "cfg_parser.c"
-+static const int cfg_parser_start = 67;
-+static const int cfg_parser_first_final = 67;
-+static const int cfg_parser_error = 0;
-+
-+static const int cfg_parser_en_main = 67;
-+
-+
-+#line 170 "cfg_parser.rl"
-+
-+#line 124 "cfg_parser.c"
-+  {
-+  cs = cfg_parser_start;
-+  }
-+
-+#line 171 "cfg_parser.rl"
-+
-+  char* cpy_start = NULL;
-+  struct listener lst;
-+  init_listener_struct(&lst);
-+
-+  char* eof = pe;
-+
-+#line 137 "cfg_parser.c"
-+  {
-+  if ( p == pe )
-+    goto _test_eof;
-+  goto _resume;
-+
-+_again:
-+  switch ( cs ) {
-+    case 67: goto st67;
-+    case 0: goto st0;
-+    case 1: goto st1;
-+    case 2: goto st2;
-+    case 3: goto st3;
-+    case 4: goto st4;
-+    case 5: goto st5;
-+    case 6: goto st6;
-+    case 7: goto st7;
-+    case 8: goto st8;
-+    case 9: goto st9;
-+    case 10: goto st10;
-+    case 11: goto st11;
-+    case 12: goto st12;
-+    case 13: goto st13;
-+    case 14: goto st14;
-+    case 15: goto st15;
-+    case 16: goto st16;
-+    case 17: goto st17;
-+    case 18: goto st18;
-+    case 19: goto st19;
-+    case 20: goto st20;
-+    case 21: goto st21;
-+    case 22: goto st22;
-+    case 23: goto st23;
-+    case 24: goto st24;
-+    case 25: goto st25;
-+    case 26: goto st26;
-+    case 27: goto st27;
-+    case 28: goto st28;
-+    case 29: goto st29;
-+    case 30: goto st30;
-+    case 31: goto st31;
-+    case 32: goto st32;
-+    case 33: goto st33;
-+    case 34: goto st34;
-+    case 35: goto st35;
-+    case 36: goto st36;
-+    case 37: goto st37;
-+    case 38: goto st38;
-+    case 39: goto st39;
-+    case 40: goto st40;
-+    case 41: goto st41;
-+    case 42: goto st42;
-+    case 43: goto st43;
-+    case 44: goto st44;
-+    case 45: goto st45;
-+    case 46: goto st46;
-+    case 47: goto st47;
-+    case 48: goto st48;
-+    case 49: goto st49;
-+    case 50: goto st50;
-+    case 51: goto st51;
-+    case 52: goto st52;
-+    case 53: goto st53;
-+    case 54: goto st54;
-+    case 55: goto st55;
-+    case 56: goto st56;
-+    case 57: goto st57;
-+    case 58: goto st58;
-+    case 59: goto st59;
-+    case 60: goto st60;
-+    case 61: goto st61;
-+    case 62: goto st62;
-+    case 63: goto st63;
-+    case 64: goto st64;
-+    case 65: goto st65;
-+    case 66: goto st66;
-+  default: break;
-+  }
-+
-+  if ( ++p == pe )
-+    goto _test_eof;
-+_resume:
-+  switch ( cs )
-+  {
-+tr1:
-+#line 127 "cfg_parser.rl"
-+  {cur_line++;}
-+  goto st67;
-+tr90:
-+#line 114 "cfg_parser.rl"
-+  {
-+    ret = listeners_add(listener, lst.la_, lst.lrt_, lst.lp_, lst.ra_, lst.rrt_, lst.rp_, lst.sa_);
-+    clear_listener_struct(&lst);
-+  }
-+  goto st67;
-+st67:
-+  if ( ++p == pe )
-+    goto _test_eof67;
-+case 67:
-+#line 236 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 10: goto tr1;
-+    case 32: goto st67;
-+    case 35: goto st1;
-+    case 108: goto st2;
-+  }
-+  if ( 9 <= (*p) && (*p) <= 13 )
-+    goto st67;
-+  goto tr2;
-+tr2:
-+#line 118 "cfg_parser.rl"
-+  {
-+    if(p == eof)
-+      log_printf(ERROR, "config file syntax error: unexpected end of file");
-+    else
-+      log_printf(ERROR, "config file syntax error at line %d", cur_line);
-+
-+    {cs = (cfg_parser_error); goto _again;}
-+  }
-+  goto st0;
-+#line 257 "cfg_parser.c"
-+st0:
-+cs = 0;
-+  goto _out;
-+st1:
-+  if ( ++p == pe )
-+    goto _test_eof1;
-+case 1:
-+  if ( (*p) == 10 )
-+    goto tr1;
-+  goto st1;
-+st2:
-+  if ( ++p == pe )
-+    goto _test_eof2;
-+case 2:
-+  if ( (*p) == 105 )
-+    goto st3;
-+  goto tr2;
-+st3:
-+  if ( ++p == pe )
-+    goto _test_eof3;
-+case 3:
-+  if ( (*p) == 115 )
-+    goto st4;
-+  goto tr2;
-+st4:
-+  if ( ++p == pe )
-+    goto _test_eof4;
-+case 4:
-+  if ( (*p) == 116 )
-+    goto st5;
-+  goto tr2;
-+st5:
-+  if ( ++p == pe )
-+    goto _test_eof5;
-+case 5:
-+  if ( (*p) == 101 )
-+    goto st6;
-+  goto tr2;
-+st6:
-+  if ( ++p == pe )
-+    goto _test_eof6;
-+case 6:
-+  if ( (*p) == 110 )
-+    goto st7;
-+  goto tr2;
-+st7:
-+  if ( ++p == pe )
-+    goto _test_eof7;
-+case 7:
-+  switch( (*p) ) {
-+    case 9: goto st8;
-+    case 32: goto st8;
-+  }
-+  goto tr2;
-+st8:
-+  if ( ++p == pe )
-+    goto _test_eof8;
-+case 8:
-+  switch( (*p) ) {
-+    case 9: goto st8;
-+    case 32: goto st8;
-+    case 42: goto st9;
-+    case 58: goto tr12;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto tr11;
-+    } else if ( (*p) >= 45 )
-+      goto tr10;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto tr10;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto tr10;
-+    } else
-+      goto tr11;
-+  } else
-+    goto tr11;
-+  goto tr2;
-+st9:
-+  if ( ++p == pe )
-+    goto _test_eof9;
-+case 9:
-+  switch( (*p) ) {
-+    case 9: goto st10;
-+    case 32: goto st10;
-+  }
-+  goto tr2;
-+tr91:
-+#line 105 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.la_), cpy_start, p); cpy_start = NULL; }
-+  goto st10;
-+st10:
-+  if ( ++p == pe )
-+    goto _test_eof10;
-+case 10:
-+#line 357 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto st10;
-+    case 32: goto st10;
-+    case 45: goto tr14;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 57 )
-+      goto tr14;
-+  } else if ( (*p) > 90 ) {
-+    if ( 97 <= (*p) && (*p) <= 122 )
-+      goto tr14;
-+  } else
-+    goto tr14;
-+  goto tr2;
-+tr14:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st11;
-+st11:
-+  if ( ++p == pe )
-+    goto _test_eof11;
-+case 11:
-+#line 380 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 10: goto tr16;
-+    case 32: goto tr15;
-+    case 35: goto tr17;
-+    case 45: goto st11;
-+    case 123: goto tr19;
-+  }
-+  if ( (*p) < 48 ) {
-+    if ( 9 <= (*p) && (*p) <= 13 )
-+      goto tr15;
-+  } else if ( (*p) > 57 ) {
-+    if ( (*p) > 90 ) {
-+      if ( 97 <= (*p) && (*p) <= 122 )
-+        goto st11;
-+    } else if ( (*p) >= 65 )
-+      goto st11;
-+  } else
-+    goto st11;
-+  goto tr2;
-+tr21:
-+#line 127 "cfg_parser.rl"
-+  {cur_line++;}
-+  goto st12;
-+tr15:
-+#line 106 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.lp_), cpy_start, p); cpy_start = NULL; }
-+  goto st12;
-+tr16:
-+#line 106 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.lp_), cpy_start, p); cpy_start = NULL; }
-+#line 127 "cfg_parser.rl"
-+  {cur_line++;}
-+  goto st12;
-+st12:
-+  if ( ++p == pe )
-+    goto _test_eof12;
-+case 12:
-+#line 418 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 10: goto tr21;
-+    case 32: goto st12;
-+    case 35: goto st13;
-+    case 123: goto st14;
-+  }
-+  if ( 9 <= (*p) && (*p) <= 13 )
-+    goto st12;
-+  goto tr2;
-+tr17:
-+#line 106 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.lp_), cpy_start, p); cpy_start = NULL; }
-+  goto st13;
-+st13:
-+  if ( ++p == pe )
-+    goto _test_eof13;
-+case 13:
-+#line 436 "cfg_parser.c"
-+  if ( (*p) == 10 )
-+    goto tr21;
-+  goto st13;
-+tr24:
-+#line 127 "cfg_parser.rl"
-+  {cur_line++;}
-+  goto st14;
-+tr19:
-+#line 106 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.lp_), cpy_start, p); cpy_start = NULL; }
-+  goto st14;
-+tr48:
-+#line 110 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.rp_), cpy_start, p); cpy_start = NULL; }
-+  goto st14;
-+tr87:
-+#line 113 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.sa_), cpy_start, p); cpy_start = NULL; }
-+  goto st14;
-+st14:
-+  if ( ++p == pe )
-+    goto _test_eof14;
-+case 14:
-+#line 460 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 10: goto tr24;
-+    case 32: goto st14;
-+    case 35: goto st15;
-+    case 114: goto st16;
-+    case 115: goto st52;
-+    case 125: goto st63;
-+  }
-+  if ( 9 <= (*p) && (*p) <= 13 )
-+    goto st14;
-+  goto tr2;
-+st15:
-+  if ( ++p == pe )
-+    goto _test_eof15;
-+case 15:
-+  if ( (*p) == 10 )
-+    goto tr24;
-+  goto st15;
-+st16:
-+  if ( ++p == pe )
-+    goto _test_eof16;
-+case 16:
-+  if ( (*p) == 101 )
-+    goto st17;
-+  goto tr2;
-+st17:
-+  if ( ++p == pe )
-+    goto _test_eof17;
-+case 17:
-+  switch( (*p) ) {
-+    case 109: goto st18;
-+    case 115: goto st43;
-+  }
-+  goto tr2;
-+st18:
-+  if ( ++p == pe )
-+    goto _test_eof18;
-+case 18:
-+  if ( (*p) == 111 )
-+    goto st19;
-+  goto tr2;
-+st19:
-+  if ( ++p == pe )
-+    goto _test_eof19;
-+case 19:
-+  if ( (*p) == 116 )
-+    goto st20;
-+  goto tr2;
-+st20:
-+  if ( ++p == pe )
-+    goto _test_eof20;
-+case 20:
-+  if ( (*p) == 101 )
-+    goto st21;
-+  goto tr2;
-+st21:
-+  if ( ++p == pe )
-+    goto _test_eof21;
-+case 21:
-+  switch( (*p) ) {
-+    case 9: goto st22;
-+    case 32: goto st22;
-+    case 45: goto st31;
-+    case 58: goto st23;
-+  }
-+  goto tr2;
-+st22:
-+  if ( ++p == pe )
-+    goto _test_eof22;
-+case 22:
-+  switch( (*p) ) {
-+    case 9: goto st22;
-+    case 32: goto st22;
-+    case 58: goto st23;
-+  }
-+  goto tr2;
-+st23:
-+  if ( ++p == pe )
-+    goto _test_eof23;
-+case 23:
-+  switch( (*p) ) {
-+    case 9: goto st24;
-+    case 32: goto st24;
-+  }
-+  goto tr2;
-+st24:
-+  if ( ++p == pe )
-+    goto _test_eof24;
-+case 24:
-+  switch( (*p) ) {
-+    case 9: goto st24;
-+    case 32: goto st24;
-+    case 58: goto tr41;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto tr40;
-+    } else if ( (*p) >= 45 )
-+      goto tr39;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto tr39;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto tr39;
-+    } else
-+      goto tr40;
-+  } else
-+    goto tr40;
-+  goto tr2;
-+tr39:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st25;
-+st25:
-+  if ( ++p == pe )
-+    goto _test_eof25;
-+case 25:
-+#line 581 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr42;
-+    case 32: goto tr42;
-+  }
-+  if ( (*p) < 48 ) {
-+    if ( 45 <= (*p) && (*p) <= 46 )
-+      goto st25;
-+  } else if ( (*p) > 57 ) {
-+    if ( (*p) > 90 ) {
-+      if ( 97 <= (*p) && (*p) <= 122 )
-+        goto st25;
-+    } else if ( (*p) >= 65 )
-+      goto st25;
-+  } else
-+    goto st25;
-+  goto tr2;
-+tr42:
-+#line 109 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.ra_), cpy_start, p); cpy_start = NULL; }
-+  goto st26;
-+st26:
-+  if ( ++p == pe )
-+    goto _test_eof26;
-+case 26:
-+#line 606 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto st26;
-+    case 32: goto st26;
-+    case 45: goto tr45;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 57 )
-+      goto tr45;
-+  } else if ( (*p) > 90 ) {
-+    if ( 97 <= (*p) && (*p) <= 122 )
-+      goto tr45;
-+  } else
-+    goto tr45;
-+  goto tr2;
-+tr45:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st27;
-+st27:
-+  if ( ++p == pe )
-+    goto _test_eof27;
-+case 27:
-+#line 629 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr46;
-+    case 32: goto tr46;
-+    case 45: goto st27;
-+    case 59: goto tr48;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 57 )
-+      goto st27;
-+  } else if ( (*p) > 90 ) {
-+    if ( 97 <= (*p) && (*p) <= 122 )
-+      goto st27;
-+  } else
-+    goto st27;
-+  goto tr2;
-+tr46:
-+#line 110 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.rp_), cpy_start, p); cpy_start = NULL; }
-+  goto st28;
-+tr63:
-+#line 111 "cfg_parser.rl"
-+  { lst.rrt_ = IPV4_ONLY; }
-+  goto st28;
-+tr64:
-+#line 112 "cfg_parser.rl"
-+  { lst.rrt_ = IPV6_ONLY; }
-+  goto st28;
-+tr73:
-+#line 107 "cfg_parser.rl"
-+  { lst.lrt_ = IPV4_ONLY; }
-+  goto st28;
-+tr74:
-+#line 108 "cfg_parser.rl"
-+  { lst.lrt_ = IPV6_ONLY; }
-+  goto st28;
-+tr85:
-+#line 113 "cfg_parser.rl"
-+  { ret = owrt_string(&(lst.sa_), cpy_start, p); cpy_start = NULL; }
-+  goto st28;
-+st28:
-+  if ( ++p == pe )
-+    goto _test_eof28;
-+case 28:
-+#line 673 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto st28;
-+    case 32: goto st28;
-+    case 59: goto st14;
-+  }
-+  goto tr2;
-+tr40:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st29;
-+st29:
-+  if ( ++p == pe )
-+    goto _test_eof29;
-+case 29:
-+#line 688 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr42;
-+    case 32: goto tr42;
-+    case 58: goto st30;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto st29;
-+    } else if ( (*p) >= 45 )
-+      goto st25;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto st25;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto st25;
-+    } else
-+      goto st29;
-+  } else
-+    goto st29;
-+  goto tr2;
-+tr41:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st30;
-+st30:
-+  if ( ++p == pe )
-+    goto _test_eof30;
-+case 30:
-+#line 720 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr42;
-+    case 32: goto tr42;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 58 )
-+      goto st30;
-+  } else if ( (*p) > 70 ) {
-+    if ( 97 <= (*p) && (*p) <= 102 )
-+      goto st30;
-+  } else
-+    goto st30;
-+  goto tr2;
-+st31:
-+  if ( ++p == pe )
-+    goto _test_eof31;
-+case 31:
-+  if ( (*p) == 114 )
-+    goto st32;
-+  goto tr2;
-+st32:
-+  if ( ++p == pe )
-+    goto _test_eof32;
-+case 32:
-+  if ( (*p) == 101 )
-+    goto st33;
-+  goto tr2;
-+st33:
-+  if ( ++p == pe )
-+    goto _test_eof33;
-+case 33:
-+  if ( (*p) == 115 )
-+    goto st34;
-+  goto tr2;
-+st34:
-+  if ( ++p == pe )
-+    goto _test_eof34;
-+case 34:
-+  if ( (*p) == 111 )
-+    goto st35;
-+  goto tr2;
-+st35:
-+  if ( ++p == pe )
-+    goto _test_eof35;
-+case 35:
-+  if ( (*p) == 108 )
-+    goto st36;
-+  goto tr2;
-+st36:
-+  if ( ++p == pe )
-+    goto _test_eof36;
-+case 36:
-+  if ( (*p) == 118 )
-+    goto st37;
-+  goto tr2;
-+st37:
-+  if ( ++p == pe )
-+    goto _test_eof37;
-+case 37:
-+  switch( (*p) ) {
-+    case 9: goto st37;
-+    case 32: goto st37;
-+    case 58: goto st38;
-+  }
-+  goto tr2;
-+st38:
-+  if ( ++p == pe )
-+    goto _test_eof38;
-+case 38:
-+  switch( (*p) ) {
-+    case 9: goto st39;
-+    case 32: goto st39;
-+  }
-+  goto tr2;
-+st39:
-+  if ( ++p == pe )
-+    goto _test_eof39;
-+case 39:
-+  switch( (*p) ) {
-+    case 9: goto st39;
-+    case 32: goto st39;
-+    case 73: goto st40;
-+    case 105: goto st40;
-+  }
-+  goto tr2;
-+st40:
-+  if ( ++p == pe )
-+    goto _test_eof40;
-+case 40:
-+  switch( (*p) ) {
-+    case 80: goto st41;
-+    case 112: goto st41;
-+  }
-+  goto tr2;
-+st41:
-+  if ( ++p == pe )
-+    goto _test_eof41;
-+case 41:
-+  switch( (*p) ) {
-+    case 86: goto st42;
-+    case 118: goto st42;
-+  }
-+  goto tr2;
-+st42:
-+  if ( ++p == pe )
-+    goto _test_eof42;
-+case 42:
-+  switch( (*p) ) {
-+    case 52: goto tr63;
-+    case 54: goto tr64;
-+  }
-+  goto tr2;
-+st43:
-+  if ( ++p == pe )
-+    goto _test_eof43;
-+case 43:
-+  if ( (*p) == 111 )
-+    goto st44;
-+  goto tr2;
-+st44:
-+  if ( ++p == pe )
-+    goto _test_eof44;
-+case 44:
-+  if ( (*p) == 108 )
-+    goto st45;
-+  goto tr2;
-+st45:
-+  if ( ++p == pe )
-+    goto _test_eof45;
-+case 45:
-+  if ( (*p) == 118 )
-+    goto st46;
-+  goto tr2;
-+st46:
-+  if ( ++p == pe )
-+    goto _test_eof46;
-+case 46:
-+  switch( (*p) ) {
-+    case 9: goto st46;
-+    case 32: goto st46;
-+    case 58: goto st47;
-+  }
-+  goto tr2;
-+st47:
-+  if ( ++p == pe )
-+    goto _test_eof47;
-+case 47:
-+  switch( (*p) ) {
-+    case 9: goto st48;
-+    case 32: goto st48;
-+  }
-+  goto tr2;
-+st48:
-+  if ( ++p == pe )
-+    goto _test_eof48;
-+case 48:
-+  switch( (*p) ) {
-+    case 9: goto st48;
-+    case 32: goto st48;
-+    case 73: goto st49;
-+    case 105: goto st49;
-+  }
-+  goto tr2;
-+st49:
-+  if ( ++p == pe )
-+    goto _test_eof49;
-+case 49:
-+  switch( (*p) ) {
-+    case 80: goto st50;
-+    case 112: goto st50;
-+  }
-+  goto tr2;
-+st50:
-+  if ( ++p == pe )
-+    goto _test_eof50;
-+case 50:
-+  switch( (*p) ) {
-+    case 86: goto st51;
-+    case 118: goto st51;
-+  }
-+  goto tr2;
-+st51:
-+  if ( ++p == pe )
-+    goto _test_eof51;
-+case 51:
-+  switch( (*p) ) {
-+    case 52: goto tr73;
-+    case 54: goto tr74;
-+  }
-+  goto tr2;
-+st52:
-+  if ( ++p == pe )
-+    goto _test_eof52;
-+case 52:
-+  if ( (*p) == 111 )
-+    goto st53;
-+  goto tr2;
-+st53:
-+  if ( ++p == pe )
-+    goto _test_eof53;
-+case 53:
-+  if ( (*p) == 117 )
-+    goto st54;
-+  goto tr2;
-+st54:
-+  if ( ++p == pe )
-+    goto _test_eof54;
-+case 54:
-+  if ( (*p) == 114 )
-+    goto st55;
-+  goto tr2;
-+st55:
-+  if ( ++p == pe )
-+    goto _test_eof55;
-+case 55:
-+  if ( (*p) == 99 )
-+    goto st56;
-+  goto tr2;
-+st56:
-+  if ( ++p == pe )
-+    goto _test_eof56;
-+case 56:
-+  if ( (*p) == 101 )
-+    goto st57;
-+  goto tr2;
-+st57:
-+  if ( ++p == pe )
-+    goto _test_eof57;
-+case 57:
-+  switch( (*p) ) {
-+    case 9: goto st57;
-+    case 32: goto st57;
-+    case 58: goto st58;
-+  }
-+  goto tr2;
-+st58:
-+  if ( ++p == pe )
-+    goto _test_eof58;
-+case 58:
-+  switch( (*p) ) {
-+    case 9: goto st59;
-+    case 32: goto st59;
-+  }
-+  goto tr2;
-+st59:
-+  if ( ++p == pe )
-+    goto _test_eof59;
-+case 59:
-+  switch( (*p) ) {
-+    case 9: goto st59;
-+    case 32: goto st59;
-+    case 58: goto tr84;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto tr83;
-+    } else if ( (*p) >= 45 )
-+      goto tr82;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto tr82;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto tr82;
-+    } else
-+      goto tr83;
-+  } else
-+    goto tr83;
-+  goto tr2;
-+tr82:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st60;
-+st60:
-+  if ( ++p == pe )
-+    goto _test_eof60;
-+case 60:
-+#line 1000 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr85;
-+    case 32: goto tr85;
-+    case 59: goto tr87;
-+  }
-+  if ( (*p) < 48 ) {
-+    if ( 45 <= (*p) && (*p) <= 46 )
-+      goto st60;
-+  } else if ( (*p) > 57 ) {
-+    if ( (*p) > 90 ) {
-+      if ( 97 <= (*p) && (*p) <= 122 )
-+        goto st60;
-+    } else if ( (*p) >= 65 )
-+      goto st60;
-+  } else
-+    goto st60;
-+  goto tr2;
-+tr83:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st61;
-+st61:
-+  if ( ++p == pe )
-+    goto _test_eof61;
-+case 61:
-+#line 1026 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr85;
-+    case 32: goto tr85;
-+    case 58: goto st62;
-+    case 59: goto tr87;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto st61;
-+    } else if ( (*p) >= 45 )
-+      goto st60;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto st60;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto st60;
-+    } else
-+      goto st61;
-+  } else
-+    goto st61;
-+  goto tr2;
-+tr84:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st62;
-+st62:
-+  if ( ++p == pe )
-+    goto _test_eof62;
-+case 62:
-+#line 1059 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr85;
-+    case 32: goto tr85;
-+    case 59: goto tr87;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 58 )
-+      goto st62;
-+  } else if ( (*p) > 70 ) {
-+    if ( 97 <= (*p) && (*p) <= 102 )
-+      goto st62;
-+  } else
-+    goto st62;
-+  goto tr2;
-+st63:
-+  if ( ++p == pe )
-+    goto _test_eof63;
-+case 63:
-+  if ( (*p) == 59 )
-+    goto tr90;
-+  goto tr2;
-+tr10:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st64;
-+st64:
-+  if ( ++p == pe )
-+    goto _test_eof64;
-+case 64:
-+#line 1089 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr91;
-+    case 32: goto tr91;
-+  }
-+  if ( (*p) < 48 ) {
-+    if ( 45 <= (*p) && (*p) <= 46 )
-+      goto st64;
-+  } else if ( (*p) > 57 ) {
-+    if ( (*p) > 90 ) {
-+      if ( 97 <= (*p) && (*p) <= 122 )
-+        goto st64;
-+    } else if ( (*p) >= 65 )
-+      goto st64;
-+  } else
-+    goto st64;
-+  goto tr2;
-+tr11:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st65;
-+st65:
-+  if ( ++p == pe )
-+    goto _test_eof65;
-+case 65:
-+#line 1114 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr91;
-+    case 32: goto tr91;
-+    case 58: goto st66;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( (*p) > 46 ) {
-+      if ( 48 <= (*p) && (*p) <= 57 )
-+        goto st65;
-+    } else if ( (*p) >= 45 )
-+      goto st64;
-+  } else if ( (*p) > 70 ) {
-+    if ( (*p) < 97 ) {
-+      if ( 71 <= (*p) && (*p) <= 90 )
-+        goto st64;
-+    } else if ( (*p) > 102 ) {
-+      if ( 103 <= (*p) && (*p) <= 122 )
-+        goto st64;
-+    } else
-+      goto st65;
-+  } else
-+    goto st65;
-+  goto tr2;
-+tr12:
-+#line 104 "cfg_parser.rl"
-+  { cpy_start = p; }
-+  goto st66;
-+st66:
-+  if ( ++p == pe )
-+    goto _test_eof66;
-+case 66:
-+#line 1146 "cfg_parser.c"
-+  switch( (*p) ) {
-+    case 9: goto tr91;
-+    case 32: goto tr91;
-+  }
-+  if ( (*p) < 65 ) {
-+    if ( 48 <= (*p) && (*p) <= 58 )
-+      goto st66;
-+  } else if ( (*p) > 70 ) {
-+    if ( 97 <= (*p) && (*p) <= 102 )
-+      goto st66;
-+  } else
-+    goto st66;
-+  goto tr2;
-+  }
-+  _test_eof67: cs = 67; goto _test_eof;
-+  _test_eof1: cs = 1; goto _test_eof;
-+  _test_eof2: cs = 2; goto _test_eof;
-+  _test_eof3: cs = 3; goto _test_eof;
-+  _test_eof4: cs = 4; goto _test_eof;
-+  _test_eof5: cs = 5; goto _test_eof;
-+  _test_eof6: cs = 6; goto _test_eof;
-+  _test_eof7: cs = 7; goto _test_eof;
-+  _test_eof8: cs = 8; goto _test_eof;
-+  _test_eof9: cs = 9; goto _test_eof;
-+  _test_eof10: cs = 10; goto _test_eof;
-+  _test_eof11: cs = 11; goto _test_eof;
-+  _test_eof12: cs = 12; goto _test_eof;
-+  _test_eof13: cs = 13; goto _test_eof;
-+  _test_eof14: cs = 14; goto _test_eof;
-+  _test_eof15: cs = 15; goto _test_eof;
-+  _test_eof16: cs = 16; goto _test_eof;
-+  _test_eof17: cs = 17; goto _test_eof;
-+  _test_eof18: cs = 18; goto _test_eof;
-+  _test_eof19: cs = 19; goto _test_eof;
-+  _test_eof20: cs = 20; goto _test_eof;
-+  _test_eof21: cs = 21; goto _test_eof;
-+  _test_eof22: cs = 22; goto _test_eof;
-+  _test_eof23: cs = 23; goto _test_eof;
-+  _test_eof24: cs = 24; goto _test_eof;
-+  _test_eof25: cs = 25; goto _test_eof;
-+  _test_eof26: cs = 26; goto _test_eof;
-+  _test_eof27: cs = 27; goto _test_eof;
-+  _test_eof28: cs = 28; goto _test_eof;
-+  _test_eof29: cs = 29; goto _test_eof;
-+  _test_eof30: cs = 30; goto _test_eof;
-+  _test_eof31: cs = 31; goto _test_eof;
-+  _test_eof32: cs = 32; goto _test_eof;
-+  _test_eof33: cs = 33; goto _test_eof;
-+  _test_eof34: cs = 34; goto _test_eof;
-+  _test_eof35: cs = 35; goto _test_eof;
-+  _test_eof36: cs = 36; goto _test_eof;
-+  _test_eof37: cs = 37; goto _test_eof;
-+  _test_eof38: cs = 38; goto _test_eof;
-+  _test_eof39: cs = 39; goto _test_eof;
-+  _test_eof40: cs = 40; goto _test_eof;
-+  _test_eof41: cs = 41; goto _test_eof;
-+  _test_eof42: cs = 42; goto _test_eof;
-+  _test_eof43: cs = 43; goto _test_eof;
-+  _test_eof44: cs = 44; goto _test_eof;
-+  _test_eof45: cs = 45; goto _test_eof;
-+  _test_eof46: cs = 46; goto _test_eof;
-+  _test_eof47: cs = 47; goto _test_eof;
-+  _test_eof48: cs = 48; goto _test_eof;
-+  _test_eof49: cs = 49; goto _test_eof;
-+  _test_eof50: cs = 50; goto _test_eof;
-+  _test_eof51: cs = 51; goto _test_eof;
-+  _test_eof52: cs = 52; goto _test_eof;
-+  _test_eof53: cs = 53; goto _test_eof;
-+  _test_eof54: cs = 54; goto _test_eof;
-+  _test_eof55: cs = 55; goto _test_eof;
-+  _test_eof56: cs = 56; goto _test_eof;
-+  _test_eof57: cs = 57; goto _test_eof;
-+  _test_eof58: cs = 58; goto _test_eof;
-+  _test_eof59: cs = 59; goto _test_eof;
-+  _test_eof60: cs = 60; goto _test_eof;
-+  _test_eof61: cs = 61; goto _test_eof;
-+  _test_eof62: cs = 62; goto _test_eof;
-+  _test_eof63: cs = 63; goto _test_eof;
-+  _test_eof64: cs = 64; goto _test_eof;
-+  _test_eof65: cs = 65; goto _test_eof;
-+  _test_eof66: cs = 66; goto _test_eof;
-+
-+  _test_eof: {}
-+  if ( p == eof )
-+  {
-+  switch ( cs ) {
-+  case 1:
-+  case 2:
-+  case 3:
-+  case 4:
-+  case 5:
-+  case 6:
-+  case 7:
-+  case 8:
-+  case 9:
-+  case 10:
-+  case 11:
-+  case 12:
-+  case 13:
-+  case 14:
-+  case 15:
-+  case 16:
-+  case 17:
-+  case 18:
-+  case 19:
-+  case 20:
-+  case 21:
-+  case 22:
-+  case 23:
-+  case 24:
-+  case 25:
-+  case 26:
-+  case 27:
-+  case 28:
-+  case 29:
-+  case 30:
-+  case 31:
-+  case 32:
-+  case 33:
-+  case 34:
-+  case 35:
-+  case 36:
-+  case 37:
-+  case 38:
-+  case 39:
-+  case 40:
-+  case 41:
-+  case 42:
-+  case 43:
-+  case 44:
-+  case 45:
-+  case 46:
-+  case 47:
-+  case 48:
-+  case 49:
-+  case 50:
-+  case 51:
-+  case 52:
-+  case 53:
-+  case 54:
-+  case 55:
-+  case 56:
-+  case 57:
-+  case 58:
-+  case 59:
-+  case 60:
-+  case 61:
-+  case 62:
-+  case 63:
-+  case 64:
-+  case 65:
-+  case 66:
-+#line 118 "cfg_parser.rl"
-+  {
-+    if(p == eof)
-+      log_printf(ERROR, "config file syntax error: unexpected end of file");
-+    else
-+      log_printf(ERROR, "config file syntax error at line %d", cur_line);
-+
-+    {cs = (cfg_parser_error); goto _again;}
-+  }
-+  break;
-+#line 1309 "cfg_parser.c"
-+  }
-+  }
-+
-+  _out: {}
-+  }
-+
-+#line 178 "cfg_parser.rl"
-+
-+  if(cs == cfg_parser_error) {
-+    listeners_revert(listener);
-+    ret = 1;
-+  }
-+  else
-+    ret = listeners_update(listener);
-+
-+  clear_listener_struct(&lst);
-+
-+  return ret;
-+}
-+
-+int read_configfile(const char* filename, listeners_t* listener)
-+{
-+  int fd = open(filename, 0);
-+  if(fd < 0) {
-+    log_printf(ERROR, "open('%s') failed: %s", filename, strerror(errno));
-+    return -1;
-+  }
-+
-+  struct stat sb;
-+  if(fstat(fd, &sb) == -1) {
-+    log_printf(ERROR, "fstat() error: %s", strerror(errno));
-+    close(fd);
-+    return -1;
-+  }
-+
-+  if(!sb.st_size) {
-+    log_printf(ERROR, "config file %s is empty", filename);
-+    close(fd);
-+    return -1;
-+  }
-+
-+  if(!S_ISREG(sb.st_mode)) {
-+    log_printf(ERROR, "config file %s is not a regular file", filename);
-+    close(fd);
-+    return -1;
-+  }
-+
-+  char* p = (char*)mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+  if(p == MAP_FAILED) {
-+    log_printf(ERROR, "mmap() error: %s", strerror(errno));
-+    close(fd);
-+    return -1;
-+  }
-+  close(fd);
-+
-+  log_printf(DEBUG, "mapped %ld bytes from file %s at address 0x%08lX", sb.st_size, filename, p);
-+  int ret = parse_listener(p, p + sb.st_size, listener);
-+
-+  if(munmap(p, sb.st_size) == -1) {
-+    log_printf(ERROR, "munmap() error: %s", strerror(errno));
-+    return -1;
-+  }
-+  log_printf(DEBUG, "unmapped file %s", filename);
-+
-+  return ret;
-+}
diff --git a/trunk/package/feeds/packages/tcsh/Makefile b/trunk/package/feeds/packages/tcsh/Makefile
deleted file mode 100644
index a50f1820..00000000
--- a/trunk/package/feeds/packages/tcsh/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tcsh
-PKG_VERSION:=6.18.01
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/tcsh/
-PKG_MD5SUM:=6eed09dbd4223ab5b6955378450d228a
-PKG_LICENSE:=BSD-4-Clause-UC
-PKG_LICENSE_FILES:=Copyright
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tcsh
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Enhanced Berkeley UNIX C shell
-  DEPENDS:=+libncurses
-  URL:=http://www.tcsh.org/
-endef
-
-define Package/tcsh/description
-	Tcsh is an enhanced, but completely compatible
-	version of the Berkeley UNIX C shell (csh). It
-	is a command language interpreter usable both
-	as an interactive login shell and a shell
-	script command processor. It includes a
-	command-line editor, programmable word
-	completion, spelling correction, a history
-	mechanism, job control and a C-like syntax.
-endef
-
-define Package/tcsh/postinst
-#!/bin/sh
-grep tcsh $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/tcsh" >> $${IPKG_INSTROOT}/etc/shells
-	echo "/bin/csh" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/tcsh/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcsh $(1)/bin/
-	ln -sf tcsh $(1)/bin/csh
-endef
-
-$(eval $(call BuildPackage,tcsh))
diff --git a/trunk/package/feeds/packages/tdb/Makefile b/trunk/package/feeds/packages/tdb/Makefile
deleted file mode 100644
index 2fce3dc6..00000000
--- a/trunk/package/feeds/packages/tdb/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tdb
-PKG_VERSION:=1.0.6
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/tdb
-PKG_MD5SUM:=6b643fdeb48304010dcd5f675e458b58
-
-PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=+libgdbm
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tdb
-  SUBMENU:=database
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Trivial Database
-  URL:=http://sourceforge.net/projects/tdb/
-  MAINTAINER:=Dmitry V. Zimin <pfzim@mail.ru>
-#  DEPENDS:=+libgdbm
-endef
-
-define Package/tdb/description
-  TDB is a Trivial Database. In concept, it is very much like GDBM,
-  and BSD's DB except that it allows multiple simultaneous writers
-  and uses locking internally to keep writers from trampling on
-  each other. TDB is also extremely small.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/tdb.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/tdb/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tdb))
-
diff --git a/trunk/package/feeds/packages/tdb/patches/001-printf-fix.patch b/trunk/package/feeds/packages/tdb/patches/001-printf-fix.patch
deleted file mode 100644
index f88d942e..00000000
--- a/trunk/package/feeds/packages/tdb/patches/001-printf-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/tdbtool.c	2001-12-11 06:45:47.000000000 +0300
-+++ b/tdbtool.c	2014-11-14 15:14:00.401164300 +0300
-@@ -169,23 +169,21 @@ static void print_data(unsigned char *bu
- 
- static void help(void)
- {
--	printf("
--tdbtool: 
--  create    dbname     : create a database
--  open      dbname     : open an existing database
--  erase                : erase the database
--  dump      dumpname   : dump the database as strings
--  insert    key  data  : insert a record
--  store     key  data  : store a record (replace)
--  show      key        : show a record by key
--  delete    key        : delete a record by key
--  list                 : print the database hash table and freelist
--  free                 : print the database freelist
--  1 | first            : print the first record
--  n | next             : print the next record
--  q | quit             : terminate
--  \\n                   : repeat 'next' command
--");
-+	printf("tdbtool:\n");
-+	printf("  create    dbname     : create a database\n");
-+	printf("  open      dbname     : open an existing database\n");
-+	printf("  erase                : erase the database\n");
-+	printf("  dump      dumpname   : dump the database as strings\n");
-+	printf("  insert    key  data  : insert a record\n");
-+	printf("  store     key  data  : store a record (replace)\n");
-+	printf("  show      key        : show a record by key\n");
-+	printf("  delete    key        : delete a record by key\n");
-+	printf("  list                 : print the database hash table and freelist\n");
-+	printf("  free                 : print the database freelist\n");
-+	printf("  1 | first            : print the first record\n");
-+	printf("  n | next             : print the next record\n");
-+	printf("  q | quit             : terminate\n");
-+	printf("  \\n                   : repeat 'next' command\n\n");
- }
- 
- static void terror(char *why)
diff --git a/trunk/package/feeds/packages/tgt/Makefile b/trunk/package/feeds/packages/tgt/Makefile
deleted file mode 100644
index 874a9309..00000000
--- a/trunk/package/feeds/packages/tgt/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tgt
-PKG_VERSION:=1.0.53
-PKG_REV:=9764e0afd9a7115e356fc85569a780f9003c4eac
-PKG_RELEASE:=3
-PKG_USE_MIPS16:=0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/fujita/tgt.git
-
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-2.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tgt
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://stgt.sourceforge.net/
-  TITLE:=userspace iSCSI target
-  DEPENDS:=+libpthread +libaio +@KERNEL_AIO +@KERNEL_DIRECT_IO
-endef
-
-define Package/tgt/description
-Linux SCSI target framework (tgt) aims to simplify various SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and maintenance.
-Key goals of the project are the clean integration into the scsi-mid layer and implementing a great portion of tgt in user space.
-Tgt consists of kernel-space and user-space code. The kernel-space component is included in upstream as of 2.6.20.
-Note that if you are interested in only iSCSI (probably you are), you need only the user-space code (any kernel version is fine).
-endef
-
-define Build/Compile
-	CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LD="$(TARGET_CC)" \
-		install-programs
-endef
-
-define Package/tgt/conffiles
-/etc/config/tgt
-endef
-
-define Package/tgt/install
-	$(INSTALL_DIR) $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) ./files/* $(1)/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tgtd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tgtadm $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,tgt))
diff --git a/trunk/package/feeds/packages/tgt/files/etc/config/tgt b/trunk/package/feeds/packages/tgt/files/etc/config/tgt
deleted file mode 100644
index a721c71c..00000000
--- a/trunk/package/feeds/packages/tgt/files/etc/config/tgt
+++ /dev/null
@@ -1,64 +0,0 @@
-config options 'tgt'
-# iothreads limits number of worker threads per rdwr target, default is 16
-# which seems to be too much for an avarage router
-	option iothreads '2'
-#	option nop_count '3'
-#	option nop_interval '1'
-#	list portal '[::1]'
-#	list portal '127.0.0.1:3261'
-#	list portal '0.0.0.0:3262'
-#	list portal '[::]:3263'
-
-config target 1
-	option name 'iqn.2012-06.org.openwrt:target1'
-#	list allow_name 'iqn.1994-05.org.example:fedcba987654'
-#	list allow_address '192.168.2.128/27'
-
-#config target 2
-#	option name 'iqn.2012-06.org.openwrt:t2'
-
-# all options are set to default, except for the device
-# lun "name" is constructed as TGTID_LUN
-#config lun                        1_1
-#	option 'device' '/dev/sda'
-# type of scsi device. available options: disk, cd, pt (sg passthrough)
-#	option 'type' 'disk'
-# backing store access method: rdwr (read-write), aio (async IO), sg (for pt type only, device must be /dev/sgN)
-#	option 'bstype' 'aio'
-# set sync and/or direct flags when opening device, affect only rdwr
-#	option 'sync' '0'
-#	option 'direct' '0'
-# block size for lun, default is 512
-#	option 'blocksize' 4096
-# override SCSI mode page, see tgtadm man page for details
-#	option 'mode_page' 'string'
-# vendor, product, revision, SCSI ID and SCSI Serial number
-#	option 'vendor_id' 'string'
-#	option 'product_id' 'string'
-#	option 'product_rev' 'string'
-#	option 'scsi_id' 'string'
-#	option 'scsi_sn' 'string'
-# refuse write attempts. applies only to disk type
-#	option 'readonly' '0'
-# Disk devices default to non-removable, cd - to removable
-#	option 'removable' '0'
-#  0 = Clasic sense format, 1 = Support descriptor format.
-#	option 'sense_format' '0'
-
-#config lun 2_1
-#	option device /mnt/iscsi.img
-
-#config lun 2_2
-#	option device /dev/sdc
-
-#config account
-#	list target 1
-#	list target 2
-#	option user "username1"
-#	option password "pass1"
-
-#config account
-#	option target 2
-#	option user "user2"
-#	option password "pwd2"
-#	option outgoing 1
diff --git a/trunk/package/feeds/packages/tgt/files/etc/init.d/tgt b/trunk/package/feeds/packages/tgt/files/etc/init.d/tgt
deleted file mode 100755
index bd5f983c..00000000
--- a/trunk/package/feeds/packages/tgt/files/etc/init.d/tgt
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=91
-STOP=10
-
-EXTRA_COMMANDS="show"
-EXTRA_HELP="	show	Show current configuration of tgtd"
-
-NAME=tgt
-PROG=/usr/sbin/tgtd
-USE_PROCD=1
-
-tgtadm="/usr/sbin/tgtadm --lld iscsi"
-logger="logger -p daemon.err -s -t $NAME"
-
-validate_lun_section() {
-	uci_validate_section tgt lun $1 \
-		'device:or(file, device)' \
-		'type:or("disk", "cd", "pt"):disk' \
-		'bstype:or("rdwr", "aio", "sg"):rdwr' \
-		'sync:bool:0' \
-		'direct:bool:0' \
-		'blocksize:uinteger' \
-		'mode_page:string' \
-		'product_id:string' \
-		'product_rev:string' \
-		'readonly:bool:0' \
-		'removable:bool' \
-		'scsi_id:string' \
-		'scsi_sn:string' \
-		'sense_format:range(0, 1)' \
-		'vendor_id:string'
-}
-
-handle_lun() {
-	local tgt_lun=$1
-	local tgtid=$2
-	local readonly device type bstype sync direct
-	local my_tgtid=${tgt_lun%_*}
-	local lun=${tgt_lun#*_}
-
-	[ $my_tgtid -eq $tgtid ] || return 0
-
-	validate_lun_section $tgt_lun || {
-		$logger "Validation failed for LUN $tgt_lun"
-		return 1
-	}
-	[ "$device" ] || {
-		$logger "Device is required for target $tgt_lun"
-		return 1
-	}
-
-	if [ $sync -ne 0 -o $direct -ne 0 ]; then
-		local bsoflags
-		[ $sync -ne 0 ] && bsoflags="sync"
-		[ $direct -ne 0 ] && bsoflags="direct"
-		[ $sync -ne 0 -a $direct -ne 0 ] && bsoflags="sync:direct"
-		bsoflags="--bsoflags $bsoflags"
-	fi
-
-	blocksize=${blocksize+--blocksize=$blocksize}
-	local params='' i
-	for i in mode_page product_id product_rev readonly removable scsi_id scsi_sn sense_format vendor_id; do
-		eval params=\${$i+$i=\$$i,}\$params
-	done
-
-	local _tgtadm="$tgtadm --mode logicalunit --tid $tgtid --lun $lun"
-	$_tgtadm --op new --backing-store $device --device-type $type --bstype $bstype --bstype $bstype $bsoflags $blocksize || {
-		$logger "Failed to create lun $tgt_lun"
-		return 1
-	}
-	$_tgtadm --op update --param $params || {
-		$logger "Failed to update lun $tgt_lun"
-		return 1
-	}
-}
-
-validate_account_section () {
-	uci_validate_section tgt account $1 \
-		'target:list(uinteger)' \
-		'user:string' \
-		'password:string' \
-		'outgoing:bool:0'
-}
-
-handle_account() {
-	local _tgtadm="$tgtadm --mode account"
-	local user password target outgoing
-
-	validate_account_section $1 || {
-		$logger "Validation failed for account ${user:-$1}"
-		return 1
-	}
-	[ "$user" ] || {
-		$logger "User is required for account $1. Run 'uci show tgt.$1' and check options"
-		return 1
-	}
-	[ "$target" ] || {
-		$logger "Target is required for account $user"
-		return 1
-	}
-	[ "$password" ] || {
-		$logger "Password is required for account $user"
-		return 1
-	}
-	$_tgtadm --op new --user "$user" --password "$password" || {
-		$logger "Failed to create user $username"
-		return 1
-	}
-}
-
-bind_account_to_target() {
-	local _tgtadm="$tgtadm --mode account"
-	local tgtid=$2 user password outgoing
-
-	validate_account_section $1 || {
-		$logger "Validation failed for account ${user:-$1}"
-		return 1
-	}
-
-	[ "$outgoing" -ne 0 ] && outgoing=--outgoing || outgoing=""
-	local t
-	for t in $target; do
-		[ "$t" -eq "$tgtid" ] && {
-			$_tgtadm --op bind --tid $tgtid --user "$user" $outgoing || {
-				$logger "Failed to bind user $username to target $tgtid"
-				return 1
-			}
-		}
-	done
-	return 0
-}
-
-validate_target_section() {
-	uci_validate_section tgt target $1 \
-		'name:string:iqn.2012-06.org.openwrt' \
-		'allow_address:list(string):ALL' \
-		'allow_name:list(string)'
-}
-
-handle_target() {
-	local tgtid=$1
-	local _tgtadm="$tgtadm --mode target"
-	local name allow
-
-	[ $tgtid -ge 0 ] || return 1
-	validate_target_section $tgtid || {
-		$logger "Validation failed for target $tgtid"
-		return 1
-	}
-	$_tgtadm --op new --tid $tgtid --targetname $name || {
-		$logger "Failed to create target $tgtid"
-		return 1
-	}
-	local i
-	for i in $allow_address; do
-		$_tgtadm --op bind --tid $tgtid --initiator-address $i || {
-			$logger "Failed to set allow $i to connect to target $tgtid"
-			return 1
-		}
-	done
-	for i in $allow_name; do
-		$_tgtadm --op bind --tid $tgtid --initiator-name $i || {
-			$logger "Failed to set allow $i to connect to target $tgtid"
-			return 1
-		}
-	done
-	config_foreach handle_lun lun $tgtid || return 1
-	config_foreach bind_account_to_target account $tgtid || return 1
-}
-
-configure() {
-	config_load $NAME
-	$tgtadm --mode sys --op update --name State -v offline || {
-		$logger "Failed to set system state to Offline"
-		return 1
-	}
-	config_foreach handle_account account || return 1
-	config_foreach handle_target target || return 1
-	$tgtadm --mode sys --op update --name State -v ready || {
-		$logger "Failed to set system state to Ready"
-		return 1
-	}
-	return 0
-}
-
-validate_tgt_section() {
-	uci_validate_section tgt options $1 \
-		'iothreads:uinteger' \
-		'portal:list(string)' \
-		'nop_interval:uinteger' \
-		'nop_count:uinteger'
-}
-
-start_service() {
-	local iothreads portal nop_interval nop_count
-	validate_tgt_section tgt || {
-		$logger "Validation failed for tgt options"
-		return 1
-	}
-	procd_open_instance
-	procd_set_param command $PROG -f
-	[ "$iothreads" ] && procd_append_param command -t $iothreads
-	[ "${portal}${nop_interval}${nop_count}" ] && {
-		local iscsi="" i
-		for i in nop_interval nop_count; do
-			eval iscsi=\${$i+$i=\$$i,}\$iscsi
-		done
-		for i in $portal; do
-			iscsi="portal=$i,$iscsi"
-		done
-		procd_append_param command --iscsi $iscsi
-	}
-	procd_set_param respawn
-	procd_close_instance
-	logger -p daemon.info -t $NAME -s "Configuration will be loaded in seconds"
-	( sleep 5; configure || { stop_service; exit 1; } ) &
-}
-
-stop_service() {
-	$tgtadm --mode sys --op update --name State -v offline || {
-		$logger "Failed to set system state to Offline"
-		return 1
-	}
-	$tgtadm --mode target --op show \
-		| awk '$1 == "Target" {sub(/:/,"",$2); print $2}' \
-		| xargs -r -n1 $tgtadm --mode target --op delete --force --tid
-	$tgtadm --mode sys --op delete
-}
-
-reload_service() {
-	stop_service
-	start_service
-}
-
-show() {
-	$tgtadm --mode target --op show
-}
diff --git a/trunk/package/feeds/packages/tgt/patches/010-fallocate.patch b/trunk/package/feeds/packages/tgt/patches/010-fallocate.patch
deleted file mode 100644
index 9d572d6b..00000000
--- a/trunk/package/feeds/packages/tgt/patches/010-fallocate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tgt-1.0.48.orig/usr/util.h	2014-06-04 15:03:53.000000000 +0300
-+++ tgt-1.0.48/usr/util.h	2014-06-04 15:17:48.548123039 +0300
-@@ -212,11 +212,6 @@
-  */
- static inline int unmap_file_region(int fd, off_t offset, off_t length)
- {
--#ifdef FALLOC_FL_PUNCH_HOLE
--	if (fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,
--			offset, length) == 0)
--		return 0;
--#endif
- 	return -1;
- }
- 
diff --git a/trunk/package/feeds/packages/tgt/patches/020-usr_Makefile.patch b/trunk/package/feeds/packages/tgt/patches/020-usr_Makefile.patch
deleted file mode 100644
index 2deb305c..00000000
--- a/trunk/package/feeds/packages/tgt/patches/020-usr_Makefile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- tgt-1.0.48.orig/usr/Makefile	2014-06-04 15:03:53.000000000 +0300
-+++ tgt-1.0.48/usr/Makefile	2014-06-04 15:17:56.373670618 +0300
-@@ -1,13 +1,13 @@
- sbindir ?= $(PREFIX)/sbin
- libdir ?= $(PREFIX)/lib/tgt
- 
--ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
-+#ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
- CFLAGS += -DUSE_SIGNALFD
--endif
-+#endif
- 
--ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
-+#ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
- CFLAGS += -DUSE_TIMERFD
--endif
-+#endif
- 
- TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
- 		iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
-@@ -25,8 +25,9 @@
- CFLAGS += -DUSE_SYSTEMD
- endif
- 
--ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
--CFLAGS += -DUSE_EVENTFD
-+#ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
-+ifneq ((test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
-+CFLAGS += -DUSE_EVENTFD -I$(STAGING_DIR)/usr/include/
- TGTD_OBJS += bs_aio.o
- LIBS += -laio
- endif
-@@ -55,7 +56,7 @@
- LIBS += -lsystemd-daemon
- endif
- 
--PROGRAMS += tgtd tgtadm tgtimg
-+PROGRAMS += tgtd tgtadm
- TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
- 		concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
- 		ssc.o libssc.o bs_rdwr.o bs_ssc.o \
-@@ -82,14 +83,8 @@
- 
- -include $(TGTADM_DEP)
- 
--TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
- TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
- 
--tgtimg: $(TGTIMG_OBJS)
--	$(CC) $^ -o $@
--
---include $(TGTIMG_DEP)
--
- %.o: %.c
- 	$(CC) -c $(CFLAGS) $*.c -o $*.o
- 	@$(CC) -MM $(CFLAGS) -MF $*.d -MT $*.o $*.c
diff --git a/trunk/package/feeds/packages/tgt/patches/030-Makefile.patch b/trunk/package/feeds/packages/tgt/patches/030-Makefile.patch
deleted file mode 100644
index ab54f229..00000000
--- a/trunk/package/feeds/packages/tgt/patches/030-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tgt-1.0.48.orig/Makefile	2014-06-04 15:03:53.000000000 +0300
-+++ tgt-1.0.48/Makefile	2014-06-04 15:18:13.132963670 +0300
-@@ -64,7 +64,7 @@
- 	$(MAKE) -C conf clean
- 
- .PHONY: install
--install: install-programs install-doc install-conf install-scripts
-+install: install-programs
- 
- .PHONY: rpm
- rpm:
diff --git a/trunk/package/feeds/packages/tiff/Makefile b/trunk/package/feeds/packages/tiff/Makefile
deleted file mode 100644
index bccab8bf..00000000
--- a/trunk/package/feeds/packages/tiff/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tiff
-PKG_VERSION:=4.0.3
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.osgeo.org/libtiff
-PKG_MD5SUM:=051c1068e6a0627f461948c365290410
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_LICENSE:=BSD
-PKG_LICENSE_FILES:=COPYRIGHT
-
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tiff/Default
-  TITLE:=TIFF
-  URL:=http://www.remotesensing.org/libtiff/
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
-endef
-
-define Package/libtiff
-$(call Package/tiff/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+zlib +libjpeg
-endef
-
-define Package/libtiffxx
-$(call Package/tiff/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library(c++ bindings)
-  DEPENDS:=+libtiff $(CXX_DEPENDS)
-endef
-
-define Package/tiff-utils
-$(call Package/tiff/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= utilities
-  DEPENDS:=+libtiff
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(if $(CONFIG_PACKAGE_libtiffxx), \
-			--enable-cxx, \
-			--disable-cxx \
-		) \
-		--disable-lzma \
-		--enable-ccitt \
-		--enable-packbits \
-		--enable-lzw \
-		--enable-thunder \
-		--enable-next \
-		--enable-logluv \
-		--enable-mdi \
-		--enable-zlib \
-		--enable-jpeg \
-		--disable-old-jpeg \
-		--disable-jbig \
-		--without-x \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-endef
-
-define Package/libtiff/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.* $(1)/usr/lib/
-endef
-
-define Package/libtiffxx/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.* $(1)/usr/lib/
-endef
-
-define Package/tiff-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libtiff))
-$(eval $(call BuildPackage,libtiffxx))
-$(eval $(call BuildPackage,tiff-utils))
diff --git a/trunk/package/feeds/packages/tiff/patches/001-autoconf-compat.patch b/trunk/package/feeds/packages/tiff/patches/001-autoconf-compat.patch
deleted file mode 100644
index c7c0dfcc..00000000
--- a/trunk/package/feeds/packages/tiff/patches/001-autoconf-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@
- 
- docdir = $(LIBTIFF_DOCDIR)
- 
--AUTOMAKE_OPTIONS = 1.12 dist-zip foreign
-+AUTOMAKE_OPTIONS = dist-zip foreign
- ACLOCAL_AMFLAGS = -I m4
- 
- docfiles = \
-@@ -48,7 +48,7 @@ EXTRA_DIST = \
- 
- dist_doc_DATA = $(docfiles)
- 
--SUBDIRS = port libtiff tools build contrib test man html
-+SUBDIRS = port libtiff tools build contrib
- 
- release:
- 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -23,7 +23,7 @@
- 
- # Process this file with automake to produce Makefile.in.
- 
--AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign
-+AUTOMAKE_OPTIONS = color-tests parallel-tests foreign
- 
- LIBTIFF = $(top_builddir)/libtiff/libtiff.la
- 
diff --git a/trunk/package/feeds/packages/tiff/patches/010-CVE-2012-4564.patch b/trunk/package/feeds/packages/tiff/patches/010-CVE-2012-4564.patch
deleted file mode 100644
index 7783353e..00000000
--- a/trunk/package/feeds/packages/tiff/patches/010-CVE-2012-4564.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: tiff-4.0.3/tools/ppm2tiff.c
-===================================================================
---- tiff-4.0.3.orig/tools/ppm2tiff.c	2013-06-23 10:36:50.779629492 -0400
-+++ tiff-4.0.3/tools/ppm2tiff.c	2013-06-23 10:36:50.775629494 -0400
-@@ -89,6 +89,7 @@
- 	int c;
- 	extern int optind;
- 	extern char* optarg;
-+	tmsize_t scanline_size;
- 
- 	if (argc < 2) {
- 	    fprintf(stderr, "%s: Too few arguments\n", argv[0]);
-@@ -237,8 +238,16 @@
- 	}
- 	if (TIFFScanlineSize(out) > linebytes)
- 		buf = (unsigned char *)_TIFFmalloc(linebytes);
--	else
--		buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
-+	else {
-+		scanline_size = TIFFScanlineSize(out);
-+		if (scanline_size != 0)
-+			buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
-+		else {
-+			fprintf(stderr, "%s: scanline size overflow\n",infile);
-+			(void) TIFFClose(out);
-+			exit(-2);
-+			}
-+		}
- 	if (resolution > 0) {
- 		TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
- 		TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);
diff --git a/trunk/package/feeds/packages/tiff/patches/011-CVE-2013-1960.patch b/trunk/package/feeds/packages/tiff/patches/011-CVE-2013-1960.patch
deleted file mode 100644
index 3bf15f19..00000000
--- a/trunk/package/feeds/packages/tiff/patches/011-CVE-2013-1960.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Index: tiff-4.0.3/tools/tiff2pdf.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiff2pdf.c	2013-06-23 10:36:50.979629486 -0400
-+++ tiff-4.0.3/tools/tiff2pdf.c	2013-06-23 10:36:50.975629486 -0400
-@@ -3341,33 +3341,56 @@
- 	uint32 height){
- 
- 	tsize_t i=0;
--	uint16 ri =0;
--	uint16 v_samp=1;
--	uint16 h_samp=1;
--	int j=0;
--	
--	i++;
--	
--	while(i<(*striplength)){
-+
-+	while (i < *striplength) {
-+		tsize_t datalen;
-+		uint16 ri;
-+		uint16 v_samp;
-+		uint16 h_samp;
-+		int j;
-+		int ncomp;
-+
-+		/* marker header: one or more FFs */
-+		if (strip[i] != 0xff)
-+			return(0);
-+		i++;
-+		while (i < *striplength && strip[i] == 0xff)
-+			i++;
-+		if (i >= *striplength)
-+			return(0);
-+		/* SOI is the only pre-SOS marker without a length word */
-+		if (strip[i] == 0xd8)
-+			datalen = 0;
-+		else {
-+			if ((*striplength - i) <= 2)
-+				return(0);
-+			datalen = (strip[i+1] << 8) | strip[i+2];
-+			if (datalen < 2 || datalen >= (*striplength - i))
-+				return(0);
-+		}
- 		switch( strip[i] ){
--			case 0xd8:
--				/* SOI - start of image */
-+			case 0xd8:	/* SOI - start of image */
- 				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2);
- 				*bufferoffset+=2;
--				i+=2;
- 				break;
--			case 0xc0:
--			case 0xc1:
--			case 0xc3:
--			case 0xc9:
--			case 0xca:
-+			case 0xc0:	/* SOF0 */
-+			case 0xc1:	/* SOF1 */
-+			case 0xc3:	/* SOF3 */
-+			case 0xc9:	/* SOF9 */
-+			case 0xca:	/* SOF10 */
- 				if(no==0){
--					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
--					for(j=0;j<buffer[*bufferoffset+9];j++){
--						if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) 
--							h_samp = (buffer[*bufferoffset+11+(2*j)]>>4);
--						if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) 
--							v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f);
-+					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
-+					ncomp = buffer[*bufferoffset+9];
-+					if (ncomp < 1 || ncomp > 4)
-+						return(0);
-+					v_samp=1;
-+					h_samp=1;
-+					for(j=0;j<ncomp;j++){
-+						uint16 samp = buffer[*bufferoffset+11+(3*j)];
-+						if( (samp>>4) > h_samp) 
-+							h_samp = (samp>>4);
-+						if( (samp & 0x0f) > v_samp) 
-+							v_samp = (samp & 0x0f);
- 					}
- 					v_samp*=8;
- 					h_samp*=8;
-@@ -3381,45 +3404,43 @@
-                                           (unsigned char) ((height>>8) & 0xff);
- 					buffer[*bufferoffset+6]=
-                                             (unsigned char) (height & 0xff);
--					*bufferoffset+=strip[i+2]+2;
--					i+=strip[i+2]+2;
--
-+					*bufferoffset+=datalen+2;
-+					/* insert a DRI marker */
- 					buffer[(*bufferoffset)++]=0xff;
- 					buffer[(*bufferoffset)++]=0xdd;
- 					buffer[(*bufferoffset)++]=0x00;
- 					buffer[(*bufferoffset)++]=0x04;
- 					buffer[(*bufferoffset)++]=(ri >> 8) & 0xff;
- 					buffer[(*bufferoffset)++]= ri & 0xff;
--				} else {
--					i+=strip[i+2]+2;
- 				}
- 				break;
--			case 0xc4:
--			case 0xdb:
--				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
--				*bufferoffset+=strip[i+2]+2;
--				i+=strip[i+2]+2;
-+			case 0xc4: /* DHT */
-+			case 0xdb: /* DQT */
-+				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
-+				*bufferoffset+=datalen+2;
- 				break;
--			case 0xda:
-+			case 0xda: /* SOS */
- 				if(no==0){
--					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
--					*bufferoffset+=strip[i+2]+2;
--					i+=strip[i+2]+2;
-+					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
-+					*bufferoffset+=datalen+2;
- 				} else {
- 					buffer[(*bufferoffset)++]=0xff;
- 					buffer[(*bufferoffset)++]=
-                                             (unsigned char)(0xd0 | ((no-1)%8));
--					i+=strip[i+2]+2;
- 				}
--				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1);
--				*bufferoffset+=(*striplength)-i-1;
-+				i += datalen + 1;
-+				/* copy remainder of strip */
-+				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i);
-+				*bufferoffset+= *striplength - i;
- 				return(1);
- 			default:
--				i+=strip[i+2]+2;
-+				/* ignore any other marker */
-+				break;
- 		}
-+		i += datalen + 1;
- 	}
--	
- 
-+	/* failed to find SOS marker */
- 	return(0);
- }
- #endif
diff --git a/trunk/package/feeds/packages/tiff/patches/012-CVE-2013-1961.patch b/trunk/package/feeds/packages/tiff/patches/012-CVE-2013-1961.patch
deleted file mode 100644
index 2d1268ee..00000000
--- a/trunk/package/feeds/packages/tiff/patches/012-CVE-2013-1961.patch
+++ /dev/null
@@ -1,768 +0,0 @@
-Index: tiff-4.0.3/contrib/dbs/xtiff/xtiff.c
-===================================================================
---- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c	2013-06-23 10:36:51.147629484 -0400
-@@ -512,9 +512,9 @@
-     Arg args[1];
- 
-     if (tfMultiPage)
--        sprintf(buffer, "%s - page %d", fileName, tfDirectory);
-+        snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory);
-     else
--        strcpy(buffer, fileName);
-+        snprintf(buffer, sizeof(buffer), "%s", fileName);
-     XtSetArg(args[0], XtNlabel, buffer);
-     XtSetValues(labelWidget, args, 1);
- }
-Index: tiff-4.0.3/libtiff/tif_dirinfo.c
-===================================================================
---- tiff-4.0.3.orig/libtiff/tif_dirinfo.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/libtiff/tif_dirinfo.c	2013-06-23 10:36:51.147629484 -0400
-@@ -711,7 +711,7 @@
- 	 * note that this name is a special sign to TIFFClose() and
- 	 * _TIFFSetupFields() to free the field
- 	 */
--	sprintf(fld->field_name, "Tag %d", (int) tag);
-+	snprintf(fld->field_name, 32, "Tag %d", (int) tag);
- 
- 	return fld;    
- }
-Index: tiff-4.0.3/libtiff/tif_codec.c
-===================================================================
---- tiff-4.0.3.orig/libtiff/tif_codec.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/libtiff/tif_codec.c	2013-06-23 10:36:51.151629482 -0400
-@@ -108,7 +108,8 @@
- 	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
-         char compression_code[20];
-         
--        sprintf( compression_code, "%d", tif->tif_dir.td_compression );
-+        snprintf(compression_code, sizeof(compression_code), "%d",
-+		 tif->tif_dir.td_compression );
- 	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-                      "%s compression support is not configured", 
-                      c ? c->name : compression_code );
-Index: tiff-4.0.3/tools/tiffdither.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiffdither.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/tiffdither.c	2013-06-23 10:36:51.151629482 -0400
-@@ -260,7 +260,7 @@
- 		TIFFSetField(out, TIFFTAG_FILLORDER, fillorder);
- 	else
- 		CopyField(TIFFTAG_FILLORDER, shortv);
--	sprintf(thing, "Dithered B&W version of %s", argv[optind]);
-+	snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]);
- 	TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing);
- 	CopyField(TIFFTAG_PHOTOMETRIC, shortv);
- 	CopyField(TIFFTAG_ORIENTATION, shortv);
-Index: tiff-4.0.3/tools/rgb2ycbcr.c
-===================================================================
---- tiff-4.0.3.orig/tools/rgb2ycbcr.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/rgb2ycbcr.c	2013-06-23 10:36:51.151629482 -0400
-@@ -332,7 +332,8 @@
- 	TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
- 	{ char buf[2048];
- 	  char *cp = strrchr(TIFFFileName(in), '/');
--	  sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in));
-+	  snprintf(buf, sizeof(buf), "YCbCr conversion of %s",
-+		   cp ? cp+1 : TIFFFileName(in));
- 	  TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf);
- 	}
- 	TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion());
-Index: tiff-4.0.3/tools/tiff2pdf.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiff2pdf.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/tiff2pdf.c	2013-06-23 10:36:51.151629482 -0400
-@@ -3630,7 +3630,9 @@
- 	char buffer[16];
- 	int buflen=0;
- 	
--	buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff);
-+	buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ",
-+			  t2p->pdf_majorversion&0xff,
-+			  t2p->pdf_minorversion&0xff);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7);
- 
-@@ -3644,10 +3646,10 @@
- tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
--	buflen=sprintf(buffer, "%lu", (unsigned long)number);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen );
- 	written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7);
- 
-@@ -3686,13 +3688,13 @@
- 	written += t2pWriteFile(output, (tdata_t) "/", 1);
- 	for (i=0;i<namelen;i++){
- 		if ( ((unsigned char)name[i]) < 0x21){
--			sprintf(buffer, "#%.2X", name[i]);
-+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 			buffer[sizeof(buffer) - 1] = '\0';
- 			written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 			nextchar=1;
- 		}
- 		if ( ((unsigned char)name[i]) > 0x7E){
--			sprintf(buffer, "#%.2X", name[i]);
-+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 			buffer[sizeof(buffer) - 1] = '\0';
- 			written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 			nextchar=1;
-@@ -3700,57 +3702,57 @@
- 		if (nextchar==0){
- 			switch (name[i]){
- 				case 0x23:
--					sprintf(buffer, "#%.2X", name[i]);
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x25:
--					sprintf(buffer, "#%.2X", name[i]);
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x28:
--					sprintf(buffer, "#%.2X", name[i]);
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x29:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x2F:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x3C:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x3E:
--					sprintf(buffer, "#%.2X", name[i]);
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x5B:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x5D:
--					sprintf(buffer, "#%.2X", name[i]);
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x7B:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
- 				case 0x7D:
--					sprintf(buffer, "#%.2X", name[i]); 
-+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
- 					buffer[sizeof(buffer) - 1] = '\0';
- 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
- 					break;
-@@ -3865,14 +3867,14 @@
- tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){
- 	
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 	
- 	written += t2pWriteFile(output, (tdata_t) "/Length ", 8);
- 	if(len!=0){
- 		written += t2p_write_pdf_stream_length(len, output);
- 	} else {
--		buflen=sprintf(buffer, "%lu", (unsigned long)number);
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
- 	}
-@@ -3913,10 +3915,10 @@
- tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
--	buflen=sprintf(buffer, "%lu", (unsigned long)len);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "\n", 1);
- 
-@@ -3930,7 +3932,7 @@
- tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output)
- {
- 	tsize_t written = 0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen = 0;
- 
- 	written += t2pWriteFile(output, 
-@@ -3969,7 +3971,6 @@
- 		written += t2p_write_pdf_string(t2p->pdf_datetime, output);
- 	}
- 	written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11);
--	_TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer));
- 	snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);
- 	written += t2p_write_pdf_string(buffer, output);
- 	written += t2pWriteFile(output, (tdata_t) "\n", 1);
-@@ -4110,7 +4111,7 @@
- {
- 	tsize_t written=0;
- 	tdir_t i=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
- 	int page=0;
-@@ -4118,7 +4119,7 @@
- 		(tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26);
- 	page = t2p->pdf_pages+1;
- 	for (i=0;i<t2p->tiff_pagecount;i++){
--		buflen=sprintf(buffer, "%d", page);
-+		buflen=snprintf(buffer, sizeof(buffer), "%d", page);
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
- 		if ( ((i+1)%8)==0 ) {
-@@ -4133,8 +4134,7 @@
- 		}
- 	}
- 	written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10);
--	_TIFFmemset(buffer, 0x00, 16);
--	buflen=sprintf(buffer, "%d", t2p->tiff_pagecount);
-+	buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6);
- 
-@@ -4149,28 +4149,28 @@
- 
- 	unsigned int i=0;
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[256];
- 	int buflen=0;
- 
- 	written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24);
--	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
- 	written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); 
--	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1);
-+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
--	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1);
-+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
--	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2);
-+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
--	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2);
-+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "] \n", 3); 
- 	written += t2pWriteFile(output, (tdata_t) "/Contents ", 10);
--	buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1));
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1));
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
- 	written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15);
-@@ -4178,15 +4178,13 @@
- 		written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
- 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){
- 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
--			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
-+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) "_", 1);
--			buflen = sprintf(buffer, "%u", i+1);
-+			buflen = snprintf(buffer, sizeof(buffer), "%u", i+1);
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) " ", 1);
--			buflen = sprintf(
--				buffer, 
--				"%lu", 
-+			buflen = snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
-@@ -4198,12 +4196,10 @@
- 	} else {
- 			written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
- 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
--			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
-+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) " ", 1);
--			buflen = sprintf(
--				buffer, 
--				"%lu", 
-+			buflen = snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
-@@ -4212,9 +4208,7 @@
- 	if(t2p->tiff_transferfunctioncount != 0) {
- 		written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13);
- 		t2pWriteFile(output, (tdata_t) "/GS1 ", 5);
--		buflen = sprintf(
--			buffer, 
--			"%lu", 
-+		buflen = snprintf(buffer, sizeof(buffer), "%lu",
- 			(unsigned long)(object + 3)); 
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
-@@ -4587,7 +4581,7 @@
- 	if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ 
- 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){
- 			box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box;
--			buflen=sprintf(buffer, 
-+			buflen=snprintf(buffer, sizeof(buffer), 
- 				"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", 
- 				t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
- 				box.mat[0],
-@@ -4602,7 +4596,7 @@
- 		}
- 	} else {
- 		box=t2p->pdf_imagebox;
--		buflen=sprintf(buffer, 
-+		buflen=snprintf(buffer, sizeof(buffer), 
- 			"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", 
- 			t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
- 			box.mat[0],
-@@ -4627,59 +4621,48 @@
- 												TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
- 	written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); 
- 	written += t2pWriteFile(output, 
- 		(tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", 
- 		42);
--	buflen=sprintf(buffer, "%u", t2p->pdf_page+1);
-+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	if(tile != 0){
- 		written += t2pWriteFile(output, (tdata_t) "_", 1);
--		buflen=sprintf(buffer, "%lu", (unsigned long)tile);
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile);
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	}
- 	written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8);
--	_TIFFmemset((tdata_t)buffer, 0x00, 16);
- 	if(tile==0){
--		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width);
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width);
- 	} else {
- 		if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
--			buflen=sprintf(
--				buffer, 
--				"%lu", 
-+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
- 		} else {
--			buflen=sprintf(
--				buffer, 
--				"%lu", 
-+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
- 		}
- 	}
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9);
--	_TIFFmemset((tdata_t)buffer, 0x00, 16);
- 	if(tile==0){
--		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length);
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length);
- 	} else {
- 		if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
--			buflen=sprintf(
--				buffer, 
--				"%lu", 
-+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
- 		} else {
--			buflen=sprintf(
--				buffer, 
--				"%lu", 
-+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
- 		}
- 	}
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19);
--	_TIFFmemset((tdata_t)buffer, 0x00, 16);
--	buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
-+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13);
- 	written += t2p_write_pdf_xobject_cs(t2p, output);
-@@ -4723,11 +4706,10 @@
- 		t2p->pdf_colorspace ^= T2P_CS_PALETTE;
- 		written += t2p_write_pdf_xobject_cs(t2p, output);
- 		t2p->pdf_colorspace |= T2P_CS_PALETTE;
--		buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 );
-+		buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 );
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " ", 1);
--		_TIFFmemset(buffer, 0x00, 16);
--		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); 
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); 
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7);
- 		return(written);
-@@ -4761,10 +4743,10 @@
- 			X_W /= Y_W;
- 			Z_W /= Y_W;
- 			Y_W = 1.0F;
--			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
-+			buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
- 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			written += t2pWriteFile(output, (tdata_t) "/Range ", 7);
--			buflen=sprintf(buffer, "[%d %d %d %d] \n", 
-+			buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", 
- 				t2p->pdf_labrange[0], 
- 				t2p->pdf_labrange[1], 
- 				t2p->pdf_labrange[2], 
-@@ -4780,26 +4762,26 @@
- tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
- 	written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25);
- 	if(t2p->tiff_transferfunctioncount == 1){
--		buflen=sprintf(buffer, "%lu",
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 			       (unsigned long)(t2p->pdf_xrefcount + 1));
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
- 	} else {
- 		written += t2pWriteFile(output, (tdata_t) "[ ", 2);
--		buflen=sprintf(buffer, "%lu",
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 			       (unsigned long)(t2p->pdf_xrefcount + 1));
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
--		buflen=sprintf(buffer, "%lu",
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 			       (unsigned long)(t2p->pdf_xrefcount + 2));
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
--		buflen=sprintf(buffer, "%lu",
-+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 			       (unsigned long)(t2p->pdf_xrefcount + 3));
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
-@@ -4821,7 +4803,7 @@
- 	written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);
- 	written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);
- 	written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18);
--	buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample));
-+	buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample));
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19);
- 	written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output);
-@@ -4848,7 +4830,7 @@
- tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[128];
-+	char buffer[256];
- 	int buflen=0;
- 	
- 	float X_W=0.0;
-@@ -4916,16 +4898,16 @@
- 	written += t2pWriteFile(output, (tdata_t) "<< \n", 4);
- 	if(t2p->pdf_colorspace & T2P_CS_CALGRAY){
- 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
--		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
-+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12);
- 	}
- 	if(t2p->pdf_colorspace & T2P_CS_CALRGB){
- 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
--		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
-+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
- 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 		written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8);
--		buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 
-+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 
- 			X_R, Y_R, Z_R, 
- 			X_G, Y_G, Z_G, 
- 			X_B, Y_B, Z_B); 
-@@ -4944,11 +4926,11 @@
- tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 	
- 	written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11);
--	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7);
- 
-@@ -4958,11 +4940,11 @@
- tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 	
- 	written += t2pWriteFile(output, (tdata_t) "/N ", 3);
--	buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel);
-+	buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11);
- 	t2p->pdf_colorspace ^= T2P_CS_ICCBASED;
-@@ -5027,7 +5009,7 @@
- tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[16];
-+	char buffer[32];
- 	int buflen=0;
- 
- 	if(t2p->pdf_compression==T2P_COMPRESS_NONE){
-@@ -5042,41 +5024,33 @@
- 			written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9);
- 			if(tile==0){
- 				written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
--				buflen=sprintf(buffer, "%lu",
-+				buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 					       (unsigned long)t2p->tiff_width);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
--				buflen=sprintf(buffer, "%lu",
-+				buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 					       (unsigned long)t2p->tiff_length);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 			} else {
- 				if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
- 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
--					buflen=sprintf(
--						buffer, 
--						"%lu", 
-+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
- 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				} else {
- 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
--					buflen=sprintf(
--						buffer, 
--						"%lu", 
-+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
- 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				}
- 				if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
- 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
--					buflen=sprintf(
--						buffer, 
--						"%lu", 
-+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
- 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				} else {
- 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
--					buflen=sprintf(
--						buffer, 
--						"%lu", 
-+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
- 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
- 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				}
-@@ -5103,21 +5077,17 @@
- 			if(t2p->pdf_compressionquality%100){
- 				written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);
- 				written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14);
--				_TIFFmemset(buffer, 0x00, 16);
--				buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100);
-+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				written += t2pWriteFile(output, (tdata_t) " /Columns ", 10);
--				_TIFFmemset(buffer, 0x00, 16);
--				buflen = sprintf(buffer, "%lu",
-+				buflen = snprintf(buffer, sizeof(buffer), "%lu",
- 						 (unsigned long)t2p->tiff_width);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				written += t2pWriteFile(output, (tdata_t) " /Colors ", 9);
--				_TIFFmemset(buffer, 0x00, 16);
--				buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel);
-+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19);
--				_TIFFmemset(buffer, 0x00, 16);
--				buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
-+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);
- 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 				written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
- 			}
-@@ -5137,16 +5107,16 @@
- tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){
- 
- 	tsize_t written=0;
--	char buffer[21];
-+	char buffer[64];
- 	int buflen=0;
- 	uint32 i=0;
- 
- 	written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7);
--	buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
- 	written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22);
- 	for (i=0;i<t2p->pdf_xrefcount;i++){
--		sprintf(buffer, "%.10lu 00000 n \n",
-+		snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n",
- 			(unsigned long)t2p->pdf_xrefoffsets[i]);
- 		written += t2pWriteFile(output, (tdata_t) buffer, 20);
- 	}
-@@ -5170,17 +5140,14 @@
- 		snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand());
- 
- 	written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17);
--	buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1));
-+	buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1));
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
--	_TIFFmemset(buffer, 0x00, 32);	
- 	written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7);
--	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
--	_TIFFmemset(buffer, 0x00, 32);	
- 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12);
--	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
--	_TIFFmemset(buffer, 0x00, 32);	
- 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11);
- 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid,
- 				sizeof(t2p->pdf_fileid) - 1);
-@@ -5188,9 +5155,8 @@
- 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid,
- 				sizeof(t2p->pdf_fileid) - 1);
- 	written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16);
--	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref);
-+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref);
- 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
--	_TIFFmemset(buffer, 0x00, 32);	
- 	written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7);
- 
- 	return(written);
-Index: tiff-4.0.3/tools/tiff2ps.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiff2ps.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/tiff2ps.c	2013-06-23 10:36:51.155629481 -0400
-@@ -1781,8 +1781,8 @@
- 		imageOp = "imagemask";
- 
- 	(void)strcpy(im_x, "0");
--	(void)sprintf(im_y, "%lu", (long) h);
--	(void)sprintf(im_h, "%lu", (long) h);
-+	(void)snprintf(im_y, sizeof(im_y), "%lu", (long) h);
-+	(void)snprintf(im_h, sizeof(im_h), "%lu", (long) h);
- 	tile_width = w;
- 	tile_height = h;
- 	if (TIFFIsTiled(tif)) {
-@@ -1803,7 +1803,7 @@
- 		}
- 		if (tile_height < h) {
- 			fputs("/im_y 0 def\n", fd);
--			(void)sprintf(im_y, "%lu im_y sub", (unsigned long) h);
-+			(void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h);
- 		}
- 	} else {
- 		repeat_count = tf_numberstrips;
-@@ -1815,7 +1815,7 @@
- 			fprintf(fd, "/im_h %lu def\n",
- 			    (unsigned long) tile_height);
- 			(void)strcpy(im_h, "im_h");
--			(void)sprintf(im_y, "%lu im_y sub", (unsigned long) h);
-+			(void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h);
- 		}
- 	}
- 
-Index: tiff-4.0.3/tools/tiffcrop.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiffcrop.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/tiffcrop.c	2013-06-23 10:36:51.159629481 -0400
-@@ -2077,7 +2077,7 @@
-         return 1;
-         }
- 
--      sprintf (filenum, "-%03d%s", findex, export_ext);
-+      snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext);
-       filenum[14] = '\0';
-       strncat (exportname, filenum, 15);
-       }
-@@ -2230,8 +2230,8 @@
- 
-           /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes 
-              fewer than PATH_MAX */ 
--          memset (temp_filename, '\0', PATH_MAX + 1);              
--          sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images,
-+          snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s",
-+		   dump.infilename, dump_images,
-                   (dump.format == DUMP_TEXT) ? "txt" : "raw");
-           if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL)
-             {
-@@ -2249,8 +2249,8 @@
- 
-           /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes 
-              fewer than PATH_MAX */ 
--          memset (temp_filename, '\0', PATH_MAX + 1);              
--          sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images,
-+          snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s",
-+		   dump.outfilename, dump_images,
-                   (dump.format == DUMP_TEXT) ? "txt" : "raw");
-           if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL)
-             {
-Index: tiff-4.0.3/tools/tiff2bw.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiff2bw.c	2013-06-23 10:36:51.163629483 -0400
-+++ tiff-4.0.3/tools/tiff2bw.c	2013-06-23 10:36:51.159629481 -0400
-@@ -205,7 +205,7 @@
- 		}
- 	}
- 	TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
--	sprintf(thing, "B&W version of %s", argv[optind]);
-+	snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]);
- 	TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing);
- 	TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw");
- 	outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
diff --git a/trunk/package/feeds/packages/tiff/patches/013-CVE-2013-4231.patch b/trunk/package/feeds/packages/tiff/patches/013-CVE-2013-4231.patch
deleted file mode 100644
index c26bd856..00000000
--- a/trunk/package/feeds/packages/tiff/patches/013-CVE-2013-4231.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Buffer overflow in gif2tiff
-Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2450
-Bug-Debian: http://bugs.debian.org/719303
-
-Index: tiff-4.0.3/tools/gif2tiff.c
-===================================================================
---- tiff-4.0.3.orig/tools/gif2tiff.c	2013-08-22 11:46:11.960846910 -0400
-+++ tiff-4.0.3/tools/gif2tiff.c	2013-08-22 11:46:11.956846910 -0400
-@@ -333,6 +333,8 @@
-     int status = 1;
- 
-     datasize = getc(infile);
-+    if (datasize > 12)
-+	return 0;
-     clear = 1 << datasize;
-     eoi = clear + 1;
-     avail = clear + 2;
diff --git a/trunk/package/feeds/packages/tiff/patches/014-CVE-2013-4232.patch b/trunk/package/feeds/packages/tiff/patches/014-CVE-2013-4232.patch
deleted file mode 100644
index 0d80ff3b..00000000
--- a/trunk/package/feeds/packages/tiff/patches/014-CVE-2013-4232.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: use after free in tiff2pdf
-Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2449
-Bug-Debian: http://bugs.debian.org/719303
-
-Index: tiff-4.0.3/tools/tiff2pdf.c
-===================================================================
---- tiff-4.0.3.orig/tools/tiff2pdf.c	2013-08-22 11:46:37.292847242 -0400
-+++ tiff-4.0.3/tools/tiff2pdf.c	2013-08-22 11:46:37.292847242 -0400
-@@ -2461,7 +2461,8 @@
- 					(unsigned long) t2p->tiff_datasize, 
- 					TIFFFileName(input));
- 				t2p->t2p_error = T2P_ERR_ERROR;
--			  _TIFFfree(buffer);
-+				_TIFFfree(buffer);
-+				return(0);
- 			} else {
- 				buffer=samplebuffer;
- 				t2p->tiff_datasize *= t2p->tiff_samplesperpixel;
diff --git a/trunk/package/feeds/packages/tiff/patches/015-CVE-2013-4244.patch b/trunk/package/feeds/packages/tiff/patches/015-CVE-2013-4244.patch
deleted file mode 100644
index 0a77a0c4..00000000
--- a/trunk/package/feeds/packages/tiff/patches/015-CVE-2013-4244.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: OOB write in gif2tiff
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=996468
-
-Index: tiff-4.0.3/tools/gif2tiff.c
-===================================================================
---- tiff-4.0.3.orig/tools/gif2tiff.c	2013-08-24 11:17:13.546447901 -0400
-+++ tiff-4.0.3/tools/gif2tiff.c	2013-08-24 11:17:13.546447901 -0400
-@@ -400,6 +400,10 @@
-     }
- 
-     if (oldcode == -1) {
-+        if (code >= clear) {
-+            fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
-+            return 0;
-+        }
- 	*(*fill)++ = suffix[code];
- 	firstchar = oldcode = code;
- 	return 1;
diff --git a/trunk/package/feeds/packages/tiff/patches/016-CVE-2013-4243.patch b/trunk/package/feeds/packages/tiff/patches/016-CVE-2013-4243.patch
deleted file mode 100644
index 75fae2c3..00000000
--- a/trunk/package/feeds/packages/tiff/patches/016-CVE-2013-4243.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: tiff/tools/gif2tiff.c
-===================================================================
---- tiff.orig/tools/gif2tiff.c
-+++ tiff/tools/gif2tiff.c
-@@ -280,6 +280,10 @@ readgifimage(char* mode)
-         fprintf(stderr, "no colormap present for image\n");
-         return (0);
-     }
-+    if (width == 0 || height == 0) {
-+        fprintf(stderr, "Invalid value of width or height\n");
-+        return(0);
-+    }
-     if ((raster = (unsigned char*) _TIFFmalloc(width*height+EXTRAFUDGE)) == NULL) {
-         fprintf(stderr, "not enough memory for image\n");
-         return (0);
-@@ -404,6 +408,10 @@ process(register int code, unsigned char
-             fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
-             return 0;
-         }
-+        if (*fill >= raster + width*height) {
-+            fprintf(stderr, "raster full before eoi code\n");
-+            return 0;
-+        }
- 	*(*fill)++ = suffix[code];
- 	firstchar = oldcode = code;
- 	return 1;
-@@ -434,6 +442,10 @@ process(register int code, unsigned char
-     }
-     oldcode = incode;
-     do {
-+        if (*fill >= raster + width*height) {
-+            fprintf(stderr, "raster full before eoi code\n");
-+            return 0;
-+        }
- 	*(*fill)++ = *--stackp;
-     } while (stackp > stack);
-     return 1;
diff --git a/trunk/package/feeds/packages/tiff/patches/017-CVE-2014-9330.patch b/trunk/package/feeds/packages/tiff/patches/017-CVE-2014-9330.patch
deleted file mode 100644
index acd0a331..00000000
--- a/trunk/package/feeds/packages/tiff/patches/017-CVE-2014-9330.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: CVE-2014-9330
- Integer overflow in bmp2tiff
-Origin: upstream, http://bugzilla.maptools.org/show_bug.cgi?id=2494
-Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2494
-Bug-Debian: http://bugs.debian.org/773987
-
-Index: tiff/tools/bmp2tiff.c
-===================================================================
---- tiff.orig/tools/bmp2tiff.c
-+++ tiff/tools/bmp2tiff.c
-@@ -1,4 +1,4 @@
--/* $Id: bmp2tiff.c,v 1.23 2010-03-10 18:56:49 bfriesen Exp $
-+/* $Id: bmp2tiff.c,v 1.24 2014-12-21 15:15:32 erouault Exp $
-  *
-  * Project:  libtiff tools
-  * Purpose:  Convert Windows BMP files in TIFF.
-@@ -403,6 +403,13 @@ main(int argc, char* argv[])
- 
- 		width = info_hdr.iWidth;
- 		length = (info_hdr.iHeight > 0) ? info_hdr.iHeight : -info_hdr.iHeight;
-+        if( width <= 0 || length <= 0 )
-+        {
-+            TIFFError(infilename,
-+                  "Invalid dimensions of BMP file" );
-+            close(fd);
-+            return -1;
-+        }
- 
- 		switch (info_hdr.iBitCount)
- 		{
-@@ -593,6 +600,14 @@ main(int argc, char* argv[])
- 
- 			compr_size = file_hdr.iSize - file_hdr.iOffBits;
- 			uncompr_size = width * length;
-+            /* Detect int overflow */
-+            if( uncompr_size / width != length )
-+            {
-+                TIFFError(infilename,
-+                    "Invalid dimensions of BMP file" );
-+                close(fd);
-+                return -1;
-+            }
- 			comprbuf = (unsigned char *) _TIFFmalloc( compr_size );
- 			if (!comprbuf) {
- 				TIFFError(infilename,
diff --git a/trunk/package/feeds/packages/tinc/Makefile b/trunk/package/feeds/packages/tinc/Makefile
deleted file mode 100644
index 0656ec98..00000000
--- a/trunk/package/feeds/packages/tinc/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tinc
-PKG_VERSION:=1.0.25
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages
-PKG_MD5SUM:=0b91b693f7cf76f481b547d0c86f9578
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tinc
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+liblzo +libopenssl +kmod-tun
-  TITLE:=VPN tunneling daemon
-  URL:=http://www.tinc-vpn.org/
-  MAINTAINER:=Saverio Proto <zioproto@gmail.com>
-  SUBMENU:=VPN
-endef
-
-define Package/tinc/description
-  tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
-  encryption to create a secure private network between hosts on the Internet.
-endef
-
-TARGET_CFLAGS += -std=gnu99
-
-CONFIGURE_ARGS += \
-	--with-kernel="$(LINUX_DIR)" \
-	--with-zlib="$(STAGING_DIR)/usr" \
-	--with-lzo-include="$(STAGING_DIR)/usr/include/lzo"
-
-define Package/tinc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/tinc
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) files/tinc.upgrade $(1)/lib/upgrade/keep.d/tinc
-endef
-
-define Package/tinc/conffiles
-/etc/config/tinc
-endef
-
-$(eval $(call BuildPackage,tinc))
diff --git a/trunk/package/feeds/packages/tinc/files/tinc.config b/trunk/package/feeds/packages/tinc/files/tinc.config
deleted file mode 100644
index 18940781..00000000
--- a/trunk/package/feeds/packages/tinc/files/tinc.config
+++ /dev/null
@@ -1,56 +0,0 @@
-config tinc-net NETNAME
-	option enabled 0
-
-	## Daemon Configuration	(cmd arguments)
-	#option generate_keys 0
-	#option key_size 2048
-	#option logfile /tmp/log/tinc.NETNAME.log
-	#option debug 3
-
-	## Server Configuration (tinc.conf)
-	#option AddressFamily any
-	#option BindToAddress 127.0.0.1
-	#option BindToInterface lo
-
-	#list ConnectTo peer1
-
-	#option DirectOnly 0
-	#option Forwarding internal
-	#option GraphDumpFile /tmp/log/tinc.NETNAME.dot
-	#option Hostnames 0
-	#option IffOneQueue 0
-	#option Interface NETNAME
-	#option KeyExpire 3600
-	#option MACExpire 600
-	#option MaxTimeout 900
-	#option Mode router
-
-	option Name NODENAME
-
-	#option PingInterval 60
-	#option PingTimeout 5
-	#option PriorityInheritance 0
-	#option PrivateKeyFile /etc/tinc/NETNAME/rsa_key.priv
-	#option ProcessPriority normal
-	#option ReplayWindow 16
-	#option StrictSubnets 0
-	#option TunnelServer 0
-	#option UDPRcvBuf x
-	#option UDPSndBuf x
-
-config tinc-host NODENAME
-	option enabled 0
-
-	option net NETNAME
-
-	#list Address example.com
-	#option Cipher blowfish
-	#option ClampMSS yes
-	#option Compression 0
-	#option Digest sha1
-	#option IndirectData 0
-	#option MACLength 4
-	#option PMTU 1514
-	#option PMTUDiscovery yes
-	#option Port 655
-	#option Subnet 192.168.1.0/24
diff --git a/trunk/package/feeds/packages/tinc/files/tinc.init b/trunk/package/feeds/packages/tinc/files/tinc.init
deleted file mode 100644
index e49b3587..00000000
--- a/trunk/package/feeds/packages/tinc/files/tinc.init
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
-# Copyright (C) 2011 Linus Lüssing
-#  Based on Jo-Philipp Wich's OpenVPN init script
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-START=42
-
-SERVICE_USE_PID=1
-
-BIN=/usr/sbin/tincd
-EXTRA_COMMANDS="up down"
-
-LIST_SEP="
-"
-TMP_TINC="/tmp/tinc"
-
-append_param() {
-	local v="$1"
-	case "$v" in
-		*_*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*_*)   v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*)     v=${v%%_*}-${v#*_} ;;
-	esac
-	ARGS="$ARGS --$v"
-	return 0
-}
-
-append_conf_bools() {
-	local p; local v; local s="$1"; local f="$2"; shift; shift
-	for p in $*; do
-		config_get_bool v "$s" "$p"
-		[ "$v" == 1 ] && echo "$p = yes" >> "$f"
-		[ "$v" == 0 ] && echo "$p = no" >> "$f"
-	done
-}
-
-append_params() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && append_param "$p" && ARGS="$ARGS=$v"
-		done
-		unset IFS
-	done
-}
-
-append_conf_params() {
-	local p; local v; local s="$1"; local f="$2"; shift; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			# Look up OpenWRT interface names
-			[ "$p" = "BindToInterface" ] && {
-				local ifname=$(uci -P /var/state get network.$v.ifname 2>&-)
-				[ -n "$ifname" ] && v="$ifname"
-			}
-
-			[ -n "$v" ] && echo "$p = $v" >> "$f"
-		done
-		unset IFS
-	done
-}
-
-section_enabled() {
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -gt 0 ]
-}
-
-prepare_host() {
-	local s="$1"
-	local n
-
-	# net disabled?
-	config_get n "$s" net
-	section_enabled "$n" || return 1
-
-	if [ "$#" = "2" ]; then
-		[ "$2" != "$n" ] && return 1
-	fi
-
-	# host disabled?
-	section_enabled "$s" || {
-		[ -f "$TMP_TINC/$n/hosts/$s" ] && rm "$TMP_TINC/$n/hosts/$s"
-		return 1
-	}
-
-	[ ! -f "/etc/tinc/$n/hosts/$s" ] && {
-		echo -n "tinc: Warning, public key for $s for network $n "
-		echo -n "missing in /etc/tinc/$n/hosts/$s, "
-		echo "skipping configuration of $s"
-		return 1
-	}
-
-	# append flags
-	append_conf_bools "$s" "$TMP_TINC/$n/hosts/$s" \
-		ClampMSS IndirectData PMTUDiscovery TCPOnly
-
-	# append params
-	append_conf_params "$s" "$TMP_TINC/$n/hosts/$s" \
-		Address Cipher Compression Digest MACLength PMTU \
-		Port PublicKey PublicKeyFile Subnet
-}
-
-check_gen_own_key() {
-	local s="$1"; local n; local k
-
-	config_get n "$s" Name
-	config_get_bool k "$s" generate_keys 0
-	[ "$k" == 0 ] && return 0
-
-	([ -z "$n" ] || [ -f "$TMP_TINC/$s/hosts/$n" ] || [ -f "$TMP_TINC/$s/rsa_key.priv" ]) && \
-		return 0
-	[ ! -d "$TMP_TINC/$s/hosts" ] && mkdir -p "$TMP_TINC/$s/hosts"
-
-	config_get k "$s" key_size
-	if [ -z "$k" ]; then
-		$BIN -c "$TMP_TINC/$s" --generate-keys </dev/null
-	else
-		$BIN -c "$TMP_TINC/$s" "--generate-keys=$k" </dev/null
-	fi
-
-	[ ! -d "/etc/tinc/$s/hosts" ] && mkdir -p "/etc/tinc/$s/hosts"
-	cp "$TMP_TINC/$s/rsa_key.priv" "/etc/tinc/$s/"
-	[ -n "$n" ] && cp "$TMP_TINC/$s/hosts/$n" "/etc/tinc/$s/hosts/"
-}
-
-prepare_net() {
-	local s="$1"
-	local n
-
-	section_enabled "$s" || return 1
-
-	[ -d "$TMP_TINC/$s" ] && rm -rf "$TMP_TINC/$s/"
-	mkdir -p "$TMP_TINC/$s"
-	[ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/"
-
-	# append flags
-	append_conf_bools "$s" "$TMP_TINC/$s/tinc.conf" \
-		DecrementTTL DirectOnly Hostnames IffOneQueue \
-		LocalDiscovery PriorityInheritance StrictSubnets TunnelServer \
-		ClampMSS IndirectData PMTUDiscovery TCPOnly
-
-	# append params
-	append_conf_params "$s" "$TMP_TINC/$s/tinc.conf" \
-		AddressFamily BindToAddress ConnectTo BindToInterface \
-		Broadcast Device DeviceType Forwarding \
-		GraphDumpFile Interface KeyExpire MACExpire \
-		MaxTimeout Mode Name PingInterval PingTimeout \
-		PrivateKey PrivateKeyFile ProcessPriority ReplayWindow \
-		UDPRcvBuf UDPSndBuf \
-		Address Cipher Compression Digest MACLength PMTU \
-		Port PublicKey PublicKeyFile Subnet
-
-	check_gen_own_key "$s" && return 0
-}
-
-start_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	ARGS=""
-
-	# append params
-	append_params "$s" logfile debug
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE"
-}
-
-stop_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_stop $BIN
-	# rm old config
-	rm -rf "$TMP_TINC/$s/"
-}
-
-reload_instance() {
-	local s="$1"
-
-	section_enabled "$s" || return 1
-
-	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-	service_reload $BIN
-}
-
-start() {
-	config_load 'tinc'
-
-	config_foreach prepare_net 'tinc-net'
-	config_foreach prepare_host 'tinc-host'
-
-	config_foreach start_instance 'tinc-net'
-}
-
-stop() {
-	config_load 'tinc'
-	config_foreach stop_instance 'tinc-net'
-}
-
-reload() {
-	config_load 'tinc'
-	config_foreach reload_instance 'tinc-net'
-}
-
-up() {
-	local exists
-	local instance
-	config_load 'tinc'
-	for instance in "$@"; do
-		config_get exists "$instance" 'TYPE'
-		if [ "$exists" == "tinc-net" ]; then
-			prepare_net "$instance"
-			config_foreach prepare_host 'tinc-host' "$instance"
-			start_instance "$instance"
-		fi
-	done
-}
-
-down() {
-	local exists
-	local instance
-	config_load 'tinc'
-	for instance in "$@"; do
-		config_get exists "$instance" 'TYPE'
-		if [ "$exists" == "tinc-net" ]; then
-			stop_instance "$instance"
-		fi
-	done
-}
diff --git a/trunk/package/feeds/packages/tinc/files/tinc.upgrade b/trunk/package/feeds/packages/tinc/files/tinc.upgrade
deleted file mode 100644
index 13f5d804..00000000
--- a/trunk/package/feeds/packages/tinc/files/tinc.upgrade
+++ /dev/null
@@ -1 +0,0 @@
-/etc/tinc/
diff --git a/trunk/package/feeds/packages/tinycdb/Makefile b/trunk/package/feeds/packages/tinycdb/Makefile
deleted file mode 100644
index 5288dea4..00000000
--- a/trunk/package/feeds/packages/tinycdb/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# 
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tinycdb
-PKG_RELEASE:=1
-PKG_SOURCE_URL:=http://www.corpit.ru/mjt/tinycdb/
-PKG_VERSION:=0.78
-PKG_MD5SUM:=976266afc3f6e7e17492a8d18f21f8f6
-PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
-PKG_LICENSE:=NLPL
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tinycdb
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=a Constant DataBase
-  URL:=http://www.corpit.ru/mjt/tinycdb.html
-endef
-
-define Package/tinycdb/description
- TinyCDB is a very fast and simple package for creating and reading constant data bases
-endef
-
-define Build/InstallDev
-        cd $(PKG_BUILD_DIR); $(MAKE) DESTDIR=$(1) prefix=/usr install
-endef
-
-
-
-$(eval $(call BuildPackage,tinycdb))
diff --git a/trunk/package/feeds/packages/tinycdb/patches/100-Makefile.patch b/trunk/package/feeds/packages/tinycdb/patches/100-Makefile.patch
deleted file mode 100644
index 830d7120..00000000
--- a/trunk/package/feeds/packages/tinycdb/patches/100-Makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur tinycdb-0.78/Makefile tinycdb-0.78.patched/Makefile
---- tinycdb-0.78/Makefile	2012-05-11 18:17:47.000000000 +0400
-+++ tinycdb-0.78.patched/Makefile	2014-09-29 00:10:00.610836323 +0400
-@@ -86,17 +86,17 @@
- $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP)
- 	-rm -f $(SOLIB)
- 	ln -s $@ $(SOLIB)
--	$(LD) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
-+	$(CC) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
- 	 $(LDFLAGS_SONAME)$(SHAREDLIB) $(LDFLAGS_VSCRIPT)$(LIBMAP) \
- 	 $(LIB_OBJS_PIC)
- 
- cdb: cdb.o $(CDB_USELIB)
--	$(LD) $(LDFLAGS) -o $@ cdb.o $(CDB_USELIB)
-+	$(CC) $(LDFLAGS) -o $@ cdb.o $(CDB_USELIB)
- cdb-shared: cdb.o $(SHAREDLIB)
--	$(LD) $(LDFLAGS) -o $@ cdb.o $(SHAREDLIB)
-+	$(CC) $(LDFLAGS) -o $@ cdb.o $(SHAREDLIB)
- 
- $(NSS_CDB): $(NSS_OBJS) $(NSS_USELIB) $(NSSMAP)
--	$(LD) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
-+	$(CC) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
- 	 $(LDFLAGS_SONAME)$@ $(LDFLAGS_VSCRIPT)$(NSSMAP) \
- 	 $(NSS_OBJS) $(NSS_USELIB)
- 
diff --git a/trunk/package/feeds/packages/tinyproxy/Makefile b/trunk/package/feeds/packages/tinyproxy/Makefile
deleted file mode 100644
index 566b500e..00000000
--- a/trunk/package/feeds/packages/tinyproxy/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tinyproxy
-PKG_VERSION:=1.8.3
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
-PKG_MD5SUM:=292ac51da8ad6ae883d4ebf56908400d
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tinyproxy
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy
-  URL:=http://tinyproxy.sourceforge.net/
-endef
-
-define Package/tinyproxy/conffiles
-/etc/config/tinyproxy
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-filter \
-	--enable-transparent \
-	--disable-regexcheck \
-
-define Package/tinyproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share/tinyproxy
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/tinyproxy.config $(1)/etc/config/tinyproxy
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/tinyproxy.init $(1)/etc/init.d/tinyproxy
-endef
-
-$(eval $(call BuildPackage,tinyproxy))
diff --git a/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.config b/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.config
deleted file mode 100644
index c8127234..00000000
--- a/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.config
+++ /dev/null
@@ -1,251 +0,0 @@
-config tinyproxy
-
-#
-# Enable the proxy
-#
-option enabled 0
-
-#
-# Name of the user the tinyproxy daemon should switch to after the port
-# has been bound.
-#
-option User nobody
-option Group nogroup
-
-#
-# Port to listen on.
-#
-option Port 8888
-
-#
-# If you have multiple interfaces this allows you to bind to only one. If
-# this is commented out, tinyproxy will bind to all interfaces present.
-#
-#option Listen 192.168.0.1
-
-#
-# The Bind directive allows you to bind the outgoing connections to a
-# particular IP address.
-#
-#option Bind 192.168.0.1
-
-#
-# Timeout: The number of seconds of inactivity a connection is allowed to
-# have before it closed by tinyproxy.
-#
-option Timeout 600
-
-#
-# ErrorFile: Defines the HTML file to send when a given HTTP error
-# occurs.  You will probably need to customize the location to your
-# particular install.  The usual locations to check are:
-#   /usr/local/share/tinyproxy
-#   /usr/share/tinyproxy
-#   /etc/tinyproxy
-#
-#option ErrorFile_404 "/usr/share/tinyproxy/404.html"
-#option ErrorFile_400 "/usr/share/tinyproxy/400.html"
-#option ErrorFile_503 "/usr/share/tinyproxy/503.html"
-#option ErrorFile_403 "/usr/share/tinyproxy/403.html"
-#option ErrorFile_408 "/usr/share/tinyproxy/408.html"
-
-# 
-# DefaultErrorFile: The HTML file that gets sent if there is no
-# HTML file defined with an ErrorFile keyword for the HTTP error
-# that has occured.
-#
-option DefaultErrorFile "/usr/share/tinyproxy/default.html"
-
-#
-# StatFile: The HTML file that gets sent when a request is made
-# for the stathost.  If this file doesn't exist a basic page is
-# hardcoded in tinyproxy.
-#
-option StatFile "/usr/share/tinyproxy/stats.html"
-
-#
-# Where to log the information. Either LogFile or Syslog should be set,
-# but not both.
-#
-option LogFile "/var/log/tinyproxy.log"
-#option Syslog 1
-
-#
-# Set the logging level. Allowed settings are:
-#	Critical	(least verbose)
-#	Error
-#	Warning
-#	Notice
-#	Connect		(to log connections without Info's noise)
-#	Info		(most verbose)
-# The LogLevel logs from the set level and above. For example, if the LogLevel
-# was set to Warning, than all log messages from Warning to Critical would be
-# output, but Notice and below would be suppressed.
-#
-option LogLevel Info
-
-#
-# Include the X-Tinyproxy header, which has the client's IP address when
-# connecting to the sites listed.
-#
-# list XTinyproxy mydomain.com
-
-#
-# This is the absolute highest number of threads which will be created. In
-# other words, only MaxClients number of clients can be connected at the
-# same time.
-#
-option MaxClients 100
-
-#
-# These settings set the upper and lower limit for the number of
-# spare servers which should be available. If the number of spare servers
-# falls below MinSpareServers then new ones will be created. If the number
-# of servers exceeds MaxSpareServers then the extras will be killed off.
-#
-option MinSpareServers 5
-option MaxSpareServers 20
-
-#
-# Number of servers to start initially.
-#
-option StartServers 10
-
-#
-# MaxRequestsPerChild is the number of connections a thread will handle
-# before it is killed. In practise this should be set to 0, which disables
-# thread reaping. If you do notice problems with memory leakage, then set
-# this to something like 10000
-#
-option MaxRequestsPerChild 0
-
-#
-# The following is the authorization controls. If there are any access
-# control keywords then the default action is to DENY. Otherwise, the
-# default action is ALLOW.
-#
-# Also the order of the controls are important. The incoming connections
-# are tested against the controls based on order.
-#
-list Allow 127.0.0.1
-#list Allow 192.168.0.0/16
-#list Allow 172.16.0.0/12
-#list Allow 10.0.0.0/8
-
-#
-# The "Via" header is required by the HTTP RFC, but using the real host name
-# is a security concern.  If the following directive is enabled, the string
-# supplied will be used as the host name in the Via header; otherwise, the
-# server's host name will be used.
-#
-option ViaProxyName "tinyproxy"
-
-#
-# The location of the filter file.
-#
-#option Filter "/etc/tinyproxy/filter"
-
-#
-# Filter based on URLs rather than domains.
-#
-#option FilterURLs 1
-
-#
-# Use POSIX Extended regular expressions rather than basic.
-#
-#option FilterExtended 1
-
-#
-# Use case sensitive regular expressions.
-#                                                                         
-#option FilterCaseSensitive 1
-
-#
-# Change the default policy of the filtering system.  If this directive is
-# commented out, or is set to "0" then the default policy is to allow
-# everything which is not specifically denied by the filter file.
-#
-# However, by setting this directive to "1" the default policy becomes to
-# deny everything which is _not_ specifically allowed by the filter file.
-#
-#option FilterDefaultDeny 1
-
-#
-# If an Anonymous keyword is present, then anonymous proxying is enabled.
-# The headers listed are allowed through, while all others are denied. If
-# no Anonymous keyword is present, then all header are allowed through.
-# You must include quotes around the headers.
-#
-#list Anonymous "Host"
-#list Anonymous "Authorization"
-
-#
-# This is a list of ports allowed by tinyproxy when the CONNECT method
-# is used.  To disable the CONNECT method altogether, set the value to 0.
-# If no ConnectPort line is found, all ports are allowed (which is not
-# very secure.)
-#
-# The following two ports are used by SSL.
-#
-list ConnectPort 443
-list ConnectPort 563
-
-#
-# Turns on upstream proxy support.
-#
-# The upstream rules allow you to selectively route upstream connections
-# based on the host/domain of the site being accessed.
-#
-# For example:
-#  # connection to test domain goes through testproxy
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target ".test.domain.invalid"
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target ".our_testbed.example.com"
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target "192.168.128.0/255.255.254.0"
-#
-#  # no upstream proxy for internal websites and unqualified hosts
-#
-#config upstream
-#	option type reject
-#	option target ".internal.example.com"
-#
-#config upstream
-#	option type reject
-#	option target "www.example.com"
-#
-#config upstream
-#	option type reject
-#	option target "10.0.0.0/8"
-#
-#config upstream
-#	option type reject
-#	option target "192.168.0.0/255.255.254.0"
-#
-#config upstream
-#	option type reject
-#	option target "."
-#
-#  # default upstream is internet firewall
-#
-#config upstream
-#	option type proxy
-#	option via firewall.internal.example.com:80
-#
-# The LAST matching rule wins the route decision.  As you can see, you
-# can use a host, or a domain:
-#  name     matches host exactly
-#  .name    matches any host in domain "name"
-#  .        matches any host with no domain (in 'empty' domain)
-#  IP/bits  matches network/mask
-#  IP/mask  matches network/mask
diff --git a/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.init b/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.init
deleted file mode 100644
index 73f38c63..00000000
--- a/trunk/package/feeds/packages/tinyproxy/files/tinyproxy.init
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=50
-
-CFGFILE=/var/etc/tinyproxy.conf
-
-section_enabled() {
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -gt 0 ]
-}
-
-start() {
-	config_load 'tinyproxy'
-	config_foreach start_proxy 'tinyproxy'
-}
-
-stop() {
-	service_stop /usr/sbin/tinyproxy
-}
-
-start_proxy() {
-	section_enabled "$1" || return 1
-
-	mkdir -m0755 -p /var/etc
-	echo '### AUTOGENERATED CONFIGURATION' > $CFGFILE
-	echo '### DO NOT EDIT' >> $CFGFILE
-	echo '### SEE /etc/config/tinyproxy INSTEAD' >> $CFGFILE
-	echo '' >> $CFGFILE
-
-	proxy_atom "$1" User >> $CFGFILE
-	proxy_atom "$1" Group >> $CFGFILE
-	proxy_atom "$1" Port 8888 >> $CFGFILE
-	proxy_atom "$1" Listen >> $CFGFILE
-	proxy_atom "$1" Bind >> $CFGFILE
-	proxy_atom "$1" Timeout >> $CFGFILE
-
-	proxy_string "$1" ErrorFile_400 "ErrorFile 400" >> $CFGFILE
-	proxy_string "$1" ErrorFile_403 "ErrorFile 403" >> $CFGFILE
-	proxy_string "$1" ErrorFile_404 "ErrorFile 404" >> $CFGFILE
-	proxy_string "$1" ErrorFile_408 "ErrorFile 408" >> $CFGFILE
-	proxy_string "$1" ErrorFile_503 "ErrorFile 503" >> $CFGFILE
-
-	proxy_string "$1" DefaultErrorFile >> $CFGFILE
-	proxy_string "$1" StatHost StatHost 127.0.0.1 >> $CFGFILE
-	proxy_string "$1" StatFile >> $CFGFILE
-	proxy_string "$1" LogFile >> $CFGFILE
-
-	proxy_flag "$1" Syslog >> $CFGFILE
-
-	proxy_atom "$1" LogLevel >> $CFGFILE
-
-	proxy_list "$1" XTinyproxy >> $CFGFILE
-
-	proxy_atom "$1" MaxClients >> $CFGFILE
-	proxy_atom "$1" MinSpareServers >> $CFGFILE
-	proxy_atom "$1" MaxSpareServers >> $CFGFILE
-	proxy_atom "$1" StartServers >> $CFGFILE
-	proxy_atom "$1" MaxRequestsPerChild >> $CFGFILE
-	proxy_list "$1" Allow >> $CFGFILE
-
-	proxy_string "$1" ViaProxyName >> $CFGFILE
-	proxy_string "$1" Filter >> $CFGFILE
-
-	proxy_flag "$1" FilterURLs >> $CFGFILE
-	proxy_flag "$1" FilterExtended >> $CFGFILE
-	proxy_flag "$1" FilterCaseSensitive >> $CFGFILE
-	proxy_flag "$1" FilterDefaultDeny Yes No >> $CFGFILE
-
-	proxy_list "$1" Anonymous '"' >> $CFGFILE
-	proxy_list "$1" ConnectPort >> $CFGFILE
-
-	config_foreach write_upstream upstream
-
-	service_start /usr/sbin/tinyproxy -c "$CFGFILE"
-}
-
-write_upstream() {
-	local type
-	local via
-	local target
-
-	config_get "type" "$1" "type"
-	config_get via "$1" via
-	config_get target "$1" target
-	[ -n "$target" ] && target=' "'"$target"'"'
-
-	[ "$type" == "proxy" -a -n "$via" ] && \
-		echo "upstream $via$target" >> $CFGFILE
-
-	[ "$type" == "reject" -a -n "$target" ] && \
-		echo "no upstream$target" >> $CFGFILE
-}
-
-proxy_atom() {
-	local SECTION=$1
-	local OPTION=$2
-	local DEFAULT=$3
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -z "$_value" ] && _value="$DEFAULT"
-	[ -n "$_value" ] && echo "$OPTION $_value"
-}
-
-proxy_string() {
-	local SECTION=$1
-	local OPTION=$2
-	local ALIAS=$3
-	local DEFAULT=$4
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -z "$_value" ] && _value="$DEFAULT"
-	[ -n "$_value" ] && echo "${ALIAS:-${OPTION}} "'"'"$_value"'"'
-	[ -n "$_value" -a "$OPTION" = "LogFile" ] && {
-		touch $_value
-		chmod 666 $_value
-	}
-}
-
-proxy_flag() {
-	local SECTION=$1
-	local OPTION=$2
-	local TRUE="${3:-On}"
-	local FALSE="${4:-Off}"
-
-	config_get_bool _value "$SECTION" "$OPTION" 0
-	[ "$_value" -eq "1" ] && _value="$TRUE" || _value="$FALSE"
-	echo "$OPTION $_value"
-}
-
-proxy_list() {
-	local SECTION=$1
-	local OPTION=$2
-	local ENCLOSE=$3
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -n "$_value" ] && {
-		for entry in $_value; do
-			echo "$OPTION ${ENCLOSE}${entry}${ENCLOSE}"
-		done
-	}
-}
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/010-no-docs-and-tests.patch b/trunk/package/feeds/packages/tinyproxy/patches/010-no-docs-and-tests.patch
deleted file mode 100644
index cbb0dd19..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/010-no-docs-and-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -6815,59 +6815,8 @@ fi
- 
- 
- 
--# Check for asciidoc
--# Extract the first word of "a2x", so it can be a program name with args.
--set dummy a2x; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_A2X+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $A2X in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
--  ;;
--esac
--fi
--A2X=$ac_cv_path_A2X
--if test -n "$A2X"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
--$as_echo "$A2X" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- if test "x$A2X" != "xno"; then
--  HAVE_A2X_TRUE=
--  HAVE_A2X_FALSE='#'
--else
-   HAVE_A2X_TRUE='#'
-   HAVE_A2X_FALSE=
--fi
--
--if test x"$A2X" = x"no"; then
--  as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5
--fi
- 
- ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile"
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- # tools want this on a single line
- ACLOCAL_AMFLAGS = -I m4macros
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -222,9 +222,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- 
- # tools want this on a single line
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/020-config_and_pid-path.patch b/trunk/package/feeds/packages/tinyproxy/patches/020-config_and_pid-path.patch
deleted file mode 100644
index 3ab7482a..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/020-config_and_pid-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -326,8 +326,8 @@ static void initialize_config_defaults (
-         conf->errorpages = NULL;
-         conf->stathost = safestrdup (TINYPROXY_STATHOST);
-         conf->idletimeout = MAX_IDLE_TIME;
--        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy/tinyproxy.log");
--        conf->pidpath = safestrdup (LOCALSTATEDIR "/run/tinyproxy/tinyproxy.pid");
-+        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy.log");
-+        conf->pidpath = safestrdup (LOCALSTATEDIR "/tinyproxy.pid");
- }
- 
- /**
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch b/trunk/package/feeds/packages/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch
deleted file mode 100644
index 68d89db4..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -865,7 +865,6 @@ static HANDLE_FUNC (handle_deny)
- 
- static HANDLE_FUNC (handle_bind)
- {
--#ifndef TRANSPARENT_PROXY
-         int r = set_string_arg (&conf->bind_address, line, &match[2]);
- 
-         if (r)
-@@ -873,11 +872,6 @@ static HANDLE_FUNC (handle_bind)
-         log_message (LOG_INFO,
-                      "Outgoing connections bound to IP %s", conf->bind_address);
-         return 0;
--#else
--        fprintf (stderr,
--                 "\"Bind\" cannot be used with transparent support enabled.\n");
--        return 1;
--#endif
- }
- 
- static HANDLE_FUNC (handle_listen)
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/120-fix_INET6.patch b/trunk/package/feeds/packages/tinyproxy/patches/120-fix_INET6.patch
deleted file mode 100644
index 1c268355..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/120-fix_INET6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/sock.c
-+++ b/src/sock.c
-@@ -39,8 +39,7 @@
-  * returned if the bind succeeded.  Otherwise, -1 is returned
-  * to indicate an error.
-  */
--static int
--bind_socket (int sockfd, const char *addr, int family)
-+static int bind_socket (int sockfd, const char *addr)
- {
-         struct addrinfo hints, *res, *ressave;
- 
-@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add
-         assert (addr != NULL && strlen (addr) != 0);
- 
-         memset (&hints, 0, sizeof (struct addrinfo));
--        hints.ai_family = family;
-+        hints.ai_family = AF_UNSPEC;
-         hints.ai_socktype = SOCK_STREAM;
- 
-         /* The local port it not important */
-@@ -106,14 +105,12 @@ int opensock (const char *host, int port
- 
-                 /* Bind to the specified address */
-                 if (bind_to) {
--                        if (bind_socket (sockfd, bind_to,
--                                         res->ai_family) < 0) {
-+                        if (bind_socket (sockfd, bind_to) < 0) {
-                                 close (sockfd);
-                                 continue;       /* can't bind, so try again */
-                         }
-                 } else if (config.bind_address) {
--                        if (bind_socket (sockfd, config.bind_address,
--                                         res->ai_family) < 0) {
-+                        if (bind_socket (sockfd, config.bind_address) < 0) {
-                                 close (sockfd);
-                                 continue;       /* can't bind, so try again */
-                         }
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tiniproxy-randomized-hashmaps.patch b/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tiniproxy-randomized-hashmaps.patch
deleted file mode 100644
index 4737b8ba..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tiniproxy-randomized-hashmaps.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/src/child.c
-+++ b/src/child.c
-@@ -20,6 +20,9 @@
-  * processing incoming connections.
-  */
- 
-+#include <stdlib.h>
-+#include <time.h>
-+
- #include "main.h"
- 
- #include "child.h"
-@@ -196,6 +199,7 @@ static void child_main (struct child_s *
-         }
- 
-         ptr->connects = 0;
-+	srand(time(NULL));
- 
-         while (!config.quit) {
-                 ptr->status = T_WAITING;
---- a/src/hashmap.c
-+++ b/src/hashmap.c
-@@ -25,6 +25,8 @@
-  * don't try to free the data, or realloc the memory. :)
-  */
- 
-+#include <stdlib.h>
-+
- #include "main.h"
- 
- #include "hashmap.h"
-@@ -50,6 +52,7 @@ struct hashbucket_s {
- };
- 
- struct hashmap_s {
-+        uint32_t seed;
-         unsigned int size;
-         hashmap_iter end_iterator;
- 
-@@ -65,7 +68,7 @@ struct hashmap_s {
-  *
-  * If any of the arguments are invalid a negative number is returned.
-  */
--static int hashfunc (const char *key, unsigned int size)
-+static int hashfunc (const char *key, unsigned int size, uint32_t seed)
- {
-         uint32_t hash;
- 
-@@ -74,7 +77,7 @@ static int hashfunc (const char *key, un
-         if (size == 0)
-                 return -ERANGE;
- 
--        for (hash = tolower (*key++); *key != '\0'; key++) {
-+        for (hash = seed; *key != '\0'; key++) {
-                 uint32_t bit = (hash & 1) ? (1 << (sizeof (uint32_t) - 1)) : 0;
- 
-                 hash >>= 1;
-@@ -104,6 +107,7 @@ hashmap_t hashmap_create (unsigned int n
-         if (!ptr)
-                 return NULL;
- 
-+	ptr->seed = (uint32_t)rand();
-         ptr->size = nbuckets;
-         ptr->buckets = (struct hashbucket_s *) safecalloc (nbuckets,
-                                                            sizeof (struct
-@@ -201,7 +205,7 @@ hashmap_insert (hashmap_t map, const cha
-         if (!data || len < 1)
-                 return -ERANGE;
- 
--        hash = hashfunc (key, map->size);
-+        hash = hashfunc (key, map->size, map->seed);
-         if (hash < 0)
-                 return hash;
- 
-@@ -382,7 +386,7 @@ ssize_t hashmap_search (hashmap_t map, c
-         if (map == NULL || key == NULL)
-                 return -EINVAL;
- 
--        hash = hashfunc (key, map->size);
-+        hash = hashfunc (key, map->size, map->seed);
-         if (hash < 0)
-                 return hash;
- 
-@@ -416,7 +420,7 @@ ssize_t hashmap_entry_by_key (hashmap_t
-         if (!map || !key || !data)
-                 return -EINVAL;
- 
--        hash = hashfunc (key, map->size);
-+        hash = hashfunc (key, map->size, map->seed);
-         if (hash < 0)
-                 return hash;
- 
-@@ -451,7 +455,7 @@ ssize_t hashmap_remove (hashmap_t map, c
-         if (map == NULL || key == NULL)
-                 return -EINVAL;
- 
--        hash = hashfunc (key, map->size);
-+        hash = hashfunc (key, map->size, map->seed);
-         if (hash < 0)
-                 return hash;
- 
diff --git a/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tinyproxy-limit-headers.patch b/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tinyproxy-limit-headers.patch
deleted file mode 100644
index b8023ab2..00000000
--- a/trunk/package/feeds/packages/tinyproxy/patches/CVE-2012-3505-tinyproxy-limit-headers.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/src/reqs.c
-+++ b/src/reqs.c
-@@ -610,6 +610,11 @@ add_header_to_connection (hashmap_t hash
-         return hashmap_insert (hashofheaders, header, sep, len);
- }
- 
-+/* define max number of headers. big enough to handle legitimate cases,
-+ * but limited to avoid DoS 
-+ */
-+#define MAX_HEADERS 10000
-+
- /*
-  * Read all the headers from the stream
-  */
-@@ -617,6 +622,7 @@ static int get_all_headers (int fd, hash
- {
-         char *line = NULL;
-         char *header = NULL;
-+	int count;
-         char *tmp;
-         ssize_t linelen;
-         ssize_t len = 0;
-@@ -625,7 +631,7 @@ static int get_all_headers (int fd, hash
-         assert (fd >= 0);
-         assert (hashofheaders != NULL);
- 
--        for (;;) {
-+        for (count = 0; count < MAX_HEADERS; count++) {
-                 if ((linelen = readline (fd, &line)) <= 0) {
-                         safefree (header);
-                         safefree (line);
-@@ -691,6 +697,12 @@ static int get_all_headers (int fd, hash
- 
-                 safefree (line);
-         }
-+
-+	/* if we get there, this is we reached MAX_HEADERS count.
-+	   bail out with error */
-+	safefree (header);
-+	safefree (line);
-+	return -1;
- }
- 
- /*
diff --git a/trunk/package/feeds/packages/tmux/Makefile b/trunk/package/feeds/packages/tmux/Makefile
deleted file mode 100644
index 1a7e6d14..00000000
--- a/trunk/package/feeds/packages/tmux/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tmux
-PKG_VERSION:=1.9a
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/tmux
-PKG_MD5SUM:=b07601711f96f1d260b390513b509a2d
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tmux
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Terminal multiplexer
-  DEPENDS:=+libncurses +libevent2 +libpthread +librt
-  URL:=http://tmux.sourceforge.net/
-endef
-
-define Package/tmux/description
-  tmux is a modern, BSD-licensed alternative to GNU screen.
-endef
-
-MAKE_FLAGS += \
-	PREFIX="/usr" \
-	PLATFORM="linux"
-
-define Package/tmux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmux $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tmux))
diff --git a/trunk/package/feeds/packages/tmux/patches/100-b64_ntop-conflict_compath_h.patch b/trunk/package/feeds/packages/tmux/patches/100-b64_ntop-conflict_compath_h.patch
deleted file mode 100644
index 3b216698..00000000
--- a/trunk/package/feeds/packages/tmux/patches/100-b64_ntop-conflict_compath_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/compat.h b/compat.h
-index 65d6ec7..7fc3aa7 100644
---- a/compat.h
-+++ b/compat.h
-@@ -219,7 +219,9 @@ int	 	 daemon(int, int);
- #ifndef HAVE_B64_NTOP
- /* b64_ntop.c */
- #undef b64_ntop /* for Cygwin */
--int		 b64_ntop(const char *, size_t, char *, size_t);
-+int		 local_b64_ntop(const char *, size_t, char *, size_t);
-+#else
-+#define local_b64_ntop b64_ntop
- #endif
- 
- #ifndef HAVE_FORKPTY
diff --git a/trunk/package/feeds/packages/tmux/patches/101-b64_ntop-conflict_compat_b64_ntop_c.patch b/trunk/package/feeds/packages/tmux/patches/101-b64_ntop-conflict_compat_b64_ntop_c.patch
deleted file mode 100644
index a03d18fa..00000000
--- a/trunk/package/feeds/packages/tmux/patches/101-b64_ntop-conflict_compat_b64_ntop_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/compat/b64_ntop.c b/compat/b64_ntop.c
-index 2b4dc2d..a1314ca 100644
---- a/compat/b64_ntop.c
-+++ b/compat/b64_ntop.c
-@@ -122,7 +122,7 @@ static const char Pad64 = '=';
-    */
- 
- int
--b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
-+local_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
- 	size_t datalength = 0;
- 	uint8_t input[3];
- 	uint8_t output[4];
diff --git a/trunk/package/feeds/packages/tmux/patches/102-b64_ntop-conflict_tty_c.patch b/trunk/package/feeds/packages/tmux/patches/102-b64_ntop-conflict_tty_c.patch
deleted file mode 100644
index 72e0a078..00000000
--- a/trunk/package/feeds/packages/tmux/patches/102-b64_ntop-conflict_tty_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tty.c b/tty.c
-index eb2511c..576edbc 100644
---- a/tty.c
-+++ b/tty.c
-@@ -1067,7 +1067,7 @@ tty_cmd_setselection(struct tty *tty, const struct tty_ctx *ctx)
- 	off = 4 * ((ctx->num + 2) / 3) + 1; /* storage for base64 */
- 	buf = xmalloc(off);
- 
--	b64_ntop(ctx->ptr, ctx->num, buf, off);
-+	local_b64_ntop(ctx->ptr, ctx->num, buf, off);
- 	tty_putcode_ptr2(tty, TTYC_MS, "", buf);
- 
- 	free(buf);
diff --git a/trunk/package/feeds/packages/tmux/patches/200-usr-local.patch b/trunk/package/feeds/packages/tmux/patches/200-usr-local.patch
deleted file mode 100644
index 07336deb..00000000
--- a/trunk/package/feeds/packages/tmux/patches/200-usr-local.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -101,9 +101,9 @@ bin_PROGRAMS = tmux$(EXEEXT)
- @IS_DEBUG_TRUE@@IS_GCC_TRUE@	-Wdeclaration-after-statement
- @IS_DEBUG_TRUE@@IS_GCC_TRUE@am__append_4 = -DDEBUG
- @IS_DEBUG_FALSE@@IS_GCC_TRUE@am__append_5 = -O2
--@IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_6 = -iquote. -I/usr/local/include
-+@IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_6 = -iquote.
- @IS_DEBUG_TRUE@@IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_7 = -Wno-pointer-sign
--@IS_GCC4_FALSE@@IS_GCC_TRUE@am__append_8 = -I. -I- -I/usr/local/include
-+@IS_GCC4_FALSE@@IS_GCC_TRUE@am__append_8 = -I. -I-
- 
- # Set flags for Solaris.
- @IS_GCC_TRUE@@IS_SUNOS_TRUE@am__append_9 = -D_XPG6 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
diff --git a/trunk/package/feeds/packages/tracertools/Makefile b/trunk/package/feeds/packages/tracertools/Makefile
deleted file mode 100644
index 733d074b..00000000
--- a/trunk/package/feeds/packages/tracertools/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tracertools
-PKG_VERSION:=20141027
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-
-PKG_LICENSE:=GPL-3.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://gitorious.org/tracertools/tracertools.git
-PKG_SOURCE_VERSION:=9ba70d1fe4f3c0f24d565d98c79fee71711823f0
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tracertools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Tracer MPPT monitoring and control tools
-endef
-
-define Package/tracertools/description
-	Tools for the Tracer MPPT solar charge controller.
-endef
-
-define Package/tracertools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tracerstat $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tracertools))
diff --git a/trunk/package/feeds/packages/transmission/Makefile b/trunk/package/feeds/packages/transmission/Makefile
deleted file mode 100644
index 1facadaf..00000000
--- a/trunk/package/feeds/packages/transmission/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=transmission
-PKG_VERSION:=2.84
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://download-origin.transmissionbt.com/files/ http://mirrors.m0k.org/transmission/files
-PKG_MD5SUM:=411aec1c418c14f6765710d89743ae42
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/transmission/template
-  SUBMENU:=BitTorrent
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A free, lightweight BitTorrent client
-  URL:=http://www.transmissionbt.com
-  MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
-endef
-
-define Package/transmission-daemon
-  $(call Package/transmission/template)
-  DEPENDS:=+libcurl +libopenssl +libpthread +libevent2 +librt
-  MENU:=1
-endef
-
-define Package/transmission-cli
-  $(call Package/transmission/template)
-  DEPENDS:=transmission-daemon
-endef
-
-define Package/transmission-remote
-  $(call Package/transmission/template)
-  DEPENDS:=+libcurl +libopenssl +libpthread +libevent2 +librt
-endef
-
-define Package/transmission-web
-  $(call Package/transmission/template)
-  DEPENDS:=transmission-daemon
-endef
-
-
-define Package/transmission-daemon/description
- Transmission is a simple BitTorrent client.
- It features a very simple, intuitive interface
- on top on an efficient, cross-platform back-end.
- This package contains the daemon itself.
-endef
-
-define Package/transmission-cli/description
- CLI utilities for transmission.
-endef
-
-define Package/transmission-remote/description
- CLI remote interface for transmission.
-endef
-
-define Package/transmission-web/description
- Webinterface resources for transmission.
-endef
-
-define Package/transmission-daemon/conffiles
-/etc/config/transmission
-endef
-
-CONFIGURE_VARS += \
-	LIBEVENT_LIBS="$(STAGING_DIR)/usr/lib/libevent-2.0.so.5"
-
-CONFIGURE_ARGS += \
-	--enable-daemon \
-	--enable-cli \
-	--without-gtk \
-	--enable-largefile \
-	--enable-lightweight
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
-
-define Package/transmission-daemon/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/transmission.init $(1)/etc/init.d/transmission
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/transmission.config $(1)/etc/config/transmission
-endef
-
-define Package/transmission-cli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-cli \
-			$(PKG_INSTALL_DIR)/usr/bin/transmission-create \
-			$(PKG_INSTALL_DIR)/usr/bin/transmission-edit \
-			$(PKG_INSTALL_DIR)/usr/bin/transmission-show \
-			$(1)/usr/bin/
-endef
-
-define Package/transmission-remote/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/
-endef
-
-define Package/transmission-web/install
-	$(INSTALL_DIR) $(1)/usr/share/transmission
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/transmission/web $(1)/usr/share/transmission/
-endef
-
-$(eval $(call BuildPackage,transmission-daemon))
-$(eval $(call BuildPackage,transmission-cli))
-$(eval $(call BuildPackage,transmission-remote))
-$(eval $(call BuildPackage,transmission-web))
diff --git a/trunk/package/feeds/packages/transmission/files/transmission.config b/trunk/package/feeds/packages/transmission/files/transmission.config
deleted file mode 100644
index a8fd56d9..00000000
--- a/trunk/package/feeds/packages/transmission/files/transmission.config
+++ /dev/null
@@ -1,71 +0,0 @@
-config transmission
-	option enabled 0
-	option config_dir '/tmp/transmission'
-	#option user 'nobody'
-	option alt_speed_down 50
-	option alt_speed_enabled false
-	option alt_speed_time_begin  540
-	option alt_speed_time_day 127
-	option alt_speed_time_enabled false
-	option alt_speed_time_end 1020
-	option alt_speed_up 50
-	option bind_address_ipv4 '0.0.0.0'
-	option bind_address_ipv6 '::'
-	option blocklist_enabled false
-	option blocklist_url ''
-	option cache_size_mb 2
-	option dht_enabled true
-	option download_dir '/tmp/transmission/done'
-	option download_queue_enabled true
-	option download_queue_size 4
-	option encryption 1
-	option idle_seeding_limit 30
-	option idle_seeding_limit_enabled false
-	option incomplete_dir '/tmp/transmission/incomplete'
-	option incomplete_dir_enabled false
-	option lazy_bitfield_enabled true
-	option lpd_enabled false
-	option message_level 1
-	option peer_congestion_algorithm ''
-	option peer_limit_global 240
-	option peer_limit_per_torrent 60
-	option peer_port 51413
-	option peer_port_random_high 65535
-	option peer_port_random_low 49152
-	option peer_port_random_on_start false
-	option peer_socket_tos 'default'
-	option pex_enabled true
-	option port_forwarding_enabled true
-	option preallocation 1
-	option prefetch_enabled true
-	option queue_stalled_enabled true
-	option queue_stalled_minutes 30
-	option ratio_limit 2.0000
-	option ratio_limit_enabled false
-	option rename_partial_files true
-	option rpc_authentication_required false
-	option rpc_bind_address '0.0.0.0'
-	option rpc_enabled true
-	option rpc_password ''
-	option rpc_port 9091
-	option rpc_url '/transmission/'
-	option rpc_username ''
-	option rpc_whitelist '127.0.0.1,192.168.1.*'
-	option rpc_whitelist_enabled true
-	option scrape_paused_torrents_enabled true
-	option script_torrent_done_enabled false
-	option script_torrent_done_filename ''
-	option seed_queue_enabled false
-	option seed_queue_size 10
-	option speed_limit_down 100
-	option speed_limit_down_enabled false
-	option speed_limit_up 20
-	option speed_limit_up_enabled false
-	option start_added_torrents true
-	option trash_original_torrent_files false
-	option umask 18
-	option upload_slots_per_torrent 14
-	option utp_enabled true
-	option scrape_paused_torrents true
-	option watch_dir_enabled false
-	option watch_dir ''
diff --git a/trunk/package/feeds/packages/transmission/files/transmission.init b/trunk/package/feeds/packages/transmission/files/transmission.init
deleted file mode 100644
index 669e710e..00000000
--- a/trunk/package/feeds/packages/transmission/files/transmission.init
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2012 OpenWrt.org
-
-START=99
-
-LIST_SEP="
-"
-
-append_params() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && (
-				echo "\""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_file
-			)
-		done
-		unset IFS
-	done
-}
-
-append_params_quotes() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && (
-				echo -n "\""$p | sed -e 's|/|\\/|g;s|_|-|g' >> $config_file; \
-				echo "\": \""$v"\"," >> $config_file
-			)
-		done
-		unset IFS
-	done
-}
-
-section_enabled() {
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -gt 0 ]
-}
-
-start_instance() {
-	local s="$1"
-	local user
-
-	section_enabled "$section" || return 1
-
-	config_get config_dir "$s" 'config_dir' '/var/etc/transmission'
-	config_get user "$s" 'user'
-
-	config_file="$config_dir/settings.json"
-	[ -d $config_dir ] || {
-		mkdir -m 0755 -p "$config_dir"
-		touch $config_file
-		[ -z "$user" ] || chown -R $user $config_dir
-	}
-
-	echo "{" > $config_file
-
-	append_params "$s" \
-		alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \
-		alt_speed_time_enabled alt_speed_time_end alt_speed_up blocklist_enabled \
-		cache_size_mb download_queue_enabled download_queue_size \
-		dht_enabled encryption idle_seeding_limit idle_seeding_limit_enabled \
-		incomplete_dir_enabled lazy_bitfield_enabled lpd_enabled message_level \
-		peer_limit_global peer_limit_per_torrent peer_port \
-		peer_port_random_high peer_port_random_low peer_port_random_on_start \
-		pex_enabled port_forwarding_enabled preallocation prefetch_enabled \
-		ratio_limit ratio_limit_enabled rename_partial_files rpc_authentication_required \
-		rpc_enabled rpc_port rpc_whitelist_enabled queue_stalled_enabled \
-		queue_stalled_minutes scrape_paused_torrents_enabled script_torrent_done_enabled \
-		seed_queue_enabled seed_queue_size \
-		speed_limit_down speed_limit_down_enabled speed_limit_up \
-		speed_limit_up_enabled start_added_torrents trash_original_torrent_files \
-		umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \
-		watch_dir_enabled
-
-	append_params_quotes "$s" \
-		blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \
-		peer_congestion_algorithm peer_socket_tos rpc_bind_address rpc_password rpc_url \
-		rpc_username rpc_whitelist script_torrent_done_filename watch_dir
-
-	echo "\""invalid-key"\": false" >> $config_file
-	echo "}" >> $config_file
-
-	SERVICE_UID="$user" \
-	service_start /usr/bin/transmission-daemon -g $config_dir
-}
-
-stop_instance() {
-	local s="$1"
-	local user
-
-	section_enabled "$section" || return 1
-
-	config_get user "$s" 'user'
-
-	SERVICE_UID="$user" \
-	service_stop /usr/bin/transmission-daemon
-}
-
-start() {
-	config_load 'transmission'
-	config_foreach start_instance 'transmission'
-}
-
-stop() {
-	config_load 'transmission'
-	config_foreach stop_instance 'transmission'
-}
diff --git a/trunk/package/feeds/packages/transmission/patches/010_libtransmission_fallocate64_eglibc.patch b/trunk/package/feeds/packages/transmission/patches/010_libtransmission_fallocate64_eglibc.patch
deleted file mode 100644
index e46a1ad9..00000000
--- a/trunk/package/feeds/packages/transmission/patches/010_libtransmission_fallocate64_eglibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libtransmission/fdlimit.c
-+++ b/libtransmission/fdlimit.c
-@@ -22,11 +22,6 @@
-  #include <fcntl.h>
- #endif
-
--#ifdef HAVE_FALLOCATE64
--  /* FIXME can't find the right #include voodoo to pick up the declaration.. */
--  extern int fallocate64 (int fd, int mode, uint64_t offset, uint64_t len);
--#endif
--
- #ifdef HAVE_XFS_XFS_H
-  #include <xfs/xfs.h>
- #endif
diff --git a/trunk/package/feeds/packages/transmission/patches/020-use-internal-miniupnp.patch b/trunk/package/feeds/packages/transmission/patches/020-use-internal-miniupnp.patch
deleted file mode 100644
index cf785679..00000000
--- a/trunk/package/feeds/packages/transmission/patches/020-use-internal-miniupnp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -251,7 +251,7 @@
- AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>],
-                    [struct UPNPDev dev;])],
--  [upnp_version="unknown"],
-+  [upnp_version="none"],
-   [upnp_version="none"]
- )
- 
diff --git a/trunk/package/feeds/packages/transmission/patches/030-fix-musl-build.patch b/trunk/package/feeds/packages/transmission/patches/030-fix-musl-build.patch
deleted file mode 100644
index badf6731..00000000
--- a/trunk/package/feeds/packages/transmission/patches/030-fix-musl-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: transmission-2.84/libtransmission/bitfield.c
-===================================================================
---- transmission-2.84.orig/libtransmission/bitfield.c
-+++ transmission-2.84/libtransmission/bitfield.c
-@@ -7,6 +7,8 @@
-  * $Id: bitfield.c 14302 2014-06-29 01:42:38Z jordan $
-  */
- 
-+#define __NEED_ssize_t
-+
- #include <assert.h>
- #include <stdlib.h> /* realloc () */
- #include <string.h> /* memset */
-@@ -15,6 +17,7 @@
- #include "bitfield.h"
- #include "utils.h" /* tr_new0 () */
- 
-+
- const tr_bitfield TR_BITFIELD_INIT = { NULL, 0, 0, 0, false, false };
- 
- /****
-Index: transmission-2.84/libtransmission/fdlimit.h
-===================================================================
---- transmission-2.84.orig/libtransmission/fdlimit.h
-+++ transmission-2.84/libtransmission/fdlimit.h
-@@ -11,6 +11,8 @@
-  #error only libtransmission should #include this header.
- #endif
- 
-+#define __NEED_off_t
-+
- #include "transmission.h"
- #include "net.h"
- 
diff --git a/trunk/package/feeds/packages/triggerhappy/Makefile b/trunk/package/feeds/packages/triggerhappy/Makefile
deleted file mode 100644
index 5b365cdd..00000000
--- a/trunk/package/feeds/packages/triggerhappy/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=triggerhappy
-PKG_VERSION:=0.3.4
-PKG_REV:=649bf670a012558393d7c41f3660d0a017edd982
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://github.com/wertarbyte/triggerhappy
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/triggerhappy
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=handle input events and run configured programs
-  URL:=http://github.com/wertarbyte/triggerhappy
-endef
-
-define Package/triggerhappy/description
-	triggerhappy - handle input events and run configured programs
-	The daemon thd can handle hotplugged input devices and is configured through
-	simple configuration files in /etc/triggerhappy/triggers.d/.
-endef
-
-MAKE_FLAGS += \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(1)
-
-define Package/triggerhappy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/triggerhappy
-	$(INSTALL_DIR) $(1)/etc/triggerhappy/triggers.d/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/input/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/thd $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/th-cmd $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/triggerhappy.init $(1)/etc/init.d/triggerhappy
-	$(INSTALL_BIN) ./files/triggerhappy.hotplug $(1)/etc/hotplug.d/input/10-triggerhappy
-	$(INSTALL_BIN) ./files/triggerhappy-example.conf $(1)/etc/triggerhappy/triggers.d/example.conf
-endef
-
-$(eval $(call BuildPackage,triggerhappy))
diff --git a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy-example.conf b/trunk/package/feeds/packages/triggerhappy/files/triggerhappy-example.conf
deleted file mode 100644
index 3a8017a7..00000000
--- a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy-example.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is an example configuration for the triggerhappy daemon (thd)
-# please note that every file to be processed must end in ".conf"
-#
-# To view a list of supported event codes, use "thd --listevents" or
-# "thd --dump /dev/input/event*"
-#
-# Format:
-# <eventcode> <value> <command>
-#
-# values for key events are 1 (pressed), 0 (released) or 2 (held)
-#
-## control an mpd instance
-# KEY_NEXTSONG		1	/usr/bin/mpc next
-# KEY_PREVSONG		1	/usr/bin/mpc prev
diff --git a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.hotplug b/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.hotplug
deleted file mode 100644
index 78ad3496..00000000
--- a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.hotplug
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-THD_SOCKET=/tmp/triggerhappy.socket
-[ -S "$THD_SOCKET" ] || exit
-
-case "$ACTION" in
-	add)
-		DEVICE="/dev/$DEVNAME"
-		[ -c "$DEVICE" ] || exit
-		# offer device to triggerhappy daemon
-		/usr/sbin/th-cmd --socket "$THD_SOCKET" --add "$DEVICE"
-	;;
-        remove)
-		# nothing to do
-	;;
-esac
diff --git a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.init b/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.init
deleted file mode 100644
index e846d29a..00000000
--- a/trunk/package/feeds/packages/triggerhappy/files/triggerhappy.init
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=93
-
-start() {
-	/usr/sbin/thd --socket /tmp/triggerhappy.socket --triggers /etc/triggerhappy/triggers.d/ --daemon /dev/input/event*
-}
-
-stop() {
-	/usr/sbin/th-cmd --socket /tmp/triggerhappy.socket --quit
-}
diff --git a/trunk/package/feeds/packages/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch b/trunk/package/feeds/packages/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
deleted file mode 100644
index 13ecd8c4..00000000
--- a/trunk/package/feeds/packages/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ THCMD_COMPS := th-cmd cmdsocket
- 
- MAKEDEPEND = $(CC) -M -MG $(CPPFLAGS) -o $*.d $<
- 
--LINUX_INPUT_H := $(shell echo '\#include <linux/input.h>' | $(CC) $(CPPFLAGS) -M -E - | awk 'NR==1 {print $$2}')
-+LINUX_INPUT_H := $(shell for i in `echo | $(CC) $(CPPFLAGS) -M -E -include 'linux/input.h' -`; do test -f "$$i" && echo "$$i" && break; done)
- 
- all: thd th-cmd man
- 
diff --git a/trunk/package/feeds/packages/uanytun/Makefile b/trunk/package/feeds/packages/uanytun/Makefile
deleted file mode 100644
index 5091920e..00000000
--- a/trunk/package/feeds/packages/uanytun/Makefile
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# Copyright (C) 2008-2014 Christian Pointner,
-#                         <equinox@anytun.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# This Makefile builds uAnytun Package for OpenWRT
-#
-# $Id: $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uanytun
-PKG_VERSION:=0.3.5
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.anytun.org/download/
-PKG_MD5SUM:=ce47ad45003ff1d84eaf5276941b9ddf
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=LICENSE
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/uanytun/template
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=VPN
-  DEPENDS:=+kmod-tun
-  TITLE:=micro anycast tunneling daemon
-  URL:=http://www.anytun.org/
-endef
-
-
-define Package/uanytun
-  $(call Package/uanytun/template)
-  TITLE+= (gcrypt)
-  VARIANT:=gcrypt
-  DEPENDS+=+libgcrypt
-endef
-
-define Package/uanytun/conffiles
-/etc/config/uanytun
-endef
-
-define Package/uanytun/description
-uAnytun is a tiny implementation of SATP the secure anycast tunneling protocol.
-  SATP defines a protocol used for communication between any combination of
-  unicast and anycast tunnel endpoints.  It has less protocol overhead than
-  IPSec in Tunnel mode and allows tunneling of every ETHER TYPE protocol (e.g.
-  ethernet, ip, arp ...). SATP directly includes cryptography and message
-  authentication based on the methods used by SRTP.  It is intended to deliver
-  a generic, scaleable and secure solution for tunneling and relaying of packets
-  of any protocol.
-  Unlike Anytun which is a full featured implementation uAnytun has no support
-  for multiple connections or synchronisation. It is a small single threaded
-  implementation intended to act as a client on small platforms.
-endef
-
-
-define Package/uanytun-nettle
-  $(call Package/uanytun/template)
-  TITLE+= (nettle)
-  VARIANT:=nettle
-  DEPENDS+=+libnettle
-endef
-
-Package/uanytun-nettle/conffiles=$(Package/uanytun/conffiles)
-Package/uanytun-nettle/description=$(Package/uanytun/description)
-
-
-define Package/uanytun-sslcrypt
-  $(call Package/uanytun/template)
-  TITLE+= (openssl)
-  VARIANT:=sslcrypt
-  DEPENDS+=+libopenssl
-endef
-
-Package/uanytun-sslcrypt/conffiles=$(Package/uanytun/conffiles)
-Package/uanytun-sslcrypt/description=$(Package/uanytun/description)
-
-
-define Package/uanytun-nocrypt
-  $(call Package/uanytun/template)
-  TITLE+= (no crypt)
-  VARIANT:=nocrypt
-endef
-
-Package/uanytun-nocrypt/conffiles=$(Package/uanytun/conffiles)
-Package/uanytun-nocrypt/description=$(Package/uanytun/description)
-
-
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/src; \
-    touch include.mk; \
-    ln -s linux/tun.c .; \
-    echo '#ifndef UANYTUN_version_h_INCLUDED' > version.h; \
-    echo '#define UANYTUN_version_h_INCLUDED' >> version.h; \
-    echo '' >> version.h; \
-    echo '#define VERSION_STRING_0 "uanytun version '`cat $(PKG_BUILD_DIR)/version`'"' >> version.h; \
-    echo '#define VERSION_STRING_1 "built on '`hostname`', '`date +"%d.%m.%Y %H:%M:%S %Z"`'"' >> version.h; \
-    echo '' >> version.h; \
-    echo '#endif' >> version.h \
-  )
-endef
-
-VARIANT_CFLAGS:=
-VARIANT_LDFLAGS:=-ldl
-VARIANT_MAKE_OPTS:=
-
-ifeq ($(BUILD_VARIANT),gcrypt)
-VARIANT_CFLAGS+=-DUSE_GCRYPT
-VARIANT_LDFLAGS+=-lgpg-error -lgcrypt
-endif
-
-ifeq ($(BUILD_VARIANT),nettle)
-VARIANT_CFLAGS+=-DUSE_NETTLE
-VARIANT_LDFLAGS+=-lnettle
-endif
-
-ifeq ($(BUILD_VARIANT),sslcrypt)
-VARIANT_CFLAGS+=-DUSE_SSL_CRYPTO
-VARIANT_LDFLAGS+=-lcrypto
-endif
-
-ifeq ($(BUILD_VARIANT),nocrypt)
-VARIANT_CFLAGS+=-DNO_CRYPT
-VARIANT_MAKE_OPTS+=NO_CRYPT_OBJ=1
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-    $(TARGET_CONFIGURE_OPTS) \
-    $(VARIANT_MAKE_OPTS) \
-    TARGET=Linux \
-    CFLAGS="$(TARGET_CFLAGS) $(VARIANT_CFLAGS)" \
-    LDFLAGS="$(TARGET_LDFLAGS) $(VARIANT_LDFLAGS)"
-	$(STRIP) $(PKG_BUILD_DIR)/src/uanytun
-endef
-
-
-define Package/uanytun/install-generic
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/$(2) $(1)/etc/config/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/uanytun $(1)/usr/sbin/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/uanytun.init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-define Package/uanytun/install
-  $(call Package/uanytun/install-generic,$(1),uanytun.config)
-endef
-
-define Package/uanytun-nettle/install
-  $(call Package/uanytun/install-generic,$(1),uanytun.config)
-endef
-
-define Package/uanytun-sslcrypt/install
-  $(call Package/uanytun/install-generic,$(1),uanytun.config)
-endef
-
-define Package/uanytun-nocrypt/install
-  $(call Package/uanytun/install-generic,$(1),uanytun-nocrypt.config)
-endef
-
-
-$(eval $(call BuildPackage,uanytun))
-$(eval $(call BuildPackage,uanytun-nettle))
-$(eval $(call BuildPackage,uanytun-sslcrypt))
-$(eval $(call BuildPackage,uanytun-nocrypt))
diff --git a/trunk/package/feeds/packages/uanytun/files/uanytun-nocrypt.config b/trunk/package/feeds/packages/uanytun/files/uanytun-nocrypt.config
deleted file mode 100644
index 9792d1f0..00000000
--- a/trunk/package/feeds/packages/uanytun/files/uanytun-nocrypt.config
+++ /dev/null
@@ -1,88 +0,0 @@
-config "client1"
-  option disabled 0
-  option username 'nobody'
-  option groupname 'nogroup'
-#  option chroot "/var/run/uanytun"
-
-#  option interface '<ip-address>'
-#  option port '4444'
-#  option sender_id '1'
-
-#  option dev 'anytun0'
-  option type 'tun'
-  option ifconfig '192.168.123.1/24'
-#  option post-up-script '/etc/uanytun/client1-post-up.sh'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 1
-
-  option log 'syslog:3,anytun-client1,daemon'
-
-
-config "client2"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.123.2/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 2
-
-  option log 'syslog:3,anytun-client2,daemon'
-
-
-config "client3"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.123.3/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 3
-
-  option log 'syslog:3,anytun-client3,daemon'
-
-
-config "p2p-a"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.223.1/24'
-
-  option remote_host 'p2p-b.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-
-  option log 'syslog:3,anytun-p2p-a,daemon'
-
-
-config "p2p-b"
-  option disabled 1
-  option username 'nobody'
-  option groupname 'nogroup'
-
-  option type 'tun'
-  option ifconfig '192.168.223.2/24'
-
-  option remote_host 'p2p-a.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-
-  option log 'syslog:3,anytun-p2p-b,daemon'
diff --git a/trunk/package/feeds/packages/uanytun/files/uanytun.config b/trunk/package/feeds/packages/uanytun/files/uanytun.config
deleted file mode 100644
index c53db373..00000000
--- a/trunk/package/feeds/packages/uanytun/files/uanytun.config
+++ /dev/null
@@ -1,116 +0,0 @@
-config "client1"
-  option disabled 0
-#  option username 'nobody'
-#  option groupname 'nogroup'
-#  option chroot "/var/run/uanytun"
-
-#  option interface '<ip-address>'
-#  option port '4444'
-#  option sender_id '1'
-
-  option cipher 'aes-ctr'
-#  option cipher 'null'
-#  option cipher 'aes-ctr-128'
-#  option cipher 'aes-ctr-192'
-#  option cipher 'aes-ctr-256'
-  option auth_algo 'sha1'
-#  option auth_algo 'null'
-#  option auth_tag_length 10
-
-#  option dev 'anytun0'
-  option type 'tun'
-  option ifconfig '192.168.123.1/24'
-#  option post-up-script '/etc/uanytun/client1-post-up.sh'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 1
-
-  option role 'client'
-#  option kd_prf 'null'
-#  option kd_prf 'aes-ctr'
-#  option kd_prf 'aes-ctr-128'
-#  option kd_prf 'aes-ctr-192'
-#  option kd_prf 'aes-ctr-256'
-#  option ld_kdr '0'
-#  option key '0123456789ABCDEF0123456789ABCDEF'
-#  option salt '0123456789ABCD0123456789ABCD'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client1,daemon'
-
-
-config "client2"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.123.2/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 2
-  option role 'client'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client2,daemon'
-
-
-config "client3"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.123.3/24'
-
-  option remote_host 'example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option mux 3
-  option role 'client'
-  option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-client3,daemon'
-
-
-config "p2p-a"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.223.1/24'
-
-  option remote_host 'p2p-b.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option role 'alice'
-  option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-p2p-a,daemon'
-
-
-config "p2p-b"
-  option disabled 1
-
-  option cipher 'aes-ctr'
-  option auth_algo 'sha1'
-  option type 'tun'
-  option ifconfig '192.168.223.2/24'
-
-  option remote_host 'p2p-a.example.com'
-  option remote_port '4444'
-
-  option window_size 0
-  option role 'bob'
-  option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy'
-
-  option log 'syslog:3,anytun-p2p-b,daemon'
diff --git a/trunk/package/feeds/packages/uanytun/files/uanytun.init b/trunk/package/feeds/packages/uanytun/files/uanytun.init
deleted file mode 100644
index 21609cad..00000000
--- a/trunk/package/feeds/packages/uanytun/files/uanytun.init
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=50
-
-BIN=uanytun
-DAEMON=/usr/sbin/$BIN
-DESC=$BIN
-RUN_D=/var/run
-
-
-option_cb() {
-  local varname="$1"
-  local value="$2"
-
-  if ! echo "$CONFIG_OPTIONS" | grep " $varname " > /dev/null; then
-    CONFIG_OPTIONS="$CONFIG_OPTIONS $varname "
-  fi
-}
-
-foreach_config_forced() {
-  foreach_config $1 "forced"
-}
-
-foreach_config() {
-  local cfg="$1"
-  local name
-  local option
-  local value
-  local args=""
-  local forced=0
-
-  if [ -n "$2" ] && [ "x$2" == "xforced" ]; then
-    forced=1
-  fi
-
-  config_get name "$cfg" TYPE
-  for option in $CONFIG_OPTIONS
-  do
-    config_get value "$cfg" "$option"
-    if [ "x$option" == "xdisabled" ]; then
-      if [ $forced -eq 0 ] && [ $value -eq 1 ]; then
-        echo -n " $name(disabled)"
-        return
-      fi
-      continue
-    fi
-
-    option=`echo $option | tr '_' '-'`
-    if [ -n "$value" ]; then
-      args="$args --$option $value"
-    fi
-  done
-  echo -n " $name"
-  local status="OK"
-  $DAEMON --write-pid "$RUN_D/$BIN.$name.pid" $args || status="failed"
-  echo -n "($status)"
-}
-
-stop_vpn() {
-  local name=$1
-  local pidfile=$RUN_D/$BIN.$name.pid
-  echo -n " $name"
-  local status="OK"
-  if [ ! -f "$pidfile" ]; then
-    status="tunnel not active"
-  else
-    kill `cat $pidfile` > /dev/null 2>&1 || status="failed"
-    rm -f $pidfile
-  fi
-  echo -n "($status)"
-}
-
-start() {
-  echo -n "Starting $DESC:"
-  config_load $BIN
-  if [ $# -gt 0 ]; then
-    while [ $# -gt 0 ]; do
-      config_foreach foreach_config_forced "$1"
-      shift
-    done
-  else
-    config_foreach foreach_config ""
-  fi
-  echo "."
-}
-
-stop() {
-  echo -n "Stopping $DESC:"
-  local name
-  local pidfile
-
-  if [ $# -gt 0 ]; then
-    while [ $# -gt 0 ]; do
-      stop_vpn $1
-      shift
-    done
-  else
-    for pidfile in `ls $RUN_D/$BIN.*.pid 2> /dev/null`; do
-      name=${pidfile%%.pid}
-      name=${name##$RUN_D/$BIN.}
-      stop_vpn $name
-    done
-  fi
-  echo "."
-}
diff --git a/trunk/package/feeds/packages/udpxy/Makefile b/trunk/package/feeds/packages/udpxy/Makefile
deleted file mode 100644
index 7d94a99f..00000000
--- a/trunk/package/feeds/packages/udpxy/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=udpxy
-PKG_SOURCE_VERSION:=c045a1e855a8033c5d70ab3e42271ba5636eb520
-PKG_VERSION:=2015-03-08-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/pcherenkov/udpxy.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=gpl.txt
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-MAKE_PATH:=chipmunk
-
-define Package/udpxy
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Convert UDP IPTV streams into HTTP streams
-  URL:=https://github.com/pcherenkov/udpxy
-endef
-
-define Package/udpxy/description
-	udproxy makes it possible to convert UDP IPTV streams into HTTP
-	streams which can be viewed even over WLANs. HTTP streams do
-	not generate huge amounts of multicast traffic, so a sd stream
-	only takes about 300k. Interesting for peoply who have IPTV at
-	home and do not want to rent multiple decoders from their
-	provider but just use their own streaming client (for example
-	popcornhour/mediatomb/vlc).
-endef
-
-define Package/udpxy/conffiles
-/etc/config/udpxy
-endef
-
-MAKE_FLAGS += \
-	INSTALLROOT="$(PKG_INSTALL_DIR)/usr" \
-	ALL_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)"
-
-define Package/udpxy/install
-	$(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config
-	$(INSTALL_CONF) ./files/udpxy.conf $(1)/etc/config/udpxy
-	$(INSTALL_BIN) ./files/udpxy.init $(1)/etc/init.d/udpxy
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udpxy $(1)/usr/bin/
-	ln -sf udpxy $(1)/usr/bin/udpxrec
-endef
-
-$(eval $(call BuildPackage,udpxy))
diff --git a/trunk/package/feeds/packages/udpxy/files/udpxy.conf b/trunk/package/feeds/packages/udpxy/files/udpxy.conf
deleted file mode 100644
index 9117a53e..00000000
--- a/trunk/package/feeds/packages/udpxy/files/udpxy.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-config udpxy
-	option disabled '1'
-	option respawn '1'
-	option verbose '0'
-	option status '1'
-	# option bind '0.0.0.0'
-	option port '4022'
-	# option source '0.0.0.0'
-	# option max_clients '3'
-	# option log_file '/var/log/udpxy'
-	# option buffer_size '4096'
-	# option buffer_messages '-1'
-	# option buffer_time '-1'
-	# option nice_increment '0'
-	# option mcsub_renew '0'
diff --git a/trunk/package/feeds/packages/udpxy/files/udpxy.init b/trunk/package/feeds/packages/udpxy/files/udpxy.init
deleted file mode 100644
index 6f911a6f..00000000
--- a/trunk/package/feeds/packages/udpxy/files/udpxy.init
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2014 OpenWrt.org
-
-START=50
-USE_PROCD=1
-
-append_arg() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get val "$cfg" "$var"
-	[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
-}
-
-append_bool() {
-	local cfg="$1"
-	local var="$2"
-	local opt="$3"
-	local def="$4"
-	local val
-
-	config_get_bool val "$cfg" "$var" "$def"
-	[ "$val" = 1 ] && procd_append_param command "$opt"
-}
-
-start_instance() {
-	local cfg="$1"
-	local aux
-
-	config_get_bool aux "$cfg" 'disabled' '0'
-	[ "$aux" = 1 ] && return 1
-
-	procd_open_instance
-
-	procd_set_param command /usr/bin/udpxy
-	procd_append_param command "-T"
-
-	append_bool "$cfg" verbose "-V"
-	append_bool "$cfg" status "-S"
-	append_arg "$cfg" bind "-a"
-	append_arg "$cfg" port "-p"
-	append_arg "$cfg" source "-m"
-	append_arg "$cfg" max_clients "-c"
-	append_arg "$cfg" log_file "-l"
-	append_arg "$cfg" buffer_size "-B"
-	append_arg "$cfg" buffer_messages "-R"
-	append_arg "$cfg" buffer_time "-H"
-	append_arg "$cfg" nice_increment "-n"
-	append_arg "$cfg" mcsub_renew "-M"
-
-	config_get_bool aux "$cfg" 'respawn' '0'
-	[ "$aux" = 1 ] && procd_set_param respawn
-
-	procd_close_instance
-}
-
-service_triggers() { 
-	procd_add_reload_trigger "udpxy" 
-}
-
-start_service() {
-	config_load udpxy
-	config_foreach start_instance udpxy
-}
diff --git a/trunk/package/feeds/packages/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch b/trunk/package/feeds/packages/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch
deleted file mode 100644
index 24f62e7e..00000000
--- a/trunk/package/feeds/packages/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 26f8177f799f3cf781ed89cb28f771da7ef22421 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Thu, 5 Mar 2015 13:42:09 +0100
-Subject: [PATCH] fix build on Mac OS X
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
----
- chipmunk/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/chipmunk/Makefile
-+++ b/chipmunk/Makefile
-@@ -32,10 +32,13 @@ DEBUG_ON := -g
- ALL_CFLAGS = -W -Wall -Werror --pedantic $(CFLAGS)
- 
- SYSTEM=$(shell uname 2>/dev/null)
--ifneq (,$(filter $(SYSTEM),FreeBSD Darwin))
-+ifneq (,$(filter $(SYSTEM),FreeBSD))
- MAKE := gmake
- GZIP := /usr/bin/gzip
- endif
-+ifneq (,$(filter $(SYSTEM),Darwin))
-+GZIP := /usr/bin/gzip
-+endif
- 
- BUILDFILE = BUILD
- BUILDNO := `cat $(BUILDFILE)`
diff --git a/trunk/package/feeds/packages/ulogd/Makefile b/trunk/package/feeds/packages/ulogd/Makefile
deleted file mode 100644
index 0cca3e4d..00000000
--- a/trunk/package/feeds/packages/ulogd/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ulogd
-PKG_VERSION:=2.0.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
-	ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
-	ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \
-	ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
-PKG_MD5SUM:=7c71ec460dfea5287eba27472c521ebc
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ulogd/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.netfilter.org/projects/ulogd/index.html
-endef
-
-define Package/ulogd
-  $(call Package/ulogd/Default)
-  DEPENDS:=+libmnl +libnfnetlink +libpthread
-  TITLE:=Netfilter userspace logging daemon
-  MENU:=1
-endef
-
-define Package/ulogd/conffiles
-/etc/ulogd.conf
-endef
-
-define Package/ulogd-mod-dbi
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libdbi
-  TITLE:=Output plugin for logging to a database using libdbi
-endef
-
-define Package/ulogd-mod-mysql
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libmysqlclient
-  TITLE:=Output plugin for logging to a MySQL database
-endef
-
-define Package/ulogd-mod-nfacct
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libnetfilter-acct
-  TITLE:=Input plugin for flow-based logging (accounting)
-endef
-
-define Package/ulogd-mod-nfct
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libnetfilter-conntrack
-  TITLE:=Input plugin for flow-based logging (conntracking)
-endef
-
-define Package/ulogd-mod-nflog
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libnetfilter-log
-  TITLE:=Input plugin using NFLOG
-endef
-
-define Package/ulogd-mod-pcap
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libpcap
-  TITLE:=Output plugin for logging in pcap format
-endef
-
-define Package/ulogd-mod-pgsql
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libpq
-  TITLE:=Output plugin for logging to a PostgreSQL database
-endef
-
-define Package/ulogd-mod-sqlite
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libsqlite3
-  TITLE:=Output plugin for logging to an SQLite database
-endef
-
-define Package/ulogd-mod-syslog
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd
-  TITLE:=Syslog output plugin
-endef
-
-define Package/ulogd-mod-xml
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd +libnetfilter-acct +libnetfilter-conntrack +libnetfilter-log
-  TITLE:=XML output plugin
-endef
-
-define Package/ulogd-mod-extra
-  $(call Package/ulogd/Default)
-  DEPENDS:=ulogd
-  TITLE:=Extra plugins
-endef
-
-PKG_BUILD_DEPENDS:=libnetfilter-acct libnetfilter-conntrack libnetfilter-log
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_PACKAGE_ulogd-mod-dbi \
-	CONFIG_PACKAGE_ulogd-mod-mysql \
-	CONFIG_PACKAGE_ulogd-mod-pgsql \
-	CONFIG_PACKAGE_ulogd-mod-sqlite \
-
-CONFIGURE_ARGS += \
-	--enable-nfacct \
-	--enable-nfct \
-	--enable-nflog \
-
-ifneq ($(DEVELOPER)$(SDK)$(CONFIG_PACKAGE_ulogd-mod-dbi),)
-	CONFIGURE_ARGS += --with-dbi \
-		--with-dbi-inc=$(STAGING_DIR)/usr/include/dbi \
-		--with-dbi-lib=$(STAGING_DIR)/usr/lib
-else
-	CONFIGURE_ARGS += --without-dbi
-endif
-
-ifneq ($(DEVELOPER)$(SDK)$(CONFIG_PACKAGE_ulogd-mod-mysql),)
-	CONFIGURE_ARGS += --with-mysql="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-mysql
-endif
-
-ifneq ($(DEVELOPER)$(SDK)$(CONFIG_PACKAGE_ulogd-mod-pgsql),)
-	CONFIGURE_ARGS += --with-pgsql="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-pgsql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_ulogd-mod-sqlite),)
-	CONFIGURE_ARGS += --with-sqlite="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-sqlite
-endif
-
-define Package/ulogd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_BUILD_DIR)/ulogd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/ulogd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_raw2packet_BASE.so $(1)/usr/lib/ulogd/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ulogd.init $(1)/etc/init.d/ulogd
-endef
-
-define BuildPlugin
-  define Package/ulogd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/ulogd
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$$$$$${m}.so $$(1)/usr/lib/ulogd/ ; \
-	done
-  endef
-  $$(eval $$(call BuildPackage,ulogd-mod-$(1)))
-endef
-
-ULOGD_EXTRA_PLUGINS:= \
-	filter_HWHDR \
-	filter_IFINDEX \
-	filter_IP2BIN \
-	filter_IP2HBIN \
-	filter_IP2STR \
-	filter_MARK \
-	filter_PRINTFLOW \
-	filter_PRINTPKT \
-	filter_PWSNIFF \
-	inppkt_UNIXSOCK \
-	output_GPRINT \
-	output_GRAPHITE \
-	output_LOGEMU \
-	output_OPRINT \
-
-$(eval $(call BuildPackage,ulogd))
-$(eval $(call BuildPlugin,dbi,output_DBI))
-$(eval $(call BuildPlugin,mysql,output_MYSQL))
-$(eval $(call BuildPlugin,nfacct,inpflow_NFACCT))
-$(eval $(call BuildPlugin,nfct,inpflow_NFCT))
-$(eval $(call BuildPlugin,nflog,inppkt_NFLOG))
-$(eval $(call BuildPlugin,pcap,output_PCAP))
-$(eval $(call BuildPlugin,pgsql,output_PGSQL))
-$(eval $(call BuildPlugin,sqlite,output_SQLITE3))
-$(eval $(call BuildPlugin,syslog,output_SYSLOG))
-$(eval $(call BuildPlugin,xml,output_XML))
-$(eval $(call BuildPlugin,extra,$(ULOGD_EXTRA_PLUGINS)))
diff --git a/trunk/package/feeds/packages/ulogd/files/ulogd.init b/trunk/package/feeds/packages/ulogd/files/ulogd.init
deleted file mode 100644
index 3650322b..00000000
--- a/trunk/package/feeds/packages/ulogd/files/ulogd.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=20
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command /usr/sbin/ulogd
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch b/trunk/package/feeds/packages/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch
deleted file mode 100644
index de6b0f19..00000000
--- a/trunk/package/feeds/packages/ulogd/patches/010-Fix-JSON-output-on-big-endian-systems.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4f267553aede76dc91133ba88c69f8b8faf00b72 Mon Sep 17 00:00:00 2001
-From: Jimmy Jones <jimmyjones2@gmx.co.uk>
-Date: Sat, 26 Jul 2014 21:48:38 +0100
-Subject: [PATCH] Fix JSON output on big endian systems
-
-Signed-off-by: Jimmy Jones <jimmyjones2@gmx.co.uk>
----
- output/ulogd_output_JSON.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
-index e7ac642..3ad2620 100644
---- a/output/ulogd_output_JSON.c
-+++ b/output/ulogd_output_JSON.c
-@@ -158,7 +158,11 @@ static int json_interp(struct ulogd_pluginstance *upi)
- 			break;
- 		case ULOGD_RET_BOOL:
- 		case ULOGD_RET_INT8:
-+			json_object_set_new(msg, field_name, json_integer(key->u.value.i8));
-+			break;
- 		case ULOGD_RET_INT16:
-+			json_object_set_new(msg, field_name, json_integer(key->u.value.i16));
-+			break;
- 		case ULOGD_RET_INT32:
- 			json_object_set_new(msg, field_name, json_integer(key->u.value.i32));
- 			break;
-@@ -171,10 +175,17 @@ static int json_interp(struct ulogd_pluginstance *upi)
- 					json_object_set_new(msg, "action", json_string("blocked"));
- 				break;
- 			}
-+			json_object_set_new(msg, field_name, json_integer(key->u.value.ui8));
-+			break;
- 		case ULOGD_RET_UINT16:
-+			json_object_set_new(msg, field_name, json_integer(key->u.value.ui16));
-+			break;
- 		case ULOGD_RET_UINT32:
-+			json_object_set_new(msg, field_name, json_integer(key->u.value.ui32));
-+			break;
- 		case ULOGD_RET_UINT64:
- 			json_object_set_new(msg, field_name, json_integer(key->u.value.ui64));
-+			break;
- 		default:
- 			/* don't know how to interpret this key. */
- 			break;
--- 
-2.3.0
-
diff --git a/trunk/package/feeds/packages/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch b/trunk/package/feeds/packages/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
deleted file mode 100644
index 5b564c42..00000000
--- a/trunk/package/feeds/packages/ulogd/patches/020-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Fri, 7 Nov 2014 18:33:01 +0100
-Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
-
-This fixes compilation if you use a Linux kernel >= 3.17. This problem
-occurs since ULOG was removed from mainstream:
-
-http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac                             |  2 +-
- include/linux/Makefile.am                |  4 +--
- include/linux/netfilter_ipv4/Makefile.am |  1 +
- include/linux/netfilter_ipv4/ipt_ULOG.h  | 49 ++++++++++++++++++++++++++++++++
- 4 files changed, 53 insertions(+), 3 deletions(-)
- create mode 100644 include/linux/netfilter_ipv4/Makefile.am
- create mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h
-
-diff --git a/configure.ac b/configure.ac
-index 522c345..c5f573c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
- 
- AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
- 	  include/linux/Makefile include/linux/netfilter/Makefile \
--	  libipulog/Makefile \
-+	  include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
- 	  input/Makefile input/packet/Makefile input/flow/Makefile \
- 	  input/sum/Makefile \
- 	  filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index ca80d0d..18af1c2 100644
---- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -1,2 +1,2 @@
--
--SUBDIRS = netfilter
-+SUBDIRS = netfilter		\
-+	  netfilter_ipv4
-diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
-new file mode 100644
-index 0000000..41819a3
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/Makefile.am
-@@ -0,0 +1 @@
-+noinst_HEADERS = ipt_ULOG.h
-diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
-new file mode 100644
-index 0000000..417aad2
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
-@@ -0,0 +1,49 @@
-+/* Header file for IP tables userspace logging, Version 1.8
-+ *
-+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
-+ * 
-+ * Distributed under the terms of GNU GPL */
-+
-+#ifndef _IPT_ULOG_H
-+#define _IPT_ULOG_H
-+
-+#ifndef NETLINK_NFLOG
-+#define NETLINK_NFLOG 	5
-+#endif
-+
-+#define ULOG_DEFAULT_NLGROUP	1
-+#define ULOG_DEFAULT_QTHRESHOLD	1
-+
-+#define ULOG_MAC_LEN	80
-+#define ULOG_PREFIX_LEN	32
-+
-+#define ULOG_MAX_QLEN	50
-+/* Why 50? Well... there is a limit imposed by the slab cache 131000
-+ * bytes. So the multipart netlink-message has to be < 131000 bytes.
-+ * Assuming a standard ethernet-mtu of 1500, we could define this up
-+ * to 80... but even 50 seems to be big enough. */
-+
-+/* private data structure for each rule with a ULOG target */
-+struct ipt_ulog_info {
-+	unsigned int nl_group;
-+	size_t copy_range;
-+	size_t qthreshold;
-+	char prefix[ULOG_PREFIX_LEN];
-+};
-+
-+/* Format of the ULOG packets passed through netlink */
-+typedef struct ulog_packet_msg {
-+	unsigned long mark;
-+	long timestamp_sec;
-+	long timestamp_usec;
-+	unsigned int hook;
-+	char indev_name[IFNAMSIZ];
-+	char outdev_name[IFNAMSIZ];
-+	size_t data_len;
-+	char prefix[ULOG_PREFIX_LEN];
-+	unsigned char mac_len;
-+	unsigned char mac[ULOG_MAC_LEN];
-+	unsigned char payload[0];
-+} ulog_packet_msg_t;
-+
-+#endif /*_IPT_ULOG_H*/
--- 
-2.3.0
-
diff --git a/trunk/package/feeds/packages/umurmur/Makefile b/trunk/package/feeds/packages/umurmur/Makefile
deleted file mode 100644
index c7ada87b..00000000
--- a/trunk/package/feeds/packages/umurmur/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Copyright (C) 2009-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=umurmur
-PKG_VERSION:=0.2.15
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/fatbob313/umurmur.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f66c0c3d630aaff1c4d589bc4d884067f00b6529
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-PKG_MAINTAINER:=Martin Johansson <martin@fatbob.nu>
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/umurmur/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Instant Messaging
-  TITLE:=uMurmur
-  DEPENDS:=+libconfig +libprotobuf-c
-  URL:=http://code.google.com/p/umurmur
-  MAINTAINER:=Martin Johansson <martin@fatbob.nu>
-endef
-
-define Package/umurmur/Default/description
-  Minimalistic Mumble server daemon.
-endef
-
-define Package/umurmur-openssl
-  $(call Package/umurmur/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+= +libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/umurmur-openssl/description
-  $(call Package/umurmur/Default/description)
-  Uses OpenSSL library for SSL and crypto.
-endef
-
-define Package/umurmur-polarssl
-  $(call Package/umurmur/Default)
-  TITLE+= (with PolarSSL support)
-  DEPENDS+= +libpolarssl
-  VARIANT:=polarssl
-endef
-
-define Package/umurmur-polarssl/description
-  $(call Package/umurmur/Default/description)
-  Uses the PolarSSL library for SSL and crypto.
-endef
-
-define Build/Compile
-	CC="$(TARGET_CC)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	$(MAKE) -C $(PKG_BUILD_DIR)/src all
-endef
-
-define Package/umurmur-openssl/conffiles
-/etc/umurmur.conf
-endef
-
-Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
-
-define Package/umurmur-openssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
-	$(INSTALL_DIR) $(1)/etc/umurmur
-endef
-
-Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
-
-ifeq ($(BUILD_VARIANT),openssl)
-  CONFIGURE_ARGS += \
-	--with-ssl=openssl
-endif
-
-ifeq ($(BUILD_VARIANT),polarssl)
-  CONFIGURE_ARGS += \
-	--with-ssl=polarssl
-endif
-
-$(eval $(call BuildPackage,umurmur-openssl))
-$(eval $(call BuildPackage,umurmur-polarssl))
diff --git a/trunk/package/feeds/packages/unbound/Makefile b/trunk/package/feeds/packages/unbound/Makefile
deleted file mode 100644
index a04aca63..00000000
--- a/trunk/package/feeds/packages/unbound/Makefile
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=unbound
-PKG_VERSION:=1.5.1
-PKG_RELEASE:=1
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Michael Hanselmann <public@hansmi.ch>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.unbound.net/downloads
-PKG_MD5SUM:=ed4c46476dcfb8a507cc08b1ba12a8f1
-
-PKG_BUILD_DEPENDS:=libexpat
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/unbound/Default
-  TITLE:=A validating, recursive & caching DNS resolver
-  URL:=http://www.unbound.net/
-  DEPENDS:=+libopenssl
-endef
-
-define Package/unbound
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (daemon)
-  DEPENDS+= +libunbound
-endef
-
-define Package/unbound/description
-  This package contains the Unbound daemon.
-endef
-
-define Package/unbound-anchor
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (anchor utility)
-  DEPENDS+= +unbound +libexpat
-endef
-
-define Package/unbound-anchor/description
-  This package contains the Unbound anchor utility.
-endef
-
-define Package/unbound-control
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (control utility)
-  DEPENDS+= +unbound
-endef
-
-define Package/unbound-control/description
-  This package contains the Unbound control utility.
-endef
-
-define Package/unbound-control-setup
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (control setup utility)
-  DEPENDS+= +unbound-control +openssl-util
-endef
-
-define Package/unbound-control-setup/description
-  This package contains the Unbound control setup utility.
-endef
-
-define Package/unbound-host
-  $(call Package/unbound/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE+= (DNS lookup utility)
-  DEPENDS+= +libunbound
-endef
-
-define Package/unbound-host/description
-  This package contains the Unbound DNS lookup utility.
-endef
-
-define Package/libunbound
-  $(call Package/unbound/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= (library)
-endef
-
-define Package/libunbound/description
-  This package contains the Unbound shared library.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-ecdsa \
-	--disable-gost \
-	--enable-allsymbols \
-	--with-libexpat="$(STAGING_DIR)/usr" \
-	--with-ssl="$(STAGING_DIR)/usr" \
-	--without-pthreads
-
-define Package/unbound/conffiles
-/etc/unbound/unbound.conf
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/unbound.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunbound.{so*,a,la} $(1)/usr/lib/
-endef
-
-define Package/unbound/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/unbound \
-		$(PKG_INSTALL_DIR)/usr/sbin/unbound-checkconf \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/unbound
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/etc/unbound/unbound.conf \
-		$(1)/etc/unbound/
-	$(INSTALL_CONF) ./files/root.key $(1)/etc/unbound/
-	$(INSTALL_CONF) ./files/named.cache $(1)/etc/unbound/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/unbound.init $(1)/etc/init.d/unbound
-endef
-
-define Package/unbound-anchor/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-anchor $(1)/usr/sbin/
-endef
-
-define Package/unbound-control/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-control $(1)/usr/sbin/
-endef
-
-define Package/unbound-control-setup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-control-setup $(1)/usr/sbin/
-endef
-
-define Package/unbound-host/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-host $(1)/usr/sbin/
-endef
-
-define Package/libunbound/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunbound.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,unbound))
-$(eval $(call BuildPackage,unbound-anchor))
-$(eval $(call BuildPackage,unbound-control))
-$(eval $(call BuildPackage,unbound-control-setup))
-$(eval $(call BuildPackage,unbound-host))
-$(eval $(call BuildPackage,libunbound))
diff --git a/trunk/package/feeds/packages/unbound/files/named.cache b/trunk/package/feeds/packages/unbound/files/named.cache
deleted file mode 100644
index 9cc20228..00000000
--- a/trunk/package/feeds/packages/unbound/files/named.cache
+++ /dev/null
@@ -1,90 +0,0 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    November 05, 2014
-;       related version of root zone:   2014110501
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000      NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803f:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file
diff --git a/trunk/package/feeds/packages/unbound/files/root.key b/trunk/package/feeds/packages/unbound/files/root.key
deleted file mode 100644
index 2ad66413..00000000
--- a/trunk/package/feeds/packages/unbound/files/root.key
+++ /dev/null
@@ -1 +0,0 @@
-. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
diff --git a/trunk/package/feeds/packages/unbound/files/unbound.init b/trunk/package/feeds/packages/unbound/files/unbound.init
deleted file mode 100755
index 4e700e44..00000000
--- a/trunk/package/feeds/packages/unbound/files/unbound.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-#Copyright (C) 2010 Ondrej Caletka <o.caletka@sh.cvut.cz>
-START=61
-
-start () {
-	unbound
-}
-
-stop () {
-	PIDFILE='/var/run/unbound.pid'
-	if [ -f $PIDFILE ] ; then
-		kill $(cat $PIDFILE)
-	fi
-}
diff --git a/trunk/package/feeds/packages/unbound/patches/001-conf.patch b/trunk/package/feeds/packages/unbound/patches/001-conf.patch
deleted file mode 100644
index 0d53615e..00000000
--- a/trunk/package/feeds/packages/unbound/patches/001-conf.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/doc/example.conf.in
-+++ b/doc/example.conf.in
-@@ -38,6 +38,8 @@ server:
- 	# interface: 192.0.2.154
- 	# interface: 192.0.2.154@5003
- 	# interface: 2001:DB8::5
-+	interface: 0.0.0.0
-+	interface: ::0
- 
- 	# enable this feature to copy the source address of queries to reply.
- 	# Socket options are not supported on all platforms. experimental. 
-@@ -57,6 +59,7 @@ server:
- 	# port range that can be open simultaneously.  About double the
- 	# num-queries-per-thread, or, use as many as the OS will allow you.
- 	# outgoing-range: 4096
-+	outgoing-range: 60
- 
- 	# permit unbound to use this port number or port range for
- 	# making outgoing queries, using an outgoing interface.
-@@ -73,9 +76,11 @@ server:
- 
- 	# number of outgoing simultaneous tcp buffers to hold per thread.
- 	# outgoing-num-tcp: 10
-+	outgoing-num-tcp: 1
- 
- 	# number of incoming simultaneous tcp buffers to hold per thread.
- 	# incoming-num-tcp: 10
-+	incoming-num-tcp: 1
- 
- 	# buffer size for UDP port 53 incoming (SO_RCVBUF socket option).
- 	# 0 is system default.  Use 4m to catch query spikes for busy servers.
-@@ -99,18 +104,22 @@ server:
- 	# buffer size for handling DNS data. No messages larger than this
- 	# size can be sent or received, by UDP or TCP. In bytes.
- 	# msg-buffer-size: 65552
-+	msg-buffer-size: 8192
- 
- 	# the amount of memory to use for the message cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# msg-cache-size: 4m
-+	msg-cache-size: 100k
- 
- 	# the number of slabs to use for the message cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# msg-cache-slabs: 4
-+	msg-cache-slabs: 1
- 
- 	# the number of queries that a thread gets to service.
- 	# num-queries-per-thread: 1024
-+	num-queries-per-thread: 30
- 
- 	# if very busy, 50% queries run to completion, 50% get timeout in msec
- 	# jostle-timeout: 200
-@@ -121,11 +130,13 @@ server:
- 	# the amount of memory to use for the RRset cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# rrset-cache-size: 4m
-+	rrset-cache-size: 100k
- 
- 	# the number of slabs to use for the RRset cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# rrset-cache-slabs: 4
-+	rrset-cache-slabs: 1
- 
- 	# the time to live (TTL) value lower bound, in seconds. Default 0.
- 	# If more than an hour could easily give trouble due to stale data.
-@@ -143,9 +154,11 @@ server:
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# infra-cache-slabs: 4
-+	infra-cache-slabs: 1
- 
- 	# the maximum number of hosts that are cached (roundtrip, EDNS, lame).
- 	# infra-cache-numhosts: 10000
-+	infra-cache-numhosts: 200
- 
- 	# Enable IPv4, "yes" or "no".
- 	# do-ip4: yes
-@@ -178,6 +191,8 @@ server:
- 	# access-control: ::0/0 refuse
- 	# access-control: ::1 allow
- 	# access-control: ::ffff:127.0.0.1 allow
-+	access-control: 0.0.0.0/0 allow
-+	access-control: ::0/0 allow
- 
- 	# if given, a chroot(2) is done to the given directory.
- 	# i.e. you can chroot to the working directory, for example,
-@@ -208,6 +223,7 @@ server:
- 	# and the given username is assumed. Default is user "unbound".
- 	# If you give "" no privileges are dropped.
- 	# username: "@UNBOUND_USERNAME@"
-+	username: ""
- 
- 	# the working directory. The relative files in this config are 
- 	# relative to this directory. If you give "" the working directory
-@@ -230,10 +246,12 @@ server:
- 
- 	# the pid file. Can be an absolute path outside of chroot/work dir.
- 	# pidfile: "@UNBOUND_PIDFILE@"
-+	pidfile: "/var/run/unbound.pid"
- 
- 	# file to read root hints from.
- 	# get one from ftp://FTP.INTERNIC.NET/domain/named.cache
- 	# root-hints: ""
-+	root-hints: "/etc/unbound/named.cache"
- 
- 	# enable to not answer id.server and hostname.bind queries.
- 	# hide-identity: no
-@@ -256,12 +274,15 @@ server:
- 	#	positive value: fetch that many targets opportunistically.
- 	# Enclose the list of numbers between quotes ("").
- 	# target-fetch-policy: "3 2 1 0 0"
-+	target-fetch-policy: "2 1 0 0 0 0"
- 
- 	# Harden against very small EDNS buffer sizes. 
- 	# harden-short-bufsize: no
-+	harden-short-bufsize: yes
- 
- 	# Harden against unseemly large queries.
- 	# harden-large-queries: no
-+	harden-large-queries: yes
- 
- 	# Harden against out of zone rrsets, to avoid spoofing attempts. 
- 	# harden-glue: yes
-@@ -342,7 +363,7 @@ server:
- 	# you start unbound (i.e. in the system boot scripts).  And enable:
- 	# Please note usage of unbound-anchor root anchor is at your own risk
- 	# and under the terms of our LICENSE (see that file in the source).
--	# auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
-+	auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
- 
- 	# File with DLV trusted keys. Same format as trust-anchor-file.
- 	# There can be only one DLV configured, it is trusted from root down.
-@@ -428,15 +449,18 @@ server:
- 	# the amount of memory to use for the key cache.
- 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
- 	# key-cache-size: 4m
-+	key-cache-size: 100k
- 
- 	# the number of slabs to use for the key cache.
- 	# the number of slabs must be a power of 2.
- 	# more slabs reduce lock contention, but fragment memory usage.
- 	# key-cache-slabs: 4
-+	key-cache-slabs: 1
- 
- 	# the amount of memory to use for the negative cache (used for DLV).
- 	# plain value in bytes or you can append k, m or G. default is "1Mb". 
- 	# neg-cache-size: 1m
-+	neg-cache-size: 10k
- 	
- 	# By default, for a number of zones a small default 'nothing here'
- 	# reply is built-in.  Query traffic is thus blocked.  If you
diff --git a/trunk/package/feeds/packages/unixodbc/Makefile b/trunk/package/feeds/packages/unixodbc/Makefile
deleted file mode 100644
index eeb6fc96..00000000
--- a/trunk/package/feeds/packages/unixodbc/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=unixodbc
-PKG_VERSION:=2.3.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=@SF/unixodbc
-PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=5e4528851eda5d3d4aed249b669bd05b
-PKG_BUILD_DIR:=$(BUILD_DIR)/unixODBC-$(PKG_VERSION)
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-PKG_LICENSE:=prog GPL libs LGPL
-
-include $(INCLUDE_DIR)/package.mk
-CONFIGURE_ARGS += \
-	--disable-gui \
-	--with-pic \
-	--enable-drivers
-
-define Package/unixodbc/Default
-  SUBMENU:=database
-  TITLE:=unixODBC
-  URL:=http://www.unixodbc.org/
-endef
-
-define Package/unixodbc
-  $(call Package/unixodbc/Default)
-  TITLE+= (libraries)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libltdl +libpthread
-endef
-
-define Package/unixodbc/description
-  unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux,
-  Mac OSX, and UNIX.
-endef
-
-define Package/unixodbc-tools
-  $(call Package/unixodbc/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+= Tools
-  DEPENDS:=+unixodbc +libncurses +libreadline
-endef
-
-define Package/unixodbc-tools/description
-  Command Line Tools to help install a driver and work with SQL.
-endef
-
-define Package/pgsqlodbc
-  $(call Package/unixodbc/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Postgresql driver for ODBC
-  DEPENDS:=+unixodbc +libpq
-endef
-
-define Package/pgsqlodbc/description
-	Postgresql driver for ODBC.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		$(MAKE_FLAGS) \
-		ARCH="$(ARCH)" \
-		CC="$(TARGET_CC)"
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		$(MAKE_FLAGS) \
-		ARCH="$(ARCH)" \
-		install -i
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/odbc* $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/ODBCDataSources
-	$(TARGET_CC) $(TARGET_CFLAGS) -E ./files/unixodbc_conf.h | tr '@' '\#' >$(1)/usr/include/unixodbc_conf.h
-endef
-
-define Package/unixodbc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libodbc[ci]*so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libodbc.*so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnn*so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/odbc* $(1)/etc/
-endef
-
-define Package/unixodbc-tools/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/pgsqlodbc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libodbcpsql*so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,unixodbc))
-$(eval $(call BuildPackage,unixodbc-tools))
-$(eval $(call BuildPackage,pgsqlodbc))
diff --git a/trunk/package/feeds/packages/unixodbc/files/unixodbc_conf.h b/trunk/package/feeds/packages/unixodbc/files/unixodbc_conf.h
deleted file mode 100644
index f149d02b..00000000
--- a/trunk/package/feeds/packages/unixodbc/files/unixodbc_conf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-@ifndef HAVE_UNISTD_H 
- @define HAVE_UNISTD_H
-@endif
-@ifndef HAVE_PWD_H 
- @define HAVE_PWD_H
-@endif
-@ifndef HAVE_SYS_TYPES_H 
- @define HAVE_SYS_TYPES_H
-@endif
-@ifndef HAVE_LONG_LONG 
- @define HAVE_LONG_LONG
-@endif
-@ifndef ODBCINT64
- @define ODBCINT64 long
-@endif
-@ifndef UODBCINT64
- @define UODBCINT64 unsigned long
-@endif
-@ifndef SIZEOF_LONG_INT
- @define SIZEOF_LONG_INT __SIZEOF_LONG__
-@endif
- 
\ No newline at end of file
diff --git a/trunk/package/feeds/packages/unrar/Makefile b/trunk/package/feeds/packages/unrar/Makefile
deleted file mode 100644
index bcabfc56..00000000
--- a/trunk/package/feeds/packages/unrar/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=unrar
-PKG_VERSION:=5.2.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.rarlab.com/rar
-PKG_MD5SUM:=0c145e1ac47d428553123462c0740279
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=UnRAR
-PKG_LICENSE_FILES:=license.txt
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/unrar
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/unrar
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Compression
-  TITLE:=UnRAR application
-  URL:=http://www.rarlab.com/
-  DEPENDS:=$(CXX_DEPENDS) +libpthread
-endef
-
-define Package/unrar/description
-   UnRAR is an application that can decompress files and archives created using
-   the RAR compression scheme
-endef
-
-define Build/Configure
-endef
-
-define Package/unrar/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/unrar $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,unrar))
diff --git a/trunk/package/feeds/packages/unrar/patches/100-makefile_fixes.patch b/trunk/package/feeds/packages/unrar/patches/100-makefile_fixes.patch
deleted file mode 100644
index ca82e135..00000000
--- a/trunk/package/feeds/packages/unrar/patches/100-makefile_fixes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -2,12 +2,12 @@
- # Makefile for UNIX - unrar
- 
- # Linux using GCC
--CXX=g++
--CXXFLAGS=-O2
-+#CXX=g++
-+#CXXFLAGS=-O2
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
- STRIP=strip
--LDFLAGS=-pthread
-+LDFLAGS=-lpthread
- DESTDIR=/usr
- 
- # Linux using LCC
diff --git a/trunk/package/feeds/packages/unzip/Makefile b/trunk/package/feeds/packages/unzip/Makefile
deleted file mode 100644
index cdd6d2ae..00000000
--- a/trunk/package/feeds/packages/unzip/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=unzip
-PKG_REV:=60
-PKG_VERSION:=6.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
-PKG_SOURCE_URL:=@SF/infozip
-PKG_MD5SUM:=62b490407489521db863b523a7f86375
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=BSD-4-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/unzip$(PKG_REV)
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/unzip
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=
-  TITLE:=De-archiver for .zip files
-  URL:=http://infozip.sourceforge.net/UnZip.html
-  SUBMENU:=Compression
-endef
-
-define Package/unzip/description
-	InfoZIP's unzip program. With the exception of multi-volume archives
-	(ie, .ZIP files that are split across several disks using PKZIP's /& option),
-	this can handle any file produced either by PKZIP, or the corresponding
-	InfoZIP zip program.
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += -DNO_LCHMOD -DLARGE_FILE_SUPPORT
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile unzips \
-		$(TARGET_CONFIGURE_OPTS) \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
-		CC="$(TARGET_CC)" \
-		LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
-		install
-endef
-
-define Package/unzip/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,unzip))
diff --git a/trunk/package/feeds/packages/unzip/patches/001-CVE-2014-8139-crc-overflow.patch b/trunk/package/feeds/packages/unzip/patches/001-CVE-2014-8139-crc-overflow.patch
deleted file mode 100644
index 5cae41f1..00000000
--- a/trunk/package/feeds/packages/unzip/patches/001-CVE-2014-8139-crc-overflow.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/extract.c
-+++ b/extract.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] =
- #ifndef SFX
-    static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
-      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
-+   static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
-+     EF block length (%u bytes) invalid (< %d)\n";
-    static ZCONST char Far InvalidComprDataEAs[] =
-      " invalid compressed data for EAs\n";
- #  if (defined(WIN32) && defined(NTSD_EAS))
-@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l
-         ebID = makeword(ef);
-         ebLen = (unsigned)makeword(ef+EB_LEN);
- 
--        if (ebLen > (ef_len - EB_HEADSIZE)) {
-+        if (ebLen > (ef_len - EB_HEADSIZE))
-+        {
-            /* Discovered some extra field inconsistency! */
-             if (uO.qflag)
-                 Info(slide, 1, ((char *)slide, "%-22s ",
-@@ -2158,11 +2161,19 @@ static int TestExtraField(__G__ ef, ef_l
-                 }
-                 break;
-             case EF_PKVMS:
--                if (makelong(ef+EB_HEADSIZE) !=
-+                if (ebLen < 4)
-+                {
-+                    Info(slide, 1,
-+                     ((char *)slide, LoadFarString(TooSmallEBlength),
-+                     ebLen, 4));
-+                }
-+                else if (makelong(ef+EB_HEADSIZE) !=
-                     crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
-                           (extent)(ebLen-4)))
-+                {
-                     Info(slide, 1, ((char *)slide,
-                       LoadFarString(BadCRC_EAs)));
-+                }
-                 break;
-             case EF_PKW32:
-             case EF_PKUNIX:
diff --git a/trunk/package/feeds/packages/unzip/patches/002-CVE-2014-8140-test-compr-eb.patch b/trunk/package/feeds/packages/unzip/patches/002-CVE-2014-8140-test-compr-eb.patch
deleted file mode 100644
index fd4ef000..00000000
--- a/trunk/package/feeds/packages/unzip/patches/002-CVE-2014-8140-test-compr-eb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/extract.c
-+++ b/extract.c
-@@ -2232,10 +2232,17 @@ static int test_compr_eb(__G__ eb, eb_si
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
- 
-+    /* Return no/bad-data error status if any problem is found:
-+     *    1. eb_size is too small to hold the uncompressed size
-+     *       (eb_ucsize).  (Else extract eb_ucsize.)
-+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
-+     *    3. eb_ucsize is positive, but eb_size is too small to hold
-+     *       the compressed data header.
-+     */
-     if ((eb_size < (EB_UCSIZE_P + 4)) ||
--        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
--         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
--        return IZ_EF_TRUNC;               /* no compressed data! */
-+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
-+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
-+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
- 
-     if (
- #ifdef INT_16BIT
diff --git a/trunk/package/feeds/packages/unzip/patches/003-CVE-2014-8141-getzip64data.patch b/trunk/package/feeds/packages/unzip/patches/003-CVE-2014-8141-getzip64data.patch
deleted file mode 100644
index ca52e19c..00000000
--- a/trunk/package/feeds/packages/unzip/patches/003-CVE-2014-8141-getzip64data.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/fileio.c
-+++ b/fileio.c
-@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTr
- #endif
- static ZCONST char Far ExtraFieldTooLong[] =
-   "warning:  extra field too long (%d).  Ignoring...\n";
-+static ZCONST char Far ExtraFieldCorrupt[] =
-+  "warning:  extra field (type: 0x%04x) corrupt.  Continuing...\n";
- 
- #ifdef WINDLL
-    static ZCONST char Far DiskFullQuery[] =
-@@ -2295,7 +2297,12 @@ int do_string(__G__ length, option)   /*
-             if (readbuf(__G__ (char *)G.extra_field, length) == 0)
-                 return PK_EOF;
-             /* Looks like here is where extra fields are read */
--            getZip64Data(__G__ G.extra_field, length);
-+            if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
-+            {
-+                Info(slide, 0x401, ((char *)slide,
-+                 LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
-+                error = PK_WARN;
-+            }
- #ifdef UNICODE_SUPPORT
-             G.unipath_filename = NULL;
-             if (G.UzO.U_flag < 2) {
---- a/process.c
-+++ b/process.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -1888,48 +1888,82 @@ int getZip64Data(__G__ ef_buf, ef_len)
-     and a 4-byte version of disk start number.
-     Sets both local header and central header fields.  Not terribly clever,
-     but it means that this procedure is only called in one place.
-+
-+    2014-12-05 SMS.
-+    Added checks to ensure that enough data are available before calling
-+    makeint64() or makelong().  Replaced various sizeof() values with
-+    simple ("4" or "8") constants.  (The Zip64 structures do not depend
-+    on our variable sizes.)  Error handling is crude, but we should now
-+    stay within the buffer.
-   ---------------------------------------------------------------------------*/
- 
-+#define Z64FLGS 0xffff
-+#define Z64FLGL 0xffffffff
-+
-     if (ef_len == 0 || ef_buf == NULL)
-         return PK_COOL;
- 
-     Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n",
-       ef_len));
- 
--    while (ef_len >= EB_HEADSIZE) {
-+    while (ef_len >= EB_HEADSIZE)
-+    {
-         eb_id = makeword(EB_ID + ef_buf);
-         eb_len = makeword(EB_LEN + ef_buf);
- 
--        if (eb_len > (ef_len - EB_HEADSIZE)) {
--            /* discovered some extra field inconsistency! */
-+        if (eb_len > (ef_len - EB_HEADSIZE))
-+        {
-+            /* Extra block length exceeds remaining extra field length. */
-             Trace((stderr,
-               "getZip64Data: block length %u > rest ef_size %u\n", eb_len,
-               ef_len - EB_HEADSIZE));
-             break;
-         }
--        if (eb_id == EF_PKSZ64) {
--
-+        if (eb_id == EF_PKSZ64)
-+        {
-           int offset = EB_HEADSIZE;
- 
--          if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){
--            G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.ucsize);
-+          if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){
--            G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.csize);
-+
-+          if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.relative_offset_local_header == 0xffffffff){
-+
-+          if (G.crec.relative_offset_local_header == Z64FLGL)
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.relative_offset_local_header = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.relative_offset_local_header);
-+            offset += 8;
-           }
--          if (G.crec.disk_number_start == 0xffff){
-+
-+          if (G.crec.disk_number_start == Z64FLGS)
-+          {
-+            if (offset+ 4 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf);
--            offset += sizeof(G.crec.disk_number_start);
-+            offset += 4;
-           }
-+#if 0
-+          break;                /* Expect only one EF_PKSZ64 block. */
-+#endif /* 0 */
-         }
- 
--        /* Skip this extra field block */
-+        /* Skip this extra field block. */
-         ef_buf += (eb_len + EB_HEADSIZE);
-         ef_len -= (eb_len + EB_HEADSIZE);
-     }
diff --git a/trunk/package/feeds/packages/unzip/patches/004-CVE-2014-9636-test-compr-eb.patch b/trunk/package/feeds/packages/unzip/patches/004-CVE-2014-9636-test-compr-eb.patch
deleted file mode 100644
index 3bba996e..00000000
--- a/trunk/package/feeds/packages/unzip/patches/004-CVE-2014-9636-test-compr-eb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/extract.c
-+++ b/extract.c
-@@ -2228,6 +2228,7 @@ static int test_compr_eb(__G__ eb, eb_si
-     ulg eb_ucsize;
-     uch *eb_ucptr;
-     int r;
-+    ush eb_compr_method;
- 
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
-@@ -2244,6 +2245,14 @@ static int test_compr_eb(__G__ eb, eb_si
-      ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
-         return IZ_EF_TRUNC;             /* no/bad compressed data! */
- 
-+    /* 2014-11-03 Michal Zalewski, SMS.
-+     * For STORE method, compressed and uncompressed sizes must agree.
-+     * http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=450
-+     */
-+    eb_compr_method = makeword( eb + (EB_HEADSIZE + compr_offset));
-+    if ((eb_compr_method == STORED) && (eb_size - compr_offset != eb_ucsize))
-+        return PK_ERR;
-+
-     if (
- #ifdef INT_16BIT
-         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||
diff --git a/trunk/package/feeds/packages/upmpdcli/Makefile b/trunk/package/feeds/packages/upmpdcli/Makefile
deleted file mode 100644
index 385a96be..00000000
--- a/trunk/package/feeds/packages/upmpdcli/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=upmpdcli
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_MD5SUM:=0e7b86037f19ea3a08067409af6f6902
-PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/upmpdcli
-  SECTION:=sound
-  CATEGORY:=Sound
-  URL:=http://www.lesbonscomptes.com/upmpdcli
-  DEPENDS+= +libupnpp +libmpdclient
-  TITLE:=A UPnP front-end to MPD, the Music Player Daemon
-  USERID:=upmpdcli=89:upmpdcli=89
-endef
-
-define Package/upmpdcli/description
-upmpdcli implements an UPnP Media Renderer, using MPD to perform the real work.
-endef
-
-define Package/upmpdcli/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/upmpdcli.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/upmpdcli.config $(1)/etc/config/upmpdcli
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upmpdcli $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/upmpdcli
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/upmpdcli/* $(1)/usr/share/upmpdcli/
-	$(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli
-endef
-
-$(eval $(call BuildPackage,upmpdcli))
diff --git a/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.config b/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.config
deleted file mode 100644
index 56b0ba3e..00000000
--- a/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.config
+++ /dev/null
@@ -1,15 +0,0 @@
-config upmpdcli lan
-	option interface 'br-lan'
-#	option friendly_name 'upmpdcli'
-#	option mpd_host '127.0.0.1'
-#	option mpd_port '6600'
-#	option upmpd_port '0'
-#	option config '/etc/upmpdcli.conf'
-
-# Add additional interfaces
-#
-#config upmpdcli wifi
-#	option interface 'wlan0'
-
-#config upmpdcli wan
-#	option interface 'eth0'
diff --git a/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.init b/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.init
deleted file mode 100644
index 6c69209c..00000000
--- a/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-NAME=upmpdcli
-START=95
-
-UPMPD_BIN=/usr/bin/${NAME}
-
-USE_PROCD=1
-
-append_arg() {
-        local cfg="$1"
-        local var="$2"
-        local opt="$3"
-        local def="$4"
-        local val
-
-        config_get val "$cfg" "$var"
-        [ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
-}
-
-start_instance() {
-       local cfg="$1"
-       local interface
-
-       procd_open_instance
-
-       procd_set_param command "${UPMPD_BIN}"
-
-#      config_get interface "$cfg" interface
-#      procd_add_reload_interface_trigger $interface
-
-       append_arg "$cfg" interface "-i"
-       append_arg "$cfg" mpd_host "-h"
-       append_arg "$cfg" mpd_port "-p"
-       append_arg "$cfg" upmpd_port "-P"
-
-       append_arg "$cfg" config "-c"
-       append_arg "$cfg" friendly_name "-f"
-
-       procd_close_instance
-}
-
-service_triggers() {
-       procd_add_reload_trigger "${NAME}"
-}
-
-start_service() {
-       config_load ${NAME}
-       config_foreach start_instance ${NAME}
-}
diff --git a/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.png b/trunk/package/feeds/packages/upmpdcli/files/upmpdcli.png
deleted file mode 100644
index ba50c644635a16c0e6de170ca53052f7928cd3d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmV-u2ABDXP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk&
z6%#vq2&+N>00rntL_t(|+U=XkZyZGw#(zCC-s0G?J@(kfVO7|{k%+}2-~dR#0XVV+
zi5o&ff(w5H+&BjbiCZMZasUAWu}I+%ViLp}Ls*g+5**tzwqrZvS(?LqEtiUJPft&e
z2aV@RE!)+tuBxxT_uf~p+K%hG>|{%@!>tWK8-O+dZ2;N;>|{%Yd1z{CDz5(a16Keg
z{p|oh0e>`Na?{h(@c<B$-47fDI)Sp$e-3yRIMd25upf8|aDg@85|9U0fj;1&R*nG~
z;2Ev9NqtvL$P1u!D*}+z<TJpA(cS^P54<TbdVrf+5r7APNm1VHa{>4q_y))VUBJFp
z1K=9qQG@p8>i-B_6f0&lj&T9e5&(1nk1N0xt$PmegYoyQ+V%j0b@b`z`d<L>AaH{M
zoE;N#z?{)`4k&2y0}=b{2c86;Zio=7(Ix~yDWJc9ba{3WSXLH@0>CKnJa8Sb2z;oY
zO<{loJRv$41NzHaL2(&aQCb{|(C3PN7Jy!0s+lfuFL0|5^*t*A7p%5*T|@+64LB|U
zQ^57j0$>by%#gW$>?i`~t@cX>0DTerKCX8ZwbvML1^|x$!vWMc88C0P6}5`Ub)t;v
zoUxb40GBli07o=4FM!*CJ1w;r1i(T-JHW1xV@k;1Ju6FFc;nfpj1y}X7*K9cTM@o&
zAnsNHucV-7+p?H2q=6T!ME!^L>>I$6+JDyqB!H{rPPsS%xEr`HAixy^(w+@KF5tOU
z0a@*kq7QgkAb4u?gnpmbH45yNJLTeXff3*y4K(j_m1=OgJptf&_Xnz^ygv=Ft~Ks0
zD#a$Wu;X#YfGahyavedkBv*M(%FSkwtMT+ydCxH;qugS!xS;sr0WcCL0GG$48VkUU
z@?osiD}{(70Dp<<jwYG*c~3H|rU(l_MgYWdkhlTdVX+{{g}Q*d<kO!0t+bcY_(zR<
z3t~nhtfmMHz);w<62i)wd^N>33cLior~r(?ka;7BXDm@wZUh6mqHHw-%+&zLsyvrh
z+$jnya{=a!mELV_tjZc|B2EC}K0{ARHEv}&`Mcx8z@V71Yy@gIP5_!^MT6>2h?vo^
zijWiY#QgRIezr?1xo)lKpuq@pY`wKEYS@SKF}i^#iO+|~Jf4`Dv*huB04PhG;j@`?
z;sjtZM%pFht1}^<%?bFEmIxcudy0w^o^@2&b41<?cq`z<z=TfVs5QW3K%cLu)Ri^b
zhsBPPm^o|QOKVQ$xB)mT0P58O9l+1PM*%vc;G-E%`nX0$3o)zIXTK+JfmXK*oE9DH
z$r?$ixI;dx<3;(hH6cHn6p%^ad&@NjjUYQ0Cjb|KBZ{(J*40^~3S8PkXH)~A2RI-A
zRxNf68XLBP<r=Zn1HPhC@-_=1Wq~pgLVUPJ^tKBgy+%-TtLTEm+8=DlHBIR}rZLS0
z09_XVIpB3G4wRIuU!ZchnGYd>`}uEWxL;$*R>?L6D(8tOfNl%O2{ELk)n9Fd5_HvR
z(O9ij;2lvn5h4zx1KPdKj2qIG)+}u?DS#Z{RF%buT?(H9J~r}jEqj2JSmd!RO3|es
zxLUt2S+22ddx1}>eDBk_1$$CHyTERv3Y3f3_w9-!DG8%9%>ZB>cw4TJ+=2lkK9Rjg
z%*jURHzE3aU!a_<g++1i27d!S&_ta8-yPJdoAm9gVS{AbuvnE;3^~?_%}_1&3GkgY
zNi&U&T4k)=+Qh7c5J5p2<&Z?tjLK!9tr5rLMc^$qYx5;5Z4OAvo>tqqg6Dih2Drel
zz-vUPTQ;g7G7G#L(1%N<obB0OwPhp50CUT}8YO@<%8meEYISWfbF--5sd`^%=^D2+
zx+L}<mCs;1tw5Nja?Ex>L2(24r4<2Kq4F(Y&SFA=%5nO$M*g2^MF603mUo!Vdc7A1
zywY_y@HLwsNo=ca*T>RFrPK~e_L?6{p9Q|4Nw%F|i+@Jt=*s?F{@bv{i$<8!{=dN;
mZfyYC0JH&U1JDLwC)>XXn|!C3HjwuK0000<MNUMnLSTXpuHGI1

diff --git a/trunk/package/feeds/packages/upmpdcli/patches/010-Add_icon_config.patch b/trunk/package/feeds/packages/upmpdcli/patches/010-Add_icon_config.patch
deleted file mode 100644
index 9b1ca6db..00000000
--- a/trunk/package/feeds/packages/upmpdcli/patches/010-Add_icon_config.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/upmpdcli.conf
-+++ b/src/upmpdcli.conf
-@@ -53,3 +53,6 @@ ohmetapersist = 1
- #  Path to the sc2mpd if it is not in /usr/bin and the location is not in
- #  the PATH for the init scripts.
- #sc2mpd = /usr/bin/sc2mpd
-+
-+# Icon for MPD UPnP interface
-+iconpath = /usr/share/upmpdcli/upmpdcli.png
diff --git a/trunk/package/feeds/packages/usbmuxd/Makefile b/trunk/package/feeds/packages/usbmuxd/Makefile
deleted file mode 100644
index 65ab0166..00000000
--- a/trunk/package/feeds/packages/usbmuxd/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=usbmuxd
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=2
-PKG_SOURCE_PROTO:=git
-
-PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING.GPLv2
-
-PKG_SOURCE_URL:=https://github.com/libimobiledevice/usbmuxd.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4bd7cd0d28e7f5920de51470b863f3aeee00409d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/usbmuxd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=USB multiplexing daemon
-  URL:=http://www.libimobiledevice.org/
-  DEPENDS:=+librt +libusb-1.0 +libusbmuxd +libcrypto +libopenssl +libimobiledevice
-endef
-
-define Package/usbmuxd/description
-  This daemon is in charge of multiplexing connections over USB to an iPhone or
-  iPod touch. To users, it means you can sync your music, contacts, photos, etc.
-  over USB. To developers, it means you can connect to any listening localhost
-  socket on the device. usbmuxd is not used for tethering data transfer, which
-  uses a dedicated USB interface as a virtual network device.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/usbmuxd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,usbmuxd))
diff --git a/trunk/package/feeds/packages/uuid/Makefile b/trunk/package/feeds/packages/uuid/Makefile
deleted file mode 100644
index 7ec89e35..00000000
--- a/trunk/package/feeds/packages/uuid/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uuid
-PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=version_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/Tieske/$(PKG_NAME)/archive/
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-version_$(PKG_VERSION)
-PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
-PKG_LICENSE=Apache-2.0
-
-LUA_MODULE_PATH:=/usr/lib/lua
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/uuid
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=uuid
-  URL:=https://github.com/Tieske/uuid
-  DEPENDS:=+lua +luasocket
-endef
-
-define Package/uuid/description
-	A pure Lua uuid generator
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/uuid/install
-	$(INSTALL_DIR) $(1)/$(LUA_MODULE_PATH)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/uuid.lua $(1)/$(LUA_MODULE_PATH)/uuid.lua
-endef
-
-$(eval $(call BuildPackage,uuid))
diff --git a/trunk/package/feeds/packages/uvcdynctrl/Makefile b/trunk/package/feeds/packages/uvcdynctrl/Makefile
deleted file mode 100644
index 7ab033c5..00000000
--- a/trunk/package/feeds/packages/uvcdynctrl/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uvcdynctrl
-PKG_VERSION:=0.2.4
-
-PKG_SOURCE:=libwebcam-src-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/libwebcam
-PKG_MD5SUM:=31dbb5713e95a699c5fc4dbe1493f764
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/libwebcam-src-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/uvcdynctrl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libwebcam +PACKAGE_UVCDYNCTRL_UDEV_RULE:udev
-  TITLE:=Manage dynamic controls in uvcvideo
-  URL:=http://sourceforge.net/projects/libwebcam/
-  MENU:=1
-endef
-
-define Package/uvcdynctrl/description
-  The webcam-tools package contains the following two components:
-  - libwebcam: Webcam Library (LGPL)
-  - uvcdynctrl: Manage dynamic controls in uvcvideo (GPL)
-endef
-
-define Package/uvcdynctrl/config
-config PACKAGE_UVCDYNCTRL_UDEV_RULE
-	bool "uvcdynctrl udev rule, selects udev"
-	depends on PACKAGE_uvcdynctrl
-	default no
-	help
-	  Installs an udev rule to load uvcdynctrl with dynamic controls
-	  from xml files in /usr/share/uvcdynctrl when a webcam is attached.
-endef
-
-define Package/libwebcam
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libxml2 +libiconv-full
-  TITLE:=Webcam library
-  URL:=http://sourceforge.net/projects/libwebcam/
-endef
-
-define Package/libwebcam/description
-  $(call Package/uvcdynctrl/description)
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/lib/libiconv-full/include -liconv
-TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/libiconv-full/lib
-
-define Package/uvcdynctrl/install
-	$(INSTALL_DIR) $(1)/usr/{bin,share}
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uvcdynctrl* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/uvcdynctrl/ $(1)/usr/share/
-
-ifeq ($(CONFIG_PACKAGE_UVCDYNCTRL_UDEV_RULE),y)
-	$(INSTALL_DIR) $(1)/lib/udev/rules.d
-	$(CP) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/udev/uvcdynctrl $(1)/lib/udev/
-endif
-endef
-
-define Package/libwebcam/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebcam.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{include,lib}
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebcam.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,uvcdynctrl))
-$(eval $(call BuildPackage,libwebcam))
diff --git a/trunk/package/feeds/packages/vala/Makefile b/trunk/package/feeds/packages/vala/Makefile
deleted file mode 100644
index c8b9c1b5..00000000
--- a/trunk/package/feeds/packages/vala/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vala
-PKG_VERSION:=0.28.0
-PKG_RELEASE:=1
-PKG_LICENSE:=LGPL-2.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/vala/0.28/
-PKG_MD5SUM:=8d4ceac3451a0d5497e7be38e5e4c2ad
-
-PKG_BUILD_DEPENDS:=glib2 glib2/host vala/host
-HOST_BUILD_DEPENDS:=glib2/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-TARGET_LDFLAGS+=\
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/vala
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=C-sharp like language for the GObject system
-  URL:=https://wiki.gnome.org/Projects/Vala
-  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
-endef
-
-define Package/vala/description
-Vala is a C-sharp like language for the GObject system. This package contains
-the Vala-to-C compiler.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/share/vala-0.28/vapi \
-		$(1)/usr/lib \
-		$(1)/usr/share/pkgconfig \
-		$(1)/usr/bin
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/vala-0.28/vapi/* \
-		$(1)/usr/share/vala-0.28/vapi
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/libvala-0.28.{so*,la} \
-		$(1)/usr/lib
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.28,valac,valac-0.28,vapicheck,vapicheck-0.28,vapigen,vapigen-0.28,vala-gen-introspect,vala-gen-introspect-0.28} \
-		$(1)/usr/bin
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \
-		$(1)/usr/share/pkgconfig
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,vala))
diff --git a/trunk/package/feeds/packages/vim/Makefile b/trunk/package/feeds/packages/vim/Makefile
deleted file mode 100644
index da01c671..00000000
--- a/trunk/package/feeds/packages/vim/Makefile
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vim
-PKG_VERSION:=7.4
-PKG_RELEASE:=2
-VIMVER:=74
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/
-PKG_MD5SUM:=607e135c559be642f210094ad023dc65
-PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vim/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=Vi IMproved - enhanced vi editor
-  URL:=http://www.vim.org/
-  SUBMENU:=Editors
-endef
-
-define Package/vim
-  $(call Package/vim/Default)
-  TITLE+= (Tiny)
-endef
-
-define Package/vim-full
-  $(call Package/vim/Default)
-  TITLE+= (Normal)
-endef
-
-define Package/vim-runtime
-  $(call Package/vim/Default)
-  TITLE+= (runtime files)
-endef
-
-define Package/vim-help
-  $(call Package/vim/Default)
-  TITLE+= (help files)
-endef
-
-define Package/xxd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=make a hexdump or do the reverse
-  URL:=http://www.vim.org/
-endef
-
-define Package/vim-full/conffiles
-/usr/share/vim/vimrc
-/root/.vimrc
-endef
-
-define Package/vim/conffiles
-/usr/share/vim/vimrc
-/root/.vimrc
-endef
-
-define Package/vim/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Tiny build)
-endef
-
-define Package/vim-full/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Normal build)
-endef
-
-define Package/vim-runtime/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Runtime files)
-endef
-
-define Package/vim-help/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Help files)
-endef
-
-define Package/xxd/description
- xxd creates a hex dump of a given file or standard input, it can also convert
- a hex dump back to its original binary form.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-gui \
-	--disable-gtktest \
-	--disable-xim \
-	--without-x \
-	--disable-netbeans \
-	--disable-cscope \
-	--disable-gpm \
-	--disable-acl \
-	--with-tlib=ncurses
-
-CONFIGURE_VARS += \
-	vim_cv_getcwd_broken=no \
-	vim_cv_memmove_handles_overlap=yes \
-	vim_cv_stat_ignores_slash=yes \
-	vim_cv_tgetent=zero \
-	vim_cv_terminfo=yes \
-	vim_cv_toupper_broken=no \
-	vim_cv_tty_group=root \
-	vim_cv_tty_mode=0620
-
-ifneq ($(CONFIG_PACKAGE_vim),)
-define Build/Compile/vim
-	$(call Build/Configure/Default, \
-		--with-features=tiny \
-		--disable-multibyte \
-	)
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
-endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_vim-full),)
-define Build/Compile/vim-full
-	$(call Build/Configure/Default, \
-		--with-features=normal \
-		--enable-multibyte \
-	)
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
-endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_xxd),)
-define Build/Compile/xxd
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-endef
-endif
-
-define Build/Compile/vim-runtime
-	$(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" installrtbase
-	(cd $(PKG_INSTALL_DIR) && tar -cf $(PKG_BUILD_DIR)/docs.tar ./usr/share/vim/vim$(VIMVER)/doc)
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER)/doc
-	rm -rf $(PKG_INSTALL_DIR)/usr/man
-endef
-
-define Build/Compile
-$(call Build/Compile/vim)
-$(call Build/Compile/vim-full)
-$(call Build/Compile/vim-runtime)
-$(call Build/Compile/xxd)
-endef
-
-define Package/vim/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_tiny $(1)/usr/bin/vim
-	$(INSTALL_DIR) $(1)/usr/share/vim
-	$(INSTALL_CONF) ./files/vimrc $(1)/usr/share/vim/
-endef
-
-define Package/vim-full/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_normal $(1)/usr/bin/vim
-	$(INSTALL_DIR) $(1)/usr/share/vim
-	$(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc
-endef
-
-define Package/vim-runtime/install
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)
-	rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc
-endef
-
-define Package/vim-help/install
-	tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar
-endef
-
-define Package/xxd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xxd/xxd $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,vim))
-$(eval $(call BuildPackage,vim-full))
-$(eval $(call BuildPackage,vim-runtime))
-$(eval $(call BuildPackage,vim-help))
-$(eval $(call BuildPackage,xxd))
diff --git a/trunk/package/feeds/packages/vim/files/vimrc b/trunk/package/feeds/packages/vim/files/vimrc
deleted file mode 100644
index 2622b773..00000000
--- a/trunk/package/feeds/packages/vim/files/vimrc
+++ /dev/null
@@ -1,11 +0,0 @@
-set showcmd			" show (partial) command in status line
-set showmatch		" show matching brackets
-set incsearch		" incremental search
-set autowrite		" automatically save before commands like :next and :make
-set nocompatible	" use vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start	" more powerful backspacing
-set autoindent		" always set autoindenting on
-set linebreak		" don't wrap words by default
-set textwidth=0		" don't wrap lines by default
-set ruler			" show the cursor position all the time
-
diff --git a/trunk/package/feeds/packages/vim/files/vimrc.full b/trunk/package/feeds/packages/vim/files/vimrc.full
deleted file mode 100644
index 56305c15..00000000
--- a/trunk/package/feeds/packages/vim/files/vimrc.full
+++ /dev/null
@@ -1,28 +0,0 @@
-set showcmd			" show (partial) command in status line
-set showmatch			" show matching brackets
-set incsearch			" incremental search
-set autowrite			" automatically save before commands like :next and :make
-set nocompatible		" use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start	" more powerful backspacing
-set autoindent			" always set autoindenting on
-set linebreak			" don't wrap words by default
-set textwidth=0			" don't wrap lines by default
-set ruler			" show the cursor position all the time
-
-if filereadable(expand("$VIMRUNTIME/syntax/synload.vim"))
-	syntax on
-endif
-if has("syntax") && &term =~ "xterm"
-	set t_Co=8
-	if has("terminfo")
-		set t_Sf=<Esc>[3%p1%dm
-		set t_Sb=<Esc>[4%p1%dm
-	else
-		set t_Sf=<Esc>[3%dm
-		set t_Sb=<Esc>[4%dm
-	endif
-endif
-
-" Uncomment out for line and/or relative numberig
-" set number
-" set rnu
diff --git a/trunk/package/feeds/packages/vim/patches/001-compile.patch b/trunk/package/feeds/packages/vim/patches/001-compile.patch
deleted file mode 100644
index 6740f1a8..00000000
--- a/trunk/package/feeds/packages/vim/patches/001-compile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/auto/configure
-+++ b/src/auto/configure
-@@ -12294,37 +12294,8 @@ _ACEOF
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
- $as_echo_n "checking uint32_t is 32 bits... " >&6; }
--if test "$cross_compiling" = yes; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5
--$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;}
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--main() {
--  uint32_t nr1 = (uint32_t)-1;
--  uint32_t nr2 = (uint32_t)0xffffffffUL;
--  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
--  exit(0);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming ok" >&5
- $as_echo "ok" >&6; }
--else
--  as_fn_error "WRONG!  uint32_t not defined correctly." "$LINENO" 5
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
- 
- bcopy_test_prog='
- #include "confdefs.h"
diff --git a/trunk/package/feeds/packages/vips/Makefile b/trunk/package/feeds/packages/vips/Makefile
deleted file mode 100644
index 501f987e..00000000
--- a/trunk/package/feeds/packages/vips/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2010-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vips
-PKG_VERSION:=7.42.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.42/
-PKG_MD5SUM:=33a4590924b3120ce309982ec85a7c16
-PKG_FIXUP:=autoreconf
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-PKG_INSTALL=1
-
-define Package/vips
-  $(call Package/vips/Default)
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  TITLE:=An image manipulation library
-  URL:=http://www.vips.ecs.soton.ac.uk/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-  DEPENDS:=+glib2 +libexif +libjpeg +libpng +libxml2 $(INTL_DEPENDS)
-endef
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--disable-cxx \
-	--disable-threads \
-	--without-cfitsio \
-	--without-fftw \
-	--without-lcms \
-	--without-magick \
-	--without-matio \
-	--without-OpenEXR \
-	--without-orc \
-	--without-pangoft2 \
-	--without-python \
-	--without-tiff \
-	--without-v4l \
-	--without-x \
-	--without-zip \
-	--with-jpeg \
-	--with-libexif \
-	--with-png \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/vips
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/vips/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,vips))
diff --git a/trunk/package/feeds/packages/vips/patches/001-no_cpp.patch b/trunk/package/feeds/packages/vips/patches/001-no_cpp.patch
deleted file mode 100644
index 72e841c5..00000000
--- a/trunk/package/feeds/packages/vips/patches/001-no_cpp.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -u --recursive --new-file vips-7.42.1-vanilla/configure.ac vips-7.42.1/configure.ac
---- vips-7.42.1-vanilla/configure.ac	2014-12-29 17:45:59.576995574 -0500
-+++ vips-7.42.1/configure.ac	2014-12-29 17:59:03.698808601 -0500
-@@ -264,7 +264,6 @@
- AC_PROG_AWK
- AC_PROG_CC
- AC_PROG_CC_STDC
--AC_PROG_CXX
- AC_C_CONST
- AC_C_RESTRICT
- AC_PROG_RANLIB
-@@ -272,19 +271,6 @@
- AC_PROG_LN_S
- AM_WITH_DMALLOC
- 
--# vips_PROG_CXX_WORKS
--# Check whether the C++ compiler works.
--AC_DEFUN([vips_PROG_CXX_WORKS],
--  [AC_REQUIRE([AC_PROG_CXX])dnl
--   AC_CACHE_CHECK([whether the C++ compiler works],
--   [vips_cv_prog_cxx_works],
--   [AC_LANG_PUSH([C++])
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
--                   [vips_cv_prog_cxx_works=yes],
--                   [vips_cv_prog_cxx_works=no])
--    AC_LANG_POP([C++])])
--])
--
- # option to build without C++
- # handy for some embedded applications
- # also, including C++ source causes link problems on some
-@@ -292,24 +278,8 @@
- AC_ARG_ENABLE(cxx, 
-   AS_HELP_STRING([--enable-cxx], [build C++ components (default: test)]))
- 
--if test x"$enable_cxx" != x"no"; then
--  vips_PROG_CXX_WORKS
--  if test x"$vips_cv_prog_cxx_works" = x"yes"; then 
--    AC_DEFINE(ENABLE_CXX,1,[build C++ components])
--    AM_CONDITIONAL(ENABLE_CXX, true)
--    # need -lstdc++ for (eg.) the C++ format loaders
--    # this gets added to vips.pc to help mingw and friends link programs
--    # using libvips
--    if test x"$vips_needs_stdcpp" != x"no"; then
--      VIPS_CXX_LIBS="-lstdc++"
--    fi
--    enable_cxx=yes
--  fi
--fi
--
- if test x"$enable_cxx" != x"yes"; then
-   AM_CONDITIONAL(ENABLE_CXX, false)
--  VIPS_CXX_LIBS=""
-   enable_cxx=no
- fi
- 
-@@ -817,7 +787,6 @@
- AC_SUBST(VIPS_CFLAGS)
- AC_SUBST(VIPS_INCLUDES)
- AC_SUBST(VIPS_LIBS)
--AC_SUBST(VIPS_CXX_LIBS)
- AC_SUBST(PACKAGES_USED)
- AC_SUBST(EXTRA_LIBS_USED)
- 
-@@ -850,12 +819,6 @@
- 	libvips/create/Makefile 
- 	libvips/resample/Makefile 
- 	libvips/video/Makefile 
--	libvipsCC/include/Makefile 
--	libvipsCC/include/vips/Makefile 
--	libvipsCC/Makefile 
--	cplusplus/include/Makefile 
--	cplusplus/include/vips/Makefile 
--	cplusplus/Makefile 
- 	tools/Makefile 
- 	tools/batch_crop 
- 	tools/batch_image_convert 
-@@ -866,7 +829,6 @@
- 	test/Makefile 
- 	test/variables.sh
- 	swig/Makefile 
--	swig/vipsCC/Makefile 
- 	man/Makefile
- 	doc/Makefile
- 	doc/reference/Makefile
-diff -u --recursive --new-file vips-7.42.1-vanilla/libvips/Makefile.am vips-7.42.1/libvips/Makefile.am
---- vips-7.42.1-vanilla/libvips/Makefile.am	2014-12-29 17:45:59.590996100 -0500
-+++ vips-7.42.1/libvips/Makefile.am	2014-12-29 17:59:32.053375826 -0500
-@@ -33,14 +33,6 @@
- # empty means default to C linking
- libvips_la_SOURCES = 
- 
--# if we have C++ components enabled, make sure we link the top-level with c++
--#
--# sadly the if/endif isn't enough to stop automake detecting a c++ link even
--# when c++ is disabled ... comment out this line if you have linking problems
--if ENABLE_CXX
--nodist_EXTRA_libvips_la_SOURCES = resample/dummy2.cc
--endif
--
- # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
- libvips_la_LIBADD = \
- 	resample/libresample.la \
-diff -u --recursive --new-file vips-7.42.1-vanilla/libvips/resample/Makefile.am vips-7.42.1/libvips/resample/Makefile.am
---- vips-7.42.1-vanilla/libvips/resample/Makefile.am	2014-12-29 17:45:59.591996138 -0500
-+++ vips-7.42.1/libvips/resample/Makefile.am	2014-12-29 18:01:57.107188019 -0500
-@@ -1,30 +1,3 @@
--# only build the C++ stuff if ENABLE_CXX
--# you'd think we could just define a couple of variables, but that seems to
--# confuse libtool and make it link the library with g++
--# instead, have two completely different paths
--if ENABLE_CXX
--
--libresample_la_SOURCES = \
--	affine.c \
--	quadratic.c \
--	resample.c \
--	similarity.c \
--	resize.c \
--	presample.h \
--	shrink.c \
--	interpolate.c \
--	transform.c \
--	bicubic.cpp \
--	lbb.cpp \
--	nohalo.cpp \
--	vsqbs.cpp \
--	templates.h 
--
--EXTRA_DIST = \
--	dummy2.cc 
--
--else
--
- libresample_la_SOURCES = \
- 	resample.c \
- 	similarity.c \
-@@ -36,16 +9,6 @@
- 	quadratic.c \
- 	transform.c 
- 
--EXTRA_DIST = \
--	dummy2.cc \
--	bicubic.cpp \
--	lbb.cpp \
--	nohalo.cpp \
--	vsqbs.cpp \
--	templates.h 
--
--endif
--
- noinst_LTLIBRARIES = libresample.la
- 
- AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
diff --git a/trunk/package/feeds/packages/vnstat/Makefile b/trunk/package/feeds/packages/vnstat/Makefile
deleted file mode 100644
index cae144e4..00000000
--- a/trunk/package/feeds/packages/vnstat/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vnstat
-PKG_VERSION:=1.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://humdi.net/vnstat
-PKG_MD5SUM:=a154b2196771e06a8accd1c24374009c
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:=libgd
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vnstat/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://humdi.net/vnstat/
-endef
-
-define Package/vnstat
-$(call Package/vnstat/Default)
-  TITLE:=Console-based network traffic monitor
-endef
-
-define Package/vnstat/description
-	vnStat is a network traffic monitor for Linux that keeps a log of daily
-	network traffic for the selected interface(s). vnStat isn't a packet
-	sniffer. The traffic information is analyzed from the /proc -filesystem,
-	so vnStat can be used without root permissions.
-endef
-
-define Package/vnstati
-$(call Package/vnstat/Default)
-  DEPENDS+=vnstat +libgd
-  TITLE:=PNG image output support for vnStat
-endef
-
-define Package/vnstati/description
-	The purpose of vnstati is to provide image output support for statistics
-	collected using vnstat(1). However, the image file format is limited to
-	png. All basic outputs of vnStat are supported excluding live traffic
-	features. The image can be outputted either to a file or to standard
-	output.
-endef
-
-define Package/vnstat/conffiles
-/etc/vnstat.conf
-/etc/config/vnstat
-endef
-
-define Build/Compile/vnstat
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)"
-endef
-
-define Build/Compile/vnstati
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
-		all
-endef
-
-define Build/Compile
-$(call Build/Compile/vnstat)
-$(call Build/Compile/vnstati)
-endef
-
-define Package/vnstat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstat $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vnstat.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/vnstat.config $(1)/etc/config/vnstat
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/vnstat.defaults $(1)/etc/uci-defaults/vnstat
-endef
-
-define Package/vnstati/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstati $(1)/usr/bin/
-endef
-
-define Package/vnstat/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/vnstat) && rm -f /etc/uci-defaults/vnstat
-exit 0
-endef
-
-$(eval $(call BuildPackage,vnstat))
-$(eval $(call BuildPackage,vnstati))
diff --git a/trunk/package/feeds/packages/vnstat/files/vnstat.config b/trunk/package/feeds/packages/vnstat/files/vnstat.config
deleted file mode 100644
index 9da71ed7..00000000
--- a/trunk/package/feeds/packages/vnstat/files/vnstat.config
+++ /dev/null
@@ -1,5 +0,0 @@
-config vnstat
-	list interface		br-lan
-#	list interface		eth0.1
-#	option remote		http://example.org/vnstat/
-#	option symlink		/www/vnstat
diff --git a/trunk/package/feeds/packages/vnstat/files/vnstat.defaults b/trunk/package/feeds/packages/vnstat/files/vnstat.defaults
deleted file mode 100644
index e013b8e4..00000000
--- a/trunk/package/feeds/packages/vnstat/files/vnstat.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-wan="$(uci -P/var/state get network.wan.ifname)"
-
-if [ -n "$wan" ]; then
-	uci -q batch <<-EOF >/dev/null
-		del_list vnstat.@vnstat[-1].interface=$wan
-		add_list vnstat.@vnstat[-1].interface=$wan
-		commit vnstat
-	EOF
-fi
-
-exit 0
diff --git a/trunk/package/feeds/packages/vnstat/files/vnstat.init b/trunk/package/feeds/packages/vnstat/files/vnstat.init
deleted file mode 100644
index 802e60b0..00000000
--- a/trunk/package/feeds/packages/vnstat/files/vnstat.init
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=99
-
-vnstat_option() {
-	sed -ne "s/^[[:space:]]*$1[[:space:]]*['\"]\([^'\"]*\)['\"].*/\1/p" \
-		/etc/vnstat.conf
-}
-
-start() {
-	local lib="$(vnstat_option DatabaseDir)"
-	local pid="$(vnstat_option PidFile)"
-
-	[ -n "$lib" ] || {
-		echo "Error: No DatabaseDir set in vnstat.conf" >&2
-		exit 1
-	}
-
-	[ -n "$pid" ] || {
-		echo "Error: No PidFile set in vnstat.conf" >&2
-		exit 1
-	}
-
-	mkdir -p "$lib"
-
-	init_ifaces() {
-		local cfg="$1"
-		local url lnk
-
-		init_iface() {
-			local ifn="$1"
-
-			[ -n "$url" ] && {
-				local try=0
-				local max=3
-				local hostname="$(cat /proc/sys/kernel/hostname)"
-
-				while [ $((++try)) -le $max ]; do
-					if wget -q -O "$lib/$ifn" "$url/${hostname}_$ifn" 2>/dev/null && [ -e "$lib/$ifn" ]; then
-						logger -t "vnstat" "Downloaded backup for database $ifn"
-						break
-					else
-						logger -t "vnstat" "Download try $try/$max for database $ifn failed"
-						sleep 30
-					fi
-				done
-			}
-
-			/usr/bin/vnstat -u -i "$ifn" >/dev/null
-
-			[ -n "$lnk" ] && {
-				mkdir -p "$lnk"
-				[ -L "$lnk/$ifn" ] || ln -s "$lib/$ifn" "$lnk/$ifn"
-			}
-		}
-
-		config_get url "$cfg" remote
-		config_get lnk "$cfg" symlink
-		config_list_foreach "$cfg" interface init_iface
-
-		return 1
-	}
-
-	config_load vnstat
-	config_foreach init_ifaces vnstat
-
-	SERVICE_PID_FILE="${pid}"
-	service_start /usr/sbin/vnstatd -d
-}
-
-stop() {
-	local pid="$(vnstat_option PidFile)"
-
-	[ -n "$pid" ] || {
-		echo "Error: No PidFile set in vnstat.conf" >&2
-		exit 1
-	}
-
-	SERVICE_PID_FILE="${pid}"
-	service_stop /usr/sbin/vnstatd
-}
diff --git a/trunk/package/feeds/packages/vnstat/patches/001-conf.patch b/trunk/package/feeds/packages/vnstat/patches/001-conf.patch
deleted file mode 100644
index 5fb24c3c..00000000
--- a/trunk/package/feeds/packages/vnstat/patches/001-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -78,13 +78,13 @@ DaemonUser ""
- DaemonGroup ""
- 
- # how often (in seconds) interface data is updated
--UpdateInterval 30
-+UpdateInterval 60
- 
- # how often (in seconds) interface status changes are checked
--PollInterval 5
-+PollInterval 30
- 
- # how often (in minutes) data is saved to file
--SaveInterval 5
-+SaveInterval 30
- 
- # how often (in minutes) data is saved when all interface are offline
- OfflineSaveInterval 30
diff --git a/trunk/package/feeds/packages/vnstat/patches/002-no_install_strip.patch b/trunk/package/feeds/packages/vnstat/patches/002-no_install_strip.patch
deleted file mode 100644
index 8f11de6f..00000000
--- a/trunk/package/feeds/packages/vnstat/patches/002-no_install_strip.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -66,11 +66,11 @@ install:
- 
- # install everything else
- 	install -d -m 755 $(BIN) $(SBIN) $(MAN)/man1 $(MAN)/man5
--	install -s -m 755 src/vnstat $(BIN)
--	install -s -m 755 src/vnstatd $(SBIN)
-+	install -m 755 src/vnstat $(BIN)
-+	install -m 755 src/vnstatd $(SBIN)
- 	@if [ -f "src/vnstati" ]; \
--	then echo install -s -m 755 src/vnstati $(BIN); \
--	install -s -m 755 src/vnstati $(BIN); \
-+	then echo install -m 755 src/vnstati $(BIN); \
-+	install -m 755 src/vnstati $(BIN); \
- 	fi
- 
- # update man pages, gzip it if previous version was done so	
-@@ -139,12 +139,12 @@ bsdinstall:
- 
- # install binaries
- 	install -d -m 755 $(DESTDIR)/var/db/vnstat
--	install -s -m 755 src/vnstat $(BIN_BSD)
--	install -s -m 755 src/vnstatd $(SBIN_BSD)
-+	install -m 755 src/vnstat $(BIN_BSD)
-+	install -m 755 src/vnstatd $(SBIN_BSD)
- 
- 	@if [ -f "src/vnstati" ]; \
--	then echo install -s -m 755 src/vnstati $(BIN_BSD); \
--	install -s -m 755 src/vnstati $(BIN_BSD); \
-+	then echo install -m 755 src/vnstati $(BIN_BSD); \
-+	install -m 755 src/vnstati $(BIN_BSD); \
- 	fi
- 
- # install default config if such doesn't exist
diff --git a/trunk/package/feeds/packages/vnstat/patches/003-no_install_uname.patch b/trunk/package/feeds/packages/vnstat/patches/003-no_install_uname.patch
deleted file mode 100644
index 14c17d5b..00000000
--- a/trunk/package/feeds/packages/vnstat/patches/003-no_install_uname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -33,12 +33,6 @@ debug:
- install:
- 	@echo "Installing vnStat..."
- 
--# check that system is really Linux
--	@if [ `uname` != "Linux" ]; \
--	then echo "This isn't a Linux system. Maybe 'make bsdinstall' is what you need?"; \
--	false; \
--	fi
--
- # check that there's something to install
- 	@if [ ! -f "src/vnstat" ] || [ ! -f "src/vnstatd" ]; \
- 	then echo "Nothing to install, run make first."; \
diff --git a/trunk/package/feeds/packages/vpnc-scripts/Makefile b/trunk/package/feeds/packages/vpnc-scripts/Makefile
deleted file mode 100644
index 95948cfd..00000000
--- a/trunk/package/feeds/packages/vpnc-scripts/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vpnc-scripts
-PKG_VERSION:=20150116
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vpnc-scripts
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=VPN configuration script for vpnc and OpenConnect
-  MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  SUBMENU:=VPN
-endef
-
-define Package/vpnc-scripts/description
-	This package contains the vpnc-script which is used by vpnc
-	and OpenConnect to configure the tunnel interface.
-endef
-
-define Build/Compile
-endef
-
-define Package/vpnc-scripts/install
-	$(INSTALL_DIR) $(1)/lib/netifd
-	$(INSTALL_BIN) ./files/vpnc-script $(1)/lib/netifd/
-endef
-
-$(eval $(call BuildPackage,vpnc-scripts))
diff --git a/trunk/package/feeds/packages/vpnc-scripts/files/vpnc-script b/trunk/package/feeds/packages/vpnc-scripts/files/vpnc-script
deleted file mode 100755
index c6007ab8..00000000
--- a/trunk/package/feeds/packages/vpnc-scripts/files/vpnc-script
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/sh
-# List of parameters passed through environment
-#* reason                       -- why this script was called, one of: pre-init connect disconnect
-#* VPNGATEWAY                   -- vpn gateway address (always present)
-#* TUNDEV                       -- tunnel device (always present)
-#* INTERNAL_IP4_ADDRESS         -- address (always present)
-#* INTERNAL_IP4_MTU             -- mtu (often unset)
-#* INTERNAL_IP4_NETMASK         -- netmask (often unset)
-#* INTERNAL_IP4_NETMASKLEN      -- netmask length (often unset)
-#* INTERNAL_IP4_NETADDR         -- address of network (only present if netmask is set)
-#* INTERNAL_IP4_DNS             -- list of dns servers
-#* INTERNAL_IP4_NBNS            -- list of wins servers
-#* INTERNAL_IP6_ADDRESS         -- IPv6 address
-#* INTERNAL_IP6_NETMASK         -- IPv6 netmask
-#* INTERNAL_IP6_DNS             -- IPv6 list of dns servers
-#* CISCO_DEF_DOMAIN             -- default domain name
-#* CISCO_BANNER                 -- banner from server
-#* CISCO_SPLIT_INC              -- number of networks in split-network-list
-#* CISCO_SPLIT_INC_%d_ADDR      -- network address
-#* CISCO_SPLIT_INC_%d_MASK      -- subnet mask (for example: 255.255.255.0)
-#* CISCO_SPLIT_INC_%d_MASKLEN   -- subnet masklen (for example: 24)
-#* CISCO_SPLIT_INC_%d_PROTOCOL  -- protocol (often just 0)
-#* CISCO_SPLIT_INC_%d_SPORT     -- source port (often just 0)
-#* CISCO_SPLIT_INC_%d_DPORT     -- destination port (often just 0)
-#* CISCO_IPV6_SPLIT_INC         -- number of networks in IPv6 split-network-list
-#* CISCO_IPV6_SPLIT_INC_%d_ADDR -- IPv6 network address
-#* CISCO_IPV6_SPLIT_INC_$%d_MASKLEN -- IPv6 subnet masklen
-
-HOOKS_DIR=/etc/openconnect
-
-# FIXMEs:
-
-# Section A: route handling
-
-# 1) The 3 values CISCO_SPLIT_INC_%d_PROTOCOL/SPORT/DPORT are currently being ignored
-#   In order to use them, we'll probably need os specific solutions
-#   * Linux: iptables -t mangle -I PREROUTING <conditions> -j ROUTE --oif $TUNDEV
-#       This would be an *alternative* to changing the routes (and thus 2) and 3)
-#       shouldn't be relevant at all)
-# 2) There are two different functions to set routes: generic routes and the
-#   default route. Why isn't the defaultroute handled via the generic route case?
-# 3) In the split tunnel case, all routes but the default route might get replaced
-#   without getting restored later. We should explicitely check and save them just
-#   like the defaultroute
-# 4) Replies to a dhcp-server should never be sent into the tunnel
-
-# Section B: Split DNS handling
-
-# 1) We parse CISCO_SPLIT_DNS and use dnsmasq to set it
-
-do_connect() {
-	if [ -n "$CISCO_BANNER" ]; then
-		logger -t openconnect "Connect Banner:"
-		echo "$CISCO_BANNER" | while read LINE ; do logger -t openconnect "|" "$LINE" ; done
-	fi
-
-	proto_init_update "$TUNDEV" 1
-
-	if [ -n "$INTERNAL_IP4_MTU" ]; then
-		MTU=$INTERNAL_IP4_MTU
-	fi
-
-	if [ -z "$MTU" ]; then
-		MTU=1412
-	fi
-
-	proto_add_ipv4_address "$INTERNAL_IP4_ADDRESS" 32 "" "$INTERNAL_IP4_ADDRESS"
-
-	if [ -n "$INTERNAL_IP4_NETMASKLEN" ]; then
-		proto_add_ipv4_route "$INTERNAL_IP4_NETADDR" "$INTERNAL_IP4_NETMASKLEN"
-	fi
-
-	# If the netmask is provided, it contains the address _and_ netmask
-	if [ -n "$INTERNAL_IP6_ADDRESS" ] && [ -z "$INTERNAL_IP6_NETMASK" ]; then
-	    INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
-	fi
-
-	if [ -n "$INTERNAL_IP6_NETMASK" ]; then
-		addr="${INTERNAL_IP6_NETMASK%%/*}"
-		mask="${INTERNAL_IP6_NETMASK##*/}"
-		[[ "$addr" != "$mask" ]] && proto_add_ipv6_address "$addr" "$mask"
-	fi
-
-	if [ -n "$CISCO_SPLIT_DNS" ] && [ -d "/tmp/dnsmasq.d/" ];then
-		SDNS=`echo $CISCO_SPLIT_DNS|sed 's/,/\n/g'`
-		DNSMASQ_FILE="/tmp/dnsmasq.d/openconnect.$TUNDEV"
-		rm -f $DNSMASQ_FILE
-		echo "$SDNS" | while read i; do
-			if [ -n "$INTERNAL_IP4_DNS" ];then
-				echo "server=/$i/$INTERNAL_IP4_DNS" >> $DNSMASQ_FILE
-			fi
-			if [ -n "$INTERNAL_IP6_DNS" ];then
-				echo "server=/$i/$INTERNAL_IP6_DNS" >> $DNSMASQ_FILE
-			fi
-			echo "rebind-domain-ok=$i" >> $DNSMASQ_FILE
-		done
-		/etc/init.d/dnsmasq restart
-	else
-		[ -n "$INTERNAL_IP4_DNS" ] && proto_add_dns_server "$INTERNAL_IP4_DNS"
-		[ -n "$CISCO_DEF_DOMAIN" ] && proto_add_dns_search "$CISCO_DEF_DOMAIN"
-	fi
-
-	if [ -n "$CISCO_SPLIT_INC" ]; then
-		i=0
-		while [ $i -lt $CISCO_SPLIT_INC ] ; do
-			eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}"
-			eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}"
-			eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}"
-			if [ $NETWORK != "0.0.0.0" ]; then
-				proto_add_ipv4_route "$NETWORK" "$NETMASKLEN"
-			else
-				proto_add_ipv4_route "0.0.0.0" 0
-			fi
-			i=$(($i + 1))
-		done
-	elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
-		proto_add_ipv4_route "0.0.0.0" 0
-	fi
-	if [ -n "$CISCO_IPV6_SPLIT_INC" ]; then
-		i=0
-		while [ $i -lt $CISCO_IPV6_SPLIT_INC ] ; do
-			eval NETWORK="\${CISCO_IPV6_SPLIT_INC_${i}_ADDR}"
-			eval NETMASKLEN="\${CISCO_IPV6_SPLIT_INC_${i}_MASKLEN}"
-			if [ $NETMASKLEN -lt 128 ]; then
-				proto_add_ipv6_route "$NETWORK" "$NETMASKLEN"
-			else
-				proto_add_ipv6_route "::0" 0
-			fi
-			i=$(($i + 1))
-		done
-	elif [ -n "$INTERNAL_IP6_NETMASK" -o -n "$INTERNAL_IP6_ADDRESS" ]; then
-		proto_add_ipv6_route "::0" 0
-	fi
-	proto_send_update "$INTERFACE"
-}
-
-do_disconnect() {
-	rm -f "/tmp/dnsmasq.d/openconnect.$TUNDEV"
-	proto_init_update "$TUNDEV" 0
-	proto_send_update "$INTERFACE"
-}
-
-#### Hooks
-run_hooks() {
-	HOOK="$1"
-
-	if [ -d ${HOOKS_DIR}/${HOOK}.d ]; then
-		for script in ${HOOKS_DIR}/${HOOK}.d/* ; do
-			[ -f $script ] && . $script
-		done
-	fi
-}
-
-#### Main
-
-if [ -z "$reason" ]; then
-	logger -t openconnect "this script must be called from vpnc" 1>&2
-	exit 1
-fi
-if [ -z "$INTERFACE" ]; then
-	logger -t openconnect "this script must be called for an active interface"
-	exit 1
-fi
-
-. /lib/netifd/netifd-proto.sh
-
-case "$reason" in
-	pre-init)
-		run_hooks pre-init
-		;;
-	connect)
-		run_hooks connect
-		do_connect
-		run_hooks post-connect
-		;;
-	disconnect)
-		run_hooks disconnect
-		do_disconnect
-		run_hooks post-disconnect
-		;;
-	reconnect)
-		run_hooks reconnect
-		;;
-	*)
-		logger -t openconnect "unknown reason '$reason'. Maybe vpnc-script is out of date" 1>&2
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/trunk/package/feeds/packages/vpnc/Config.in b/trunk/package/feeds/packages/vpnc/Config.in
deleted file mode 100644
index 5eacd978..00000000
--- a/trunk/package/feeds/packages/vpnc/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# vpnc avanced configuration
-
-menu "Configuration"
-	depends on PACKAGE_vpnc
-
-choice
-	prompt "SSL library"
-	default VPNC_GNUTLS
-
-config VPNC_GNUTLS
-	bool "GnuTLS support"
-
-config VPNC_OPENSSL
-	bool "OpenSSL"
-
-endchoice
-
-endmenu
diff --git a/trunk/package/feeds/packages/vpnc/Makefile b/trunk/package/feeds/packages/vpnc/Makefile
deleted file mode 100644
index 16a45a4b..00000000
--- a/trunk/package/feeds/packages/vpnc/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vpnc
-PKG_REV:=550
-PKG_VERSION:=0.5.3.r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-PKG_MAINTAINER:=Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
-PKG_LICENSE:=VARIOUS
-PKG_LICENSE_FILES:=COPYING
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_VPNC_GNUTLS \
-	CONFIG_VPNC_OPENSSL \
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vpnc/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/vpnc
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libgpg-error +libgcrypt +kmod-tun +VPNC_OPENSSL:libopenssl +VPNC_GNUTLS:libgnutls +vpnc-scripts +resolveip
-  TITLE:=VPN client for Cisco EasyVPN
-  URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
-  SUBMENU:=VPN
-endef
-
-define Package/vpnc/description
-	A VPN client compatible with Cisco's EasyVPN equipment.
-
-	Supports IPSec (ESP) with Mode Configuration and Xauth.  Supports only
-	shared-secret IPSec authentication with Xauth, AES (256, 192, 128),
-	3DES, 1DES, MD5, SHA1, DH1/2/5 and IP tunneling.
-endef
-
-define Package/vpnc/conffiles
-/etc/vpnc/default.conf
-endef
-
-ifeq ($(CONFIG_VPNC_OPENSSL),y)
-define Build/Compile
-	$(call Build/Compile/Default, \
-		OFLAGS="$(TARGET_CFLAGS)" \
-		OS="Linux" VERSION="$(PKG_VERSION)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		OPENSSL_GPL_VIOLATION=yes PREFIX=/usr \
-		all install \
-	)
-endef
-else
-define Build/Compile
-	$(call Build/Compile/Default, \
-		OFLAGS="$(TARGET_CFLAGS)" \
-		OS="Linux" VERSION="$(PKG_VERSION)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		PREFIX=/usr \
-		all install \
-	)
-endef
-endif
-
-define Package/vpnc/install
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/vpnc.sh $(1)/lib/netifd/proto/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP)	$(PKG_INSTALL_DIR)/usr/sbin/vpnc \
-		$(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/vpnc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vpnc/default.conf $(1)/etc/vpnc/
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/vpnc.upgrade $(1)/lib/upgrade/keep.d/vpnc
-endef
-
-$(eval $(call BuildPackage,vpnc))
diff --git a/trunk/package/feeds/packages/vpnc/README b/trunk/package/feeds/packages/vpnc/README
deleted file mode 100644
index b18777ef..00000000
--- a/trunk/package/feeds/packages/vpnc/README
+++ /dev/null
@@ -1,39 +0,0 @@
-The vpnc client expects to be configured using the uci interface.
-
-To setup a VPN connection, add the following to /etc/config/network:
-
-config interface 'MYVPN'
-        option proto 'vpnc'
-        option interface 'wan'
-        option server 'vpn.example.com'
-        option username 'test'
-        option password 'secret' # or:
-        option hexpasswd 'AE7FF6A0426F0A0CD0A02EB9EC3C5066FAEB0B25'
-        option authgroup 'DEFAULT'
-        option passgroup 'groupsecret' # or:
-        option hexpassgroup '52B0BEAF6605C3CE9BE20A0DC0A0F6240A6FF7EA'
-        option domain 'WORKGROUP'
-        option vendor 'cisco' # or 'netscreen'
-        option natt_mode 'natt' # or 'none' or 'force-natt' or 'cisco-udp'
-        option dh_group 'dh2' # or 'dh1' or 'dh5'
-        option pfs 'server' # or 'nopfs' or 'dh1' or 'dh2' or 'dh5'
-        option enable_single_des '0'
-        option enable_no_enc '0' # '1' to enable unencrypted VPN
-        option mtu '0'
-        option local_addr '0.0.0.0'
-        option local_port '500' # '0' to use a random port
-        option udp_port '10000' # '0' to use a random port
-        option dpd_idle '300'
-        option auth_mode 'psk' # or 'hybrid'
-        option target_network '0.0.0.0/0.0.0.0' # network/netmask or CIDR
-
-The additional file(s) are also used:
-/etc/vpnc/ca-vpn-MYVPN.pem: The server's CA certificate (for auth_mode 'hybrid')
-
-After these are setup you can initiate the VPN using "ifup MYVPN", and
-deinitialize it using ifdown. You may also use the luci web interface
-(Network -> Interfaces -> MYVPN Connect).
-
-Note that you need to configure the firewall to allow communication between
-the MYVPN interface and lan.
-
diff --git a/trunk/package/feeds/packages/vpnc/files/vpnc.sh b/trunk/package/feeds/packages/vpnc/files/vpnc.sh
deleted file mode 100755
index 31d0070d..00000000
--- a/trunk/package/feeds/packages/vpnc/files/vpnc.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_vpnc_init_config() {
-	proto_config_add_string "server"
-	proto_config_add_string "username"
-	proto_config_add_string "hexpasswd"
-	proto_config_add_string "authgroup"
-	proto_config_add_string "password"
-	proto_config_add_string "token_mode"
-	proto_config_add_string "token_secret"
-	proto_config_add_string "interface"
-	proto_config_add_string "passgroup"
-	proto_config_add_string "hexpassgroup"
-	proto_config_add_string "domain"
-	proto_config_add_string "vendor"
-	proto_config_add_string "natt_mode"
-	proto_config_add_string "dh_group"
-	proto_config_add_string "pfs"
-	proto_config_add_boolean "enable_single_des"
-	proto_config_add_boolean "enable_no_enc"
-	proto_config_add_int "mtu"
-	proto_config_add_string "local_addr"
-	proto_config_add_int "local_port"
-	proto_config_add_int "udp_port"
-	proto_config_add_int "dpd_idle"
-	proto_config_add_string "auth_mode"
-	proto_config_add_string "target_network"
-	no_device=1
-	available=1
-}
-
-proto_vpnc_setup() {
-	local config="$1"
-
-	json_get_vars server username hexpasswd authgroup password token_mode token_secret interface passgroup hexpassgroup domain vendor natt_mode dh_group pfs enable_single_des enable_no_enc mtu local_addr local_port udp_port dpd_idle auth_mode target_network
-
-	grep -q tun /proc/modules || insmod tun
-
-	logger -t vpnc "initializing..."
-	serv_addr=
-	for ip in $(resolveip -t 10 "$server"); do
-		( proto_add_host_dependency "$config" "$ip" $interface )
-		serv_addr=1
-	done
-	[ -n "$serv_addr" ] || {
-		logger -t vpnc "Could not resolve server address: '$server'"
-		sleep 60
-		proto_setup_failed "$config"
-		exit 1
-	}
-
-	mkdir -p /var/etc
-	umask 077
-	pwfile="/var/etc/vpnc-$config.conf"
-	echo "IPSec gateway $server" > "$pwfile"
-	cmdline="--no-detach --pid-file /var/run/vpnc-$config.pid --ifname vpn-$config --non-inter --script /lib/netifd/vpnc-script $pwfile"
-
-	[ -f /etc/vpnc/ca-vpn-$config.pem ] && echo "CA-File /etc/vpnc/ca-vpn-$config.pem" >> "$pwfile"
-	[ -n "$hexpasswd" ] && echo "Xauth obfuscated password $hexpasswd" >> "$pwfile"
-	[ -n "$authgroup" ] && echo "IPSec ID $authgroup" >> "$pwfile"
-	[ -n "$username" ] && echo "Xauth username $username" >> "$pwfile"
-	[ -n "$password" ] && echo "Xauth password $password" >> "$pwfile"
-	[ -n "$passgroup" ] && echo "IPSec secret $passgroup" >> "$pwfile"
-	[ -n "$hexpassgroup" ] && echo "IPSec obfuscated secret $hexpassgroup" >> "$pwfile"
-	[ -n "$domain" ] && echo "Domain $domain" >> "$pwfile"
-	[ -n "$vendor" ] && echo "Vendor $vendor" >> "$pwfile"
-	[ -n "$natt_mode" ] && echo "NAT Traversal Mode $natt_mode" >> "$pwfile"
-	[ -n "$dh_group" ] && echo "IKE DH Group $dh_group" >> "$pwfile"
-	[ -n "$pfs" ] && echo "Perfect Forward Secrecy $pfs" >> "$pwfile"
-	[ "${enable_single_des:-0}" -gt 0 ] && echo "Enable Single DES" >> "$pwfile"
-	[ "${enable_no_enc:-0}" -gt 0 ] && echo "Enable no encryption" >> "$pwfile"
-	[ -n "$mtu" ] && echo "Interface MTU $mtu" >> "$pwfile"
-	[ -n "$local_addr" ] && echo "Local Addr $local_addr" >> "$pwfile"
-	[ -n "$local_port" ] && echo "Local Port $local_port" >> "$pwfile"
-	[ -n "$udp_port" ] && echo "Cisco UDP Encapsulation Port $udp_port" >> "$pwfile"
-	[ -n "$dpd_idle" ] && echo "DPD idle timeout (our side) $dpd_idle" >> "$pwfile"
-	[ -n "$auth_mode" ] && echo "IKE Authmode $auth_mode" >> "$pwfile"
-	[ -n "$target_network" ] && echo "IPSEC target network $target_network" >> "$pwfile"
-
-	proto_export INTERFACE="$config"
-	logger -t vpnc "executing 'vpnc $cmdline'"
-	proto_run_command "$config" /usr/sbin/vpnc $cmdline
-}
-
-proto_vpnc_teardown() {
-	local config="$1"
-
-	pwfile="/var/etc/vpnc-$config.conf"
-
-	rm -f $pwfile
-	logger -t vpnc "bringing down vpnc"
-	proto_kill_command "$config" 2
-}
-
-add_protocol vpnc
diff --git a/trunk/package/feeds/packages/vpnc/files/vpnc.upgrade b/trunk/package/feeds/packages/vpnc/files/vpnc.upgrade
deleted file mode 100644
index 585513dc..00000000
--- a/trunk/package/feeds/packages/vpnc/files/vpnc.upgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/vpnc/ca-vpn-*.pem
-
diff --git a/trunk/package/feeds/packages/vpnc/patches/001-cross.patch b/trunk/package/feeds/packages/vpnc/patches/001-cross.patch
deleted file mode 100644
index 94b382c3..00000000
--- a/trunk/package/feeds/packages/vpnc/patches/001-cross.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@
- # $Id$
- 
- DESTDIR=
--PREFIX=/usr/local
-+PREFIX=/usr
- ETCDIR=/etc/vpnc
- BINDIR=$(PREFIX)/bin
- SBINDIR=$(PREFIX)/sbin
-@@ -57,18 +57,15 @@
- CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS)))
- BINOBJS = $(addsuffix .o,$(BINS))
- BINSRCS = $(addsuffix .c,$(BINS))
--VERSION := $(shell sh mk-version)
- RELEASE_VERSION := $(shell cat VERSION)
- 
- CC ?= gcc
--CFLAGS ?= -O3 -g
- CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
--CFLAGS +=  $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
-+CFLAGS += -O3 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) $(CRYPTO_CFLAGS)
- CPPFLAGS += -DVERSION=\"$(VERSION)\"
--LDFLAGS ?= -g
--LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
-+LIBS += -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error $(CRYPTO_LDADD)
- 
--ifeq ($(shell uname -s), SunOS)
-+ifeq ($(OS), SunOS)
- LIBS += -lnsl -lresolv -lsocket
- endif
- ifneq (,$(findstring Apple,$(shell $(CC) --version)))
-@@ -82,7 +79,7 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- vpnc.8 : vpnc.8.template makeman.pl vpnc
--	./makeman.pl
-+	touch vpnc.8
- 
- cisco-decrypt : cisco-decrypt.o decrypt-utils.o
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/trunk/package/feeds/packages/vsftpd/Makefile b/trunk/package/feeds/packages/vsftpd/Makefile
deleted file mode 100644
index a5c55ad0..00000000
--- a/trunk/package/feeds/packages/vsftpd/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vsftpd
-PKG_VERSION:=3.0.2
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://security.appspot.com/downloads/
-PKG_MD5SUM:=8b00c749719089401315bd3c44dddbb2
-PKG_LICENSE:=GPLv2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vsftpd/Default
-  SUBMENU:=File Transfer
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A fast and secure FTP server
-  URL:=http://vsftpd.beasts.org/
-  MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
-endef
-
-
-define Package/vsftpd
-$(call Package/vsftpd/Default)
-  VARIANT:=notls
-  TITLE+= (no TLS)
-endef
-
-define Package/vsftpd-tls
-$(call Package/vsftpd/Default)
-  VARIANT:=tls
-  TITLE+= (TLS)
-  DEPENDS+=+libopenssl
-endef
-
-define Package/vsftpd/conffiles
-/etc/vsftpd.conf
-endef
-
-Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
-
-ifeq ($(BUILD_VARIANT),notls)
- define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		vsftpd
- endef
-endif
-
-ifeq ($(BUILD_VARIANT),tls)
- define Build/Compile
-	$(SED) 's/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(PKG_BUILD_DIR)/builddefs.h
-	$(SED) 's/-lcrypt -lnsl/-lcrypt -lnsl -lssl -lcrypto/' $(PKG_BUILD_DIR)/Makefile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		vsftpd
- endef
-endif
-
-define Package/vsftpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-Package/vsftpd-tls/install=$(Package/vsftpd/install)
-
-$(eval $(call BuildPackage,vsftpd))
-$(eval $(call BuildPackage,vsftpd-tls))
diff --git a/trunk/package/feeds/packages/vsftpd/files/vsftpd.conf b/trunk/package/feeds/packages/vsftpd/files/vsftpd.conf
deleted file mode 100644
index 7d46506e..00000000
--- a/trunk/package/feeds/packages/vsftpd/files/vsftpd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-background=YES
-listen=YES
-anonymous_enable=NO
-local_enable=YES
-write_enable=YES
-local_umask=022
-check_shell=NO
-#dirmessage_enable=YES
-#ftpd_banner=Welcome to blah FTP service.
-session_support=NO
-#syslog_enable=YES
-#userlist_enable=YES
-#userlist_deny=NO
-#userlist_file=/etc/vsftpd.users
-#xferlog_enable=YES
-#xferlog_file=/var/log/vsftpd.log
-#xferlog_std_format=YES
-###
-### TLS/SSL options
-### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/config/vsftpd_privkey.pem -out /etc/config/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt"
-#ssl_enable=YES
-#allow_anon_ssl=NO
-#force_local_data_ssl=NO
-#force_local_logins_ssl=NO
-#ssl_tlsv1=YES
-#ssl_sslv2=NO
-#ssl_sslv3=NO
-#rsa_cert_file=/etc/config/vsftpd_cert.pem
-#rsa_private_key_file=/etc/config/vsftpd_privkey.pem
-
diff --git a/trunk/package/feeds/packages/vsftpd/files/vsftpd.init b/trunk/package/feeds/packages/vsftpd/files/vsftpd.init
deleted file mode 100644
index ad3e23da..00000000
--- a/trunk/package/feeds/packages/vsftpd/files/vsftpd.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=50
-
-start() {
-	mkdir -m 0755 -p /var/run/vsftpd
-	service_start /usr/sbin/vsftpd
-}
-
-stop() {
-	service_stop /usr/sbin/vsftpd
-}
diff --git a/trunk/package/feeds/packages/vsftpd/patches/001-destdir.patch b/trunk/package/feeds/packages/vsftpd/patches/001-destdir.patch
deleted file mode 100644
index 70d95927..00000000
--- a/trunk/package/feeds/packages/vsftpd/patches/001-destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -22,6 +22,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
-     seccompsandbox.o
- 
- 
-+DESTDIR =
-+
- .c.o:
- 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
- 
-@@ -29,21 +31,20 @@ vsftpd: $(OBJS) 
- 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
- 
- install:
--	if [ -x /usr/local/sbin ]; then \
--		$(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
--	else \
--		$(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
--	if [ -x /usr/local/man ]; then \
--		$(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
--	elif [ -x /usr/share/man ]; then \
--		$(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
--	else \
--		$(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
--		$(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
--	if [ -x /etc/xinetd.d ]; then \
--		$(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
-+	mkdir -p $(DESTDIR)/usr/sbin
-+	$(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/
-+	mkdir -p $(DESTDIR)/usr/share/man/man8
-+	$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/
-+	mkdir -p $(DESTDIR)/usr/share/man/man5
-+	$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/
-+	mkdir -p $(DESTDIR)/etc/xinetd.d
-+	$(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/
-+
-+uninstall:
-+	rm -f $(DESTDIR)/usr/sbin/vsftpd
-+	rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8
-+	rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5
-+	rm -f $(DESTDIR)/etc/xinetd.d/vsftpd
- 
- clean:
- 	rm -f *.o *.swp vsftpd
diff --git a/trunk/package/feeds/packages/vsftpd/patches/002-find_libs.patch b/trunk/package/feeds/packages/vsftpd/patches/002-find_libs.patch
deleted file mode 100644
index daf83efa..00000000
--- a/trunk/package/feeds/packages/vsftpd/patches/002-find_libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -8,8 +8,8 @@ CFLAGS	=	-O2 -fPIE -fstack-protector --p
- 	-D_FORTIFY_SOURCE=2 \
- 	#-pedantic -Wconversion
- 
--LIBS	=	`./vsf_findlibs.sh`
--LINK	=	-Wl,-s
-+LIBS	=	-lcrypt -lnsl
-+LINK	=
- LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
- 
- OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
diff --git a/trunk/package/feeds/packages/vsftpd/patches/003-chroot.patch b/trunk/package/feeds/packages/vsftpd/patches/003-chroot.patch
deleted file mode 100644
index 8965da41..00000000
--- a/trunk/package/feeds/packages/vsftpd/patches/003-chroot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tunables.c
-+++ b/tunables.c
-@@ -254,7 +254,7 @@ tunables_load_defaults()
-   /* -rw------- */
-   tunable_chown_upload_mode = 0600;
- 
--  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+  install_str_setting("/var/run/vsftpd", &tunable_secure_chroot_dir);
-   install_str_setting("ftp", &tunable_ftp_username);
-   install_str_setting("root", &tunable_chown_username);
-   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
diff --git a/trunk/package/feeds/packages/vsftpd/patches/004-disable-capabilities.patch b/trunk/package/feeds/packages/vsftpd/patches/004-disable-capabilities.patch
deleted file mode 100644
index 7aa6330b..00000000
--- a/trunk/package/feeds/packages/vsftpd/patches/004-disable-capabilities.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -165,6 +165,9 @@
- #endif
- /* END config */
- 
-+#undef VSF_SYSDEP_HAVE_CAPABILITIES
-+#undef VSF_SYSDEP_HAVE_LIBCAP
-+
- /* PAM support - we include our own dummy version if the system lacks this */
- #include <security/pam_appl.h>
- 
diff --git a/trunk/package/feeds/packages/vsftpd/patches/005-disable-pam.patch b/trunk/package/feeds/packages/vsftpd/patches/005-disable-pam.patch
deleted file mode 100644
index ebb72447..00000000
--- a/trunk/package/feeds/packages/vsftpd/patches/005-disable-pam.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/builddefs.h
-+++ b/builddefs.h
-@@ -2,7 +2,7 @@
- #define VSF_BUILDDEFS_H
- 
- #undef VSF_BUILD_TCPWRAPPERS
--#define VSF_BUILD_PAM
-+#undef VSF_BUILD_PAM
- #undef VSF_BUILD_SSL
- 
- #endif /* VSF_BUILDDEFS_H */
diff --git a/trunk/package/feeds/packages/watchcat/Makefile b/trunk/package/feeds/packages/watchcat/Makefile
deleted file mode 100644
index 74597944..00000000
--- a/trunk/package/feeds/packages/watchcat/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2010 segal.di.ubi.pt
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=watchcat
-PKG_VERSION:=1
-PKG_RELEASE:=5
-
-PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/watchcat
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Enable the configuration of programed reboots
-endef
-
-define Package/watchcat/description
-Allows to configure a periodically reboot, or after loosing internet connectivity. Configured trough UCI /etc/config/system.
-endef
-
-define Package/watchcat/conffiles
-/etc/config/system
-endef
-
-define Build/Compile
-endef
-
-define Package/watchcat/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/initd_watchcat $(1)/etc/init.d/watchcat
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/watchcat.sh $(1)/usr/bin/watchcat.sh
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/uci_defaults_watchcat $(1)/etc/uci-defaults/50-watchcat
-endef
-
-$(eval $(call BuildPackage,watchcat))
diff --git a/trunk/package/feeds/packages/watchcat/files/initd_watchcat b/trunk/package/feeds/packages/watchcat/files/initd_watchcat
deleted file mode 100644
index 36e353f5..00000000
--- a/trunk/package/feeds/packages/watchcat/files/initd_watchcat
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=97
-
-PIDFILE="/tmp/run/watchcat"
-
-append_string() {
-	local varname="$1"; local add="$2"; local separator="${3:- }"; local actual
-	eval "actual=\$$varname"
-
-	new="${actual:+$actual$separator}$add"
-	eval "$varname=\$new"
-}
-
-timetoseconds() {
-	local time=$1
-	unset seconds
-
-	{ [ "$time" -ge 1 ] 2> /dev/null && seconds="$time"; } || \
-	{ [ "${time%s}" -ge 1 ] 2> /dev/null && seconds="${time%s}"; } || \
-	{ [ "${time%m}" -ge 1 ] 2> /dev/null && seconds=$((${time%m}*60)); } || \
-	{ [ "${time%h}" -ge 1 ] 2> /dev/null && seconds=$((${time%h}*3600)); } || \
-	{ [ "${time%d}" -ge 1 ] 2> /dev/null && seconds=$((${time%d}*86400)); }
-}
-
-load_watchcat() {
-	config_get period	$1 period
-	config_get mode		$1 mode		"allways"
-	config_get pinghosts	$1 pinghosts	"8.8.8.8"
-	config_get pingperiod	$1 pingperiod
-	config_get forcedelay	$1 forcedelay	"0"
-
-	error=""
-
-	timetoseconds "$period"
-	period="$seconds"
-	[ "$period" -ge 1 ] \
-		|| append_string "error" 'period is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
-	[ "$mode" = "allways" -o "$mode" = "ping" ] \
-		|| append_string "error" "mode must be 'allways' or 'ping'" "; "
-	[ -n "$pinghosts" -o "$mode" = "allways" ] \
-		|| append_string "error" "pinghosts must be set when in 'ping' mode" "; "
-	[ "$mode" = "ping" ] && {
-		if [ -n "$pingperiod" ]
-		then
-			timetoseconds "$pingperiod"
-			pingperiod="$seconds"
-			if [ "$pingperiod" -ge 0 ]
-			then
-				[ "$pingperiod" -le "$period" ] \
-					|| append_string "error" "pingperiod must be less than period" "; "
-			else
-				append_string "error" 'pingperiod is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
-			fi
-		else
-			pingperiod="$((period/20))"
-		fi
-	}
-	[ "$pingperiod" -lt "$period" -o "$mode" = "allways" ] \
-		|| append_string "error" "pingperiod is not recognized" "; "
-	[ "$forcedelay" -ge 0 ] \
-		|| append_string "error" "forcedelay must be a integer greater or equal than 0, where 0 means disabled" "; "
-
-	[ -n "$error" ] && { logger -p user.err -t "watchcat" "reboot program $1 not started - $error"; return; }
-
-	if [ "$mode" = "allways" ]
-	then
-		/usr/bin/watchcat.sh "allways" "$period" "$forcedelay" &
-		logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;forcedelay=$forcedelay)" 
-	else
-		/usr/bin/watchcat.sh "period" "$period" "$forcedelay" "$pinghosts" "$pingperiod" &
-		logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;pinghosts=$pinghosts;pingperiod=$pingperiod;forcedelay=$forcedelay)" 
-	fi
-
-	echo $! >> "${PIDFILE}.pids"
-}
-
-stop() {
-	if [ -f "${PIDFILE}.pids" ]
-	then
-		logger -p user.info -t "watchcat" "stopping all tasks"
-
-		while read pid
-		do
-			kill "$pid"
-		done < "${PIDFILE}.pids"
-
-		rm "${PIDFILE}.pids"
-
-		logger -p user.info -t "watchcat" "all tasks stopped"
-	else
-		logger -p user.info -t "watchcat" "no tasks running"
-	fi
-}
-
-start() {
-	[ -f "${PIDFILE}.pids" ] && stop
-
-	config_load system
-	if [ -n "$(uci show system.@watchcat[0])" ] # at least one watchcat section exists
-	then
-		logger -p user.info -t "watchcat" "starting all tasks"
-		config_foreach load_watchcat watchcat
-		logger -p user.info -t "watchcat" "all tasks started"
-	else
-		logger -p user.info -t "watchcat" "no tasks defined"
-	fi
-}
diff --git a/trunk/package/feeds/packages/watchcat/files/uci_defaults_watchcat b/trunk/package/feeds/packages/watchcat/files/uci_defaults_watchcat
deleted file mode 100644
index 49def81e..00000000
--- a/trunk/package/feeds/packages/watchcat/files/uci_defaults_watchcat
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q show system.@watchcat[0] || {
-	uci add system watchcat
-	uci set system.@watchcat[0].period=6h
-	uci set system.@watchcat[0].mode=ping
-	uci set system.@watchcat[0].pinghosts=8.8.8.8
-	uci set system.@watchcat[0].forcedelay=30
-	uci commit
-}
diff --git a/trunk/package/feeds/packages/watchcat/files/watchcat.sh b/trunk/package/feeds/packages/watchcat/files/watchcat.sh
deleted file mode 100644
index 304ef27c..00000000
--- a/trunk/package/feeds/packages/watchcat/files/watchcat.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 segal.di.ubi.pt
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-mode="$1"
-
-shutdown_now() {
-	local forcedelay="$1"
-
-	reboot &
-
-	[ "$forcedelay" -ge 1 ] && {
-		sleep "$forcedelay"
-
-		echo b > /proc/sysrq-trigger # Will immediately reboot the system without syncing or unmounting your disks.
-	}
-}
-
-watchcat_allways() {
-	local period="$1"; local forcedelay="$2"
-
-	sleep "$period" && shutdown_now "$forcedelay"
-}
-
-watchcat_ping() {
-	local period="$1"; local forcedelay="$2"; local pinghosts="$3"; local pingperiod="$4"
-
-	time_now="$(cat /proc/uptime)"
-	time_now="${time_now%%.*}"
-	time_lastcheck="$time_now"
-	time_lastcheck_withinternet="$time_now"
-
-	while true
-	do
-		# account for the time ping took to return. With a ping time of 5s, ping might take more than that, so it is important to avoid even more delay.
-		time_now="$(cat /proc/uptime)"
-		time_now="${time_now%%.*}"
-		time_diff="$((time_now-time_lastcheck))"
-
-		[ "$time_diff" -lt "$pingperiod" ] && {
-			sleep_time="$((pingperiod-time_diff))"
-			sleep "$sleep_time"
-		}
-
-		time_now="$(cat /proc/uptime)"
-		time_now="${time_now%%.*}"
-		time_lastcheck="$time_now"
-
-		for host in "$pinghosts"
-		do
-			if ping -c 1 "$host" &> /dev/null
-			then
-				time_lastcheck_withinternet="$time_now"
-			else
-				time_diff="$((time_now-time_lastcheck_withinternet))"
-				logger -p daemon.info -t "watchcat[$$]" "no internet connectivity for $time_diff seconds. Reseting when reaching $period"
-			fi
-		done
-
-		time_diff="$((time_now-time_lastcheck_withinternet))"
-		[ "$time_diff" -ge "$period" ] && shutdown_now "$forcedelay"
-
-	done
-}
-
-	if [ "$mode" = "allways" ]
-	then
-		watchcat_allways "$2" "$3"
-	else
-		watchcat_ping "$2" "$3" "$4" "$5"
-	fi
diff --git a/trunk/package/feeds/packages/wavemon/Makefile b/trunk/package/feeds/packages/wavemon/Makefile
deleted file mode 100644
index feb197df..00000000
--- a/trunk/package/feeds/packages/wavemon/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2008-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wavemon
-PKG_VERSION:=0.7.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/uoaerg/wavemon/archive
-PKG_MD5SUM:=cd0049f174745d32b4fdf3b63d897bad
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wavemon
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=N-curses based wireless network devices monitor
-  DEPENDS:=+libncurses +libpthread
-  SUBMENU:=wireless
-  URL:=https://github.com/uoaerg/wavemon/releases
-endef
-
-define Package/wavemon/description
-  wavemon is a ncurses-based monitoring application for wireless network
-  devices. It currently works under Linux with devices that are supported
-  by the wireless extensions by Jean Tourrilhes (included in Kernel 2.4
-  and higher), e.g. the Lucent Orinoco cards.
-endef
-
-CONFIGURE_VARS += \
-	ac_cv_lib_cap_cap_get_flag=no
-
-TARGET_CFLAGS += -pthread
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include"
-
-define Package/wavemon/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wavemon $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,wavemon))
diff --git a/trunk/package/feeds/packages/wget/Makefile b/trunk/package/feeds/packages/wget/Makefile
deleted file mode 100644
index a146a01e..00000000
--- a/trunk/package/feeds/packages/wget/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wget
-PKG_VERSION:=1.16.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_MD5SUM:=d2e4455781a70140ae83b54ca594ce21
-PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wget/Default
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcre
-  SUBMENU:=File Transfer
-  TITLE:=Non-interactive network downloader
-  URL:=http://www.gnu.org/software/wget/index.html
-endef
-
-define Package/wget/Default/description
- Wget is a network utility to retrieve files from the Web using http
- and ftp, the two most widely used Internet protocols. It works
- non-interactively, so it will work in the background, after having
- logged off. The program supports recursive retrieval of web-authoring
- pages as well as ftp sites -- you can use wget to make mirrors of
- archives and home pages or to travel the Web like a WWW robot.
-endef
-
-define Package/wget
-$(call Package/wget/Default)
-  DEPENDS+= +libopenssl +librt
-  TITLE+= (with SSL support)
-  VARIANT:=ssl
-endef
-
-define Package/wget/description
-$(call Package/wget/Default/description)
- This package is built with SSL support.
-endef
-
-define Package/wget-nossl
-$(call Package/wget/Default)
-  TITLE+= (without SSL support)
-  DEPENDS+= +zlib
-  VARIANT:=nossl
-endef
-
-define Package/wget-nossl/description
-$(call Package/wget/Default/description)
- This package is built without SSL support.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-rpath \
-	--disable-iri \
-	--without-libuuid
-
-CONFIGURE_VARS += \
-	ac_cv_header_uuid_uuid_h=no
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS+= \
-		--with-ssl=openssl \
-		--with-libssl-prefix="$(STAGING_DIR)/usr"
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
-	CONFIGURE_ARGS+= \
-		--disable-ntlm \
-		--without-ssl
-endif
-
-define Package/wget/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl
-endef
-
-define Package/wget-nossl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl
-endef
-
-define Package/wget/postinst
-#!/bin/sh
-if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then
-  rm -rf $${IPKG_INSTROOT}/usr/bin/wget;
-fi
-ln -sf ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget
-endef
-
-define Package/wget/postrm
-#!/bin/sh
-rm $${IPKG_INSTROOT}/usr/bin/wget
-[ -x $${IPKG_INSTROOT}/usr/bin/wget-nossl ] && ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget || {
-  ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget
-  $${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget
-}
-exit 0
-endef
-
-define Package/wget-nossl/postinst
-#!/bin/sh
-if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then
-  rm -rf $${IPKG_INSTROOT}/usr/bin/wget;
-fi
-ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget
-endef
-
-define Package/wget-nossl/postrm
-#!/bin/sh
-rm $${IPKG_INSTROOT}/usr/bin/wget
-[ -x $${IPKG_INSTROOT}/usr/bin/wget-ssl ] && ln -s ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget || {
-  ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget
-  $${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget
-}
-exit 0
-endef
-
-$(eval $(call BuildPackage,wget))
-$(eval $(call BuildPackage,wget-nossl))
diff --git a/trunk/package/feeds/packages/wifitoggle/Makefile b/trunk/package/feeds/packages/wifitoggle/Makefile
deleted file mode 100644
index 182f1db7..00000000
--- a/trunk/package/feeds/packages/wifitoggle/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-# Copyright (C) 2010 segal.di.ubi.pt
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wifitoggle
-PKG_VERSION:=1
-PKG_RELEASE:=4
-PKG_LICENSE:=GPL-2.0+
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wifitoggle
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Script to toggle Wi-Fi with a button and UCI config
-endef
-
-define Package/wifitoggle/description
-Very versatile script to toggle Wi-Fi with a button. Allows to set
-timeouts, persist changes after boot, and set LEDs according to the state.
-endef
-
-define Package/wifitoggle/conffiles
-/etc/config/wifitoggle
-endef
-
-define Build/Compile
-endef
-
-define Package/wifitoggle/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
-	$(INSTALL_BIN) ./files/wifitoggle.hotplug $(1)/etc/hotplug.d/button/50-wifitoggle
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/wifitoggle.config $(1)/etc/config/wifitoggle
-endef
-
-$(eval $(call BuildPackage,wifitoggle))
diff --git a/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.config b/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.config
deleted file mode 100755
index f3bec29a..00000000
--- a/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.config
+++ /dev/null
@@ -1,11 +0,0 @@
-config wifitoggle
-	option button	'wps'
-
-	option persistent	'0' 
-	option timer		'600'
-
-	option led_sysfs		'wrt160nl:amber:wps'
-	option led_enable_trigger	'timer' 
-	option led_enable_delayon	'500'
-	option led_enable_delayoff	'500'
-	option led_disable_default	'0'
diff --git a/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.hotplug b/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.hotplug
deleted file mode 100755
index d66db3f0..00000000
--- a/trunk/package/feeds/packages/wifitoggle/files/wifitoggle.hotplug
+++ /dev/null
@@ -1,172 +0,0 @@
-# /bin/sh
-
-setled() {
-        if [ -e /sys/class/leds/${led_sysfs}/brightness ]
-	then
-                [ $led_default -eq 1 ] && echo 1 >/sys/class/leds/${led_sysfs}/brightness
-                [ $led_default -eq 1 ] || echo 0 >/sys/class/leds/${led_sysfs}/brightness
-
-                echo $led_trigger > /sys/class/leds/${led_sysfs}/trigger
-
-                [ "$led_trigger" == "netdev" -a -n "$led_dev" ] && {
-                        echo $led_dev > /sys/class/leds/${led_sysfs}/device_name
-                        echo $led_mode > /sys/class/leds/${led_sysfs}/mode
-                }
-
-                [ "$led_trigger" == "timer" ] && {
-                        [ -n "$led_delayon" ] && echo $led_delayon > /sys/class/leds/${led_sysfs}/delay_on
-                        [ -n "$led_delayoff" ] && echo $led_delayoff > /sys/class/leds/${led_sysfs}/delay_off
-                }
-        else
-		logger -p user.err -t "wifitoggle" "led: ${led_sysfs} not found"
-	fi
-}
-
-load_wireless() {
-	disabled="$(uci get wireless.${1}.disabled)"
-}
-
-save_wireless() {
-	[ "$device" = "all" -o "$device" = "${1}" ] && {
-		uci set "wireless.${1}.disabled=$disabled"
-	}
-}
-
-setwifi() {
-        setled
-
-        config_load wireless
-        config_foreach save_wireless wifi-device
-
-        if ubus list network.wireless >/dev/null 2>/dev/null; then
-                ubus call network reload
-        else
-                wifi
-        fi
-}
-
-
-save_system() {
-        config_get sysfs $1 sysfs
-        [ "$sysfs" = "$led_sysfs" ] && {
-                uci set "system.${1}.trigger=$led_trigger"
-                uci set "system.${1}.dev=$led_dev"
-                uci set "system.${1}.mode=$led_mode"
-                uci set "system.${1}.default=$led_default"
-                uci set "system.${1}.delayon=$led_delayon"
-                uci set "system.${1}.delayoff=$led_delayoff"
-
-                ledset=1
-        }
-}
-
-commit_changes() {
-        ledset=""
-
-        config_load system
-        config_foreach save_system led
-
-        [ "$ledset" -eq 1 ] || {
-                section=$(uci add system led)
-                uci set "system.${section}.sysfs=$led_sysfs"
-                uci set "system.${section}.trigger=$led_trigger"
-                uci set "system.${section}.dev=$led_dev"
-                uci set "system.${section}.mode=$led_mode"
-                uci set "system.${section}.default=$led_default"
-                uci set "system.${section}.delayon=$led_delayon"
-                uci set "system.${section}.delayoff=$led_delayoff"
-        }
-
-        uci commit
-}
-
-enable() {
-
-	led_trigger="$led_enable_trigger"
-	led_trigger="$led_enable_trigger"
-	led_dev="$led_enable_dev"
-	led_mode="$led_enable_mode"
-	led_default="$led_enable_default"
-	led_delayon="$led_enable_delayon"
-	led_delayoff="$led_enable_delayoff"
-	disabled=0
-	
-	setwifi
-
-	[ "$timer" -le 0 -a "$persistent" -eq 1 ] && commit_changes
-	
-	logger -p user.info -t "wifitoggle" "device($device) enabled"
-
-	[ "$timer" -gt 0 ] && {
-		sleep "$timer" && disable && rm /tmp/run/wirelesstoggle_${1}.pid &
-                echo $! > /tmp/run/wirelesstoggle_${1}.pid
-		logger -p user.info -t "wifitoggle" "auto-disable timer started($timer seconds)"
-	}
-}
-
-disable() {
-
-	led_trigger="$led_disable_trigger"
-	led_trigger="$led_disable_trigger"
-	led_dev="$led_disable_dev"
-	led_mode="$led_disable_mode"
-	led_default="$led_disable_default"
-	led_delayon="$led_disable_delayon"
-	led_delayoff="$led_disable_delayoff"
-	disabled=1
-
-	setwifi
-
-	[ "$timer" -le 0 -a "$persistent" -eq 1 ] && commit_changes
-	
-	logger -p user.info -t "wifitoggle" "device($device) disabled"
-}
-
-
-load_wifitoggle() {
-	config_get device $1 device "all"
-        config_get button $1 button "wps"
-        config_get action $1 action "pressed"
-        config_get_bool persistent $1 persistent "0"
-        config_get timer $1 timer "0"
-
-        config_get led_sysfs $1 led_sysfs
-
-	config_get led_enable_trigger $1 led_enable_trigger "none"
-	config_get led_enable_dev $1 led_enable_dev
-	config_get led_enable_mode $1 led_enable_mode "link"
-	config_get_bool led_enable_default $1 led_enable_default "1"
-	config_get led_enable_delayon $1 led_enable_delayon
-	config_get led_enable_delayoff $1 led_enable_delayoff
-
-	config_get led_disable_trigger $1 led_disable_trigger "none"
-	config_get led_disable_dev $1 led_disable_dev
-	config_get led_disable_mode $1 led_disable_mode "link"
-	config_get_bool led_disable_default $1 led_disable_default "0"
-	config_get led_disable_delayon $1 led_disable_delayon
-	config_get led_disable_delayoff $1 led_disable_delayoff
-
-        [ "$ACTION" = "$action" -a "$BUTTON" = "$button" ] && {
-
-		[ -f /tmp/run/wirelesstoggle_${1}.pid ] && read PID < /tmp/run/wirelesstoggle_${1}.pid && kill $PID && rm /tmp/run/wirelesstoggle_${1}.pid
-
-		if [ "$device" = "all" ]
-		then
-			config_load wireless
-        		config_foreach load_wireless wifi-device
-		else
-			disabled="$(uci get wireless."$device".disabled)"
-		fi
-
-
-		if [ "$disabled" = "1" ] 
-		then
-			enable $1
-		else
-			disable
-		fi
-        }
-}
-
-config_load wifitoggle
-config_foreach load_wifitoggle wifitoggle
diff --git a/trunk/package/feeds/packages/wshaper/Makefile b/trunk/package/feeds/packages/wshaper/Makefile
deleted file mode 100644
index 65b4045b..00000000
--- a/trunk/package/feeds/packages/wshaper/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wshaper
-PKG_VERSION:=1.1a
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wshaper
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-sched +tc
-  TITLE:=wshaper
-  URL:=http://lartc.org/wondershaper/
-  PKGARCH:=all
-endef
-
-define Package/wshaper/description
- A script to do traffing shaping with the HTB algorithm.
- Wshaper attempts to:
- * Maintain low latency for interfactive traffic at all times
- * Allow 'surfing' at reasonable speeds while up or downloading
- * Make sure uploads don't harm downloads, and the other way around
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/wshaper/install
-	$(INSTALL_DIR) $(1)/usr/sbin/ $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) ./files/wshaper.htb $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/wshaper.init $(1)/etc/init.d/wshaper
-	$(INSTALL_BIN) ./files/wshaper.iface $(1)/etc/hotplug.d/iface/10-wshaper
-	$(INSTALL_DATA) ./files/wshaper.config $(1)/etc/config/wshaper
-endef
-
-define Package/wshaper/conffiles
-/etc/config/wshaper
-endef
-
-$(eval $(call BuildPackage,wshaper))
diff --git a/trunk/package/feeds/packages/wshaper/files/wshaper.config b/trunk/package/feeds/packages/wshaper/files/wshaper.config
deleted file mode 100644
index ed857c52..00000000
--- a/trunk/package/feeds/packages/wshaper/files/wshaper.config
+++ /dev/null
@@ -1,4 +0,0 @@
-config 'wshaper' 'settings'
-	option 'network' 'wan'
-	option 'downlink' '2000'
-	option 'uplink' '240'
diff --git a/trunk/package/feeds/packages/wshaper/files/wshaper.htb b/trunk/package/feeds/packages/wshaper/files/wshaper.htb
deleted file mode 100755
index 4b63eeeb..00000000
--- a/trunk/package/feeds/packages/wshaper/files/wshaper.htb
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-# Wonder Shaper
-# please read the README before filling out these values 
-#
-# Set the following values to somewhat less than your actual download
-# and uplink speed. In kilobits. Also set the device that is to be shaped.
-
-# All config needs to be done in /etc/config/wshaper
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-
-config_load wshaper
-for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do
-	config_get $s settings $s
-done
-
-if ! network_get_device device "$network"; then
-	logger -t wondershaper "Error: Could not find the device for network $network, aborting."
-	exit 1
-fi
-
-[ -z "$downlink" ] && logger -t wondershaper "Error: Downlink speed not set, aborting." && exit 1
-[ -z "$uplink" ] && logger -t wondershaper "Error: Uplink speed not set, aborting." && exit 1
-
-MODULES='sch_ingress sch_sfq sch_htb cls_u32 act_police'
-DOWNLINK="$downlink"
-UPLINK="$uplink"
-DEV="$device"
-
-# low priority OUTGOING traffic - you can leave this blank if you want
-# low priority source netmasks
-NOPRIOHOSTSRC="$nopriohostsrc"
-
-# low priority destination netmasks
-NOPRIOHOSTDST="$nopriohostdst"
-
-# low priority source ports
-NOPRIOPORTSRC="$noprioportsrc"
-
-# low priority destination ports
-NOPRIOPORTDST="$noprioportdst"
-
-if [ "$1" = "status" ]
-then
-	tc -s qdisc ls dev $DEV
-	tc -s class ls dev $DEV
-	exit
-fi
-
-
-# clean existing down- and uplink qdiscs, hide errors
-tc qdisc del dev $DEV root    2> /dev/null > /dev/null
-tc qdisc del dev $DEV ingress 2> /dev/null > /dev/null
-
-if [ "$1" = "stop" ] 
-then 
-	for i in $MODULES ; do
-		rmmod $i
-	done
-	exit
-fi
-
-for i in $MODULES ; do
-        insmod $i
-done
-
-###### uplink
-
-# install root HTB, point default traffic to 1:20:
-
-tc qdisc add dev $DEV root handle 1: htb default 20
-
-# shape everything at $UPLINK speed - this prevents huge queues in your
-# DSL modem which destroy latency:
-
-tc class add dev $DEV parent 1: classid 1:1 htb rate ${UPLINK}kbit burst 6k
-
-# high prio class 1:10:
-
-tc class add dev $DEV parent 1:1 classid 1:10 htb rate ${UPLINK}kbit \
-   burst 6k prio 1
-
-# bulk & default class 1:20 - gets slightly less traffic, 
-# and a lower priority:
-
-tc class add dev $DEV parent 1:1 classid 1:20 htb rate $((9*$UPLINK/10))kbit \
-   burst 6k prio 2
-
-tc class add dev $DEV parent 1:1 classid 1:30 htb rate $((8*$UPLINK/10))kbit \
-   burst 6k prio 2
-
-# all get Stochastic Fairness:
-tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10
-tc qdisc add dev $DEV parent 1:20 handle 20: sfq perturb 10
-tc qdisc add dev $DEV parent 1:30 handle 30: sfq perturb 10
-
-# TOS Minimum Delay (ssh, NOT scp) in 1:10:
-
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-      match ip tos 0x10 0xff  flowid 1:10
-
-# ICMP (ip protocol 1) in the interactive class 1:10 so we 
-# can do measurements & impress our friends:
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-        match ip protocol 1 0xff flowid 1:10
-
-# To speed up downloads while an upload is going on, put ACK packets in
-# the interactive class:
-
-tc filter add dev $DEV parent 1: protocol ip prio 10 u32 \
-   match ip protocol 6 0xff \
-   match u8 0x05 0x0f at 0 \
-   match u16 0x0000 0xffc0 at 2 \
-   match u8 0x10 0xff at 33 \
-   flowid 1:10
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
-# some traffic however suffers a worse fate
-for a in $NOPRIOPORTDST
-do
-	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \
-	   match ip dport $a 0xffff flowid 1:30
-done
-
-for a in $NOPRIOPORTSRC
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \
-	   match ip sport $a 0xffff flowid 1:30
-done
-
-for a in $NOPRIOHOSTSRC
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 16 u32 \
-	   match ip src $a flowid 1:30
-done
-
-for a in $NOPRIOHOSTDST
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 17 u32 \
-	   match ip dst $a flowid 1:30
-done
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
-tc filter add dev $DEV parent 1: protocol ip prio 18 u32 \
-   match ip dst 0.0.0.0/0 flowid 1:20
-
-
-########## downlink #############
-# slow downloads down to somewhat less than the real speed  to prevent 
-# queuing at our ISP. Tune to see how high you can set it.
-# ISPs tend to have *huge* queues to make sure big downloads are fast
-#
-# attach ingress policer:
-
-tc qdisc add dev $DEV handle ffff: ingress
-
-# filter *everything* to it (0.0.0.0/0), drop everything that's
-# coming in too fast:
-
-tc filter add dev $DEV parent ffff: protocol ip prio 50 u32 match ip src \
-   0.0.0.0/0 police rate ${DOWNLINK}kbit burst 10k drop flowid :1
-
-logger -t wondershaper "Wondershaper was started on device $device."
diff --git a/trunk/package/feeds/packages/wshaper/files/wshaper.iface b/trunk/package/feeds/packages/wshaper/files/wshaper.iface
deleted file mode 100644
index 2964005d..00000000
--- a/trunk/package/feeds/packages/wshaper/files/wshaper.iface
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = ifup ] && /etc/init.d/wshaper enabled && /etc/init.d/wshaper start || exit 0
diff --git a/trunk/package/feeds/packages/wshaper/files/wshaper.init b/trunk/package/feeds/packages/wshaper/files/wshaper.init
deleted file mode 100644
index 638cef24..00000000
--- a/trunk/package/feeds/packages/wshaper/files/wshaper.init
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=45
-start() {
-	wshaper.htb
-}
-
-stop() {
-	wshaper.htb stop
-}
diff --git a/trunk/package/feeds/packages/xinetd/Makefile b/trunk/package/feeds/packages/xinetd/Makefile
deleted file mode 100644
index 65c5368c..00000000
--- a/trunk/package/feeds/packages/xinetd/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xinetd
-PKG_VERSION:=2.3.15
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.xinetd.org
-PKG_MD5SUM:=77358478fd58efa6366accae99b8b04c
-PKG_LICENSE:=xinetd
-PKG_LICENSE_FILES:=COPYRIGHT
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xinetd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A powerful and secure super-server
-  URL:=http://www.xinetd.org/
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-endef
-
-define Package/xinetd/description
-	xinetd has access control mechanisms, extensive logging capabilities,
-	the ability to make services available based on time, can place limits
-	on the number of servers that can be started, and has deployable
-	defence mechanisms to protect against port scanners, among other
-	things.
-endef
-
-define Package/xinetd/conffiles
-/etc/xinetd.conf
-endef
-
-TARGET_CFLAGS += -DNO_RPC
-
-CONFIGURE_ARGS += \
-	--without-libwrap \
-	--with-loadavg
-
-CONFIGURE_VARS += \
-	ac_cv_header_rpc_pmap_clnt_h=no \
-	ac_cv_header_rpc_rpc_h=no \
-	ac_cv_header_rpc_rpcent_h=no
-
-define Package/xinetd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/xinetd.conf $(1)/etc/xinetd.conf
-	$(INSTALL_DIR) $(1)/etc/xinetd.d
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/xinetd.init $(1)/etc/init.d/xinetd
-endef
-
-$(eval $(call BuildPackage,xinetd))
diff --git a/trunk/package/feeds/packages/xinetd/files/xinetd.conf b/trunk/package/feeds/packages/xinetd/files/xinetd.conf
deleted file mode 100644
index bd473ed3..00000000
--- a/trunk/package/feeds/packages/xinetd/files/xinetd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-defaults
-{
-
-}
-
-includedir /etc/xinetd.d
diff --git a/trunk/package/feeds/packages/xinetd/files/xinetd.init b/trunk/package/feeds/packages/xinetd/files/xinetd.init
deleted file mode 100644
index 1437f587..00000000
--- a/trunk/package/feeds/packages/xinetd/files/xinetd.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=50
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/sbin/xinetd -pidfile /var/run/xinetd.pid
-}
-
-stop() {
-	service_stop /usr/sbin/xinetd
-}
-
diff --git a/trunk/package/feeds/packages/xinetd/patches/001-ar.patch b/trunk/package/feeds/packages/xinetd/patches/001-ar.patch
deleted file mode 100644
index 4d961ba2..00000000
--- a/trunk/package/feeds/packages/xinetd/patches/001-ar.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/libs/src/misc/Makefile.in
-+++ b/libs/src/misc/Makefile.in
-@@ -62,7 +62,7 @@ libopt: clean
- 
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
---- a/libs/src/portable/Makefile.in
-+++ b/libs/src/portable/Makefile.in
-@@ -57,7 +57,7 @@ libopt: clean
- 
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
---- a/libs/src/pset/Makefile.in
-+++ b/libs/src/pset/Makefile.in
-@@ -53,7 +53,7 @@ libopt: clean
- 	mv $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
---- a/libs/src/sio/Makefile.in
-+++ b/libs/src/sio/Makefile.in
-@@ -52,7 +52,7 @@ libopt: clean
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
---- a/libs/src/str/Makefile.in
-+++ b/libs/src/str/Makefile.in
-@@ -63,7 +63,7 @@ libopt: clean
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- LINT_IGNORE=possible pointer alignment|RCSid unused
---- a/libs/src/xlog/Makefile.in
-+++ b/libs/src/xlog/Makefile.in
-@@ -58,7 +58,7 @@ libopt: clean
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
diff --git a/trunk/package/feeds/packages/xinetd/patches/002-destdir.patch b/trunk/package/feeds/packages/xinetd/patches/002-destdir.patch
deleted file mode 100644
index 89075c89..00000000
--- a/trunk/package/feeds/packages/xinetd/patches/002-destdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
- 
- install: build
- 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
--	   test -d $$i || mkdir -p $$i ; done
--	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
-+	   test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
-+	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
- 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
- 	@echo "There is a sample config file in xinetd/sample.conf and you can"
- 	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
diff --git a/trunk/package/feeds/packages/xinetd/patches/003-rpc_fix.patch b/trunk/package/feeds/packages/xinetd/patches/003-rpc_fix.patch
deleted file mode 100644
index 11f47e72..00000000
--- a/trunk/package/feeds/packages/xinetd/patches/003-rpc_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/xinetd/confparse.c
-+++ b/xinetd/confparse.c
-@@ -745,7 +745,7 @@ static status_e check_entry( struct serv
- 	   }
-    }
- 
--/* #ifndef NO_RPC */
-+#ifndef NO_RPC
- #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
-    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
-    {
-@@ -759,6 +759,7 @@ static status_e check_entry( struct serv
-       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
-    }
-    else
-+#endif
- #endif   /* ! NO_RPC */
-    {
-        if ( !SC_IS_UNLISTED( scp ) ) 
diff --git a/trunk/package/feeds/packages/xinetd/patches/004-ident-bind.patch b/trunk/package/feeds/packages/xinetd/patches/004-ident-bind.patch
deleted file mode 100644
index ddabab8a..00000000
--- a/trunk/package/feeds/packages/xinetd/patches/004-ident-bind.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-xinetd: socket bind: Invalid argument (errno = 22) when using USERID on ipv6
-
-Use right size of addresses in bind() call. Also use getpeername addresses when
-connecting to ident service to prevent address family mismatch between socket(),
-bind() and connect() calls.
-
-Author: Jan Safranek <jsafrane@redhat.com>
-Reviewed-By: Adam Tkac <atkac@redhat.com>
-
-#diff -up xinetd-2.3.14/xinetd/ident.c.orig xinetd-2.3.14/xinetd/ident.c
---- a/xinetd/ident.c
-+++ b/xinetd/ident.c
-@@ -97,7 +98,13 @@ idresult_e log_remote_user( const struct
-    }
- 
-    CLEAR( sin_contact );
--   sin_remote = *CONN_XADDRESS( SERVER_CONNECTION( serp ) ) ;
-+
-+   sin_len = sizeof( sin_remote );
-+   if ( getpeername( SERVER_FD( serp ), &sin_remote.sa, &sin_len ) == -1 )
-+   {
-+      msg( LOG_ERR, func, "(%d) getpeername: %m", getpid() ) ;
-+      return( IDR_ERROR ) ;
-+   }
-    sin_contact = sin_remote;
-    memcpy( &sin_bind, &sin_local, sizeof(sin_bind) ) ;
-    local_port = 0;
-@@ -121,7 +128,13 @@ idresult_e log_remote_user( const struct
-       msg( LOG_ERR, func, "socket creation: %m" ) ;
-       return( IDR_ERROR ) ;
-    }
--   if ( bind(sd, &sin_bind.sa, sizeof(sin_bind.sa)) == -1 )
-+
-+   if ( sin_bind.sa.sa_family == AF_INET ) 
-+      sin_len = sizeof( sin_bind.sa_in ) ;
-+   else
-+      sin_len = sizeof( sin_bind.sa_in6 ) ;
-+
-+   if ( bind(sd, &sin_bind.sa, sin_len) == -1 )
-    { 
-       msg( LOG_ERR, func, "socket bind: %m" ) ;
-       (void) Sclose( sd ) ;
diff --git a/trunk/package/feeds/packages/xl2tpd/Makefile b/trunk/package/feeds/packages/xl2tpd/Makefile
deleted file mode 100644
index 2a1c4a5d..00000000
--- a/trunk/package/feeds/packages/xl2tpd/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xl2tpd
-PKG_VERSION:=1.3.6
-PKG_RELEASE:=1
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/xelerance/xl2tpd.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5619e1771048e74b729804e8602f409af0f3faea
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xl2tpd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
-  URL:=http://www.xelerance.com/software/xl2tpd/
-  SUBMENU:=VPN
-  DEPENDS:=+ppp-mod-pppol2tp +ip +resolveip
-endef
-
-define Package/xl2tpd/description
-l2tpd is the open source implementation of the L2TP tunneling protocol (RFC2661).
-It does implement both LAC and LNS role in a L2TP networking architecture. The
-main goal of this protocol is to tunnel PPP frame trough an IP network.
-endef
-
-# XXX: CFLAGS are already set by Build/Compile/Default
-MAKE_FLAGS+= \
-	OFLAGS=""
-
-define Package/xl2tpd/conffiles
-/etc/xl2tpd/xl2tpd.conf
-/etc/xl2tpd/xl2tp-secrets
-/etc/ppp/options.xl2tpd
-endef
-
-define Package/xl2tpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/xl2tpd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/xl2tpd-control $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/xl2tpd.init $(1)/etc/init.d/xl2tpd
-
-	$(INSTALL_DIR) $(1)/etc/xl2tpd
-	$(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/
-	$(INSTALL_CONF) ./files/xl2tp-secrets $(1)/etc/xl2tpd/
-
-	$(INSTALL_DIR) $(1)/etc/ppp
-	$(INSTALL_DATA) ./files/options.xl2tpd $(1)/etc/ppp/
-
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/netifd/proto
-endef
-
-$(eval $(call BuildPackage,xl2tpd))
diff --git a/trunk/package/feeds/packages/xl2tpd/README b/trunk/package/feeds/packages/xl2tpd/README
deleted file mode 100644
index aadc26e4..00000000
--- a/trunk/package/feeds/packages/xl2tpd/README
+++ /dev/null
@@ -1,23 +0,0 @@
-OpenWRT Package for xl2tpd
-
-xl2tpd is a development from the original l2tpd package originally written by
-Mark Spencer, subsequently forked by Scott Balmos and David Stipp, inherited
-by Jeff McAdams, modified substantially by Jacco de Leeuw and then forked 
-again by Xelerance (after it was abandoned by l2tpd.org).
-
-Rationale for inclusion in OpenWRT:
-
-l2tpd has some serious alignment problems on RISC platforms. It also runs 
-purely in userspace.
-
-Some of the features added in this fork include:
-
-1. IPSec SA reference tracking inconjunction with openswan's IPSec transport
-   mode, which adds support for multiple clients behind the same NAT router
-	 and multiple clients on the same internal IP behind different NAT routers.
-
-2. Support for the pppol2tp kernel mode L2TP.
-
-3. Alignment and endian problems resolved.
-
-hcg
diff --git a/trunk/package/feeds/packages/xl2tpd/files/l2tp.sh b/trunk/package/feeds/packages/xl2tpd/files/l2tp.sh
deleted file mode 100644
index 867234db..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/l2tp.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-[ -x /usr/sbin/xl2tpd ] || exit 0
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_l2tp_init_config() {
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "keepalive"
-	proto_config_add_string "pppd_options"
-	proto_config_add_boolean "ipv6"
-	proto_config_add_int "mtu"
-	proto_config_add_string "server"
-	available=1
-	no_device=1
-}
-
-proto_l2tp_setup() {
-	local config="$1"
-	local iface="$2"
-	local optfile="/tmp/l2tp/options.${config}"
-
-	local ip serv_addr server
-	json_get_var server server && {
-		for ip in $(resolveip -t 5 "$server"); do
-			( proto_add_host_dependency "$config" "$ip" )
-			serv_addr=1
-		done
-	}
-	[ -n "$serv_addr" ] || {
-		echo "Could not resolve server address"
-		sleep 5
-		proto_setup_failed "$config"
-		exit 1
-	}
-
-	if [ ! -p /var/run/xl2tpd/l2tp-control ]; then
-		/etc/init.d/xl2tpd start
-	fi
-
-	json_get_vars ipv6 demand keepalive username password pppd_options
-	[ "$ipv6" = 1 ] || ipv6=""
-	if [ "${demand:-0}" -gt 0 ]; then
-		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
-	else
-		demand="persist"
-	fi
-
-	[ -n "$mtu" ] || json_get_var mtu mtu
-
-	local interval="${keepalive##*[, ]}"
-	[ "$interval" != "$keepalive" ] || interval=5
-
-	mkdir -p /tmp/l2tp
-
-	echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}"
-	echo "usepeerdns" >> "${optfile}"
-	echo "nodefaultroute" >> "${optfile}"
-	echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}"
-	echo "ipparam \"$config\"" >> "${optfile}"
-	echo "ifname \"l2tp-$config\"" >> "${optfile}"
-	echo "ip-up-script /lib/netifd/ppp-up" >> "${optfile}"
-	echo "ipv6-up-script /lib/netifd/ppp-up" >> "${optfile}"
-	echo "ip-down-script /lib/netifd/ppp-down" >> "${optfile}"
-	echo "ipv6-down-script /lib/netifd/ppp-down" >> "${optfile}"
-	# Don't wait for LCP term responses; exit immediately when killed.
-	echo "lcp-max-terminate 0" >> "${optfile}"
-	echo "${ipv6:++ipv6} ${pppd_options}" >> "${optfile}"
-	echo "${mtu:+mtu $mtu mru $mtu}" >> "${optfile}"
-
-	xl2tpd-control add l2tp-${config} pppoptfile=${optfile} lns=${server} redial=yes redial timeout=20
-	xl2tpd-control connect l2tp-${config}
-}
-
-proto_l2tp_teardown() {
-	local interface="$1"
-	local optfile="/tmp/l2tp/options.${interface}"
-
-	case "$ERROR" in
-		11|19)
-			proto_notify_error "$interface" AUTH_FAILED
-			proto_block_restart "$interface"
-		;;
-		2)
-			proto_notify_error "$interface" INVALID_OPTIONS
-			proto_block_restart "$interface"
-		;;
-	esac
-
-	xl2tpd-control disconnect l2tp-${interface}
-	# Wait for interface to go down
-        while [ -d /sys/class/net/l2tp-${interface} ]; do
-		sleep 1
-	done
-
-	xl2tpd-control remove l2tp-${interface}
-	rm -f ${optfile}
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol l2tp
-}
diff --git a/trunk/package/feeds/packages/xl2tpd/files/options.xl2tpd b/trunk/package/feeds/packages/xl2tpd/files/options.xl2tpd
deleted file mode 100644
index f0fc4f40..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/options.xl2tpd
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-
-lock
-noauth
-debug
-dump
-logfd 2
-logfile /var/log/xl2tpd.log
-noccp
-novj
-novjccomp
-nopcomp
-noaccomp
diff --git a/trunk/package/feeds/packages/xl2tpd/files/xl2tp-secrets b/trunk/package/feeds/packages/xl2tpd/files/xl2tp-secrets
deleted file mode 100644
index 0fb513f6..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/xl2tp-secrets
+++ /dev/null
@@ -1,5 +0,0 @@
-# Secrets for authenticating l2tp tunnels
-# us		them		secret
-# *		marko		blah2
-# zeus		marko		blah
-# *		*		interop
diff --git a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf b/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf
deleted file mode 100644
index 2423ff64..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[global]
-port = 1701
-auth file = /etc/xl2tpd/xl2tp-secrets
-access control = no
-
-;[lns default]
-;exclusive = yes
-;ip range = 192.168.254.202-192.168.254.210
-;lac = 10.0.1.2
-;hidden bit = no
-;local ip = 192.168.254.200
-;length bit = yes
-;refuse authentication = yes
-;name = VersaLink
-;ppp debug = yes
-;pppoptfile = /etc/ppp/options.xl2tpd
-
-;[lac left]
-;lns = 10.0.1.2
-;refuse authentication = yes
-;name = VersaLink
-;ppp debug = yes
-;pppoptfile = /etc/ppp/options.xl2tpd
diff --git a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf.sample b/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf.sample
deleted file mode 100644
index 477afa5a..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.conf.sample
+++ /dev/null
@@ -1,73 +0,0 @@
-;
-; Sample l2tpd configuration file
-;
-; This example file should give you some idea of how the options for l2tpd
-; should work.  The best place to look for a list of all options is in
-; the source code itself, until I have the time to write better documetation :)
-; Specifically, the file "file.c" contains a list of commands at the end.
-;
-; You most definitely don't have to spell out everything as it is done here
-;
-; [global]										; Global parameters:
-; port = 1701									; * Bind to port 1701
-; auth file = /etc/xl2tpd/xl2tp-secrets			; * Where our challenge secrets are
-; access control = yes							; * Refuse connections without IP match
-; rand source = dev								; Source for entropy for random
-; 												; numbers, options are:
-; 												; dev - reads of /dev/urandom
-; 												; sys - uses rand()
-; 												; egd - reads from egd socket
-; 												; egd is not yet implemented
-;
-; [lns default]									; Our fallthrough LNS definition
-; exclusive = no								; * Only permit one tunnel per host
-; ip range = 192.168.0.1-192.168.0.20			; * Allocate from this IP range
-; no ip range = 192.168.0.3-192.168.0.9			; * Except these hosts
-; ip range = 192.168.0.5						; * But this one is okay
-; ip range = lac1-lac2							; * And anything from lac1 to lac2's IP
-; lac = 192.168.1.4 - 192.168.1.8				; * These can connect as LAC's
-; no lac = untrusted.marko.net					; * This guy can't connect
-; hidden bit = no								; * Use hidden AVP's?
-; local ip = 192.168.1.2						; * Our local IP to use
-; length bit = yes								; * Use length bit in payload?
-; require chap = yes							; * Require CHAP auth. by peer
-; refuse pap = yes								; * Refuse PAP authentication
-; refuse chap = no								; * Refuse CHAP authentication
-; refuse authentication = no					; * Refuse authentication altogether
-; require authentication = yes					; * Require peer to authenticate
-; unix authentication = no						; * Use /etc/passwd for auth.
-; name = myhostname								; * Report this as our hostname
-; ppp debug = no								; * Turn on PPP debugging
-; pppoptfile = /etc/ppp/options.xl2tpd.lns		; * ppp options file
-; call rws = 10									; * RWS for call (-1 is valid)
-; tunnel rws = 4								; * RWS for tunnel (must be > 0)
-; flow bit = yes								; * Include sequence numbers
-; challenge = yes								; * Challenge authenticate peer ;
-;
-; [lac marko]									; Example VPN LAC definition
-; lns = lns.marko.net							; * Who is our LNS?
-; lns = lns2.marko.net							; * A backup LNS (not yet used)
-; redial = yes									; * Redial if disconnected?
-; redial timeout = 15							; * Wait n seconds between redials
-; max redials = 5								; * Give up after n consecutive failures
-; hidden bit = yes								; * User hidden AVP's?
-; local ip = 192.168.1.1						; * Force peer to use this IP for us
-; remote ip = 192.168.1.2						; * Force peer to use this as their IP
-; length bit = no								; * Use length bit in payload?
-; require pap = no								; * Require PAP auth. by peer
-; require chap = yes							; * Require CHAP auth. by peer
-; refuse pap = yes								; * Refuse PAP authentication
-; refuse chap = no								; * Refuse CHAP authentication
-; refuse authentication = no					; * Refuse authentication altogether
-; require authentication = yes					; * Require peer to authenticate
-; name = marko									; * Report this as our hostname
-; ppp debug = no								; * Turn on PPP debugging
-; pppoptfile = /etc/ppp/options.xl2tpd.marko	; * ppp options file for this lac
-; call rws = 10									; * RWS for call (-1 is valid)
-; tunnel rws = 4								; * RWS for tunnel (must be > 0)
-; flow bit = yes								; * Include sequence numbers
-; challenge = yes								; * Challenge authenticate peer
-;
-; [lac cisco]									; Another quick LAC
-; lns = cisco.marko.net							; * Required, but can take from default
-; require authentication = yes
diff --git a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.init b/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.init
deleted file mode 100644
index 22e84590..00000000
--- a/trunk/package/feeds/packages/xl2tpd/files/xl2tpd.init
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2010 OpenWrt.org
-
-START=60
-BIN=xl2tpd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
-
-start() {
-	mkdir -p $RUN_D/$BIN
-	[ -f $DEFAULT ] && . $DEFAULT
-	$BIN $OPTIONS
-}
-
-stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
diff --git a/trunk/package/feeds/packages/xl2tpd/patches/100-makefile_opt_flags.patch b/trunk/package/feeds/packages/xl2tpd/patches/100-makefile_opt_flags.patch
deleted file mode 100644
index 82e875d7..00000000
--- a/trunk/package/feeds/packages/xl2tpd/patches/100-makefile_opt_flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -91,7 +91,8 @@ OSFLAGS+= -DUSE_KERNEL
- 
- IPFLAGS?= -DIP_ALLOCATION
- 
--CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-+OFLAGS=-O2
-+CFLAGS+= $(DFLAGS) $(OFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
- HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
- OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
- SRCS=${OBJS:.o=.c} ${HDRS}
diff --git a/trunk/package/feeds/packages/xl2tpd/patches/110-makefile_dont_build_pfc.patch b/trunk/package/feeds/packages/xl2tpd/patches/110-makefile_dont_build_pfc.patch
deleted file mode 100644
index 460a0f15..00000000
--- a/trunk/package/feeds/packages/xl2tpd/patches/110-makefile_dont_build_pfc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -107,10 +107,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
- MANDIR?=$(DESTDIR)${PREFIX}/share/man
- 
- 
--all: $(EXEC) pfc $(CONTROL_EXEC)
-+all: $(EXEC) $(CONTROL_EXEC)
- 
- clean:
--	rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
-+	rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
- 
- $(EXEC): $(OBJS) $(HDRS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
-@@ -118,14 +118,10 @@ $(EXEC): $(OBJS) $(HDRS)
- $(CONTROL_EXEC): $(CONTROL_SRCS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
- 
--pfc:
--	$(CC) $(CFLAGS) -c contrib/pfc.c
--	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
--
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
- 
--install: ${EXEC} pfc ${CONTROL_EXEC}
-+install: ${EXEC} ${CONTROL_EXEC}
- 	install -d -m 0755 ${SBINDIR}
- 	install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
- 	install -d -m 0755 ${MANDIR}/man5
-@@ -133,11 +129,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
- 	install -m 0644 doc/xl2tpd.8 ${MANDIR}/man8/
- 	install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
- 		 ${MANDIR}/man5/
--	# pfc
--	install -d -m 0755 ${BINDIR}
--	install -m 0755 pfc ${BINDIR}/pfc
--	install -d -m 0755 ${MANDIR}/man1
--	install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
- 	# control exec
- 	install -d -m 0755 ${SBINDIR}
- 	install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)
diff --git a/trunk/package/feeds/packages/xl2tpd/patches/120-no-bsd-signal-in-musl.patch b/trunk/package/feeds/packages/xl2tpd/patches/120-no-bsd-signal-in-musl.patch
deleted file mode 100644
index dba544c0..00000000
--- a/trunk/package/feeds/packages/xl2tpd/patches/120-no-bsd-signal-in-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xl2tpd-1.3.6/xl2tpd.c
-===================================================================
---- xl2tpd-1.3.6.orig/xl2tpd.c
-+++ xl2tpd-1.3.6/xl2tpd.c
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <time.h>
--#if (__GLIBC__ < 2)
-+#if defined (__GLIBC__) && (__GLIBC__ < 2)
- # if defined(FREEBSD) || defined(OPENBSD)
- #  include <sys/signal.h>
- # elif defined(LINUX)
diff --git a/trunk/package/feeds/packages/xmlrpc-c/Makefile b/trunk/package/feeds/packages/xmlrpc-c/Makefile
deleted file mode 100644
index 998219a9..00000000
--- a/trunk/package/feeds/packages/xmlrpc-c/Makefile
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xmlrpc-c
-PKG_REV:=2640
-PKG_VERSION:=1.39.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.code.sf.net/p/xmlrpc-c/code/advanced
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=VARIOUS
-PKG_LICENSE_FILES:=doc/COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xmlrpc-c/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=XML-RPC library
-  URL:=http://xmlrpc-c.sourceforge.net/
-endef
-
-define Package/xmlrpc-c-common
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - common
-  DEPENDS+= +libpthread
-  HIDDEN:=1
-endef
-
-define Package/xmlrpc-c-internal
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= (uses internal expat variant)
-  DEPENDS:=+xmlrpc-c-common
-#  PROVIDES:=xmlrpc-c
-  VARIANT:=internal
-  HIDDEN:=1
-endef
-
-define Package/xmlrpc-c
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= (uses internal expat variant)
-  DEPENDS:=+xmlrpc-c-internal
-endef
-
-define Package/xmlrpc-c-libxml2
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= (uses libxml2)
-  DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN
-#  PROVIDES:=xmlrpc-c
-  VARIANT:=libxml2
-endef
-
-define Package/xmlrpc-c-client
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - client
-  DEPENDS:=+xmlrpc-c +libcurl
-endef
-
-define Package/xmlrpc-c-server
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - server
-  DEPENDS:=+xmlrpc-c
-endef
-
-define Package/xmlrpc-c-abyss
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - abyss
-  DEPENDS:=+xmlrpc-c-common @BROKEN
-endef
-
-define Package/xmlrpc-c-server-abyss
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - abyss server
-  DEPENDS:=+xmlrpc-c-server +xmlrpc-c-abyss
-endef
-
-define Package/xmlrpc-c/description/Default
-    Programming library for writing an XML-RPC server or client in C or C++.
-    XML-RPC is a standard network protocol to allow a client program to make
-    a simple remote procedure call (RPC) type request of a server.
-endef
-
-Package/xmlrpc-c-common/description = $(Package/xmlrpc-c/description/Default)
-Package/xmlrpc-c-libxml2/description = $(Package/xmlrpc-c/description/Default)
-Package/xmlrpc-c-internal/description = $(Package/xmlrpc-c/description/Default)
-
-Package/xmlrpc-c-libxml2/description += Uses external libxml2 library (quite big)
-Package/xmlrpc-c-internal/description += Uses internal expat variant (stripped down)
-
-CONFIGURE_ARGS+= \
-	--disable-wininet-client \
-	--disable-libwww-client \
-	--disable-abyss-server \
-	--disable-cplusplus \
-	--disable-abyss-threads \
-	--disable-cgi-server
-
-ifeq ($(BUILD_VARIANT),libxml2)
-	CONFIGURE_ARGS += \
-		--enable-libxml2-backend
-endif
-
-ifeq ($(BUILD_VARIANT),internal)
-	CONFIGURE_ARGS += \
-		--disable-libxml2-backend
-endif
-
-define Build/Compile
-	( cd $(PKG_BUILD_DIR)/lib/expat/gennmtab && cc -I$(PKG_BUILD_DIR) -c gennmtab.c -o gennmtab.o && cc -o gennmtab  gennmtab.o )
-	$(call Build/Compile/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/include \
-		$(1)/usr/lib \
-		$(1)/usr/bin \
-		$(2)/bin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc*.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xmlrpc-c-config \
-		$(2)/bin/
-	$(SED) \
-		's,HEADERINST_DIR="/usr/include",HEADERINST_DIR="$(STAGING_DIR)/usr/include",g' \
-		$(2)/bin/xmlrpc-c-config
-	$(SED) \
-		's,LIBINST_DIR="/usr/lib",LIBINST_DIR="$(STAGING_DIR)/usr/lib",g' \
-		$(2)/bin/xmlrpc-c-config
-endef
-
-define Package/xmlrpc-c-libxml2/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-internal/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmltok.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmlparse.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-server/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-abyss/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_abyss.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-server-abyss/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server_abyss.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-client/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_client* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-common/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_util.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c/install
-	true
-endef
-
-$(eval $(call BuildPackage,xmlrpc-c))
-$(eval $(call BuildPackage,xmlrpc-c-common))
-#$(eval $(call BuildPackage,xmlrpc-c-libxml2))
-$(eval $(call BuildPackage,xmlrpc-c-internal))
-$(eval $(call BuildPackage,xmlrpc-c-server))
-#$(eval $(call BuildPackage,xmlrpc-c-abyss))
-#$(eval $(call BuildPackage,xmlrpc-c-server-abyss))
-$(eval $(call BuildPackage,xmlrpc-c-client))
diff --git a/trunk/package/feeds/packages/xmlrpc-c/patches/001-config.mk.in.patch b/trunk/package/feeds/packages/xmlrpc-c/patches/001-config.mk.in.patch
deleted file mode 100644
index e190ebb8..00000000
--- a/trunk/package/feeds/packages/xmlrpc-c/patches/001-config.mk.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -175,7 +175,7 @@ ifeq ($(patsubst linux-gnu%,linux-gnu,$(
-   shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
-   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
- #  SHLIB_CLIB = -lc
--  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
-+  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB) $(LDFLAGS)
-   CFLAGS_SHLIB=-fPIC
- endif
- 
diff --git a/trunk/package/feeds/packages/xmlrpc-c/patches/002-automake-compat.patch b/trunk/package/feeds/packages/xmlrpc-c/patches/002-automake-compat.patch
deleted file mode 100644
index be69611d..00000000
--- a/trunk/package/feeds/packages/xmlrpc-c/patches/002-automake-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -224,9 +224,7 @@ dnl Checks for programs.
- dnl =======================================================================
- 
- AC_PROG_CC
--if test x"$enable_cplusplus" != xno; then
--    AC_PROG_CXX
--fi
-+AC_PROG_CXX
- 
- 
- dnl =======================================================================
diff --git a/trunk/package/feeds/packages/xupnpd/Makefile b/trunk/package/feeds/packages/xupnpd/Makefile
deleted file mode 100644
index 9522e83f..00000000
--- a/trunk/package/feeds/packages/xupnpd/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xupnpd
-PKG_REV:=404
-PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=xupnpd-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://tsdemuxer.googlecode.com/svn/trunk/xupnpd/src/
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-LUA_FLAGS:=-llua
-
-define Build/Compile
-	(cd $(PKG_BUILD_DIR); $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp)
-endef
-
-define Package/xupnpd
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+liblua
-  TITLE:=eXtensible UPnP agent
-  URL:=http://xupnpd.org/
-endef
-
-define Package/xupnpd/conffiles
-/usr/share/xupnpd/xupnpd.lua
-/usr/share/xupnpd/config
-/usr/share/xupnpd/playlists
-endef
-
-define Package/xupnpd/description
-xupnpd - eXtensible UPnP agent
-This program is a light DLNA Media Server which provides ContentDirectory:1 service for sharing IPTV unicast streams over local area network (with udpxy for multicast to HTTP unicast conversion).
-The program shares UTF8-encoded M3U playlists with links over local area network as content of the directory.
-You can watch HDTV broadcasts (multicast or unicast) and listen Internet Radio in IP network without transcoding and PC.
-endef
-
-define Package/xupnpd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xupnpd $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/xupnpd.init $(1)/etc/init.d/xupnpd
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd
-	$(CP) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/xupnpd
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/ui
-	$(CP) $(PKG_BUILD_DIR)/ui/* $(1)/usr/share/xupnpd/ui
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/www
-	$(CP) $(PKG_BUILD_DIR)/www/* $(1)/usr/share/xupnpd/www
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/playlists
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/plugins
-	$(CP) $(PKG_BUILD_DIR)/plugins/* $(1)/usr/share/xupnpd/plugins
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/config
-	$(INSTALL_DIR) $(1)/etc/xupnpd
-	(cd $(1)/etc/xupnpd; ln -s ../../usr/share/xupnpd/config ./; ln -s ../../usr/share/xupnpd/xupnpd.lua ./)
-	$(INSTALL_DIR) $(1)/usr/share/xupnpd/localmedia
-endef
-
-$(eval $(call BuildPackage,xupnpd))
diff --git a/trunk/package/feeds/packages/xupnpd/files/xupnpd.init b/trunk/package/feeds/packages/xupnpd/files/xupnpd.init
deleted file mode 100644
index 29c458a9..00000000
--- a/trunk/package/feeds/packages/xupnpd/files/xupnpd.init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013-2014 OpenWrt.org
-
-START=50
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-
-	procd_set_param command /usr/bin/xupnpd
-	procd_append_param command -d /usr/share/xupnpd
-
-	procd_set_param respawn
-	procd_close_instance
-}
diff --git a/trunk/package/feeds/packages/xupnpd/patches/100-default_config.patch b/trunk/package/feeds/packages/xupnpd/patches/100-default_config.patch
deleted file mode 100644
index 89958c7f..00000000
--- a/trunk/package/feeds/packages/xupnpd/patches/100-default_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/xupnpd.lua
-+++ b/xupnpd.lua
-@@ -1,10 +1,10 @@
- cfg={}
- 
- -- multicast interface for SSDP exchange, 'eth0', 'br0', 'br-lan' for example
--cfg.ssdp_interface='lo'
-+cfg.ssdp_interface='br-lan'
- 
- -- 'cfg.ssdp_loop' enables multicast loop (if player and server in one host)
--cfg.ssdp_loop=1
-+cfg.ssdp_loop=0
- 
- -- SSDP announcement interval
- cfg.ssdp_notify_interval=15
diff --git a/trunk/package/feeds/packages/xupnpd/patches/101-root_dir_param.patch b/trunk/package/feeds/packages/xupnpd/patches/101-root_dir_param.patch
deleted file mode 100644
index 68ea3e82..00000000
--- a/trunk/package/feeds/packages/xupnpd/patches/101-root_dir_param.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -4,11 +4,14 @@
-  * https://tsdemuxer.googlecode.com/svn/trunk/xupnpd
-  */
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include "luacompat.h"
- #include "luaxlib.h"
- #include "luaxcore.h"
-@@ -16,35 +19,36 @@
- 
- int main(int argc,char** argv)
- {
--    const char* p=strrchr(argv[0],'/');
--
--    int rc;
--
--    if(p)
--    {
--        char location[512];
--        int n=p-argv[0];
--        if(n>=sizeof(location))
--            n=sizeof(location)-1;
--        strncpy(location,argv[0],n);
--        location[n]=0;
--
--        rc=chdir(location);
--
--        argv[0]=(char*)p+1;
--    }
--
--    const char* root=getenv("XUPNPDROOTDIR");
--    if(root && *root)
--        rc=chdir(root);
--
--    {
--        FILE* fp=fopen("xupnpd.lua","r");
--        if(fp)
--            fclose(fp);
--        else
--            rc=chdir("/usr/share/xupnpd/");
--    }
-+	int c;
-+	char *xupnpd_root = "/usr/share/xupnpd/";
-+	struct stat s;
-+
-+	opterr = 0;
-+	while ((c = getopt (argc, argv, "d:")) != -1) {
-+		switch (c) {
-+			case 'd':
-+				xupnpd_root = optarg;
-+				break;
-+			case '?':
-+				if (optopt == 'd')
-+					fprintf(stderr, "Option -%c requires an argument.\n", optopt);
-+				else if (isprint(optopt))
-+					fprintf(stderr, "Unknown option \"-%c\".\n", optopt);
-+				else
-+					fprintf(stderr, "Unknown option\n");
-+					return 1;
-+			default:
-+				abort();
-+		}
-+	}
-+
-+	if(stat(xupnpd_root, &s) != -1 && S_ISDIR(s.st_mode)) {
-+		c = chdir(xupnpd_root);
-+	}
-+	else {
-+		fprintf(stderr, "Directory %s doesn't exist.\n", xupnpd_root);
-+		return 1;
-+	}
- 
-     lua_State* L=lua_open();
-     if(L)
diff --git a/trunk/package/feeds/packages/zabbix/Makefile b/trunk/package/feeds/packages/zabbix/Makefile
deleted file mode 100644
index 8e084a77..00000000
--- a/trunk/package/feeds/packages/zabbix/Makefile
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zabbix
-PKG_VERSION:=2.4.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/zabbix
-PKG_MD5SUM:=400a3e2ebec80e2f1fe86d1b32bfd2e1
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/zabbix/Default
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Zabbix
-  URL:=http://www.zabbix.com/
-  SUBMENU:=zabbix
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-  USERID:=zabbix=53:zabbix=53
-endef
-
-define Package/zabbix-agent
-  $(call Package/zabbix/Default)
-  TITLE+= agent
-endef
-
-define Package/zabbix-agentd
-  $(call Package/zabbix/Default)
-  TITLE+= agentd
-endef
-
-define Package/zabbix-extra-mac80211
-  $(call Package/zabbix/Default)
-  TITLE+= discovery/userparameters for mac80211
-  DEPENDS += +zabbix-agentd @PACKAGE_MAC80211_DEBUGFS @KERNEL_DEBUG_FS
-endef
-
-define Package/zabbix-extra-network
-  $(call Package/zabbix/Default)
-  TITLE+= discovery/userparameters for network
-  DEPENDS += +zabbix-agentd +libuci-lua +lua
-endef
-
-define Package/zabbix-extra-wifi
-  $(call Package/zabbix/Default)
-  TITLE+= discovery/userparameters for wifi
-  DEPENDS += +zabbix-agentd +libiwinfo-lua +libuci-lua +lua
-endef
-
-define Package/zabbix-sender
-  $(call Package/zabbix/Default)
-  TITLE+= sender
-endef
-
-define Package/zabbix-get
-  $(call Package/zabbix/Default)
-  TITLE+= get
-endef
-
-define Package/zabbix-server
-  $(call Package/zabbix/Default)
-  TITLE+= server
-  DEPENDS += +libsqlite3
-endef
-
-define Package/zabbix-proxy
-  $(call Package/zabbix/Default)
-  TITLE+= proxy
-  DEPENDS += +libsqlite3
-endef
-
-define Package/zabbix-extra-mac80211/description
-An extra package for zabbix-agentd that adds a discovery rule for mac80211 wifi phy and many userparameters.
-It contains an suid helper to allow zabbix-agentd to still run as zabbix user and not as root.
-See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
-endef
-
-define Package/zabbix-extra-network/description
-An extra package for zabbix-agentd that adds a discovery rule for openwrt network interfaces.
-The idea here is to discover only interfaces listed in /etc/config/network (discover br-lan and not eth0.1 and wlan0)
-See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
-endef
-
-define Package/zabbix-extra-wifi/description
-An extra package for zabbix-agentd that adds a discovery rule for wifi interfaces and many userparameters.
-As it uses libiwinfo, it works with all wifi devices supported by openwrt.
-See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-agent \
-	--enable-server \
-	--enable-proxy \
-	--disable-java \
-	--with-sqlite3="$(STAGING_DIR)/usr"
-
-MAKE_FLAGS += ARCH="linux"
-
-define Package/zabbix/install/sbin
-	$(INSTALL_DIR) \
-		$(1)/usr/sbin
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/zabbix_$(2) \
-		$(1)/usr/sbin/
-endef
-
-define Package/zabbix/install/bin
-	$(INSTALL_DIR) \
-		$(1)/usr/bin
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/zabbix_$(2) \
-		$(1)/usr/bin/
-endef
-
-define Package/zabbix/install/etc
-	$(INSTALL_DIR) \
-		$(1)/etc
-
-	$(INSTALL_CONF) \
-		$(PKG_INSTALL_DIR)/etc/zabbix_$(2).conf \
-		$(1)/etc/
-endef
-
-define Package/zabbix/install/init.d
-	$(INSTALL_DIR) \
-		$(1)/etc/init.d
-
-	$(INSTALL_BIN) \
-		./files/zabbix_$(2).init \
-		$(1)/etc/init.d/zabbix_$(2)
-endef
-
-define Package/zabbix/install/zabbix.conf.d
-	$(INSTALL_DIR) \
-		$(1)/etc/zabbix_agentd.conf.d
-
-	$(INSTALL_BIN) \
-		./files/$(2) \
-		$(1)/etc/zabbix_agentd.conf.d/$(2)
-endef
-
-define Package/zabbix-agent/conffiles
-/etc/zabbix_agent.conf
-endef
-define Package/zabbix-agentd/conffiles
-/etc/zabbix_agentd.conf
-endef
-define Package/zabbix-server/conffiles
-/etc/zabbix_server.conf
-endef
-define Package/zabbix-proxy/conffiles
-/etc/zabbix_proxy.conf
-endef
-
-ifdef CONFIG_PACKAGE_zabbix-extra-mac80211
-define Build/Prepare/zabbix-extra-mac80211
-	mkdir -p $(PKG_BUILD_DIR)/zabbix-extra-mac80211
-	$(CP) ./files/zabbix_helper_mac80211.c $(PKG_BUILD_DIR)/zabbix-extra-mac80211/
-endef
-
-define Build/Compile/zabbix-extra-mac80211
-	$(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/zabbix-extra-mac80211/zabbix_helper_mac80211.c -o $(PKG_BUILD_DIR)/zabbix-extra-mac80211/zabbix_helper_mac80211
-endef
-endif
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(call Build/Prepare/zabbix-extra-mac80211)
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call Build/Compile/zabbix-extra-mac80211)
-endef
-
-define Package/zabbix-agent/install
-	$(call Package/zabbix/install/sbin,$(1),agent)
-	$(call Package/zabbix/install/etc,$(1),agent)
-endef
-
-define Package/zabbix-agentd/install
-	$(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
-	$(call Package/zabbix/install/sbin,$(1),agentd)
-	$(call Package/zabbix/install/etc,$(1),agentd)
-	$(call Package/zabbix/install/init.d,$(1),agentd)
-endef
-
-define Package/zabbix-extra-mac80211/install
-	$(call Package/zabbix/install/zabbix.conf.d,$(1),mac80211)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zabbix-extra-mac80211/zabbix_helper_mac80211 $(1)/usr/bin/
-	chmod 4755 $(1)/usr/bin/zabbix_helper_mac80211
-endef
-
-define Package/zabbix-extra-network/install
-	$(call Package/zabbix/install/zabbix.conf.d,$(1),network)
-endef
-
-define Package/zabbix-extra-wifi/install
-	$(call Package/zabbix/install/zabbix.conf.d,$(1),wifi)
-endef
-
-define Package/zabbix-sender/install
-	$(call Package/zabbix/install/bin,$(1),sender)
-endef
-
-define Package/zabbix-get/install
-	$(call Package/zabbix/install/bin,$(1),get)
-endef
-
-define Package/zabbix-server/install
-	$(call Package/zabbix/install/sbin,$(1),server)
-	$(call Package/zabbix/install/etc,$(1),server)
-endef
-
-define Package/zabbix-proxy/install
-	$(call Package/zabbix/install/sbin,$(1),proxy)
-	$(call Package/zabbix/install/etc,$(1),proxy)
-endef
-
-$(eval $(call BuildPackage,zabbix-agent))
-$(eval $(call BuildPackage,zabbix-agentd))
-$(eval $(call BuildPackage,zabbix-extra-mac80211))
-$(eval $(call BuildPackage,zabbix-extra-network))
-$(eval $(call BuildPackage,zabbix-extra-wifi))
-$(eval $(call BuildPackage,zabbix-sender))
-$(eval $(call BuildPackage,zabbix-server))
-$(eval $(call BuildPackage,zabbix-proxy))
-$(eval $(call BuildPackage,zabbix-get))
diff --git a/trunk/package/feeds/packages/zabbix/files/mac80211 b/trunk/package/feeds/packages/zabbix/files/mac80211
deleted file mode 100644
index 93d83518..00000000
--- a/trunk/package/feeds/packages/zabbix/files/mac80211
+++ /dev/null
@@ -1,27 +0,0 @@
-#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
-
-# If you want to know the exact meaning of an UserParameter, you can search in the ieee80211 standard:
-# http://standards.ieee.org/getieee802/download/802.11-2012.pdf
-# exemple: for mac80211.ACKFailureCount search for dot11ACKFailureCount (page 2145)
-
-# mac80211 phy discovery (like 'phy0')
-# exemple: {"data":[{"{#PHY}":"phy0"}]}
-#
-UserParameter=mac80211.phydiscovery,zabbix_helper_mac80211 discovery
-
-#phy statistics (you need {#PHY} as parameter)
-#
-UserParameter=mac80211.ACKFailureCount[*],zabbix_helper_mac80211 $1 dot11ACKFailureCount
-UserParameter=mac80211.FCSErrorCount[*],zabbix_helper_mac80211 $1 dot11FCSErrorCount
-UserParameter=mac80211.RTSFailureCount[*],zabbix_helper_mac80211 $1 dot11RTSFailureCount
-UserParameter=mac80211.RTSSuccessCount[*],zabbix_helper_mac80211 $1 dot11RTSSuccessCount
-UserParameter=mac80211.FailedCount[*],zabbix_helper_mac80211 $1 failed_count
-UserParameter=mac80211.FrameDuplicateCount[*],zabbix_helper_mac80211 $1 frame_duplicate_count
-UserParameter=mac80211.MulticastReceivedFrameCount[*],zabbix_helper_mac80211 $1 multicast_received_frame_count
-UserParameter=mac80211.MulticastTransmittedFrameCount[*],zabbix_helper_mac80211 $1 multicast_transmitted_frame_count
-UserParameter=mac80211.MultipleRetryCount[*],zabbix_helper_mac80211 $1 multiple_retry_count
-UserParameter=mac80211.ReceivedFragmentCount[*],zabbix_helper_mac80211 $1 received_fragment_count
-UserParameter=mac80211.RetryCount[*],zabbix_helper_mac80211 $1 retry_count
-UserParameter=mac80211.TransmittedFragmentCount[*],zabbix_helper_mac80211 $1 transmitted_fragment_count
-UserParameter=mac80211.TransmittedFrameCount[*],zabbix_helper_mac80211 $1 transmitted_frame_count
-
diff --git a/trunk/package/feeds/packages/zabbix/files/network b/trunk/package/feeds/packages/zabbix/files/network
deleted file mode 100644
index 51cb1cbc..00000000
--- a/trunk/package/feeds/packages/zabbix/files/network
+++ /dev/null
@@ -1,9 +0,0 @@
-#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
-
-# network interface discovery
-# exemple: {"data":[{"{#IF}":"lo", "{#NET}":"loopback"},{"{#IF}":"br-lan", "{#NET}":"lan"},{"{#IF}":"eth0.1", "{#NET}":"wan"}]}
-#
-UserParameter=netowrt.discovery,lua -l uci -e 'x = uci.cursor(nil, "/var/state");list = "{\"data\":[";x:foreach("network", "interface", function(s) list=list.."{\"{#IF}\":\""..s.ifname.."\", \"{#NET}\":\""..s[".name"].."\"}," end); list=string.gsub(list,",$",""); print(list.."]}")'
-
-
-
diff --git a/trunk/package/feeds/packages/zabbix/files/wifi b/trunk/package/feeds/packages/zabbix/files/wifi
deleted file mode 100644
index 250d2f91..00000000
--- a/trunk/package/feeds/packages/zabbix/files/wifi
+++ /dev/null
@@ -1,25 +0,0 @@
-#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
-
-# wifi interface discovery
-# exemple: {"data":[{"{#IF}":"wlan0", "{#MODE}":"ap", "{#SSID}":"Openwrt", "{#NET}":"lan", "{#DEV}":"radio0", "{#ENC}":"psk2+ccmp", "{#TYPE}":"mac80211", "{#HWMODE}":"11ng", "{#CHANNEL}":"11", "{#BSSID}":"xx:xx:xx:xx:xx:xx"}]}
-# ubus call only work as root so you need to run zabbix as root to use wifi.ifdiscovery
-UserParameter=wifi.ifdiscovery, lua -l uci -l ubus -l iwinfo -e 'u = ubus.connect();x = uci.cursor();list="{\"data\":[";stat=u:call("network.wireless", "status", {});for dev, dev_table in pairs(stat) do for i, iface in pairs(dev_table["interfaces"]) do s=iface["section"];list=list.."{\"{#IF}\":\""..iface["ifname"].."\", \"{#MODE}\":\""..x:get("wireless", s, "mode").."\", \"{#SSID}\":\""..x:get("wireless", s, "ssid").."\", \"{#NET}\":\""..x:get("wireless", s, "network").."\", \"{#DEV}\":\""..dev.."\", \"{#ENC}\":\""..(x:get("wireless", s, "encryption") or "?").."\", \"{#TYPE}\":\""..x:get("wireless", dev, "type").."\", \"{#HWMODE}\":\""..x:get("wireless", dev, "hwmode").."\", \"{#CHANNEL}\":\""..x:get("wireless", dev, "channel").."\", \"{#BSSID}\":\""..iwinfo[iwinfo.type(iface["ifname"])].bssid(iface["ifname"]).."\"},";end;end;list=string.gsub(list,",$","");print(list.."]}")'
-
-
-#iwinfo info (you need {#IF} as parameter, like 'wlan0')
-UserParameter=wifi.iwinfo.channel[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].channel('$1'))"
-UserParameter=wifi.iwinfo.frequency[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].frequency('$1'))"
-UserParameter=wifi.iwinfo.txpower[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].txpower('$1'))"
-UserParameter=wifi.iwinfo.bitrate[*],lua -l iwinfo -e "b = iwinfo[iwinfo.type('$1')].bitrate('$1'); print(b or '0')"
-UserParameter=wifi.iwinfo.signal[*],lua -l iwinfo -e "s = iwinfo[iwinfo.type('$1')].signal('$1'); print(s or '-255')"
-UserParameter=wifi.iwinfo.noise[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].noise('$1'))"
-UserParameter=wifi.iwinfo.quality[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].quality('$1'))"
-UserParameter=wifi.iwinfo.quality_max[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].quality_max('$1'))"
-UserParameter=wifi.iwinfo.mode[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].mode('$1'))"
-UserParameter=wifi.iwinfo.ssid[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].ssid('$1'))"
-UserParameter=wifi.iwinfo.bssid[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].bssid('$1'))"
-UserParameter=wifi.iwinfo.country[*],lua -l iwinfo -e "print(iwinfo[iwinfo.type('$1')].country('$1'))"
-UserParameter=wifi.iwinfo.nbusers[*],lua -l iwinfo -e "n = 0; for _,_ in pairs(iwinfo[iwinfo.type('$1')].assoclist('$1')) do n = n + 1 end; print(n)"
-UserParameter=wifi.iwinfo.encryption[*],lua -l iwinfo -e "e = iwinfo[iwinfo.type('$1')].encryption('$1'); print(e and e.description or 'None')"
-UserParameter=wifi.iwinfo.hwmode[*],lua -l iwinfo -e "x=iwinfo[iwinfo.type('$1')].hwmodelist('$1'); print((x.a and 'a' or '')..(x.b and 'b' or '')..(x.g and 'g' or '')..(x.n and 'n' or ''))"
-
diff --git a/trunk/package/feeds/packages/zabbix/files/zabbix_agentd.init b/trunk/package/feeds/packages/zabbix/files/zabbix_agentd.init
deleted file mode 100644
index c806a9f0..00000000
--- a/trunk/package/feeds/packages/zabbix/files/zabbix_agentd.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=60
-
-PROG=/usr/sbin/zabbix_agentd
-CONFIG=/etc/zabbix_agentd.conf
-SERVICE_PID_FILE=/var/run/zabbix_agentd.pid
-
-start() {
-	# Sometimes the agentd config was installed in /etc/zabbix/zabbix_agentd.conf
-	[ -f /etc/zabbix/zabbix_agentd.conf ] && mv /etc/zabbix/zabbix_agentd.conf ${CONFIG}
-
-	[ -f ${CONFIG} ] || return 1
-
-	grep -q "^PidFile=${SERVICE_PID_FILE}" ${CONFIG} || {
-		logger -s -t ${CONFIG} -p daemon.error "Only \"PidFile=${SERVICE_PID_FILE}\" supported"
-		return 1
-	}
-
-	grep -q "^AllowRoot=1" ${CONFIG} || {
-		touch ${SERVICE_PID_FILE}
-		chown zabbix:zabbix ${SERVICE_PID_FILE}
-	}
-
-	service_start ${PROG} -c ${CONFIG}
-}
-
-stop() {
-	service_stop ${PROG}
-}
diff --git a/trunk/package/feeds/packages/zabbix/files/zabbix_helper_mac80211.c b/trunk/package/feeds/packages/zabbix/files/zabbix_helper_mac80211.c
deleted file mode 100644
index 1442d274..00000000
--- a/trunk/package/feeds/packages/zabbix/files/zabbix_helper_mac80211.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
-
-int discovery()
-{
-    DIR *dir;
-    struct dirent *ent;
-    bool comma = false;
-    if ((dir = opendir ("/sys/kernel/debug/ieee80211/")) != NULL) {
-        printf("{\"data\":[");
-        while ((ent = readdir (dir)) != NULL) {
-            if (strcmp(".", ent->d_name) && strcmp("..", ent->d_name)) {
-                if (comma)
-                    printf(",");
-                printf("{\"{#PHY}\":\"%s\"}", ent->d_name);
-                comma = true;
-            }
-        }
-        printf("]}\n");
-        closedir(dir);
-    } else {
-        perror("");
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
-}
-
-int get_param(char *phy, char *stat)
-{
-    char *filename = NULL;
-    FILE *f = NULL;
-    phy = basename(phy);
-    stat = basename(stat);
-    if (asprintf(&filename, "/sys/kernel/debug/ieee80211/%s/statistics/%s", phy, stat) > 0)
-        f = fopen(filename, "r");
-
-    if (f != NULL) {
-        char temp[256];
-        while (fgets(temp, 256, f) != NULL)
-            printf("%s",temp);
-
-        fclose(f);
-    } else {
-        perror("");
-        return EXIT_FAILURE;
-    }
-    free(filename);
-    return EXIT_SUCCESS;
-}
-
-int usage(char *name)
-{
-    fprintf(stderr, "Usage:\n");
-    fprintf(stderr, " %s discovery\n", name);
-    fprintf(stderr, " => print mac80211.phydiscovery discovery rule\n");
-    fprintf(stderr, " %s PHY STAT\n", name);
-    fprintf(stderr, " => cat /sys/kernel/debug/ieee80211/PHY/statistics/STAT as root\n");
-    return EXIT_FAILURE;
-}
-
-int main(int argc, char *argv[])
-{
-
-    switch (argc) {
-    case 2:
-        return discovery();
-    case 3:
-        return get_param(argv[1], argv[2]);
-    default:
-        return usage(argv[0]);
-    }
-}
diff --git a/trunk/package/feeds/packages/zabbix/patches/002-fix-res_send-on-uclibc.patch b/trunk/package/feeds/packages/zabbix/patches/002-fix-res_send-on-uclibc.patch
deleted file mode 100644
index cedad900..00000000
--- a/trunk/package/feeds/packages/zabbix/patches/002-fix-res_send-on-uclibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -152,6 +152,10 @@ if test "x$found_resolv" != "xyes"; then
- 	AC_MSG_ERROR([Unable to do DNS lookups (libresolv check failed)])
- fi
- LIBS="${LIBS} ${RESOLV_LIBS}"
-+AC_SEARCH_LIBS([res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])])
-+AC_SEARCH_LIBS([__res_mkquery], [], [AC_DEFINE([HAVE_RES_MKQUERY], 1, [Define if res_mkquery exists])])
-+AC_SEARCH_LIBS([res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])])
-+AC_SEARCH_LIBS([__res_send], [], [AC_DEFINE([HAVE_RES_SEND], 1, [Define if res_send exists])]) 
- 
- dnl *****************************************************************
- dnl *                                                               *
---- a/src/libs/zbxsysinfo/common/net.c
-+++ b/src/libs/zbxsysinfo/common/net.c
-@@ -450,6 +450,7 @@ static int	dns_query(AGENT_REQUEST *requ
- 		return SYSINFO_RET_FAIL;
- 	}
- 
-+#if defined(HAVE_RES_MKQUERY) && defined(HAVE_RES_SEND) 
- 	if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
- 	{
- 		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot create DNS query: %s", zbx_strerror(errno)));
-@@ -480,6 +481,11 @@ static int	dns_query(AGENT_REQUEST *requ
- 	_res.retry = retry;
- 
- 	res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));
-+#else /* defined(HAVE_RES_QUERY) && defined(HAVE_RES_SEND) */
-+	/* retrand and retry are ignored */
-+	if (-1 == (res = res_query(zone, C_IN, type, answer.buffer, sizeof(answer.buffer))))
-+	return SYSINFO_RET_FAIL;
-+#endif 
- 
- 	_res.retrans = saved_retrans;
- 	_res.retry = saved_retry;
diff --git a/trunk/package/feeds/packages/zabbix/patches/002-uclibc_loadavg.patch b/trunk/package/feeds/packages/zabbix/patches/002-uclibc_loadavg.patch
deleted file mode 100644
index 191f1a13..00000000
--- a/trunk/package/feeds/packages/zabbix/patches/002-uclibc_loadavg.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/libs/zbxsysinfo/linux/cpu.c
-+++ b/src/libs/zbxsysinfo/linux/cpu.c
-@@ -62,6 +62,45 @@ int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *
- 	return SYSINFO_RET_OK;
- }
- 
-+
-+/* uclibc and dietlibc do not have this junk -ReneR */
-+#if defined (__UCLIBC__) || defined (__dietlibc__)
-+static int getloadavg (double loadavg[], int nelem)
-+{
-+  int fd;
-+
-+  fd = open ("/proc/loadavg", O_RDONLY);
-+  if (fd < 0)
-+    return -1;
-+  else
-+    {
-+      char buf[65], *p;
-+      ssize_t nread;
-+      int i;
-+
-+      nread = read (fd, buf, sizeof buf - 1);
-+      close (fd);
-+      if (nread <= 0)
-+	return -1;
-+      buf[nread - 1] = '\0';
-+
-+      if (nelem > 3)
-+	nelem = 3;
-+      p = buf;
-+      for (i = 0; i < nelem; ++i)
-+	{
-+	  char *endp;
-+	  loadavg[i] = strtod (p, &endp);
-+	  if (endp == p)
-+	    return -1;
-+	  p = endp;
-+	}
-+
-+      return i;
-+    }
-+}
-+#endif
-+
- int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
- {
- 	char	*type;
diff --git a/trunk/package/feeds/packages/zabbix/patches/010-change-agentd-config.patch b/trunk/package/feeds/packages/zabbix/patches/010-change-agentd-config.patch
deleted file mode 100644
index ccc36d1b..00000000
--- a/trunk/package/feeds/packages/zabbix/patches/010-change-agentd-config.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/conf/zabbix_agentd.conf
-+++ b/conf/zabbix_agentd.conf
-@@ -3,12 +3,8 @@
- 
- ############ GENERAL PARAMETERS #################
- 
--### Option: PidFile
--#	Name of PID file.
--#
--# Mandatory: no
--# Default:
--# PidFile=/tmp/zabbix_agentd.pid
-+# Only /var/run/zabbix_agentd.pid supported
-+PidFile=/var/run/zabbix_agentd.pid
- 
- ### Option: LogFile
- #	Name of log file.
-@@ -18,8 +14,6 @@
- # Default:
- # LogFile=
- 
--LogFile=/tmp/zabbix_agentd.log
--
- ### Option: LogFileSize
- #	Maximum size of log file in MB.
- #	0 - disable automatic log rotation.
-@@ -104,6 +98,7 @@ Server=127.0.0.1
- # Range: 0-100
- # Default:
- # StartAgents=3
-+StartAgents=1
- 
- ##### Active checks related
- 
-@@ -119,8 +114,6 @@ Server=127.0.0.1
- # Default:
- # ServerActive=
- 
--ServerActive=127.0.0.1
--
- ### Option: Hostname
- #	Unique, case sensitive hostname.
- #	Required for active checks and must match hostname as configured on the server.
-@@ -130,8 +123,6 @@ ServerActive=127.0.0.1
- # Default:
- # Hostname=
- 
--Hostname=Zabbix server
--
- ### Option: HostnameItem
- #	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
- #	Does not support UserParameters or aliases.
-@@ -249,8 +240,8 @@ Hostname=Zabbix server
- # Include=
- 
- # Include=/usr/local/etc/zabbix_agentd.userparams.conf
--# Include=/usr/local/etc/zabbix_agentd.conf.d/
- # Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
-+Include=/etc/zabbix_agentd.conf.d/
- 
- ####### USER-DEFINED MONITORED PARAMETERS #######
- 
diff --git a/trunk/package/feeds/packages/zile/Makefile b/trunk/package/feeds/packages/zile/Makefile
deleted file mode 100644
index 512057c2..00000000
--- a/trunk/package/feeds/packages/zile/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zile
-PKG_VERSION:=2.3.24
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/zile
-PKG_MD5SUM:=fe77d801ba69e0fb9b4914a04b9ff506
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-
-PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zile
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncursesw
-  TITLE:=very small emacs-like editor
-  URL:=http://www.gnu.org/software/zile/
-  SUBMENU:=Editors
-endef
-
-define Package/zile/description
-	Zile is a small Emacs clone. Zile is a customizable, self-documenting
-	real-time display editor. Zile was written to be as similar as possible
-	to Emacs; every Emacs user should feel at home with Zile.
-endef
-
-CONFIGURE_VARS += \
-	gl_cv_func_getopt_gnu=yes
-
-define Package/zile/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,zile))
diff --git a/trunk/package/feeds/packages/zip/Makefile b/trunk/package/feeds/packages/zip/Makefile
deleted file mode 100644
index dcbc7037..00000000
--- a/trunk/package/feeds/packages/zip/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zip
-PKG_REV:=30
-PKG_VERSION:=3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
-PKG_SOURCE_URL:=@SF/infozip
-PKG_MD5SUM:=7b74551e63f8ee6aab6fbc86676c0d37
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-
-PKG_LICENSE:=BSD-4-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV)
-PKG_CHECK_FORMAT_SECURITY:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zip
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=
-  TITLE:=Archiver for .zip files
-  URL:=http://infozip.sourceforge.net/Zip.html
-  SUBMENU:=Compression
-endef
-
-define Package/zip/description
-	This is InfoZIP's zip program. It produces files that are fully
-	compatible with the popular PKZIP program; however, the command line
-	options are not identical. In other words, the end result is the same,
-	but the methods differ.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
-		LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
-		IZ_BZIP2="no" \
-		install
-endef
-
-define Package/zip/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,zip))
diff --git a/trunk/package/feeds/packages/znc/Makefile b/trunk/package/feeds/packages/znc/Makefile
deleted file mode 100644
index 8e39a380..00000000
--- a/trunk/package/feeds/packages/znc/Makefile
+++ /dev/null
@@ -1,289 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=znc
-PKG_VERSION:=1.4
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://znc.in/releases \
-		http://znc.in/releases/archive
-PKG_MD5SUM:=630cb74db34d2d5451ba30b47869f6bb
-
-PKG_MAINTAINER:=Jonas Gorski <jogo@openwrt.org>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
-
-
-define Package/znc/default
-  SUBMENU:=Instant Messaging
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=ZNC
-  URL:=http://en.znc.in/
-endef
-
-define Package/znc
-  $(Package/znc/default)
-  DEPENDS:=+libopenssl +libpthread +libstdcpp
-  MENU:=1
-endef
-
-define Package/znc/description
-	ZNC is an IRC bouncer with many advanced features like detaching,
-	multiple users, per channel playback buffer, SSL, IPv6, transparent DCC
-	bouncing, and c++ module support to name a few.
-endef
-
-define Package/znc/conffiles
-/etc/config/znc
-endef
-
-
-define Package/znc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/znc $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/znc.init $(1)/etc/init.d/znc
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/znc.conf $(1)/etc/config/znc
-	$(INSTALL_DIR) $(1)/usr/lib/znc/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/droproot.so $(1)/usr/lib/znc/
-endef
-
-
-ZNC_MODULES :=
-ZNC_MODULE_TARGETS := droproot.so
-
-define module
-  define Package/znc-mod-$(strip $(1))
-    $(Package/znc/default)
-    TITLE+= ($(strip $(1)) plugin)
-    DEPENDS:=znc
-  endef
-
-  define Package/znc-mod-$(strip $(1))/description
-   $(strip $(2))
-  endef
-
-  define Package/znc-mod-$(strip $(1))/install
-	$(INSTALL_DIR) $$(1)/usr/lib/znc/
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/$(subst -,_,$(strip $(1))).so $$(1)/usr/lib/znc/
-	# include webadmin page templates if existing
-	if [ -d $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) ]; then \
-		$(INSTALL_DIR) $$(1)/usr/share/znc/modules ;\
-		$(CP) -r $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\
-	fi
-  endef
-
-  ZNC_MODULES += znc-mod-$(strip $(1))
-  $(if $(CONFIG_PACKAGE_znc-mod-$(strip $(1))),ZNC_MODULE_TARGETS += $(subst -,_,$(strip $(1))).so)
-endef
-
-define webadmin
-  define Package/znc-mod-webadmin
-    $(Package/znc/default)
-    TITLE+= (webadmin plugin)
-    DEPENDS:=znc
-  endef
-
-  define Package/znc-mod-webadmin/description
-   Allows you to add/remove/edit users and settings on the fly via a web browser.
-  endef
-
-  define Package/znc-mod-webadmin/install
-	$(INSTALL_DIR) $$(1)/usr/lib/znc/
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/
-	$(INSTALL_DIR) $$(1)/usr/share/znc/modules
-	$(CP) -r $$(PKG_BUILD_DIR)/modules/data/webadmin $$(1)/usr/share/znc/modules
-	$(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-	$(CP) -r $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/
-  endef
-
-  ZNC_MODULES += znc-mod-webadmin
-  $(if $(CONFIG_PACKAGE_znc-mod-webadmin),ZNC_MODULE_TARGETS += webadmin.so)
-endef
-
-define webskin
-  define Package/znc-webskin-$(strip $(1))
-    $(Package/znc/default)
-    TITLE+= ($(strip $(1)) webskin)
-    DEPENDS:=znc-mod-webadmin
-  endef
-
-  define Package/znc-webskin-$(strip $(1))/description
-    $(strip $(1)) webskin for webadmin
-  endef
-
-  define Package/znc-webskin-$(strip $(1))/install
-	$(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-	$(CP) -r $$(PKG_BUILD_DIR)/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/
-  endef
-  ZNC_MODULES += znc-webskin-$(strip $(1))
-endef
-
-, := ,
-
-$(eval $(call module,adminlog,Log user connects and disconnects and failed \
-	logins to file or syslog.))
-
-$(eval $(call module,autoattach,Reattaches you to channels on activity.))
-
-$(eval $(call module,autocycle,Cycles a channel when you are the only one in \
-	there and you don't have op.))
-
-$(eval $(call module,autoop,Auto op the good guys.))
-
-$(eval $(call module,autoreply,Gives a automatic reply if someone messages you \
-	if you are away.))
-
-$(eval $(call module,autovoice,Autovoices everyone who joins some channel.))
-
-$(eval $(call module,awaynick,Change your nick while you are away.))
-
-$(eval $(call module,awaystore,Stores messages while away$(,) also auto away.))
-
-$(eval $(call module,block-motd,This module blocks the server's Message of the \
-	Day.))
-
-$(eval $(call module,blockuser,Blocks certain users from using ZNC saying \
-	their account was disabled.))
-
-$(eval $(call module,bouncedcc,Bounces dcc transfers through the znc server \
-	instead of sending them directly to the user.))
-
-$(eval $(call module,buffextras,Add nick changes$(,) joins$(,) parts$(,) topic \
-	changes etc. to your playback buffer.))
-
-$(eval $(call module,cert,Use a SSL certificate for connecting to a server.))
-
-$(eval $(call module,certauth,This module allows users to log in to ZNC via \
-	SSL client keys.))
-
-$(eval $(call module,chansaver,Keeping config up to date when user joins and \
-	parts.))
-
-$(eval $(call module,clearbufferonmsg,This module keeps the buffer until the \
-	next message from the client.))
-
-$(eval $(call module,clientnotify,Notify about new incoming connections to \
-	your user.))
-
-$(eval $(call module,controlpanel,Allows you to add/remove/edit users and \
-	settings on the fly via IRC messages.))
-
-$(eval $(call module,crypt,Encryption for channel/private messages.))
-
-$(eval $(call module,ctcpflood,This module tries to block ctcp floods.))
-
-$(eval $(call module,dcc,Allows you to transfer files to and from ZNC.))
-
-$(eval $(call module,disconkick,This module will kick your client from all \
-	channels where you are$(,) in case if ZNC disconnects from server.))
-
-$(eval $(call module,fail2ban,Block IPs for some time after a failed login.))
-
-$(eval $(call module,flooddetach,This module detaches you from channels which \
-	are flooded.))
-
-$(eval $(call module,identfile,Places the ident of a user to a file when they \
-	 are trying to connect.))
-
-$(eval $(call module,keepnick,Tries to get you your primary nick.))
-
-$(eval $(call module,kickrejoin,Implements auto-rejoin-on-kick.))
-
-$(eval $(call module,lastseen,Logs when a user last logged in to ZNC.))
-
-$(eval $(call module,listsockets,This module displays a list of all open \
-	sockets in ZNC.))
-
-$(eval $(call module,log,Log conversations to file.))
-
-$(eval $(call module,modules_online,This module fakes the online status of \
-	ZNC-*users.))
-
-$(eval $(call module,nickserv,Auths you with NickServ.))
-
-$(eval $(call module,notes,This modules stores and displays short notes using \
-	a key/note pairs and shows them to you on connect.))
-
-$(eval $(call module,notify-connect,Sends a notice to all admins when a user \
-	logs in or out.))
-
-$(eval $(call module,partyline,Allows ZNC users to join internal channels and \
-	query other ZNC users on the same ZNC.))
-
-$(eval $(call module,perform,Performs commands on connect.))
-
-$(eval $(call module,q,Auths you with Q (and a little more).))
-
-$(eval $(call module,raw,View all of the raw traffic.))
-
-$(eval $(call module,route-replies,Routes back answers to the right client \
-	when connected with multiple clients.))
-
-$(eval $(call module,sasl,The SASL module allows you to authenticate to an \
-	IRC network via SASL.))
-
-$(eval $(call module,savebuff,Saves your channel buffers into an encrypted \
-	file so they can survive restarts and reboots.))
-
-$(eval $(call module,schat,SSL (encrypted) DCC chats.))
-
-$(eval $(call module,send-raw,Allows you to send raw traffic to IRC from \
-	other users.))
-
-$(eval $(call module,simple-away,This module will automatically set you away \
-	on IRC while you are disconnected from the bouncer.))
-
-$(eval $(call module,shell,Have your unix shell in a query window right inside \
-	of your IRC client.))
-
-$(eval $(call module,stickychan,Keeps you sticked to specific channels.))
-
-$(eval $(call module,watch,Monitor activity for specific text patterns from \
-	specific users and have the text sent to a special query window.))
-
-$(eval $(call webadmin))
-
-$(eval $(call webskin,dark-clouds))
-$(eval $(call webskin,forest))
-$(eval $(call webskin,ice))
-
-PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-	LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	LIBS="-lstdc++ -lm -lssl -lcrypto $(LIBGCC_S) -lc"
-
-CONFIGURE_ARGS += \
-	--disable-c-ares \
-	--disable-perl
-
-define Build/Configure
-	$(call Build/Configure/Default,)
-	$(call libtool_disable_rpath)
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default,znc)
-	+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
-		$(MAKE_FLAGS) $(ZNC_MODULE_TARGETS)
-endef
-
-$(eval $(call BuildPackage,znc))
-$(foreach m,$(ZNC_MODULES),$(eval $(call BuildPackage,$(m))))
diff --git a/trunk/package/feeds/packages/znc/files/znc.conf b/trunk/package/feeds/packages/znc/files/znc.conf
deleted file mode 100644
index 1b0d842a..00000000
--- a/trunk/package/feeds/packages/znc/files/znc.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-config znc
-	# where to listen for connections
-	list listener	'192.168.1.1 1234'
-	# If using SSL sockets, use the following certifcate:
-	# option znc_ssl_cert '/etc/znc.cert'
-
-	# load global modules (You need to install them first):
-	# list module 'fail2ban'
-
-	# remove this to enable the service
-	option disabled 1
-
-config user 'sampleUser'
-	# Use either a plain text password or use the full sha256#... line.
-	# You can generate one with 'znc -s'.
-	option password 'changeme'
-	option nick 	'sampleUser'
-	option altnick 	'userSample'
-	option ident 	'openwrt'
-	option realname 'John Doe'
-
-	# This adds support for channels in znc configuration:
-	# list channel    '#chan optional_password'
-
-	# list of allowed servers:
-	# list server 	'chat.freenode.net 6667'
-
-	# load user modules ('<module> [params...]'):
-	# list module 'simple_away -timer 10 disconnected'
diff --git a/trunk/package/feeds/packages/znc/files/znc.init b/trunk/package/feeds/packages/znc/files/znc.init
deleted file mode 100644
index 7cc7fa70..00000000
--- a/trunk/package/feeds/packages/znc/files/znc.init
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010 Openwrt.org
-
-START=60
-
-ZNC_CONFIG_PATH=/tmp/etc/znc
-PID_FILE=${ZNC_CONFIG_PATH}/znc.pid
-ZNC_CONFIG=${ZNC_CONFIG_PATH}/configs/znc.conf
-
-EXTERNAL_CONFIG=0
-DISABLED=
-
-RUNAS_USER=
-RUNAS_GROUP=
-
-add_param() {
-	echo "$1 = $2" >> $ZNC_CONFIG
-}
-
-add_chan() {
-	chan=${1% *}
-	pass=${1#* }
-	echo "		<Chan $chan>" >> $ZNC_CONFIG
-	[ "$chan" != "$pass" ] && echo "			Key = $pass" >> $ZNC_CONFIG
-	echo "		</Chan>" >> $ZNC_CONFIG
-}
-
-add_network() {
-	local current_user="$1"
-	local network="$2"
-	local user
-	local name
-
-	config_get user "$network" user
-
-	[ "$user" = "$current_user" ] || return 0
-
-	config_get name "$network" name
-	echo "	<Network $name>" >> $ZNC_CONFIG
-	config_list_foreach "$network" server "add_param \"		Server\""
-	config_list_foreach "$network" channel "add_chan"
-}
-
-znc_global() {
-	local znc="$1"
-	local anoniplimit
-	local maxbuffersize
-	local connectdelay
-	local serverthrottle
-	local znc_config_path
-	local znc_pem_file
-
-	config_get_bool DISABLED "$znc" disabled 0
-
-	[ "$DISABLED" -eq 0 ] || return 0
-
-	config_get znc_config_path "$znc" znc_config_path
-
-	config_get RUNAS_USER "$znc" runas_user
-	config_get RUNAS_GROUP "$znc" runas_group
-
-	if [ "${znc_config_path}" ]
-	then
-		ZNC_CONFIG_PATH=$znc_config_path
-		EXTERNAL_CONFIG=1
-	else
-		mkdir -p $ZNC_CONFIG_PATH/configs/
-		[ ! -f "$ZNC_CONFIG" ] || rm "$ZNC_CONFIG"
-
-		add_param "Version" "1.0"
-
-		config_get anoniplimit "$znc" anoniplimit
-		config_get maxbuffersize "$znc" maxbuffersize
-		config_get connectdelay "$znc" connectdelay
-		config_get serverthrottle "$znc" serverthrottle
-		config_get znc_pem_file "$znc" znc_ssl_cert
-
-		[ -z "$znc_pem_file" ] || ln -sf "$znc_pem_file" $ZNC_CONFIG_PATH/znc.pem
-
-		[ -z $anoniplimit ] || echo "AnonIPLimit = $anoniplimit" >> $ZNC_CONFIG
-		[ -z $maxbuffersize ] || echo "MaxBufferSize = $maxbuffersize" >> $ZNC_CONFIG
-		[ -z $connectdelay ] || echo "ConnectDelay = $connectdelay" >> $ZNC_CONFIG
-		[ -z $serverthrottle ] || echo "ServerThrottle = $anoniplimit" >> $ZNC_CONFIG
-
-		echo "PidFile = $PID_FILE" >> $ZNC_CONFIG
-
-		config_list_foreach "$znc" listener "add_param Listener"
-		config_list_foreach "$znc" module "add_param LoadModule"
-
-		add_param LoadModule "droproot ${RUNAS_USER:-nobody} ${RUNAS_GROUP:-nogroup}"
-	fi
-}
-
-add_user() {
-	local user="$1"
-	local password
-	local nick
-	local altnick
-	local ident
-	local realname
-	local buffer
-	local quitmsg
-	local chanmodes
-	local vhost
-	local server
-
-	config_get password "$user" password
-	config_get nick "$user" nick
-	config_get altnick "$user" altnick
-	config_get ident "$user" ident
-	config_get realname "$user" realname
-	config_get buffer "$user" buffer
-	config_get quitmsg "$user" quitmsg
-	config_get chanmodes "$user" chanmodes
-	config_get vhost "$user" vhost
-	config_get server "$user" server
-
-	echo "<User $user>" >> $ZNC_CONFIG
-
-	case "$password" in
-	"md5#"* | "sha256#"* | "plain#"*)
-		add_param "	Pass" "$password"
-		;;
-	*)
-		add_param "	Pass" "plain#$password"
-		;;
-	esac
-
-	add_param "	Nick" "$nick"
-	add_param "	AltNick" "${altnick:-$nick"_"}"
-	add_param "	Ident" "${ident:-$nick}"
-	add_param "	RealName" "${realname:-$nick}"
-	[ -z "$vhost" ] || add_param "	VHost" "$vhost"
-	add_param "	Buffer" "${buffer:-50}"
-	add_param "	KeepBuffer" "false"
-	add_param "	ChanModes" "${chanmodes:-"+stn"}"
-	[ -z "$quitmsg" ] || add_param "	QuitMsg" "$quitmsg"
-
-	config_list_foreach "$user" module "add_param \"	LoadModule\""
-
-	# add legacy network
-	if [ "$server" ]; then
-		echo "	<Network Default>" >> $ZNC_CONFIG
-		config_list_foreach "$user" server "add_param \"		Server\""
-		config_list_foreach "$user" channel "add_chan"
-		echo "	</Network>" >> $ZNC_CONFIG
-	fi
-
-	config_foreach "add_network \"$user\"" network
-
-	echo "</User>" >> $ZNC_CONFIG
-}
-
-
-start() {
-	config_load znc
-	config_foreach znc_global znc
-
-	if [ "$DISABLED" -eq 1 ]; then
-		return 0
-	fi
-
-	if [ "$EXTERNAL_CONFIG" -eq 0 ]
-	then
-		config_foreach add_listener listener
-		config_foreach add_user user
-
-		chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc
-	fi
-
-	if [ "$EXTERNAL_CONFIG" -eq 1 -a "$RUNAS_USER"  ]
-	then
-		local SU=$(which su)
-		if [ "$SU" ]
-		then
-			$SU -c "/usr/bin/znc -d$ZNC_CONFIG_PATH >/dev/null &" $RUNAS_USER
-		else
-			logger -s -t ZNC -p daemon.err "Could not run ZNC as user $RUNAS_USER: su not found."
-			exit 1
-		fi
-	else
-		/usr/bin/znc -d$ZNC_CONFIG_PATH >/dev/null &
-	fi
-}
-
-stop() {
-	if [ -f "$PID_FILE" ]
-	then
-		kill $(cat "$PID_FILE")
-	else
-		killall znc
-	fi
-}
-
diff --git a/trunk/package/feeds/packages/znc/patches/001-move_rootcheck_after_config.patch b/trunk/package/feeds/packages/znc/patches/001-move_rootcheck_after_config.patch
deleted file mode 100644
index 8b3e3e70..00000000
--- a/trunk/package/feeds/packages/znc/patches/001-move_rootcheck_after_config.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5f655f9a25a377c01cb15517859eb514628a43d4 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
-Date: Wed, 6 Apr 2011 04:10:23 +0200
-Subject: [PATCH] Move the root check to after config parsing
-
----
- src/main.cpp |   27 ++++++++++++++-------------
- 1 files changed, 14 insertions(+), 13 deletions(-)
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -243,19 +243,6 @@ int main(int argc, char** argv) {
- 		CUtils::PrintStatus(true, "");
- 	}
- 
--	if (isRoot()) {
--		CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
--		CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
--		if (!bAllowRoot) {
--			delete pZNC;
--			return 1;
--		}
--		CUtils::PrintError("You have been warned.");
--		CUtils::PrintError("Hit CTRL+C now if you don't want to run ZNC as root.");
--		CUtils::PrintError("ZNC will start in 30 seconds.");
--		sleep(30);
--	}
--
- 	if (bMakeConf) {
- 		if (!pZNC->WriteNewConfig(sConfig)) {
- 			delete pZNC;
-@@ -276,6 +263,20 @@ int main(int argc, char** argv) {
- 		return 1;
- 	}
- 
-+	if (isRoot()) {
-+		CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
-+		CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
-+		if (!bAllowRoot) {
-+			delete pZNC;
-+			return 1;
-+		}
-+		CUtils::PrintError("You have been warned.");
-+		CUtils::PrintError("Hit CTRL+C now if you don't want to run ZNC as root.");
-+		CUtils::PrintError("ZNC will start in 30 seconds.");
-+		sleep(30);
-+	}
-+
-+
- 	if (bForeground) {
- 		int iPid = getpid();
- 		CUtils::PrintMessage("Staying open for debugging [pid: " + CString(iPid) + "]");
diff --git a/trunk/package/feeds/packages/znc/patches/003-Reduce_rebuild_time.patch b/trunk/package/feeds/packages/znc/patches/003-Reduce_rebuild_time.patch
deleted file mode 100644
index 25c08e5b..00000000
--- a/trunk/package/feeds/packages/znc/patches/003-Reduce_rebuild_time.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 94aff4c3389111fc85054eb06b40bea26a216d0c Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
-Date: Sat, 16 Apr 2011 05:51:04 +0200
-Subject: [PATCH] Don't rebuild everything when the Makefile's timestamp changed
-
----
- Makefile.in         |    2 +-
- modules/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,7 +104,7 @@ clean:
- distclean: clean
- 	rm -rf $(DISTCLEAN)
- 
--src/%.o: src/%.cpp Makefile
-+src/%.o: src/%.cpp
- 	@mkdir -p .depend src
- 	$(E) Building core object $*...
- 	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MD -MF .depend/$*.dep -MT $@
---- a/modules/Makefile.in
-+++ b/modules/Makefile.in
-@@ -117,12 +117,12 @@ install_datadir:
- clean:
- 	rm -rf $(CLEAN)
- 
--%.o: %.cpp Makefile
-+%.o: %.cpp
- 	@mkdir -p .depend
- 	$(E) Building module $(notdir $(basename $@))...
- 	$(Q)$(CXX) $(MODFLAGS) -c -o $@ $< $($(notdir $(basename $@))CXXFLAGS) -MD -MF .depend/$(notdir $@).dep
- 
--%.so: %.o Makefile
-+%.so: %.o
- 	$(E) "Linking  module" $(notdir $(basename $@))...
- 	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))LDFLAGS) $(LIBS)
- 
diff --git a/trunk/package/feeds/packages/znc/patches/004-restore_droproot.patch b/trunk/package/feeds/packages/znc/patches/004-restore_droproot.patch
deleted file mode 100644
index 2c7cefe5..00000000
--- a/trunk/package/feeds/packages/znc/patches/004-restore_droproot.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- /dev/null
-+++ b/modules/droproot.cpp
-@@ -0,0 +1,144 @@
-+/*
-+ * droproot.cpp
-+ *
-+ * Copyright (c) 2009 Vadtec (vadtec@vadtec.net)
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ *
-+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <znc/znc.h>
-+#include <znc/User.h>
-+#include <pwd.h>
-+#include <grp.h>
-+
-+class CDroproot : public CModule {
-+
-+public:
-+	MODCONSTRUCTOR(CDroproot) {
-+	}
-+
-+	virtual ~CDroproot() {
-+	}
-+
-+	uid_t GetUser(const CString& sUser, CString& sMessage) {
-+		uid_t ret = sUser.ToUInt();
-+
-+		if (ret != 0)
-+			return ret;
-+
-+		struct passwd *pUser = getpwnam(sUser.c_str());
-+
-+		if (!pUser) {
-+			sMessage = "User [" + sUser + "] not found!";
-+			return 0;
-+		}
-+
-+		return pUser->pw_uid;
-+	}
-+
-+	gid_t GetGroup(const CString& sGroup, CString& sMessage) {
-+		gid_t ret = sGroup.ToUInt();
-+
-+		if (ret != 0)
-+			return ret;
-+
-+		struct group *pGroup = getgrnam(sGroup.c_str());
-+
-+		if (!pGroup) {
-+			sMessage = "Group [" + sGroup + "] not found!";
-+			return 0;
-+		}
-+
-+		return pGroup->gr_gid;
-+	}
-+
-+	virtual bool OnLoad(const CString& sArgs, CString& sMessage) {
-+		CString sUser = sArgs.Token(0);
-+		CString sGroup = sArgs.Token(1, true);
-+
-+		if (sUser.empty() || sGroup.empty()) {
-+			sMessage = "Usage: LoadModule = Droproot <uid> <gid>";
-+			return false;
-+		}
-+
-+		m_user = GetUser(sUser, sMessage);
-+
-+		if (m_user == 0) {
-+			sMessage
-+					= "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot <uid> <gid>";
-+			return false;
-+		}
-+
-+		m_group = GetGroup(sGroup, sMessage);
-+
-+		if (m_group == 0) {
-+			sMessage
-+					= "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot <uid> <gid>";
-+			return false;
-+		}
-+
-+		return true;
-+	}
-+
-+	virtual bool OnBoot() {
-+		int u, eu, g, eg, sg;
-+
-+		if ((geteuid() == 0) || (getuid() == 0) || (getegid() == 0) || (getgid()
-+				== 0)) {
-+
-+			CUtils::PrintAction("Dropping root permissions");
-+
-+			// Clear all the supplementary groups
-+			sg = setgroups(0, NULL);
-+
-+			if (sg < 0) {
-+				CUtils::PrintStatus(false,
-+						"Could not remove supplementary groups! ["
-+								+ CString(strerror(errno)) + "]");
-+
-+				return false;
-+			}
-+
-+			// Set the group (if we are root, this sets all three group IDs)
-+			g = setgid(m_group);
-+			eg = setegid(m_group);
-+
-+			if ((g < 0) || (eg < 0)) {
-+				CUtils::PrintStatus(false, "Could not switch group id! ["
-+						+ CString(strerror(errno)) + "]");
-+
-+				return false;
-+			}
-+
-+			// and set the user (if we are root, this sets all three user IDs)
-+			u = setuid(m_user);
-+			eu = seteuid(m_user);
-+
-+			if ((u < 0) || (eu < 0)) {
-+				CUtils::PrintStatus(false, "Could not switch user id! ["
-+						+ CString(strerror(errno)) + "]");
-+
-+				return false;
-+			}
-+
-+			CUtils::PrintStatus(true);
-+
-+			return true;
-+		}
-+
-+		return true;
-+	}
-+
-+protected:
-+	uid_t m_user;
-+	gid_t m_group;
-+};
-+
-+GLOBALMODULEDEFS(CDroproot, "Allows ZNC to drop root privileges and run as an un-privileged user.")
diff --git a/trunk/package/feeds/packages/zoneinfo/Makefile b/trunk/package/feeds/packages/zoneinfo/Makefile
deleted file mode 100644
index 3327fddc..00000000
--- a/trunk/package/feeds/packages/zoneinfo/Makefile
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# Author: Michael Geddes
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zoneinfo
-PKG_VERSION:=2015b
-PKG_VERSION_CODE:=2015b
-PKG_RELEASE:=1
-
-#As i couldn't find real license used "Public Domain"
-#as referense to http://www.iana.org/time-zones/repository/tz-link.html
-PKG_LICENSE:=Public Domain
-
-PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
-PKG_SOURCE_CODE:=tzcode$(PKG_VERSION_CODE).tar.gz
-PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases
-PKG_MD5SUM:=75571bb17c7b6be88a9f8872e45bc726
-
-include $(INCLUDE_DIR)/package.mk
-
-define Download/tzcode
-   FILE=$(PKG_SOURCE_CODE)
-   URL=$(PKG_SOURCE_URL)
-   MD5SUM:=f073a7c9bca7f9fe408491f826e92968
-endef
-
-$(eval $(call Download,tzcode))
-
-define Package/zoneinfo/Default
-  SUBMENU:=zoneinfo
-  TITLE:=Zone Information
-  SECTION:=utils
-  CATEGORY:=Utilities
-  MAINTAINER=Vladimir Ulrich <admin@evl.su>
-endef
-
-define Package/zoneinfo-core
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (core)
-endef
-
-define Package/zoneinfo-simple
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (simple)
-endef
-
-define Package/zoneinfo-africa
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Africa)
-endef
-
-define Package/zoneinfo-northamerica
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (NorthAmerica)
-endef
-
-define Package/zoneinfo-southamerica
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (SouthAmerica)
-endef
-
-define Package/zoneinfo-poles
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Arctic, Antarctic)
-endef
-
-define Package/zoneinfo-asia
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Asia)
-endef
-
-define Package/zoneinfo-atlantic
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Atlantic)
-endef
-
-define Package/zoneinfo-australia-nz
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Australia-NZ)
-endef
-
-define Package/zoneinfo-pacific
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Pacific)
-endef
-
-define Package/zoneinfo-europe
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Europe)
-endef
-
-define Package/zoneinfo-india
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (India)
-endef
-
-define Build/Prepare
-	(cd $(PKG_BUILD_DIR) && tar -xzf $(DL_DIR)/$(PKG_SOURCE_CODE) && tar -xzf $(DL_DIR)/$(PKG_SOURCE))
-endef
-
-define Build/Compile
-	CFLAGS="$(HOST_CFLAGS)" \
-	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile \
-		$(HOST_CONFIGURE_OPTS) \
-		CC="$(HOSTCC)" \
-		LD="\$$$$(CC)" \
-		CPPFLAGS="$(HOST_CPPFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		TOPDIR="$(PKG_INSTALL_DIR)" \
-		TZDIR="$(PKG_INSTALL_DIR)/zoneinfo" \
-		install
-endef
-
-define Package/zoneinfo-core/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in \
-		CET CST6CDT EET EST EST5EDT GB-Eire Eire \
-		GB    GMT   GMT+0 GMT-0 GMT0  Greenwich  \
-		HST   MET   MST   MST7MDT                \
-		PRC   PST8PDT ROC ROK     UCT   UTC      \
-		Universal W-SU WET Zulu Etc/* zone.tab ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-simple/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Pacific/Honolulu     \
-		America/Anchorage   America/Los_Angeles America/Denver   \
-		America/Chicago     America/New_York    America/Caracas  \
-		America/Sao_Paulo   Europe/London       Europe/Paris     \
-		Africa/Cairo        Europe/Moscow       Asia/Dubai       \
-		Asia/Karachi        Asia/Dhaka          Asia/Bankok      \
-		Asia/Hong_Kong      Asia/Tokyo          Australia/Darwin \
-		Australia/Adelaide  Australia/Brisbane  Australia/Sydney \
-		Australia/Perth     Pacific/Noumea ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-africa/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo/Africa
-	$(CP) $(PKG_INSTALL_DIR)/zoneinfo/Africa/* \
-	      $(1)/usr/share/zoneinfo/Africa
-endef
-
-define Package/zoneinfo-northamerica/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in US America Canada Mexico Cuba Jamaica Navajo ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-	rm  -rf $(1)/usr/share/zoneinfo/America/Argentina
-endef
-
-define Package/zoneinfo-southamerica/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Brazil Chile ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo/America/Argentina
-	$(CP) $(PKG_INSTALL_DIR)/zoneinfo/America/Argentina/* \
-	      $(1)/usr/share/zoneinfo/America/Argentina
-endef
-
-define Package/zoneinfo-poles/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Antarctica Arctic ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-asia/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Asia Japan Singapore Hongkong ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-atlantic/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Atlantic Iceland ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-australia-nz/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in NZ NZ-CHAT Australia ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-pacific/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Pacific Kwajalein ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-europe/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Europe Portugal Poland ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-india/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Indian ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-$(eval $(call BuildPackage,zoneinfo-simple))
-$(eval $(call BuildPackage,zoneinfo-core))
-$(eval $(call BuildPackage,zoneinfo-africa))
-$(eval $(call BuildPackage,zoneinfo-northamerica))
-$(eval $(call BuildPackage,zoneinfo-southamerica))
-$(eval $(call BuildPackage,zoneinfo-poles))
-$(eval $(call BuildPackage,zoneinfo-asia))
-$(eval $(call BuildPackage,zoneinfo-atlantic))
-$(eval $(call BuildPackage,zoneinfo-australia-nz))
-$(eval $(call BuildPackage,zoneinfo-pacific))
-$(eval $(call BuildPackage,zoneinfo-europe))
-$(eval $(call BuildPackage,zoneinfo-india))
diff --git a/trunk/package/feeds/packages/zsh/Makefile b/trunk/package/feeds/packages/zsh/Makefile
deleted file mode 100644
index 2e62f08a..00000000
--- a/trunk/package/feeds/packages/zsh/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zsh
-PKG_VERSION:=5.0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/zsh
-PKG_MD5SUM:=7150a6abc2aa1a79d81ed9a282594225
-PKG_MAINTAINER:=Vadim A. Misbakh-Soloviov <mva@mva.name>
-PKG_LICENSE:=ZSH
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zsh
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The Z shell
-  DEPENDS:=+libncurses +libncursesw +libpcre +librt
-  URL:=http://www.zsh.org/
-endef
-
-define Package/zsh/description
-        Zsh is a UNIX command interpreter (shell) usable as an interactive
-        login  shell  and  as a shell script command processor. Of the standard
-        shells, zsh most closely resembles ksh but includes many enhancements.
-        Zsh has command line editing, builtin spelling correction, programmable
-        command completion, shell functions (with autoloading), a history
-        mechanism, and a host of other features.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--bindir=/bin \
-		--disable-etcdir \
-		--disable-gdbm \
-		--enable-pcre \
-		--enable-multibyte \
-		--enable-function-subdirs \
-		--with-tcsetpgrp \
-		--with-term-lib="ncursesw", \
-		zsh_cv_sys_nis=no \
-		zsh_cv_sys_nis_plus=no \
-	)
-	# Do not install these functions:
-	$(SED) 's, Completion/AIX/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/BSD/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Cygwin/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Darwin/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Debian/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Mandriva/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Redhat/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Solaris/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/X/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/openSUSE/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	# After mucking with 'config.modules', one must call
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" prep
-endef
-
-define Package/zsh/postinst
-#!/bin/sh
-grep zsh $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/zsh" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/zsh/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/zsh $(1)/bin/
-	$(INSTALL_DIR) $(1)/usr/share/zsh/$(PKG_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/zsh/$(PKG_VERSION)/* $(1)/usr/share/zsh/$(PKG_VERSION)/
-endef
-
-$(eval $(call BuildPackage,zsh))
-- 
2.25.1